diff --git a/Add-loongarch-cpu-model-and-vendor-info.patch b/Add-loongarch-cpu-model-and-vendor-info.patch
deleted file mode 100644
index e4e66514b9cdd4945bc8da1cf492d8ecf00ebc5a..0000000000000000000000000000000000000000
--- a/Add-loongarch-cpu-model-and-vendor-info.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 55c7dc34b8ff1a75bb011ca783b6cd3c7f1a5643 Mon Sep 17 00:00:00 2001
-From: zhaotianrui <zhaotianrui@loongson.cn>
-Date: Wed, 11 Jan 2023 11:41:55 -0500
-Subject: [PATCH 2/4] Add loongarch cpu model and vendor info
-
-Define loongarch cpu model type and vendor id in
-cpu_map/loongarch.xml
-
-Signed-off-by: zhaotianrui <zhaotianrui@loongson.cn>
----
- src/cpu_map/Makefile.inc.am       | 2 ++
- src/cpu_map/index.xml             | 5 +++++
- src/cpu_map/loongarch_3a5000.xml  | 6 ++++++
- src/cpu_map/loongarch_vendors.xml | 3 +++
- 4 files changed, 16 insertions(+)
- create mode 100644 src/cpu_map/loongarch_3a5000.xml
- create mode 100644 src/cpu_map/loongarch_vendors.xml
-
-diff --git a/src/cpu_map/Makefile.inc.am b/src/cpu_map/Makefile.inc.am
-index 8eb818706a..3c674dea40 100644
---- a/src/cpu_map/Makefile.inc.am
-+++ b/src/cpu_map/Makefile.inc.am
-@@ -68,6 +68,8 @@ cpumap_DATA = \
- 	cpu_map/x86_Skylake-Server-noTSX-IBRS.xml \
- 	cpu_map/x86_Westmere.xml \
- 	cpu_map/x86_Westmere-IBRS.xml \
-+	cpu_map/loongarch_vendors.xml \
-+	cpu_map/loongarch_3a5000.xml \
- 	cpu_map/arm_vendors.xml \
- 	cpu_map/arm_cortex-a53.xml \
- 	cpu_map/arm_cortex-a57.xml \
-diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml
-index 3ccc76b9ed..1c05dd814d 100644
---- a/src/cpu_map/index.xml
-+++ b/src/cpu_map/index.xml
-@@ -101,4 +101,9 @@
-     <include filename='arm_FT-2000plus.xml'/>
-     <include filename='arm_Tengyun-S2500.xml'/>
-   </arch>
-+
-+  <arch name='loongarch64'>
-+    <include filename="loongarch_vendors.xml"/>
-+    <include filename="loongarch_3a5000.xml"/>
-+  </arch>
- </cpus>
-diff --git a/src/cpu_map/loongarch_3a5000.xml b/src/cpu_map/loongarch_3a5000.xml
-new file mode 100644
-index 0000000000..f6fe3386f7
---- /dev/null
-+++ b/src/cpu_map/loongarch_3a5000.xml
-@@ -0,0 +1,6 @@
-+<cpus>
-+  <model name='Loongson-3A5000'>
-+    <vendor name='Loongson'/>
-+      <prid value='0x14c010' mask='0xfffff0'/>
-+  </model>
-+</cpus>
-diff --git a/src/cpu_map/loongarch_vendors.xml b/src/cpu_map/loongarch_vendors.xml
-new file mode 100644
-index 0000000000..c744654617
---- /dev/null
-+++ b/src/cpu_map/loongarch_vendors.xml
-@@ -0,0 +1,3 @@
-+<cpus>
-+  <vendor name='Loongson'/>
-+</cpus>
--- 
-2.25.1
-
diff --git a/Add-loongarch-cpu-support.patch b/Add-loongarch-cpu-support.patch
deleted file mode 100644
index 7d057551d10b01957c84916bc6ad4921cf2aa1d7..0000000000000000000000000000000000000000
--- a/Add-loongarch-cpu-support.patch
+++ /dev/null
@@ -1,994 +0,0 @@
-From c0b26612cf12d5f0594a9dfa5bd97fcf7acfe9da Mon Sep 17 00:00:00 2001
-From: zhaotianrui <zhaotianrui@loongson.cn>
-Date: Wed, 11 Jan 2023 10:53:08 -0500
-Subject: [PATCH 1/4] Add loongarch cpu support
-
-Add loongarch cpu support: Define new cpu type 'loongarch64'
-and implement it's driver functions.
-
-Signed-off-by: zhaotianrui <zhaotianrui@loongson.cn>
----
- docs/schemas/basictypes.rng  |   1 +
- po/POTFILES.in               |   1 +
- src/cpu/Makefile.inc.am      |   3 +
- src/cpu/cpu.c                |   2 +
- src/cpu/cpu.h                |   3 +-
- src/cpu/cpu_loongarch.c      | 739 +++++++++++++++++++++++++++++++++++
- src/cpu/cpu_loongarch.h      |  28 ++
- src/cpu/cpu_loongarch_data.h |  40 ++
- src/qemu/qemu_capabilities.c |   1 +
- src/qemu/qemu_domain.c       |   4 +
- src/util/virarch.c           |   1 +
- src/util/virarch.h           |   3 +
- 12 files changed, 825 insertions(+), 1 deletion(-)
- create mode 100644 src/cpu/cpu_loongarch.c
- create mode 100644 src/cpu/cpu_loongarch.h
- create mode 100644 src/cpu/cpu_loongarch_data.h
-
-diff --git a/docs/schemas/basictypes.rng b/docs/schemas/basictypes.rng
-index 81465273c8..34d285db48 100644
---- a/docs/schemas/basictypes.rng
-+++ b/docs/schemas/basictypes.rng
-@@ -444,6 +444,7 @@
-       <value>x86_64</value>
-       <value>xtensa</value>
-       <value>xtensaeb</value>
-+      <value>loongarch64</value>
-     </choice>
-   </define>
- 
-diff --git a/po/POTFILES.in b/po/POTFILES.in
-index 197ff2f3d3..24dc8087d6 100644
---- a/po/POTFILES.in
-+++ b/po/POTFILES.in
-@@ -60,6 +60,7 @@
- @SRCDIR@/src/cpu/cpu_arm.c
- @SRCDIR@/src/cpu/cpu_map.c
- @SRCDIR@/src/cpu/cpu_ppc64.c
-+@SRCDIR@/src/cpu/cpu_loongarch.c
- @SRCDIR@/src/cpu/cpu_s390.c
- @SRCDIR@/src/cpu/cpu_x86.c
- @SRCDIR@/src/datatypes.c
-diff --git a/src/cpu/Makefile.inc.am b/src/cpu/Makefile.inc.am
-index 1ee1290c2d..e2219bbc1c 100644
---- a/src/cpu/Makefile.inc.am
-+++ b/src/cpu/Makefile.inc.am
-@@ -15,6 +15,9 @@ CPU_SOURCES = \
- 	cpu/cpu_ppc64.h \
- 	cpu/cpu_ppc64.c \
- 	cpu/cpu_ppc64_data.h \
-+	cpu/cpu_loongarch.h \
-+	cpu/cpu_loongarch.c \
-+	cpu/cpu_loongarch_data.h \
- 	cpu/cpu_map.h \
- 	cpu/cpu_map.c \
- 	$(NULL)
-diff --git a/src/cpu/cpu.c b/src/cpu/cpu.c
-index 89c06aceeb..df78a0d33f 100644
---- a/src/cpu/cpu.c
-+++ b/src/cpu/cpu.c
-@@ -30,6 +30,7 @@
- #include "cpu_s390.h"
- #include "cpu_arm.h"
- #include "cpu_sw64.h"
-+#include "cpu_loongarch.h"
- #include "capabilities.h"
- #include "virstring.h"
- 
-@@ -44,6 +45,7 @@ static struct cpuArchDriver *drivers[] = {
-     &cpuDriverS390,
-     &cpuDriverArm,
-     &cpuDriverSW64,
-+    &cpuDriverLoongArch,
- };
- 
- 
-diff --git a/src/cpu/cpu.h b/src/cpu/cpu.h
-index ec22a183a1..307c85fb61 100644
---- a/src/cpu/cpu.h
-+++ b/src/cpu/cpu.h
-@@ -28,7 +28,7 @@
- #include "cpu_x86_data.h"
- #include "cpu_ppc64_data.h"
- #include "cpu_arm_data.h"
--
-+#include "cpu_loongarch_data.h"
- 
- typedef struct _virCPUData virCPUData;
- typedef virCPUData *virCPUDataPtr;
-@@ -38,6 +38,7 @@ struct _virCPUData {
-         virCPUx86Data x86;
-         virCPUppc64Data ppc64;
-         virCPUarmData arm;
-+        virCPULoongArchData loongarch;
-         /* generic driver needs no data */
-     } data;
- };
-diff --git a/src/cpu/cpu_loongarch.c b/src/cpu/cpu_loongarch.c
-new file mode 100644
-index 0000000000..953316bf78
---- /dev/null
-+++ b/src/cpu/cpu_loongarch.c
-@@ -0,0 +1,739 @@
-+/*
-+ * cpu_loongarch.c: CPU driver for 64-bit LOONGARCH CPUs
-+ *
-+ * Copyright (C) 2023 Loongson Technology.
-+ *
-+ * 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 <fcntl.h>
-+#include <unistd.h>
-+#include <stdint.h>
-+#include <stdio.h>
-+#include <sys/time.h>
-+#include <sys/types.h>
-+#include <sys/wait.h>
-+#include <sys/resource.h>
-+#include <sys/stat.h>
-+#include <sys/types.h>
-+#include "virlog.h"
-+#include "viralloc.h"
-+#include "cpu.h"
-+#include "virstring.h"
-+#include "cpu_map.h"
-+#include "virbuffer.h"
-+
-+#define VIR_FROM_THIS VIR_FROM_CPU
-+
-+VIR_LOG_INIT("cpu.cpu_loongarch");
-+
-+static const virArch archs[] = { VIR_ARCH_LOONGARCH64 };
-+
-+typedef struct {
-+    char *name;
-+} LoongArch_vendor;
-+
-+typedef struct {
-+    char *name;
-+    const LoongArch_vendor *vendor;
-+    virCPULoongArchData data;
-+} LoongArch_model;
-+
-+typedef struct {
-+    size_t nvendors;
-+    LoongArch_vendor **vendors;
-+    size_t nmodels;
-+    LoongArch_model **models;
-+} LoongArch_map;
-+
-+static void
-+LoongArchDataClear(virCPULoongArchData *data)
-+{
-+    if (!data)
-+        return;
-+
-+    VIR_FREE(data->prid);
-+}
-+
-+static int
-+LoongArchDataCopy(virCPULoongArchData *dst, const virCPULoongArchData *src)
-+{
-+    size_t i;
-+
-+    if (VIR_ALLOC_N(dst->prid, src->len) < 0)
-+        return -1;
-+
-+    dst->len = src->len;
-+
-+    for (i = 0; i < src->len; i++) {
-+        dst->prid[i].value = src->prid[i].value;
-+        dst->prid[i].mask = src->prid[i].mask;
-+    }
-+
-+    return 0;
-+}
-+
-+static void
-+LoongArchVendorFree(LoongArch_vendor *vendor)
-+{
-+    if (!vendor)
-+        return;
-+
-+    VIR_FREE(vendor->name);
-+    VIR_FREE(vendor);
-+}
-+
-+static LoongArch_vendor *
-+LoongArchVendorFind(const LoongArch_map *map,
-+                    const char *name)
-+{
-+    size_t i;
-+
-+    for (i = 0; i < map->nvendors; i++) {
-+        if (STREQ(map->vendors[i]->name, name))
-+            return map->vendors[i];
-+    }
-+
-+    return NULL;
-+}
-+
-+static void
-+LoongArchModelFree(LoongArch_model *model)
-+{
-+    if (!model)
-+        return;
-+
-+    LoongArchDataClear(&model->data);
-+    VIR_FREE(model->name);
-+    VIR_FREE(model);
-+}
-+
-+static LoongArch_model *
-+LoongArchModelCopy(const LoongArch_model *model)
-+{
-+    LoongArch_model *copy;
-+
-+    if (VIR_ALLOC(copy) < 0)
-+        goto cleanup;
-+
-+    copy->name = g_strdup(model->name);
-+
-+    if (LoongArchDataCopy(&copy->data, &model->data) < 0)
-+        goto cleanup;
-+
-+    copy->vendor = model->vendor;
-+
-+    return copy;
-+
-+ cleanup:
-+    LoongArchModelFree(copy);
-+    return NULL;
-+}
-+
-+static LoongArch_model *
-+LoongArchModelFind(const LoongArch_map *map,
-+                   const char *name)
-+{
-+    size_t i;
-+
-+    for (i = 0; i < map->nmodels; i++) {
-+        if (STREQ(map->models[i]->name, name))
-+            return map->models[i];
-+    }
-+
-+    return NULL;
-+}
-+
-+static LoongArch_model *
-+LoongArchModelFindPrid(const LoongArch_map *map,
-+                       uint32_t prid)
-+{
-+    size_t i;
-+    size_t j;
-+
-+    for (i = 0; i < map->nmodels; i++) {
-+        LoongArch_model *model = map->models[i];
-+        for (j = 0; j < model->data.len; j++) {
-+            if ((prid & model->data.prid[j].mask) == model->data.prid[j].value)
-+                return model;
-+        }
-+    }
-+
-+    return NULL;
-+}
-+
-+static LoongArch_model *
-+LoongArchModelFromCPU(const virCPUDef *cpu,
-+                      const LoongArch_map *map)
-+{
-+    LoongArch_model *model;
-+
-+    if (!cpu->model) {
-+        virReportError(VIR_ERR_INVALID_ARG, "%s",
-+                       _("no CPU model specified"));
-+        return NULL;
-+    }
-+
-+    if (!(model = LoongArchModelFind(map, cpu->model))) {
-+        virReportError(VIR_ERR_INTERNAL_ERROR,
-+                       _("Unknown CPU model %s"), cpu->model);
-+        return NULL;
-+    }
-+
-+    return LoongArchModelCopy(model);
-+}
-+
-+static void
-+LoongArchMapFree(LoongArch_map *map)
-+{
-+    size_t i;
-+
-+    if (!map)
-+        return;
-+
-+    for (i = 0; i < map->nmodels; i++)
-+        LoongArchModelFree(map->models[i]);
-+    VIR_FREE(map->models);
-+
-+    for (i = 0; i < map->nvendors; i++)
-+        LoongArchVendorFree(map->vendors[i]);
-+    VIR_FREE(map->vendors);
-+
-+    VIR_FREE(map);
-+}
-+
-+static int
-+LoongArchVendorParse(xmlXPathContextPtr ctxt ATTRIBUTE_UNUSED,
-+                     const char *name,
-+                     void *data)
-+{
-+    LoongArch_map *map = data;
-+    LoongArch_vendor *vendor;
-+    int ret = -1;
-+
-+    if (VIR_ALLOC(vendor) < 0)
-+        return ret;
-+    vendor->name = g_strdup(name);
-+
-+    if (LoongArchVendorFind(map, vendor->name)) {
-+        virReportError(VIR_ERR_INTERNAL_ERROR,
-+                       _("CPU vendor %s already defined"), vendor->name);
-+        goto cleanup;
-+    }
-+
-+    if (VIR_APPEND_ELEMENT(map->vendors, map->nvendors, vendor) < 0)
-+        goto cleanup;
-+
-+    ret = 0;
-+
-+ cleanup:
-+    LoongArchVendorFree(vendor);
-+    return ret;
-+}
-+
-+static int
-+LoongArchModelParse(xmlXPathContextPtr ctxt,
-+                    const char *name,
-+                    void *data)
-+{
-+    LoongArch_map *map = data;
-+    LoongArch_model *model;
-+    xmlNodePtr *nodes = NULL;
-+    char *vendor = NULL;
-+    unsigned long prid;
-+    size_t i;
-+    int n;
-+    int ret = -1;
-+
-+    if (VIR_ALLOC(model) < 0)
-+        goto cleanup;
-+
-+    model->name = g_strdup(name);
-+
-+    if (LoongArchModelFind(map, model->name)) {
-+        virReportError(VIR_ERR_INTERNAL_ERROR,
-+                       _("CPU model %s already defined"), model->name);
-+        goto cleanup;
-+    }
-+
-+    if (virXPathBoolean("boolean(./vendor)", ctxt)) {
-+        vendor = virXPathString("string(./vendor/@name)", ctxt);
-+        if (!vendor) {
-+            virReportError(VIR_ERR_INTERNAL_ERROR,
-+                           _("Invalid vendor element in CPU model %s"),
-+                           model->name);
-+            goto cleanup;
-+        }
-+
-+        if (!(model->vendor = LoongArchVendorFind(map, vendor))) {
-+            virReportError(VIR_ERR_INTERNAL_ERROR,
-+                           _("Unknown vendor %s referenced by CPU model %s"),
-+                           vendor, model->name);
-+            goto cleanup;
-+        }
-+    }
-+
-+    if ((n = virXPathNodeSet("./prid", ctxt, &nodes)) <= 0) {
-+        virReportError(VIR_ERR_INTERNAL_ERROR,
-+                       _("Missing Prid information for CPU model %s"),
-+                       model->name);
-+        goto cleanup;
-+    }
-+
-+    if (VIR_ALLOC_N(model->data.prid, n) < 0)
-+        goto cleanup;
-+
-+    model->data.len = n;
-+
-+    for (i = 0; i < n; i++) {
-+        ctxt->node = nodes[i];
-+
-+        if (virXPathULongHex("string(./@value)", ctxt, &prid) < 0) {
-+            virReportError(VIR_ERR_INTERNAL_ERROR,
-+                           _("Missing or invalid Prid value in CPU model %s"),
-+                           model->name);
-+            goto cleanup;
-+        }
-+        model->data.prid[i].value = prid;
-+
-+        if (virXPathULongHex("string(./@mask)", ctxt, &prid) < 0) {
-+            virReportError(VIR_ERR_INTERNAL_ERROR,
-+                           _("Missing or invalid PVR mask in CPU model %s"),
-+                           model->name);
-+            goto cleanup;
-+        }
-+        model->data.prid[i].mask = prid;
-+    }
-+
-+    if (VIR_APPEND_ELEMENT(map->models, map->nmodels, model) < 0)
-+        goto cleanup;
-+
-+    ret = 0;
-+
-+ cleanup:
-+    LoongArchModelFree(model);
-+    VIR_FREE(vendor);
-+    VIR_FREE(nodes);
-+    return ret;
-+}
-+
-+static LoongArch_map *
-+LoongArchLoadMap(void)
-+{
-+    LoongArch_map *map;
-+
-+    if (VIR_ALLOC(map) < 0)
-+        goto cleanup;
-+
-+    if (cpuMapLoad("loongarch64", LoongArchVendorParse, NULL, LoongArchModelParse, map) < 0)
-+        goto cleanup;
-+
-+    return map;
-+
-+ cleanup:
-+    LoongArchMapFree(map);
-+    return NULL;
-+}
-+
-+static virCPUDataPtr
-+LoongArchMakeCPUData(virArch arch,
-+                     virCPULoongArchData *data)
-+{
-+    virCPUDataPtr cpuData;
-+
-+    if (VIR_ALLOC(cpuData) < 0)
-+        return NULL;
-+
-+    cpuData->arch = arch;
-+
-+    if (LoongArchDataCopy(&cpuData->data.loongarch, data) < 0)
-+        VIR_FREE(cpuData);
-+
-+    return cpuData;
-+}
-+
-+static virCPUCompareResult
-+LoongArchCompute(virCPUDefPtr host,
-+                 const virCPUDef *other,
-+                 virCPUDataPtr *guestData,
-+                 char **message)
-+{
-+    LoongArch_map *map = NULL;
-+    LoongArch_model *host_model = NULL;
-+    LoongArch_model *guest_model = NULL;
-+    virCPUDefPtr cpu = NULL;
-+    virCPUCompareResult ret = VIR_CPU_COMPARE_ERROR;
-+    virArch arch;
-+    size_t i;
-+
-+    /* Ensure existing configurations are handled correctly */
-+    if (!(cpu = virCPUDefCopy(other)))
-+        goto cleanup;
-+
-+    if (cpu->arch != VIR_ARCH_NONE) {
-+        bool found = false;
-+
-+        for (i = 0; i < G_N_ELEMENTS(archs); i++) {
-+            if (archs[i] == cpu->arch) {
-+                found = true;
-+                break;
-+            }
-+        }
-+
-+        if (!found) {
-+            VIR_DEBUG("CPU arch %s does not match host arch",
-+                      virArchToString(cpu->arch));
-+	    if (message) {
-+                *message = g_strdup_printf(_("CPU arch %s does not match host arch"),
-+                                             virArchToString(cpu->arch));
-+            }
-+            ret = VIR_CPU_COMPARE_INCOMPATIBLE;
-+            goto cleanup;
-+        }
-+        arch = cpu->arch;
-+    } else {
-+        arch = host->arch;
-+    }
-+
-+    if (cpu->vendor &&
-+        (!host->vendor || STRNEQ(cpu->vendor, host->vendor))) {
-+        VIR_DEBUG("host CPU vendor does not match required CPU vendor %s",
-+                  cpu->vendor);
-+	if (message) {
-+            *message = g_strdup_printf(_("host CPU vendor does not match required "
-+                                         "CPU vendor %s"), cpu->vendor);
-+	}
-+        ret = VIR_CPU_COMPARE_INCOMPATIBLE;
-+        goto cleanup;
-+    }
-+
-+    if (!(map = LoongArchLoadMap()))
-+        goto cleanup;
-+
-+    /* Host CPU information */
-+    if (!(host_model = LoongArchModelFromCPU(host, map)))
-+        goto cleanup;
-+
-+    if (cpu->type == VIR_CPU_TYPE_GUEST) {
-+        /* Guest CPU information */
-+        switch (cpu->mode) {
-+        case VIR_CPU_MODE_HOST_MODEL:
-+        case VIR_CPU_MODE_HOST_PASSTHROUGH:
-+            /* host-model and host-passthrough:
-+             * the guest CPU is the same as the host */
-+            guest_model = LoongArchModelCopy(host_model);
-+            break;
-+
-+        case VIR_CPU_MODE_CUSTOM:
-+            /* custom:
-+             * look up guest CPU information */
-+            guest_model = LoongArchModelFromCPU(cpu, map);
-+            break;
-+        }
-+    } else {
-+        /* Other host CPU information */
-+        guest_model = LoongArchModelFromCPU(cpu, map);
-+    }
-+
-+    if (!guest_model)
-+        goto cleanup;
-+
-+    if (STRNEQ(guest_model->name, host_model->name)) {
-+        VIR_DEBUG("host CPU model does not match required CPU model %s",
-+                  guest_model->name);
-+        if (message) {
-+            *message = g_strdup_printf(_("host CPU model does not match required "
-+                                         "CPU model %s"),guest_model->name);
-+	}
-+        ret = VIR_CPU_COMPARE_INCOMPATIBLE;
-+        goto cleanup;
-+    }
-+
-+    if (guestData)
-+        if (!(*guestData = LoongArchMakeCPUData(arch, &guest_model->data)))
-+            goto cleanup;
-+
-+    ret = VIR_CPU_COMPARE_IDENTICAL;
-+
-+ cleanup:
-+    virCPUDefFree(cpu);
-+    LoongArchMapFree(map);
-+    LoongArchModelFree(host_model);
-+    LoongArchModelFree(guest_model);
-+    return ret;
-+}
-+
-+static virCPUCompareResult
-+virCPULoongArchCompare(virCPUDefPtr host,
-+                       virCPUDefPtr cpu,
-+                       bool failIncompatible)
-+{
-+    virCPUCompareResult ret;
-+    char *message = NULL;
-+
-+    if (!host || !host->model) {
-+        if (failIncompatible) {
-+            virReportError(VIR_ERR_CPU_INCOMPATIBLE, "%s",
-+                           _("unknown host CPU"));
-+        } else {
-+            VIR_WARN("unknown host CPU");
-+            ret = VIR_CPU_COMPARE_INCOMPATIBLE;
-+        }
-+        return -1;
-+    }
-+
-+    ret = LoongArchCompute(host, cpu, NULL, &message);
-+
-+    if (failIncompatible && ret == VIR_CPU_COMPARE_INCOMPATIBLE) {
-+        ret = VIR_CPU_COMPARE_ERROR;
-+        if (message) {
-+            virReportError(VIR_ERR_CPU_INCOMPATIBLE, "%s", message);
-+        } else {
-+            virReportError(VIR_ERR_CPU_INCOMPATIBLE, NULL);
-+        }
-+    }
-+    VIR_FREE(message);
-+
-+    return ret;
-+}
-+
-+static int
-+LoongArchDriverDecode(virCPUDefPtr cpu,
-+                      const virCPUData *data,
-+                      virDomainCapsCPUModelsPtr models)
-+{
-+    int ret = -1;
-+    LoongArch_map *map;
-+    const LoongArch_model *model;
-+
-+    if (!data || !(map = LoongArchLoadMap()))
-+        return -1;
-+
-+    if (!(model = LoongArchModelFindPrid(map, data->data.loongarch.prid[0].value))) {
-+        virReportError(VIR_ERR_OPERATION_FAILED,
-+                       _("Cannot find CPU model with Prid 0x%08x"),
-+                       data->data.loongarch.prid[0].value);
-+        goto cleanup;
-+    }
-+
-+    if (!virCPUModelIsAllowed(model->name, models)) {
-+        virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-+                       _("CPU model %s is not supported by hypervisor"),
-+                       model->name);
-+        goto cleanup;
-+    }
-+
-+    cpu->model = g_strdup(model->name);
-+    if (model->vendor) {
-+        cpu->vendor = g_strdup(model->vendor->name);
-+    }
-+    ret = 0;
-+
-+ cleanup:
-+    LoongArchMapFree(map);
-+
-+    return ret;
-+}
-+
-+static void
-+virCPULoongArchDataFree(virCPUDataPtr data)
-+{
-+    if (!data)
-+        return;
-+
-+    LoongArchDataClear(&data->data.loongarch);
-+    VIR_FREE(data);
-+}
-+
-+static int
-+virCPULoongArchGetHostPRID(void)
-+{
-+    return 0x14c010;
-+}
-+
-+static int
-+virCPULoongArchGetHost(virCPUDefPtr cpu,
-+                       virDomainCapsCPUModelsPtr models)
-+{
-+    virCPUDataPtr cpuData = NULL;
-+    virCPULoongArchData *data;
-+    int ret = -1;
-+
-+    if (!(cpuData = virCPUDataNew(archs[0])))
-+        goto cleanup;
-+
-+    data = &cpuData->data.loongarch;
-+    if (VIR_ALLOC(data->prid) < 0)
-+        goto cleanup;
-+
-+
-+    data->len = 1;
-+
-+    data->prid[0].value = virCPULoongArchGetHostPRID();
-+    data->prid[0].mask = 0xffff00ul;
-+
-+    ret = LoongArchDriverDecode(cpu, cpuData, models);
-+
-+ cleanup:
-+    virCPULoongArchDataFree(cpuData);
-+    return ret;
-+}
-+
-+
-+static int
-+virCPULoongArchUpdate(virCPUDefPtr guest,
-+                      const virCPUDef *host ATTRIBUTE_UNUSED)
-+{
-+    /*
-+     * - host-passthrough doesn't even get here
-+     * - host-model is used for host CPU running in a compatibility mode and
-+     *   it needs to remain unchanged
-+     * - custom doesn't support any optional features, there's nothing to
-+     *   update
-+     */
-+
-+    if (guest->mode == VIR_CPU_MODE_CUSTOM)
-+        guest->match = VIR_CPU_MATCH_EXACT;
-+
-+    return 0;
-+}
-+
-+static virCPUDefPtr
-+LoongArchDriverBaseline(virCPUDefPtr *cpus,
-+                        unsigned int ncpus,
-+                        virDomainCapsCPUModelsPtr models ATTRIBUTE_UNUSED,
-+                        const char **features ATTRIBUTE_UNUSED,
-+                        bool migratable ATTRIBUTE_UNUSED)
-+{
-+    LoongArch_map *map;
-+    const LoongArch_model *model;
-+    const LoongArch_vendor *vendor = NULL;
-+    virCPUDefPtr cpu = NULL;
-+    size_t i;
-+
-+    if (!(map = LoongArchLoadMap()))
-+        goto error;
-+
-+    if (!(model = LoongArchModelFind(map, cpus[0]->model))) {
-+        virReportError(VIR_ERR_INTERNAL_ERROR,
-+                       _("Unknown CPU model %s"), cpus[0]->model);
-+        goto error;
-+    }
-+
-+    for (i = 0; i < ncpus; i++) {
-+        const LoongArch_vendor *vnd;
-+
-+        if (STRNEQ(cpus[i]->model, model->name)) {
-+            virReportError(VIR_ERR_OPERATION_FAILED, "%s",
-+                           _("CPUs are incompatible"));
-+            goto error;
-+        }
-+
-+        if (!cpus[i]->vendor)
-+            continue;
-+
-+        if (!(vnd = LoongArchVendorFind(map, cpus[i]->vendor))) {
-+            virReportError(VIR_ERR_OPERATION_FAILED,
-+                           _("Unknown CPU vendor %s"), cpus[i]->vendor);
-+            goto error;
-+        }
-+
-+        if (model->vendor) {
-+            if (model->vendor != vnd) {
-+                virReportError(VIR_ERR_OPERATION_FAILED,
-+                               _("CPU vendor %s of model %s differs from "
-+                                 "vendor %s"),
-+                               model->vendor->name, model->name,
-+                               vnd->name);
-+                goto error;
-+            }
-+        } else if (vendor) {
-+            if (vendor != vnd) {
-+                virReportError(VIR_ERR_OPERATION_FAILED, "%s",
-+                               _("CPU vendors do not match"));
-+                goto error;
-+            }
-+        } else {
-+            vendor = vnd;
-+        }
-+    }
-+
-+    cpu = virCPUDefNew();
-+    cpu->model = g_strdup(model->name);
-+    if (vendor) {
-+        cpu->vendor = g_strdup(vendor->name);
-+    }
-+    cpu->type = VIR_CPU_TYPE_GUEST;
-+    cpu->match = VIR_CPU_MATCH_EXACT;
-+    cpu->fallback = VIR_CPU_FALLBACK_FORBID;
-+
-+ cleanup:
-+    LoongArchMapFree(map);
-+    return cpu;
-+
-+ error:
-+    virCPUDefFree(cpu);
-+    cpu = NULL;
-+    goto cleanup;
-+}
-+
-+static int
-+virCPULoongArchDriverGetModels(char ***models)
-+{
-+    LoongArch_map *map;
-+    size_t i;
-+    int ret = -1;
-+
-+    if (!(map = LoongArchLoadMap())) {
-+        goto error;
-+    }
-+
-+    if (models) {
-+        if (VIR_ALLOC_N(*models, map->nmodels + 1) < 0)
-+            goto error;
-+
-+        for (i = 0; i < map->nmodels; i++) {
-+            (*models)[i] = g_strdup(map->models[i]->name);
-+        }
-+    }
-+
-+    ret = map->nmodels;
-+
-+ cleanup:
-+    LoongArchMapFree(map);
-+    return ret;
-+
-+ error:
-+    if (models) {
-+        virStringListFree(*models);
-+        *models = NULL;
-+    }
-+    goto cleanup;
-+}
-+
-+struct cpuArchDriver cpuDriverLoongArch = {
-+    .name       = "LoongArch",
-+    .arch       = archs,
-+    .narch      = G_N_ELEMENTS(archs),
-+    .compare    = virCPULoongArchCompare,
-+    .decode     = LoongArchDriverDecode,
-+    .encode     = NULL,
-+    .dataFree   = virCPULoongArchDataFree,
-+    .getHost    = virCPULoongArchGetHost,
-+    .baseline   = LoongArchDriverBaseline,
-+    .update     = virCPULoongArchUpdate,
-+    .getModels  = virCPULoongArchDriverGetModels,
-+};
-diff --git a/src/cpu/cpu_loongarch.h b/src/cpu/cpu_loongarch.h
-new file mode 100644
-index 0000000000..304af628d4
---- /dev/null
-+++ b/src/cpu/cpu_loongarch.h
-@@ -0,0 +1,28 @@
-+/*
-+ * cpu_loongarch.h: CPU driver for 64-bit LOONGARCH CPUs
-+ *
-+ * Copyright (C) 2023 Loongson Technology.
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * This library is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library.  If not, see
-+ * <http://www.gnu.org/licenses/>.
-+ */
-+
-+#ifndef __VIR_CPU_LOONGARCH_H__
-+# define __VIR_CPU_LOONGARCH_H__
-+
-+# include "cpu.h"
-+
-+extern struct cpuArchDriver cpuDriverLoongArch;
-+
-+#endif /* __VIR_CPU_LOONGARCH_H__ */
-diff --git a/src/cpu/cpu_loongarch_data.h b/src/cpu/cpu_loongarch_data.h
-new file mode 100644
-index 0000000000..c640a0c6b4
---- /dev/null
-+++ b/src/cpu/cpu_loongarch_data.h
-@@ -0,0 +1,40 @@
-+/*
-+ * cpu_loongarch_data.h: 64-bit LOONGARCH CPU specific data
-+ *
-+ * Copyright (C) 2023 Loongson Technology.
-+ *
-+ * This library is free software; you can redistribute it and/or
-+ * modify it under the terms of the GNU Lesser General Public
-+ * License as published by the Free Software Foundation; either
-+ * version 2.1 of the License, or (at your option) any later version.
-+ *
-+ * This library is distributed in the hope that it will be useful,
-+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-+ * Lesser General Public License for more details.
-+ *
-+ * You should have received a copy of the GNU Lesser General Public
-+ * License along with this library;  If not, see
-+ * <http://www.gnu.org/licenses/>.
-+ */
-+
-+#ifndef __VIR_CPU_LOONGARCH_DATA_H__
-+# define __VIR_CPU_LOONGARCH_DATA_H__
-+
-+# include <stdint.h>
-+
-+typedef struct _virCPULoongArchPrid virCPULoongArchPrid;
-+struct _virCPULoongArchPrid {
-+    uint32_t value;
-+    uint32_t mask;
-+};
-+
-+# define VIR_CPU_LOONGARCH_DATA_INIT { 0 }
-+
-+typedef struct _virCPULoongArchData virCPULoongArchData;
-+struct _virCPULoongArchData {
-+    size_t len;
-+    virCPULoongArchPrid *prid;
-+};
-+
-+#endif /* __VIR_CPU_MIPS64_DATA_H__ */
-diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
-index 2e9f2025ba..0c3eb148b2 100644
---- a/src/qemu/qemu_capabilities.c
-+++ b/src/qemu/qemu_capabilities.c
-@@ -2692,6 +2692,7 @@ static const char *preferredMachines[] =
-     "sim", /* VIR_ARCH_XTENSAEB */
- 
-     "core3", /* VIR_ARCH_SW_64 */
-+    "loongson7a", /* VIR_ARCH_LOONGARCH64 */
- };
- G_STATIC_ASSERT(G_N_ELEMENTS(preferredMachines) == VIR_ARCH_LAST);
- 
-diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
-index 70835e4efd..37dac3694b 100644
---- a/src/qemu/qemu_domain.c
-+++ b/src/qemu/qemu_domain.c
-@@ -4361,6 +4361,10 @@ qemuDomainDefAddDefaultDevices(virDomainDefPtr def,
- 	addPCIeRoot = true;
- 	break;
- 
-+    case VIR_ARCH_LOONGARCH64:
-+        addPCIeRoot = true;
-+        break;
-+
-     case VIR_ARCH_ARMV7B:
-     case VIR_ARCH_CRIS:
-     case VIR_ARCH_ITANIUM:
-diff --git a/src/util/virarch.c b/src/util/virarch.c
-index 653136cc73..decdbdd7ac 100644
---- a/src/util/virarch.c
-+++ b/src/util/virarch.c
-@@ -85,6 +85,7 @@ static const struct virArchData {
-     { "xtensaeb",     32, VIR_ARCH_BIG_ENDIAN },
- 
-     { "sw_64",        64, VIR_ARCH_LITTLE_ENDIAN},
-+    { "loongarch64",  64, VIR_ARCH_LITTLE_ENDIAN },
- };
- 
- G_STATIC_ASSERT(G_N_ELEMENTS(virArchData) == VIR_ARCH_LAST);
-diff --git a/src/util/virarch.h b/src/util/virarch.h
-index 5eb146eb1b..a7834ae799 100644
---- a/src/util/virarch.h
-+++ b/src/util/virarch.h
-@@ -70,6 +70,7 @@ typedef enum {
-     VIR_ARCH_XTENSAEB,     /* XTensa      32 BE http://en.wikipedia.org/wiki/Xtensa#Processor_Cores */
- 
-     VIR_ARCH_SW_64,        /* SW64        64 LE XHB*/
-+    VIR_ARCH_LOONGARCH64,  /* LoongArch   64 LE */
- 
-     VIR_ARCH_LAST,
- } virArch;
-@@ -99,6 +100,8 @@ typedef enum {
- 
- #define ARCH_IS_SW64(arch)   ((arch) == VIR_ARCH_SW_64)
- 
-+#define ARCH_IS_LOONGARCH(arch)  ((arch) == VIR_ARCH_LOONGARCH64)
-+
- typedef enum {
-     VIR_ARCH_LITTLE_ENDIAN,
-     VIR_ARCH_BIG_ENDIAN,
--- 
-2.25.1
-
diff --git a/CVE-2024-4418.patch b/CVE-2024-4418.patch
new file mode 100644
index 0000000000000000000000000000000000000000..65ed38bd59286bdd49f2a876b281706cb4aea12f
--- /dev/null
+++ b/CVE-2024-4418.patch
@@ -0,0 +1,99 @@
+From 8074d64dc2eca846d6a61efe1a9b7428a0ce1dd1 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
+Date: Tue, 30 Apr 2024 11:51:15 +0100
+Subject: [PATCH] rpc: ensure temporary GSource is removed from client event
+ loop
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Users are seeing periodic segfaults from libvirt client apps,
+especially thread heavy ones like virt-manager. A typical
+stack trace would end up in the virNetClientIOEventFD method,
+with illegal access to stale stack data. eg
+
+==238721==ERROR: AddressSanitizer: stack-use-after-return on address 0x75cd18709788 at pc 0x75cd3111f907 bp 0x75cd181ff550 sp 0x75cd181ff548
+WRITE of size 4 at 0x75cd18709788 thread T11
+    #0 0x75cd3111f906 in virNetClientIOEventFD /usr/src/debug/libvirt/libvirt-10.2.0/build/../src/rpc/virnetclient.c:1634:15
+    #1 0x75cd3210d198  (/usr/lib/libglib-2.0.so.0+0x5a198) (BuildId: 0a2311dfbbc6c215dc36f4b6bdd2b4b6fbae55a2)
+    #2 0x75cd3216c3be  (/usr/lib/libglib-2.0.so.0+0xb93be) (BuildId: 0a2311dfbbc6c215dc36f4b6bdd2b4b6fbae55a2)
+    #3 0x75cd3210ddc6 in g_main_loop_run (/usr/lib/libglib-2.0.so.0+0x5adc6) (BuildId: 0a2311dfbbc6c215dc36f4b6bdd2b4b6fbae55a2)
+    #4 0x75cd3111a47c in virNetClientIOEventLoop /usr/src/debug/libvirt/libvirt-10.2.0/build/../src/rpc/virnetclient.c:1722:9
+    #5 0x75cd3111a47c in virNetClientIO /usr/src/debug/libvirt/libvirt-10.2.0/build/../src/rpc/virnetclient.c:2002:10
+    #6 0x75cd3111a47c in virNetClientSendInternal /usr/src/debug/libvirt/libvirt-10.2.0/build/../src/rpc/virnetclient.c:2170:11
+    #7 0x75cd311198a8 in virNetClientSendWithReply /usr/src/debug/libvirt/libvirt-10.2.0/build/../src/rpc/virnetclient.c:2198:11
+    #8 0x75cd31111653 in virNetClientProgramCall /usr/src/debug/libvirt/libvirt-10.2.0/build/../src/rpc/virnetclientprogram.c:318:9
+    #9 0x75cd31241c8f in callFull /usr/src/debug/libvirt/libvirt-10.2.0/build/../src/remote/remote_driver.c:6054:10
+    #10 0x75cd31241c8f in call /usr/src/debug/libvirt/libvirt-10.2.0/build/../src/remote/remote_driver.c:6076:12
+    #11 0x75cd31241c8f in remoteNetworkGetXMLDesc /usr/src/debug/libvirt/libvirt-10.2.0/build/src/remote/remote_client_bodies.h:5959:9
+    #12 0x75cd31410ff7 in virNetworkGetXMLDesc /usr/src/debug/libvirt/libvirt-10.2.0/build/../src/libvirt-network.c:952:15
+
+The root cause is a bad assumption in the virNetClientIOEventLoop
+method. This method is run by whichever thread currently owns the
+buck, and is responsible for handling I/O. Inside a for(;;) loop,
+this method creates a temporary GSource, adds it to the event loop
+and runs g_main_loop_run(). When I/O is ready, the GSource callback
+(virNetClientIOEventFD) will fire and call g_main_loop_quit(), and
+return G_SOURCE_REMOVE which results in the temporary GSource being
+destroyed. A g_autoptr() will then remove the last reference.
+
+What was overlooked, is that a second thread can come along and
+while it can't enter virNetClientIOEventLoop, it will register an
+idle source that uses virNetClientIOWakeup to interrupt the
+original thread's 'g_main_loop_run' call. When this happens the
+virNetClientIOEventFD callback never runs, and so the temporary
+GSource is not destroyed. The g_autoptr() will remove a reference,
+but by virtue of still being attached to the event context, there
+is an extra reference held causing GSource to be leaked. The
+next time 'g_main_loop_run' is called, the original GSource will
+trigger its callback, and access data that was allocated on the
+stack by the previous thread, and likely SEGV.
+
+To solve this, the thread calling 'g_main_loop_run' must call
+g_source_destroy, immediately upon return, to guarantee that
+the temporary GSource is removed.
+
+CVE-2024-4418
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+Reported-by: Martin Shirokov <shirokovmartin@gmail.com>
+Tested-by: Martin Shirokov <shirokovmartin@gmail.com>
+Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
+---
+ src/rpc/virnetclient.c | 14 +++++++++++++-
+ 1 file changed, 13 insertions(+), 1 deletion(-)
+
+diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c
+index 68098b1c8d..147b0d661a 100644
+--- a/src/rpc/virnetclient.c
++++ b/src/rpc/virnetclient.c
+@@ -1657,7 +1657,7 @@ static int virNetClientIOEventLoop(virNetClient *client,
+ #endif /* !WIN32 */
+         int timeout = -1;
+         virNetMessage *msg = NULL;
+-        g_autoptr(GSource) G_GNUC_UNUSED source = NULL;
++        g_autoptr(GSource) source = NULL;
+         GIOCondition ev = 0;
+         struct virNetClientIOEventData data = {
+             .client = client,
+@@ -1721,6 +1721,18 @@ static int virNetClientIOEventLoop(virNetClient *client,
+ 
+         g_main_loop_run(client->eventLoop);
+ 
++        /*
++         * If virNetClientIOEventFD ran, this GSource will already be
++         * destroyed due to G_SOURCE_REMOVE. It is harmless to re-destroy
++         * it, since we still own a reference.
++         *
++         * If virNetClientIOWakeup ran, it will have interrupted the
++         * g_main_loop_run call, before virNetClientIOEventFD could
++         * run, and thus the GSource is still registered, and we need
++         * to destroy it since it is referencing stack memory for 'data'
++         */
++        g_source_destroy(source);
++
+ #ifndef WIN32
+         ignore_value(pthread_sigmask(SIG_SETMASK, &oldmask, NULL));
+ #endif /* !WIN32 */
+-- 
+GitLab
+
diff --git a/Config-some-capabilities-for-loongarch-virt-machine.patch b/Config-some-capabilities-for-loongarch-virt-machine.patch
deleted file mode 100644
index add6100b2102ae429fe06d273b0ce121dbd2157c..0000000000000000000000000000000000000000
--- a/Config-some-capabilities-for-loongarch-virt-machine.patch
+++ /dev/null
@@ -1,263 +0,0 @@
-From 4b7f6284eaa3e3b15360e25848fc68b37ee6c768 Mon Sep 17 00:00:00 2001
-From: zhaotianrui <zhaotianrui@loongson.cn>
-Date: Wed, 11 Jan 2023 11:56:03 -0500
-Subject: [PATCH 3/4] Config some capabilities for loongarch virt machine
-
-Config some capabilities for loongarch virt machine such as
-PCI multi bus and the path of loongarch uefi binary.
-
-Signed-off-by: zhaotianrui <zhaotianrui@loongson.cn>
----
- src/qemu/qemu.conf                 |  3 +-
- src/qemu/qemu_capabilities.c       |  4 ++
- src/qemu/qemu_conf.c               |  3 +-
- src/qemu/qemu_domain.c             | 31 ++++++++++-
- src/qemu/qemu_domain.h             |  1 +
- src/qemu/qemu_domain_address.c     | 86 ++++++++++++++++++++++++++++++
- src/qemu/test_libvirtd_qemu.aug.in |  1 +
- 7 files changed, 125 insertions(+), 4 deletions(-)
-
-diff --git a/src/qemu/qemu.conf b/src/qemu/qemu.conf
-index abdbf07fec..3856087248 100644
---- a/src/qemu/qemu.conf
-+++ b/src/qemu/qemu.conf
-@@ -771,7 +771,8 @@
- #   "/usr/share/OVMF/OVMF_CODE.fd:/usr/share/OVMF/OVMF_VARS.fd",
- #   "/usr/share/OVMF/OVMF_CODE.secboot.fd:/usr/share/OVMF/OVMF_VARS.fd",
- #   "/usr/share/AAVMF/AAVMF_CODE.fd:/usr/share/AAVMF/AAVMF_VARS.fd",
--#   "/usr/share/AAVMF/AAVMF32_CODE.fd:/usr/share/AAVMF/AAVMF32_VARS.fd"
-+#   "/usr/share/AAVMF/AAVMF32_CODE.fd:/usr/share/AAVMF/AAVMF32_VARS.fd",
-+#   "/usr/share/qemu/loongarch_bios.bin:/usr/share/qemu/loongarch_vars.bin"
- #]
- 
- # The backend to use for handling stdout/stderr output from
-diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
-index 0c3eb148b2..21b477cd4d 100644
---- a/src/qemu/qemu_capabilities.c
-+++ b/src/qemu/qemu_capabilities.c
-@@ -1983,6 +1983,10 @@ bool virQEMUCapsHasPCIMultiBus(virQEMUCapsPtr qemuCaps,
-      * since forever */
-     if (ARCH_IS_SW64(def->os.arch))
-         return true;
-+    /* loongarch64 support PCI-multibus on all machine types
-+     * since forever */
-+    if (ARCH_IS_LOONGARCH(def->os.arch))
-+        return true;
- 
-     if (def->os.arch == VIR_ARCH_PPC ||
-         ARCH_IS_PPC64(def->os.arch)) {
-diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
-index 28319a1baf..3253875d6e 100644
---- a/src/qemu/qemu_conf.c
-+++ b/src/qemu/qemu_conf.c
-@@ -98,7 +98,8 @@ qemuDriverUnlock(virQEMUDriverPtr driver)
-     "/usr/share/OVMF/OVMF_CODE.fd:/usr/share/OVMF/OVMF_VARS.fd:" \
-     "/usr/share/OVMF/OVMF_CODE.secboot.fd:/usr/share/OVMF/OVMF_VARS.fd:" \
-     "/usr/share/AAVMF/AAVMF_CODE.fd:/usr/share/AAVMF/AAVMF_VARS.fd:" \
--    "/usr/share/AAVMF/AAVMF32_CODE.fd:/usr/share/AAVMF/AAVMF32_VARS.fd"
-+    "/usr/share/AAVMF/AAVMF32_CODE.fd:/usr/share/AAVMF/AAVMF32_VARS.fd:" \
-+    "/usr/share/qemu/loongarch_bios.bin:/usr/share/qemu/loongarch_vars.bin"
- #endif
- 
- 
-diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
-index 37dac3694b..152c8615d5 100644
---- a/src/qemu/qemu_domain.c
-+++ b/src/qemu/qemu_domain.c
-@@ -5186,7 +5186,7 @@ qemuDomainDefValidateFeatures(const virDomainDef *def,
-         switch ((virDomainFeature) i) {
-         case VIR_DOMAIN_FEATURE_IOAPIC:
-             if (def->features[i] != VIR_DOMAIN_IOAPIC_NONE) {
--                if (!ARCH_IS_X86(def->os.arch)) {
-+                if (!ARCH_IS_X86(def->os.arch) && !ARCH_IS_LOONGARCH(def->os.arch)) {
-                     virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-                                    _("The '%s' feature is not supported for "
-                                      "architecture '%s' or machine type '%s'"),
-@@ -9089,6 +9089,11 @@ qemuDomainControllerDefPostParse(virDomainControllerDefPtr cont,
-                     cont->model = VIR_DOMAIN_CONTROLLER_MODEL_USB_QEMU_XHCI;
-                 else if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_NEC_USB_XHCI))
-                     cont->model = VIR_DOMAIN_CONTROLLER_MODEL_USB_NEC_XHCI;
-+            } else if (ARCH_IS_LOONGARCH(def->os.arch)) {
-+                if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_QEMU_XHCI))
-+                    cont->model = VIR_DOMAIN_CONTROLLER_MODEL_USB_QEMU_XHCI;
-+                else if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_NEC_USB_XHCI))
-+                    cont->model = VIR_DOMAIN_CONTROLLER_MODEL_USB_NEC_XHCI;
-             }
-         }
-         /* forbid usb model 'qusb1' and 'qusb2' in this kind of hyperviosr */
-@@ -12985,6 +12990,20 @@ qemuDomainMachineIsPSeries(const char *machine,
-     return false;
- }
- 
-+static bool
-+qemuDomainMachineIsLoongson(const char *machine,
-+                            const virArch arch)
-+{
-+    if (!ARCH_IS_LOONGARCH(arch))
-+        return false;
-+
-+    if (STREQ(machine, "loongson7a") ||
-+        STRPREFIX(machine, "loongson7a-")) {
-+        return true;
-+    }
-+
-+    return false;
-+}
- 
- /* You should normally avoid this function and use
-  * qemuDomainHasBuiltinIDE() instead. */
-@@ -12996,7 +13015,8 @@ qemuDomainMachineHasBuiltinIDE(const char *machine,
-         STREQ(machine, "malta") ||
-         STREQ(machine, "sun4u") ||
-         STREQ(machine, "core3") ||
--        STREQ(machine, "g3beige");
-+        STREQ(machine, "g3beige") ||
-+        STREQ(machine, "loongson7a");
- }
- 
- 
-@@ -13066,6 +13086,13 @@ qemuDomainIsPSeries(const virDomainDef *def)
- }
- 
- 
-+bool
-+qemuDomainIsLoongson(const virDomainDef *def)
-+{
-+    return qemuDomainMachineIsLoongson(def->os.machine, def->os.arch);
-+}
-+
-+
- bool
- qemuDomainHasPCIRoot(const virDomainDef *def)
- {
-diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h
-index 7603724ccd..368fc4030f 100644
---- a/src/qemu/qemu_domain.h
-+++ b/src/qemu/qemu_domain.h
-@@ -999,6 +999,7 @@ bool qemuDomainIsS390CCW(const virDomainDef *def);
- bool qemuDomainIsARMVirt(const virDomainDef *def);
- bool qemuDomainIsRISCVVirt(const virDomainDef *def);
- bool qemuDomainIsPSeries(const virDomainDef *def);
-+bool qemuDomainIsLoongson(const virDomainDef *def);
- bool qemuDomainHasPCIRoot(const virDomainDef *def);
- bool qemuDomainHasPCIeRoot(const virDomainDef *def);
- bool qemuDomainHasBuiltinIDE(const virDomainDef *def);
-diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c
-index ab6bce19f4..7f48773832 100644
---- a/src/qemu/qemu_domain_address.c
-+++ b/src/qemu/qemu_domain_address.c
-@@ -2078,6 +2078,87 @@ qemuDomainValidateDevicePCISlotsQ35(virDomainDefPtr def,
-     return 0;
- }
- 
-+static int
-+qemuDomainValidateDevicePCISlotsLoongson(virDomainDefPtr def,
-+                                         virQEMUCapsPtr qemuCaps,
-+                                         virDomainPCIAddressSetPtr addrs)
-+{
-+    int ret = -1;
-+    virPCIDeviceAddress tmp_addr;
-+    bool qemuDeviceVideoUsable = virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VIDEO_PRIMARY);
-+    g_autofree char *addrStr = NULL;
-+    virDomainPCIConnectFlags flags = VIR_PCI_CONNECT_TYPE_PCI_DEVICE;
-+
-+    if (addrs->nbuses) {
-+        memset(&tmp_addr, 0, sizeof(tmp_addr));
-+        tmp_addr.slot = 1;
-+        /* pci-ohci at 00:01.0 */
-+        if (virDomainPCIAddressReserveAddr(addrs, &tmp_addr, flags, 0) < 0)
-+            return -1;
-+    }
-+
-+    if (def->nvideos > 0 &&
-+        def->videos[0]->type != VIR_DOMAIN_VIDEO_TYPE_NONE &&
-+        def->videos[0]->type != VIR_DOMAIN_VIDEO_TYPE_RAMFB) {
-+        /* reserve slot 2 for vga device */
-+        virDomainVideoDefPtr primaryVideo = def->videos[0];
-+
-+        if (virDeviceInfoPCIAddressIsWanted(&primaryVideo->info)) {
-+            memset(&tmp_addr, 0, sizeof(tmp_addr));
-+            tmp_addr.slot = 2;
-+
-+            if (!(addrStr = virPCIDeviceAddressAsString(&tmp_addr)))
-+                return -1;
-+            if (!virDomainPCIAddressValidate(addrs, &tmp_addr,
-+                                             addrStr, flags, true))
-+                return ret;
-+
-+            if (virDomainPCIAddressSlotInUse(addrs, &tmp_addr)) {
-+                if (qemuDeviceVideoUsable) {
-+                    if (qemuDomainPCIAddressReserveNextAddr(addrs,
-+                                                            &primaryVideo->info) < 0) {
-+                        return ret;
-+                    }
-+                } else {
-+                    virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-+                                   _("PCI address 0:0:2.0 is in use, "
-+                                     "QEMU needs it for primary video"));
-+                    return ret;
-+                }
-+            } else {
-+                if (virDomainPCIAddressReserveAddr(addrs, &tmp_addr, flags, 0) < 0)
-+                    return ret;
-+                primaryVideo->info.addr.pci = tmp_addr;
-+                primaryVideo->info.type = VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI;
-+            }
-+        } else if (!qemuDeviceVideoUsable) {
-+            if (primaryVideo->info.addr.pci.domain != 0 ||
-+                primaryVideo->info.addr.pci.bus != 0 ||
-+                primaryVideo->info.addr.pci.slot != 2 ||
-+                primaryVideo->info.addr.pci.function != 0) {
-+                virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-+                               _("Primary video card must have PCI address 0:0:2.0"));
-+                return ret;
-+            }
-+            /* If TYPE == PCI, then qemuDomainCollectPCIAddress() function
-+             * has already reserved the address, so we must skip */
-+        }
-+    } else if (addrs->nbuses && !qemuDeviceVideoUsable) {
-+        memset(&tmp_addr, 0, sizeof(tmp_addr));
-+        tmp_addr.slot = 2;
-+
-+        if (virDomainPCIAddressSlotInUse(addrs, &tmp_addr)) {
-+            VIR_DEBUG("PCI address 0:0:2.0 in use, future addition of a video"
-+                      " device will not be possible without manual"
-+                      " intervention");
-+        } else if (virDomainPCIAddressReserveAddr(addrs, &tmp_addr, flags, 0) < 0) {
-+            return ret;
-+        }
-+    }
-+
-+    ret = 0;
-+    return ret;
-+}
- 
- static int
- qemuDomainValidateDevicePCISlotsChipsets(virDomainDefPtr def,
-@@ -2094,6 +2175,11 @@ qemuDomainValidateDevicePCISlotsChipsets(virDomainDefPtr def,
-         return -1;
-     }
- 
-+    if (qemuDomainIsLoongson(def) &&
-+        qemuDomainValidateDevicePCISlotsLoongson(def, qemuCaps, addrs) < 0) {
-+        return -1;
-+    }
-+
-     return 0;
- }
- 
-diff --git a/src/qemu/test_libvirtd_qemu.aug.in b/src/qemu/test_libvirtd_qemu.aug.in
-index 19da591aae..caa06a45cb 100644
---- a/src/qemu/test_libvirtd_qemu.aug.in
-+++ b/src/qemu/test_libvirtd_qemu.aug.in
-@@ -95,6 +95,7 @@ module Test_libvirtd_qemu =
-     { "2" = "/usr/share/OVMF/OVMF_CODE.secboot.fd:/usr/share/OVMF/OVMF_VARS.fd" }
-     { "3" = "/usr/share/AAVMF/AAVMF_CODE.fd:/usr/share/AAVMF/AAVMF_VARS.fd" }
-     { "4" = "/usr/share/AAVMF/AAVMF32_CODE.fd:/usr/share/AAVMF/AAVMF32_VARS.fd" }
-+    { "5" = "/usr/share/qemu/loongarch_bios.bin:/usr/share/qemu/loongarch_vars.bin" }
- }
- { "stdio_handler" = "logd" }
- { "gluster_debug_level" = "9" }
--- 
-2.25.1
-
diff --git a/Don-t-cache-device-mapper-major.patch b/Don-t-cache-device-mapper-major.patch
deleted file mode 100644
index a4ef223b619bb067509bdf026cb2442429aa7996..0000000000000000000000000000000000000000
--- a/Don-t-cache-device-mapper-major.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 1c5804926a289882ff4a84f1c6ca6df1dd117215 Mon Sep 17 00:00:00 2001
-From: rpm-build <rpm-build>
-Date: Tue, 31 Aug 2021 08:22:41 -0400
-Subject: [PATCH] Don't cache device-mapper major
-
----
- src/util/virdevmapper.c | 19 +++++--------------
- 1 file changed, 5 insertions(+), 14 deletions(-)
-
-diff --git a/src/util/virdevmapper.c b/src/util/virdevmapper.c
-index a471504..2b9e689 100644
---- a/src/util/virdevmapper.c
-+++ b/src/util/virdevmapper.c
-@@ -46,11 +46,8 @@
- 
- G_STATIC_ASSERT(BUF_SIZE > sizeof(struct dm_ioctl));
- 
--static unsigned int virDMMajor;
--
--
- static int
--virDevMapperOnceInit(void)
-+virDevMapperGetMajor(unsigned int *major)
- {
-     g_autofree char *buf = NULL;
-     VIR_AUTOSTRINGLIST lines = NULL;
-@@ -69,7 +66,7 @@ virDevMapperOnceInit(void)
- 
-         if (sscanf(lines[i], "%u %ms\n", &maj, &dev) == 2 &&
-             STREQ(dev, DM_NAME)) {
--            virDMMajor = maj;
-+            *major = maj;
-             break;
-         }
-     }
-@@ -84,10 +81,6 @@ virDevMapperOnceInit(void)
-     return 0;
- }
- 
--
--VIR_ONCE_GLOBAL_INIT(virDevMapper);
--
--
- static void *
- virDMIoctl(int controlFD, int cmd, struct dm_ioctl *dm, char **buf)
- {
-@@ -305,9 +298,6 @@ virDevMapperGetTargets(const char *path,
-      * consist of devices or yet another targets. If that's the
-      * case, we have to stop recursion somewhere. */
- 
--    if (virDevMapperInitialize() < 0)
--        return -1;
--
-     if ((controlFD = virDMOpen()) < 0)
-         return -1;
- 
-@@ -319,13 +309,14 @@ bool
- virIsDevMapperDevice(const char *dev_name)
- {
-     struct stat buf;
-+    unsigned int major;
- 
--    if (virDevMapperInitialize() < 0)
-+    if (virDevMapperGetMajor(&major) < 0)
-         return false;
- 
-     if (!stat(dev_name, &buf) &&
-         S_ISBLK(buf.st_mode) &&
--        major(buf.st_rdev) == virDMMajor)
-+        major(buf.st_rdev) == major)
-         return true;
- 
-     return false;
--- 
-2.18.2
-
diff --git a/Don-t-call-qsort-over-NULL.patch b/Don-t-call-qsort-over-NULL.patch
deleted file mode 100644
index 6e866a207d51fc316f522cfaabf099d597698a19..0000000000000000000000000000000000000000
--- a/Don-t-call-qsort-over-NULL.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From bfcbf70e99b9fb06468de8135d3a251ef22e0cd3 Mon Sep 17 00:00:00 2001
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Mon, 14 Jun 2021 12:46:02 +0200
-Subject: [PATCH 094/108] Don't call qsort() over NULL
-
-In a few places it may happen that the array we want to sort is
-still NULL (e.g. because there were no leases found, no paths for
-secdriver to lock or no cache banks). However, passing NULL to
-qsort() is undefined and even though glibc plays nicely we
-shouldn't rely on undefined behaviour.
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Tim Wiederhake <twiederh@redhat.com>
-(cherry picked from commit 1ab5a37c4a70434a1dacebbdababb91baaa29ef1)
----
- src/conf/capabilities.c         | 6 ++++--
- src/security/security_manager.c | 3 ++-
- tools/nss/libvirt_nss.c         | 3 ++-
- 3 files changed, 8 insertions(+), 4 deletions(-)
-
-diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c
-index d6ec1f12f4..deb99cecd3 100644
---- a/src/conf/capabilities.c
-+++ b/src/conf/capabilities.c
-@@ -1982,8 +1982,10 @@ virCapabilitiesInitCaches(virCapsPtr caps)
-     /* Sort the array in order for the tests to be predictable.  This way we can
-      * still traverse the directory instead of guessing names (in case there is
-      * 'index1' and 'index3' but no 'index2'). */
--    qsort(caps->host.cache.banks, caps->host.cache.nbanks,
--          sizeof(*caps->host.cache.banks), virCapsHostCacheBankSorter);
-+    if (caps->host.cache.banks) {
-+        qsort(caps->host.cache.banks, caps->host.cache.nbanks,
-+              sizeof(*caps->host.cache.banks), virCapsHostCacheBankSorter);
-+    }
- 
-     if (virCapabilitiesInitResctrlMemory(caps) < 0)
-         goto cleanup;
-diff --git a/src/security/security_manager.c b/src/security/security_manager.c
-index 9d5dfec12b..a74b663685 100644
---- a/src/security/security_manager.c
-+++ b/src/security/security_manager.c
-@@ -1302,7 +1302,8 @@ virSecurityManagerMetadataLock(virSecurityManagerPtr mgr G_GNUC_UNUSED,
-      * paths in the same order and thus no deadlock can occur.
-      * Lastly, it makes searching for duplicate paths below
-      * simpler. */
--    qsort(paths, npaths, sizeof(*paths), cmpstringp);
-+    if (paths)
-+        qsort(paths, npaths, sizeof(*paths), cmpstringp);
- 
-     for (i = 0; i < npaths; i++) {
-         const char *p = paths[i];
-diff --git a/tools/nss/libvirt_nss.c b/tools/nss/libvirt_nss.c
-index 3b89f72742..265ef236cc 100644
---- a/tools/nss/libvirt_nss.c
-+++ b/tools/nss/libvirt_nss.c
-@@ -69,7 +69,8 @@ static void
- sortAddr(leaseAddress *tmpAddress,
-          size_t ntmpAddress)
- {
--    qsort(tmpAddress, ntmpAddress, sizeof(*tmpAddress), leaseAddressSorter);
-+    if (tmpAddress)
-+        qsort(tmpAddress, ntmpAddress, sizeof(*tmpAddress), leaseAddressSorter);
- }
- 
- 
--- 
-2.33.0
-
diff --git a/Fix-allocation-of-virDomainFSDef.patch b/Fix-allocation-of-virDomainFSDef.patch
deleted file mode 100644
index fb55fd57c7faf6d8286bd9461ca409712c1a4f08..0000000000000000000000000000000000000000
--- a/Fix-allocation-of-virDomainFSDef.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 805efc1e0446e84c4b9bf9984c92b9e05b6ced62 Mon Sep 17 00:00:00 2001
-From: tangbin <tangbin_yewu@cmss.chinamobile.com>
-Date: Wed, 23 Nov 2022 16:00:29 +0200
-Subject: [PATCH 09/23] Fix allocation of virDomainFSDef
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Some less commonly used drivers were omitted when we switched
-the allocator from a plain VIR_ALLOC to virDomainFSDefNew.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1846450
-
-Fixes: da665fbd4858890fbb3bbf5da2a7b6ca37bb3220
-Signed-off-by: Ján Tomko <jtomko@redhat.com>
-Reviewed-by: Andrea Bolognani <abologna@redhat.com>
-
-Signed-off-by: tangbin <tangbin_yewu@cmss.chinamobile.com>
-(cherry-pick from ea3320048897f5279bc49cb49d26f8099706a834)
----
- src/openvz/openvz_conf.c | 2 +-
- src/vbox/vbox_common.c   | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/openvz/openvz_conf.c b/src/openvz/openvz_conf.c
-index 78547b8b28..15e1e2ae9f 100644
---- a/src/openvz/openvz_conf.c
-+++ b/src/openvz/openvz_conf.c
-@@ -357,7 +357,7 @@ openvzReadFSConf(virDomainDefPtr def,
-             goto error;
-         }
- 
--        if (VIR_ALLOC(fs) < 0)
-+        if (!(fs = virDomainFSDefNew(NULL)))
-             goto error;
- 
-         veid_str = g_strdup_printf("%d", veid);
-diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c
-index e98ae04ec0..d06a5f79ab 100644
---- a/src/vbox/vbox_common.c
-+++ b/src/vbox/vbox_common.c
-@@ -3620,7 +3620,7 @@ vboxDumpSharedFolders(virDomainDefPtr def, vboxDriverPtr data, IMachine *machine
-         char *hostPath = NULL;
-         PRBool writable = PR_FALSE;
- 
--        if (VIR_ALLOC(def->fss[i]) < 0)
-+        if (!(def->fss[i] = virDomainFSDefNew(data->xmlopt)))
-             goto cleanup;
- 
-         def->fss[i]->type = VIR_DOMAIN_FS_TYPE_MOUNT;
--- 
-2.27.0
-
diff --git a/Fix-off-by-one-error-in-udevListInterfacesByStatus.patch b/Fix-off-by-one-error-in-udevListInterfacesByStatus.patch
new file mode 100644
index 0000000000000000000000000000000000000000..7cf445b866ff4754b385df956f584707a7f4e281
--- /dev/null
+++ b/Fix-off-by-one-error-in-udevListInterfacesByStatus.patch
@@ -0,0 +1,39 @@
+From 0f082f9d3df0b1c2b63c2b5ad3201e08d1ffe449 Mon Sep 17 00:00:00 2001
+From: Martin Kletzander <mkletzan@redhat.com>
+Date: Tue, 27 Feb 2024 16:20:12 +0100
+Subject: [PATCH] Fix off-by-one error in udevListInterfacesByStatus
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Ever since this function was introduced in 2012 it could've tried
+filling in an extra interface name.  That was made worse in 2019 when
+the caller functions started accepting NULL arrays of size 0.
+
+This is assigned CVE-2024-1441.
+
+Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
+Reported-by: Alexander Kuznetsov <kuznetsovam@altlinux.org>
+Fixes: 5a33366f5c0b18c93d161bd144f9f079de4ac8ca
+Fixes: d6064e2759a24e0802f363e3a810dc5a7d7ebb15
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+---
+ src/interface/interface_backend_udev.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/interface/interface_backend_udev.c b/src/interface/interface_backend_udev.c
+index fb6799ed94..4091483060 100644
+--- a/src/interface/interface_backend_udev.c
++++ b/src/interface/interface_backend_udev.c
+@@ -222,7 +222,7 @@ udevListInterfacesByStatus(virConnectPtr conn,
+         g_autoptr(virInterfaceDef) def = NULL;
+ 
+         /* Ensure we won't exceed the size of our array */
+-        if (count > names_len)
++        if (count >= names_len)
+             break;
+ 
+         path = udev_list_entry_get_name(dev_entry);
+-- 
+2.27.0
+
diff --git a/Fix-potential-crash-during-driver-cleanup.patch b/Fix-potential-crash-during-driver-cleanup.patch
deleted file mode 100644
index ed8ec7d658029272c1e1a56b2f6a74f5ae880be5..0000000000000000000000000000000000000000
--- a/Fix-potential-crash-during-driver-cleanup.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From: Jim Fehlig <jfehlig@suse.com>
-Date: Tue, 11 Apr 2023 09:15:43 -0600
-Subject: [PATCH] qemu: Fix potential crash during driver cleanup
-
-During qemu driver shutdown, objects are freed in qemuStateCleanup that
-could still be used by active worker threads, resulting in crashes. E.g.
-a worker thread could be processing a monitor EOF event after the
-security manager is already disposed
-
-Program terminated with signal SIGSEGV, Segmentation fault.
-#0  0x00007fd9a9a1e1fe in virSecurityManagerMoveImageMetadata (mgr=0x7fd948012160, pid=-1, src=src@entry=0x7fd98c072c90, dst=dst@entry=0x0)
-    at ../../src/security/security_manager.c:468
-#1  0x00007fd9646ff0f0 in qemuSecurityMoveImageMetadata (driver=driver@entry=0x7fd948043830, vm=vm@entry=0x7fd98c066db0, src=src@entry=0x7fd98c072c90,
-    dst=dst@entry=0x0) at ../../src/qemu/qemu_security.c:182
-#2  0x00007fd96462c7b0 in qemuBlockRemoveImageMetadata (driver=driver@entry=0x7fd948043830, vm=vm@entry=0x7fd98c066db0, diskTarget=0x7fd98c072530 "vda",
-    src=<optimized out>) at ../../src/qemu/qemu_block.c:2628
-#3  0x00007fd9646929d6 in qemuProcessStop (driver=driver@entry=0x7fd948043830, vm=vm@entry=0x7fd98c066db0, reason=reason@entry=VIR_DOMAIN_SHUTOFF_SHUTDOWN,
-    asyncJob=asyncJob@entry=QEMU_ASYNC_JOB_NONE, flags=<optimized out>) at ../../src/qemu/qemu_process.c:7585
-#4  0x00007fd9646fc842 in processMonitorEOFEvent (vm=0x7fd98c066db0, driver=0x7fd948043830) at ../../src/qemu/qemu_driver.c:4794
-#5  qemuProcessEventHandler (data=0x561a93febb60, opaque=0x7fd948043830) at ../../src/qemu/qemu_driver.c:4900
-#6  0x00007fd9a9971a31 in virThreadPoolWorker (opaque=opaque@entry=0x561a93fb58e0) at ../../src/util/virthreadpool.c:163
-(gdb) p mgr->drv
-$2 = (virSecurityDriverPtr) 0x0
-
-Prior to commit 7cf76d4e3ab, the worker thread pool was freed before
-disposing any driver objects. Let's return to that pattern, but leave
-the other changes made by 7cf76d4e3ab.
-
-Signed-off-by: Tamara Schmitz <tamara.schmitz@suse.com>
-Signed-off-by: Jim Fehlig <jfehlig@suse.com>
-Reviewed-by: Martin Kletzander <mkletzan@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 32b3ef3..7a70d6c 100644
---- a/src/qemu/qemu_driver.c
-+++ b/src/qemu/qemu_driver.c
-@@ -1120,6 +1120,7 @@ qemuStateCleanup(void)
-     if (!qemu_driver)
-         return -1;
- 
-+    virThreadPoolFree(qemu_driver->workerPool);
-     virObjectUnref(qemu_driver->migrationErrors);
-     virObjectUnref(qemu_driver->closeCallbacks);
-     virLockManagerPluginUnref(qemu_driver->lockManager);
-@@ -1139,7 +1140,6 @@ qemuStateCleanup(void)
-     ebtablesContextFree(qemu_driver->ebtables);
-     VIR_FREE(qemu_driver->qemuImgBinary);
-     virObjectUnref(qemu_driver->domains);
--    virThreadPoolFree(qemu_driver->workerPool);
- 
-     if (qemu_driver->lockFD != -1)
-         virPidFileRelease(qemu_driver->config->stateDir, "driver", qemu_driver->lockFD);
--- 
-2.33.0
-
diff --git a/bugfix-fix-warnings-found-by-clang.patch b/Fix-warnings-found-by-clang.patch
similarity index 68%
rename from bugfix-fix-warnings-found-by-clang.patch
rename to Fix-warnings-found-by-clang.patch
index 378bc20903f0ee18a437e9f758baa9fdf65eface..dd2e7b4ee3e3bf801459fc8f4939fbc2f8eb8e94 100644
--- a/bugfix-fix-warnings-found-by-clang.patch
+++ b/Fix-warnings-found-by-clang.patch
@@ -1,7 +1,7 @@
-From 0559dfd4d4fa74484dae487711a986cc9acdfbfc Mon Sep 17 00:00:00 2001
+From f3bee7ca84e0e7f915ad425935e6279b227a00a6 Mon Sep 17 00:00:00 2001
 From: Chenxi Mao <chenxi.mao@suse.com>
 Date: Tue, 4 Apr 2023 14:25:17 +0800
-Subject: [PATCH 4/4] Fix warnings found by clang
+Subject: [PATCH] Fix warnings found by clang
 
 Warnings found if build with clang 15:
 
@@ -14,17 +14,17 @@ Signed-off-by: Chenxi Mao <chenxi.mao@suse.com>
  1 file changed, 1 deletion(-)
 
 diff --git a/src/qemu/qemu_hotpatch.c b/src/qemu/qemu_hotpatch.c
-index 02f511cc38..64aac9bb4c 100644
+index 0259ae76c8..29d13db030 100644
 --- a/src/qemu/qemu_hotpatch.c
 +++ b/src/qemu/qemu_hotpatch.c
-@@ -214,7 +214,6 @@ qemuDomainHotpatchAutoload(virDomainObjPtr vm, char *hotpatch_path)
-     VIR_AUTOSTRINGLIST applied_patches = NULL;
-     VIR_AUTOSTRINGLIST lines = NULL;
+@@ -214,7 +214,6 @@ qemuDomainHotpatchAutoload(virDomainObj *vm, char *hotpatch_path)
+     g_auto(GStrv) applied_patches = NULL;
+     g_auto(GStrv) lines = NULL;
      g_autofree char *applied_patch = NULL;
 -    g_autofree char *libvirtd_conf = NULL;
      g_autofree char *patch_conf = NULL;
      g_autofree char *buf = NULL;
      char *ret = NULL;
 -- 
-2.33.0
+2.27.0
 
diff --git a/Hotpatch-introduce-DomainHotpatchManage-API.patch b/Hotpatch-introduce-DomainHotpatchManage-API.patch
index 26b643df70cca5662374893a66f4fc9de10350d0..640f180406a76837de7a601d2d8e7baf9996b7fd 100644
--- a/Hotpatch-introduce-DomainHotpatchManage-API.patch
+++ b/Hotpatch-introduce-DomainHotpatchManage-API.patch
@@ -1,4 +1,4 @@
-From 9a12606bb5caf3e213ce1564445d88325592e642 Mon Sep 17 00:00:00 2001
+From dd9b8be8f47638f9149f3b577f1c38e36cd3e0db Mon Sep 17 00:00:00 2001
 From: AlexChen <alex.chen@huawei.com>
 Date: Tue, 19 Oct 2021 14:50:32 +0800
 Subject: [PATCH] Hotpatch: introduce DomainHotpatchManage API
@@ -7,23 +7,28 @@ Signed-off-by: Hao Wang <wanghao232@huawei.com>
 Signed-off-by: Bihong Yu <yubihong@huawei.com>
 Signed-off-by: AlexChen <alex.chen@huawei.com>
 ---
- include/libvirt/libvirt-domain.h | 18 ++++++++++
+ include/libvirt/libvirt-domain.h | 23 +++++++++++++
  scripts/check-aclrules.py        |  1 +
  src/driver-hypervisor.h          |  8 +++++
- src/libvirt-domain.c             | 58 ++++++++++++++++++++++++++++++++
- src/libvirt_public.syms          |  4 +++
+ src/libvirt-domain.c             | 59 ++++++++++++++++++++++++++++++++
+ src/libvirt_public.syms          |  5 +++
  src/remote/remote_driver.c       |  1 +
- src/remote/remote_protocol.x     | 20 ++++++++++-
- 7 files changed, 109 insertions(+), 1 deletion(-)
+ src/remote/remote_protocol.x     | 19 +++++++++-
+ 7 files changed, 115 insertions(+), 1 deletion(-)
 
 diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h
-index 90cb652db1..f91061724b 100644
+index a1902546bb..f8def59032 100644
 --- a/include/libvirt/libvirt-domain.h
 +++ b/include/libvirt/libvirt-domain.h
-@@ -4991,4 +4991,22 @@ int virDomainBackupBegin(virDomainPtr domain,
- char *virDomainBackupGetXMLDesc(virDomainPtr domain,
-                                 unsigned int flags);
+@@ -6416,6 +6416,29 @@ int virDomainAuthorizedSSHKeysGet(virDomainPtr domain,
+                                   char ***keys,
+                                   unsigned int flags);
  
++/**
++ * virDomainHotpatchAction:
++ *
++ * Since: 6.2.0
++ */
 +typedef enum {
 +    VIR_DOMAIN_HOTPATCH_NONE = 0, /* No action */
 +    VIR_DOMAIN_HOTPATCH_APPLY,    /* Apply hotpatch */
@@ -42,12 +47,14 @@ index 90cb652db1..f91061724b 100644
 +                        const char *id,
 +                        unsigned int flags);
 +
- #endif /* LIBVIRT_DOMAIN_H */
+ /**
+  * virDomainAuthorizedSSHKeysSetFlags:
+  *
 diff --git a/scripts/check-aclrules.py b/scripts/check-aclrules.py
-index a1fa473174..e196f81de9 100755
+index ed6805058b..e39dbd2ba8 100755
 --- a/scripts/check-aclrules.py
 +++ b/scripts/check-aclrules.py
-@@ -53,6 +53,7 @@ whitelist = {
+@@ -53,6 +53,7 @@ permitted = {
      "connectURIProbe": True,
      "localOnly": True,
      "domainQemuAttach": True,
@@ -56,12 +63,12 @@ index a1fa473174..e196f81de9 100755
  
  # XXX this vzDomainMigrateConfirm3Params looks
 diff --git a/src/driver-hypervisor.h b/src/driver-hypervisor.h
-index bce023017d..afc21a0b3f 100644
+index 5219344b72..e54af0515f 100644
 --- a/src/driver-hypervisor.h
 +++ b/src/driver-hypervisor.h
-@@ -1387,6 +1387,13 @@ typedef char *
- (*virDrvDomainBackupGetXMLDesc)(virDomainPtr domain,
-                                 unsigned int flags);
+@@ -1448,6 +1448,13 @@ typedef int
+                            int *fds,
+                            unsigned int flags);
  
 +typedef char *
 +(*virDrvDomainHotpatchManage)(virDomainPtr domain,
@@ -71,23 +78,22 @@ index bce023017d..afc21a0b3f 100644
 +                              unsigned int flags);
 +
  typedef struct _virHypervisorDriver virHypervisorDriver;
- typedef virHypervisorDriver *virHypervisorDriverPtr;
  
-@@ -1650,4 +1657,5 @@ struct _virHypervisorDriver {
-     virDrvDomainAgentSetResponseTimeout domainAgentSetResponseTimeout;
-     virDrvDomainBackupBegin domainBackupBegin;
-     virDrvDomainBackupGetXMLDesc domainBackupGetXMLDesc;
+ /**
+@@ -1720,4 +1727,5 @@ struct _virHypervisorDriver {
+     virDrvDomainGetMessages domainGetMessages;
+     virDrvDomainStartDirtyRateCalc domainStartDirtyRateCalc;
+     virDrvDomainFDAssociate domainFDAssociate;
 +    virDrvDomainHotpatchManage domainHotpatchManage;
  };
 diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c
-index a12809c2d5..068ab52f54 100644
+index 77a9682ecb..26833efd0e 100644
 --- a/src/libvirt-domain.c
 +++ b/src/libvirt-domain.c
-@@ -12733,3 +12733,61 @@ virDomainBackupGetXMLDesc(virDomainPtr domain,
-     virDispatchError(conn);
+@@ -13784,6 +13784,65 @@ virDomainBackupGetXMLDesc(virDomainPtr domain,
      return NULL;
  }
-+
+ 
 +/**
 + * virDomainHotpatchManage:
 + * @domain: a domain object
@@ -108,6 +114,8 @@ index a12809c2d5..068ab52f54 100644
 + * of the applied hotpatch of the current domain.
 + *
 + * Returns success messages in case of success, NULL otherwise.
++ *
++ * Since: 6.10.0
 + */
 +char *
 +virDomainHotpatchManage(virDomainPtr domain,
@@ -145,11 +153,14 @@ index a12809c2d5..068ab52f54 100644
 +    virDispatchError(conn);
 +    return NULL;
 +}
+ 
+ /**
+  * virDomainAuthorizedSSHKeysGet:
 diff --git a/src/libvirt_public.syms b/src/libvirt_public.syms
-index 539d2e3943..0ad0b9e489 100644
+index bd1e916d2a..52a5d03240 100644
 --- a/src/libvirt_public.syms
 +++ b/src/libvirt_public.syms
-@@ -873,4 +873,8 @@ LIBVIRT_6.0.0 {
+@@ -873,6 +873,11 @@ LIBVIRT_6.0.0 {
          virDomainBackupGetXMLDesc;
  } LIBVIRT_5.10.0;
  
@@ -157,25 +168,28 @@ index 539d2e3943..0ad0b9e489 100644
 +    global:
 +        virDomainHotpatchManage;
 +} LIBVIRT_6.0.0;
- # .... define new API here using predicted next version number ....
++
+ LIBVIRT_6.10.0 {
+     global:
+         virDomainAuthorizedSSHKeysGet;
 diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
-index 7bae0c2514..1202d44017 100644
+index c4831db6cd..25fae1cad6 100644
 --- a/src/remote/remote_driver.c
 +++ b/src/remote/remote_driver.c
-@@ -8684,6 +8684,7 @@ static virHypervisorDriver hypervisor_driver = {
+@@ -7842,6 +7842,7 @@ static virHypervisorDriver hypervisor_driver = {
      .domainAgentSetResponseTimeout = remoteDomainAgentSetResponseTimeout, /* 5.10.0 */
      .domainBackupBegin = remoteDomainBackupBegin, /* 6.0.0 */
      .domainBackupGetXMLDesc = remoteDomainBackupGetXMLDesc, /* 6.0.0 */
 +    .domainHotpatchManage = remoteDomainHotpatchManage, /* 6.2.0 */
- };
- 
- static virNetworkDriver network_driver = {
+     .domainAuthorizedSSHKeysGet = remoteDomainAuthorizedSSHKeysGet, /* 6.10.0 */
+     .domainAuthorizedSSHKeysSet = remoteDomainAuthorizedSSHKeysSet, /* 6.10.0 */
+     .domainGetMessages = remoteDomainGetMessages, /* 7.1.0 */
 diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x
-index 8b05082b61..ee13075ce1 100644
+index e295b0acc3..eea11df2ea 100644
 --- a/src/remote/remote_protocol.x
 +++ b/src/remote/remote_protocol.x
-@@ -3771,6 +3771,18 @@ struct remote_domain_backup_get_xml_desc_ret {
-     remote_nonnull_string xml;
+@@ -3956,6 +3956,17 @@ struct remote_domain_event_memory_device_size_change_msg {
+     unsigned hyper size;
  };
  
 +struct remote_domain_hotpatch_manage_args {
@@ -189,16 +203,15 @@ index 8b05082b61..ee13075ce1 100644
 +struct remote_domain_hotpatch_manage_ret {
 +    remote_string info;
 +};
-+
- /*----- Protocol. -----*/
  
- /* Define the program number, protocol version and procedure numbers here. */
-@@ -6668,5 +6680,11 @@ enum remote_procedure {
-      * @priority: high
-      * @acl: domain:read
+ struct remote_domain_fd_associate_args {
+     remote_nonnull_domain dom;
+@@ -7021,5 +7032,11 @@ enum remote_procedure {
+      * @generate: both
+      * @acl: none
       */
--    REMOTE_PROC_DOMAIN_BACKUP_GET_XML_DESC = 422
-+    REMOTE_PROC_DOMAIN_BACKUP_GET_XML_DESC = 422,
+-    REMOTE_PROC_NETWORK_EVENT_CALLBACK_METADATA_CHANGE = 446
++    REMOTE_PROC_NETWORK_EVENT_CALLBACK_METADATA_CHANGE = 446,
 +
 +    /**
 +     * @generate: both
diff --git a/Implement-the-method-of-getting-host-info-for-loonga.patch b/Implement-the-method-of-getting-host-info-for-loonga.patch
deleted file mode 100644
index d386a0ca84450d0571d28dd3ef0e2ab8bf86f954..0000000000000000000000000000000000000000
--- a/Implement-the-method-of-getting-host-info-for-loonga.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 4123437e633f05af0ae8091d5db440597394ba36 Mon Sep 17 00:00:00 2001
-From: zhaotianrui <zhaotianrui@loongson.cn>
-Date: Wed, 11 Jan 2023 14:09:41 -0500
-Subject: [PATCH 4/4] Implement the method of getting host info for loongarch
-
-Implement method for loongarch to get host info, such as
-cpu frequency, system info, etc.
-
-Signed-off-by: zhaotianrui <zhaotianrui@loongson.cn>
----
- src/util/virarch.c    | 2 ++
- src/util/virhostcpu.c | 2 +-
- src/util/virsysinfo.c | 3 ++-
- 3 files changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/src/util/virarch.c b/src/util/virarch.c
-index decdbdd7ac..0520a1c80b 100644
---- a/src/util/virarch.c
-+++ b/src/util/virarch.c
-@@ -227,6 +227,8 @@ virArch virArchFromHost(void)
-         arch = VIR_ARCH_X86_64;
-     } else if (STREQ(ut.machine, "sw_64")) {
-         arch = VIR_ARCH_SW_64;
-+    } else if (STREQ(ut.machine, "loongarch64")) {
-+        arch = VIR_ARCH_LOONGARCH64;
-     } else {
-         /* Otherwise assume the canonical name */
-         if ((arch = virArchFromString(ut.machine)) == VIR_ARCH_NONE) {
-diff --git a/src/util/virhostcpu.c b/src/util/virhostcpu.c
-index 5ec98d6016..ce3da7e6ec 100644
---- a/src/util/virhostcpu.c
-+++ b/src/util/virhostcpu.c
-@@ -577,7 +577,7 @@ virHostCPUParseFrequency(FILE *cpuinfo,
-     char line[1024];
- 
-     /* No sensible way to retrieve CPU frequency */
--    if (ARCH_IS_ARM(arch))
-+    if (ARCH_IS_ARM(arch) || ARCH_IS_LOONGARCH(arch))
-         return 0;
- 
-     if (ARCH_IS_X86(arch))
-diff --git a/src/util/virsysinfo.c b/src/util/virsysinfo.c
-index 8a53702224..6d4778fed7 100644
---- a/src/util/virsysinfo.c
-+++ b/src/util/virsysinfo.c
-@@ -1190,7 +1190,7 @@ virSysinfoRead(void)
- {
- #if defined(__powerpc__)
-     return virSysinfoReadPPC();
--#elif defined(__arm__) || defined(__aarch64__)
-+#elif defined(__arm__) || defined(__aarch64__) || defined(__loongarch__)
-     return virSysinfoReadARM();
- #elif defined(__s390__) || defined(__s390x__)
-     return virSysinfoReadS390();
-@@ -1198,6 +1198,7 @@ virSysinfoRead(void)
-     (defined(__x86_64__) || \
-      defined(__i386__) || \
-      defined(__amd64__) || \
-+     defined(__loongarch__) || \
-      defined(__sw_64__))
-     return virSysinfoReadDMI();
- #else /* WIN32 || not supported arch */
--- 
-2.25.1
-
diff --git a/Include-vdpa-devices-in-node-device-list.patch b/Include-vdpa-devices-in-node-device-list.patch
deleted file mode 100644
index 9fb06749c17fa92eab51a9296bc6efdc7dd6e61b..0000000000000000000000000000000000000000
--- a/Include-vdpa-devices-in-node-device-list.patch
+++ /dev/null
@@ -1,322 +0,0 @@
-From e8597e64126a5cf77fbb9422977268878a6376b6 Mon Sep 17 00:00:00 2001
-From: AlexChen <alex.chen@huawei.com>
-Date: Wed, 14 Oct 2020 12:08:30 -0500
-Subject: [PATCH] Include vdpa devices in node device list
-
-The current udev node device driver ignores all events related to vdpa
-devices. Since libvirt now supports vDPA network devices, include these
-devices in the device list.
-
-Example output:
-
-virsh # nodedev-list
-[...ommitted long list of nodedevs...]
-vdpa_vdpa0
-
-virsh # nodedev-dumpxml vdpa_vdpa0
-<device>
-  <name>vdpa_vdpa0</name>
-  <path>/sys/devices/vdpa0</path>
-  <parent>computer</parent>
-  <driver>
-    <name>vhost_vdpa</name>
-  </driver>
-  <capability type='vdpa'>
-    <chardev>/dev/vhost-vdpa-0</chardev>
-  </capability>
-</device>
-
-NOTE: normally the 'parent' would be a PCI device instead of 'computer',
-but this example output is from the vdpa_sim kernel module, so it
-doesn't have a normal parent device.
-
-Signed-off-by: Jonathon Jongsma <jjongsma@redhat.com>
-Signed-off-by: AlexChen <alex.chen@huawei.com>
----
- docs/formatnode.html.in            |  9 ++++++
- docs/schemas/nodedev.rng           | 10 ++++++
- include/libvirt/libvirt-nodedev.h  |  1 +
- src/conf/node_device_conf.c        | 13 ++++++++
- src/conf/node_device_conf.h        | 11 ++++++-
- src/conf/virnodedeviceobj.c        |  4 ++-
- src/node_device/node_device_udev.c | 51 ++++++++++++++++++++++++++++++
- tools/virsh-nodedev.c              |  3 ++
- 8 files changed, 100 insertions(+), 2 deletions(-)
-
-diff --git a/docs/formatnode.html.in b/docs/formatnode.html.in
-index c2a8f8fb7a..573391ef0f 100644
---- a/docs/formatnode.html.in
-+++ b/docs/formatnode.html.in
-@@ -341,6 +341,15 @@
-               <dd>The device number.</dd>
-             </dl>
-           </dd>
-+          <dt><code>vdpa</code></dt>
-+          <dd>Describes a virtual datapath acceleration (vDPA) network device.
-+          <span class="since">Since 6.9.0</span>. Sub-elements include:
-+            <dl>
-+              <dt><code>chardev</code></dt>
-+              <dd>The path to the character device that is used to access the
-+                  device.</dd>
-+            </dl>
-+          </dd>
-         </dl>
-       </dd>
-     </dl>
-diff --git a/docs/schemas/nodedev.rng b/docs/schemas/nodedev.rng
-index fe6ffa0b53..4f197b327a 100644
---- a/docs/schemas/nodedev.rng
-+++ b/docs/schemas/nodedev.rng
-@@ -85,6 +85,7 @@
-         <ref name="capdrm"/>
-         <ref name="capmdev"/>
-         <ref name="capccwdev"/>
-+        <ref name="capvdpa"/>
-       </choice>
-     </element>
-   </define>
-@@ -651,6 +652,15 @@
-     </element>
-   </define>
- 
-+  <define name="capvdpa">
-+    <attribute name="type">
-+      <value>vdpa</value>
-+    </attribute>
-+    <element name="chardev">
-+      <ref name="path"/>
-+    </element>
-+  </define>
-+
-   <define name='address'>
-     <element name='address'>
-       <attribute name='domain'><ref name='hexuint'/></attribute>
-diff --git a/include/libvirt/libvirt-nodedev.h b/include/libvirt/libvirt-nodedev.h
-index a2ad61ac6d..4129f1afed 100644
---- a/include/libvirt/libvirt-nodedev.h
-+++ b/include/libvirt/libvirt-nodedev.h
-@@ -81,6 +81,7 @@ typedef enum {
-     VIR_CONNECT_LIST_NODE_DEVICES_CAP_MDEV_TYPES    = 1 << 13, /* Capable of mediated devices */
-     VIR_CONNECT_LIST_NODE_DEVICES_CAP_MDEV          = 1 << 14, /* Mediated device */
-     VIR_CONNECT_LIST_NODE_DEVICES_CAP_CCW_DEV       = 1 << 15, /* CCW device */
-+    VIR_CONNECT_LIST_NODE_DEVICES_CAP_VDPA          = 1 << 17, /* vDPA device */
- } virConnectListAllNodeDeviceFlags;
- 
- int                     virConnectListAllNodeDevices (virConnectPtr conn,
-diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c
-index d64f6d3986..41d7c7d12e 100644
---- a/src/conf/node_device_conf.c
-+++ b/src/conf/node_device_conf.c
-@@ -65,6 +65,7 @@ VIR_ENUM_IMPL(virNodeDevCap,
-               "mdev_types",
-               "mdev",
-               "ccw",
-+              "vdpa",
- );
- 
- VIR_ENUM_IMPL(virNodeDevNetCap,
-@@ -500,6 +501,12 @@ virNodeDeviceCapStorageDefFormat(virBufferPtr buf,
-         virBufferAddLit(buf, "<capability type='hotpluggable'/>\n");
- }
- 
-+static void
-+virNodeDeviceCapVDPADefFormat(virBufferPtr buf,
-+                              const virNodeDevCapData *data)
-+{
-+    virBufferEscapeString(buf, "<chardev>%s</chardev>\n", data->vdpa.chardev);
-+}
- 
- char *
- virNodeDeviceDefFormat(const virNodeDeviceDef *def)
-@@ -595,6 +602,9 @@ virNodeDeviceDefFormat(const virNodeDeviceDef *def)
-             virBufferAsprintf(&buf, "<devno>0x%04x</devno>\n",
-                               data->ccw_dev.devno);
-             break;
-+        case VIR_NODE_DEV_CAP_VDPA:
-+            virNodeDeviceCapVDPADefFormat(&buf, data);
-+            break;
-         case VIR_NODE_DEV_CAP_MDEV_TYPES:
-         case VIR_NODE_DEV_CAP_FC_HOST:
-         case VIR_NODE_DEV_CAP_VPORTS:
-@@ -1897,6 +1907,7 @@ virNodeDevCapsDefParseXML(xmlXPathContextPtr ctxt,
-     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_VDPA:
-     case VIR_NODE_DEV_CAP_LAST:
-         virReportError(VIR_ERR_INTERNAL_ERROR,
-                        _("unknown capability type '%d' for '%s'"),
-@@ -2209,6 +2220,7 @@ virNodeDevCapsDefFree(virNodeDevCapsDefPtr caps)
-     case VIR_NODE_DEV_CAP_FC_HOST:
-     case VIR_NODE_DEV_CAP_VPORTS:
-     case VIR_NODE_DEV_CAP_CCW_DEV:
-+    case VIR_NODE_DEV_CAP_VDPA:
-     case VIR_NODE_DEV_CAP_LAST:
-         /* This case is here to shutup the compiler */
-         break;
-@@ -2262,6 +2274,7 @@ virNodeDeviceUpdateCaps(virNodeDeviceDefPtr def)
-         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:
-         case VIR_NODE_DEV_CAP_LAST:
-             break;
-         }
-diff --git a/src/conf/node_device_conf.h b/src/conf/node_device_conf.h
-index 9e4b0847fb..a14eaef742 100644
---- a/src/conf/node_device_conf.h
-+++ b/src/conf/node_device_conf.h
-@@ -64,6 +64,7 @@ typedef enum {
-     VIR_NODE_DEV_CAP_MDEV_TYPES,        /* Device capable of mediated devices */
-     VIR_NODE_DEV_CAP_MDEV,              /* Mediated device */
-     VIR_NODE_DEV_CAP_CCW_DEV,           /* s390 CCW device */
-+    VIR_NODE_DEV_CAP_VDPA,              /* vDPA device */
- 
-     VIR_NODE_DEV_CAP_LAST
- } virNodeDevCapType;
-@@ -271,6 +272,12 @@ struct _virNodeDevCapCCW {
-     unsigned int devno;
- };
- 
-+typedef struct _virNodeDevCapVDPA virNodeDevCapVDPA;
-+typedef virNodeDevCapVDPA *virNodeDevCapVDPAPtr;
-+struct _virNodeDevCapVDPA {
-+    char *chardev;
-+};
-+
- typedef struct _virNodeDevCapData virNodeDevCapData;
- typedef virNodeDevCapData *virNodeDevCapDataPtr;
- struct _virNodeDevCapData {
-@@ -289,6 +296,7 @@ struct _virNodeDevCapData {
-         virNodeDevCapDRM drm;
-         virNodeDevCapMdev mdev;
-         virNodeDevCapCCW ccw_dev;
-+        virNodeDevCapVDPA vdpa;
-     };
- };
- 
-@@ -364,7 +372,8 @@ virNodeDevCapsDefFree(virNodeDevCapsDefPtr caps);
-                  VIR_CONNECT_LIST_NODE_DEVICES_CAP_DRM           | \
-                  VIR_CONNECT_LIST_NODE_DEVICES_CAP_MDEV_TYPES    | \
-                  VIR_CONNECT_LIST_NODE_DEVICES_CAP_MDEV          | \
--                 VIR_CONNECT_LIST_NODE_DEVICES_CAP_CCW_DEV)
-+                 VIR_CONNECT_LIST_NODE_DEVICES_CAP_CCW_DEV       | \
-+                 VIR_CONNECT_LIST_NODE_DEVICES_CAP_VDPA)
- 
- int
- virNodeDeviceGetSCSIHostCaps(virNodeDevCapSCSIHostPtr scsi_host);
-diff --git a/src/conf/virnodedeviceobj.c b/src/conf/virnodedeviceobj.c
-index 3a34a324ca..be111741bf 100644
---- a/src/conf/virnodedeviceobj.c
-+++ b/src/conf/virnodedeviceobj.c
-@@ -676,6 +676,7 @@ virNodeDeviceObjHasCap(const virNodeDeviceObj *obj,
-         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:
-         case VIR_NODE_DEV_CAP_LAST:
-             break;
-         }
-@@ -826,7 +827,8 @@ virNodeDeviceObjMatch(virNodeDeviceObjPtr obj,
-               MATCH(DRM)           ||
-               MATCH(MDEV_TYPES)    ||
-               MATCH(MDEV)          ||
--              MATCH(CCW_DEV)))
-+              MATCH(CCW_DEV)       ||
-+              MATCH(VDPA)))
-             return false;
-     }
- 
-diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c
-index 0d8a7db5c6..2764315325 100644
---- a/src/node_device/node_device_udev.c
-+++ b/src/node_device/node_device_udev.c
-@@ -1089,6 +1089,53 @@ udevProcessCCW(struct udev_device *device,
-     return 0;
- }
- 
-+static int
-+udevGetVDPACharDev(const char *sysfs_path,
-+                   virNodeDevCapDataPtr data)
-+{
-+    struct dirent *entry;
-+    DIR *dir = NULL;
-+    int direrr;
-+
-+    if (virDirOpenIfExists(&dir, sysfs_path) <= 0)
-+        return -1;
-+
-+    while ((direrr = virDirRead(dir, &entry, NULL)) > 0) {
-+        if (g_str_has_prefix(entry->d_name, "vhost-vdpa")) {
-+            g_autofree char *chardev = g_strdup_printf("/dev/%s", entry->d_name);
-+
-+            if (!virFileExists(chardev)) {
-+                virReportError(VIR_ERR_INTERNAL_ERROR,
-+                               _("vDPA chardev path '%s' does not exist"),
-+                               chardev);
-+                return -1;
-+            }
-+            VIR_DEBUG("vDPA chardev is at '%s'", chardev);
-+
-+            data->vdpa.chardev = g_steal_pointer(&chardev);
-+            break;
-+        }
-+    }
-+
-+    if (direrr < 0)
-+        return -1;
-+
-+    return 0;
-+}
-+
-+static int
-+udevProcessVDPA(struct udev_device *device,
-+                virNodeDeviceDefPtr def)
-+{
-+    if (udevGenerateDeviceName(device, def, NULL) != 0)
-+        return -1;
-+
-+    if (udevGetVDPACharDev(def->sysfs_path, &def->caps->data) < 0)
-+        return -1;
-+
-+    return 0;
-+}
-+
- 
- static int
- udevGetDeviceNodes(struct udev_device *device,
-@@ -1168,6 +1215,8 @@ udevGetDeviceType(struct udev_device *device,
-             *type = VIR_NODE_DEV_CAP_MDEV;
-         else if (STREQ_NULLABLE(subsystem, "ccw"))
-             *type = VIR_NODE_DEV_CAP_CCW_DEV;
-+        else if (STREQ_NULLABLE(subsystem, "vdpa"))
-+            *type = VIR_NODE_DEV_CAP_VDPA;
- 
-         VIR_FREE(subsystem);
-     }
-@@ -1212,6 +1261,8 @@ udevGetDeviceDetails(struct udev_device *device,
-         return udevProcessMediatedDevice(device, def);
-     case VIR_NODE_DEV_CAP_CCW_DEV:
-         return udevProcessCCW(device, def);
-+    case VIR_NODE_DEV_CAP_VDPA:
-+        return udevProcessVDPA(device, def);
-     case VIR_NODE_DEV_CAP_MDEV_TYPES:
-     case VIR_NODE_DEV_CAP_SYSTEM:
-     case VIR_NODE_DEV_CAP_FC_HOST:
-diff --git a/tools/virsh-nodedev.c b/tools/virsh-nodedev.c
-index 7f091d7cf8..f831b36054 100644
---- a/tools/virsh-nodedev.c
-+++ b/tools/virsh-nodedev.c
-@@ -462,6 +462,9 @@ cmdNodeListDevices(vshControl *ctl, const vshCmd *cmd G_GNUC_UNUSED)
-         case VIR_NODE_DEV_CAP_CCW_DEV:
-             flags |= VIR_CONNECT_LIST_NODE_DEVICES_CAP_CCW_DEV;
-             break;
-+        case VIR_NODE_DEV_CAP_VDPA:
-+            flags |= VIR_CONNECT_LIST_NODE_DEVICES_CAP_VDPA;
-+            break;
-         case VIR_NODE_DEV_CAP_LAST:
-             break;
-         }
--- 
-2.27.0
-
diff --git a/Revert-libvirt-support-aarch64-vtpm-with-parameter-t.patch b/Revert-libvirt-support-aarch64-vtpm-with-parameter-t.patch
deleted file mode 100644
index a26b4ce3c8380774b7e25e2cbac11fd95046097a..0000000000000000000000000000000000000000
--- a/Revert-libvirt-support-aarch64-vtpm-with-parameter-t.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-From 78c25600daf2a2822e7ecec2af9e7458b9f44eff Mon Sep 17 00:00:00 2001
-From: yezengruan <yezengruan@huawei.com>
-Date: Sat, 12 Mar 2022 09:35:07 +0800
-Subject: [PATCH 1/6] Revert libvirt: support aarch64 vtpm with parameter
- tpm-tis-device
-
-Before backport the patch support aarch64 vtpm, let's
-revert it first.
-
-Signed-off-by: yezengruan <yezengruan@huawei.com>
----
- src/conf/domain_conf.c       | 1 -
- src/conf/domain_conf.h       | 1 -
- src/qemu/qemu_capabilities.c | 9 +--------
- src/qemu/qemu_capabilities.h | 4 +---
- src/qemu/qemu_domain.c       | 3 ---
- 5 files changed, 2 insertions(+), 16 deletions(-)
-
-diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
-index 4e3bcf479c..54228a2151 100644
---- a/src/conf/domain_conf.c
-+++ b/src/conf/domain_conf.c
-@@ -1141,7 +1141,6 @@ VIR_ENUM_IMPL(virDomainTPMModel,
-               "tpm-tis",
-               "tpm-crb",
-               "tpm-spapr",
--              "tpm-tis-device",
- );
- 
- VIR_ENUM_IMPL(virDomainTPMBackend,
-diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
-index ccee986849..e057c384c6 100644
---- a/src/conf/domain_conf.h
-+++ b/src/conf/domain_conf.h
-@@ -1280,7 +1280,6 @@ typedef enum {
-     VIR_DOMAIN_TPM_MODEL_TIS,
-     VIR_DOMAIN_TPM_MODEL_CRB,
-     VIR_DOMAIN_TPM_MODEL_SPAPR,
--    VIR_DOMAIN_TPM_MODEL_TIS_DEVICE,
- 
-     VIR_DOMAIN_TPM_MODEL_LAST
- } virDomainTPMModel;
-diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
-index 6013be9d05..0fb3e74c77 100644
---- a/src/qemu/qemu_capabilities.c
-+++ b/src/qemu/qemu_capabilities.c
-@@ -568,9 +568,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
-               "blockdev-snapshot.allow-write-only-overlay",
-               "blockdev-reopen",
-               "storage.werror",
--	      
--              /* 360 */
--              "tpm-tis-device",
-+
- 	      "migration-param.bandwidth",
- 	      "migration-param.downtime",
- 	      "migration-param.xbzrle-cache-size",
-@@ -1292,7 +1290,6 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = {
-     { "rng-builtin", QEMU_CAPS_OBJECT_RNG_BUILTIN },
-     { "tpm-spapr", QEMU_CAPS_DEVICE_TPM_SPAPR },
-     { "vhost-user-fs-device", QEMU_CAPS_DEVICE_VHOST_USER_FS },
--    { "tpm-tis-device", QEMU_CAPS_DEVICE_TPM_TIS_DEVICE },
- };
- 
- static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsVirtioBalloon[] = {
-@@ -3100,10 +3097,6 @@ const struct tpmTypeToCaps virQEMUCapsTPMModelsToCaps[] = {
-         .type = VIR_DOMAIN_TPM_MODEL_SPAPR,
-         .caps = QEMU_CAPS_DEVICE_TPM_SPAPR,
-     },
--    {
--	.type = VIR_DOMAIN_TPM_MODEL_TIS_DEVICE,
--	.caps = QEMU_CAPS_DEVICE_TPM_TIS_DEVICE,
--    },
- };
- 
- static int
-diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
-index 5f28006b48..10a6ce50e7 100644
---- a/src/qemu/qemu_capabilities.h
-+++ b/src/qemu/qemu_capabilities.h
-@@ -549,9 +549,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
-     QEMU_CAPS_BLOCKDEV_SNAPSHOT_ALLOW_WRITE_ONLY, /* blockdev-snapshot has the 'allow-write-only-overlay' feature */
-     QEMU_CAPS_BLOCKDEV_REOPEN, /* 'blockdev-reopen' qmp command is supported */
-     QEMU_CAPS_STORAGE_WERROR, /* virtio-blk,scsi-hd.werror */
--    
--    /* 360 */
--    QEMU_CAPS_DEVICE_TPM_TIS_DEVICE, /* -device tpm-tis-device */
-+
-     QEMU_CAPS_MIGRATION_PARAM_BANDWIDTH, /* max-bandwidth field in migrate-set-parameters */
-     QEMU_CAPS_MIGRATION_PARAM_DOWNTIME, /* downtime-limit field in migrate-set-parameters */
-     QEMU_CAPS_MIGRATION_PARAM_XBZRLE_CACHE_SIZE, /* xbzrle-cache-size field in migrate-set-parameters */
-diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
-index 2351cac120..cb2fbdc179 100644
---- a/src/qemu/qemu_domain.c
-+++ b/src/qemu/qemu_domain.c
-@@ -8130,9 +8130,6 @@ qemuDomainDeviceDefValidateTPM(virDomainTPMDef *tpm,
-     case VIR_DOMAIN_TPM_MODEL_SPAPR:
-         flag = QEMU_CAPS_DEVICE_TPM_SPAPR;
-         break;
--    case VIR_DOMAIN_TPM_MODEL_TIS_DEVICE:
--        flag = QEMU_CAPS_DEVICE_TPM_TIS_DEVICE;
--        break;
-     case VIR_DOMAIN_TPM_MODEL_LAST:
-     default:
-         virReportEnumRangeError(virDomainTPMModel, tpm->model);
--- 
-2.27.0
-
diff --git a/Revert-selinux-adapt-to-libselinux.patch b/Revert-selinux-adapt-to-libselinux.patch
deleted file mode 100644
index 9f5e6ae08c3ac34b2866c85573fe8c331e96df77..0000000000000000000000000000000000000000
--- a/Revert-selinux-adapt-to-libselinux.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 3dc1e0f37c013c317f3e868d1e4a6668d8f18a03 Mon Sep 17 00:00:00 2001
-From: mayunlong <mayunlong6@huawei.com>
-Date: Wed, 9 Aug 2023 20:51:37 +0800
-Subject: [PATCH] Revert "selinux: adapt to libselinux"
-
-use the solution modified by the upstream community torevert this patch
-This reverts commit 20fd0fb6b915363efecd2d108363995d8dea8e1a.
----
- src/security/security_selinux.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c
-index cb4dc3e101..c91c7ca484 100644
---- a/src/security/security_selinux.c
-+++ b/src/security/security_selinux.c
-@@ -541,7 +541,7 @@ static char *
- virSecuritySELinuxContextAddRange(char *src,
-                                   char *dst)
- {
--    const char *str = NULL;
-+    char *str = NULL;
-     char *ret = NULL;
-     context_t srccon = NULL;
-     context_t dstcon = NULL;
-@@ -582,7 +582,7 @@ virSecuritySELinuxGenNewContext(const char *basecontext,
- {
-     context_t context = NULL;
-     char *ret = NULL;
--    const char *str;
-+    char *str;
-     char *ourSecContext = NULL;
-     context_t ourContext = NULL;
- 
--- 
-2.41.0.windows.1
-
diff --git a/Revert-tests-disabale-storage-tests.patch b/Revert-tests-disabale-storage-tests.patch
deleted file mode 100644
index 78cab82e0161e24adad840d3ec43207ca73ed793..0000000000000000000000000000000000000000
--- a/Revert-tests-disabale-storage-tests.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 8629a253113a019215b38f7206db03892157a370 Mon Sep 17 00:00:00 2001
-From: imxcc <xingchaochao@huawei.com>
-Date: Sat, 29 Jan 2022 17:14:59 +0800
-Subject: [PATCH] Revert tests: disabale storage tests
-
-Signed-off-by: imxcc <xingchaochao@huawei.com>
----
- tests/Makefile.am | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/tests/Makefile.am b/tests/Makefile.am
-index abb261e..ada5b8f 100644
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -363,10 +363,16 @@ endif WITH_NWFILTER
- 
- if WITH_STORAGE
- test_programs += storagevolxml2argvtest
-+test_programs += storagepoolxml2argvtest
- test_programs += virstorageutiltest
-+test_programs += storagepoolxml2xmltest
- test_programs += storagepoolcapstest
- endif WITH_STORAGE
- 
-+if WITH_STORAGE_FS
-+test_programs += virstoragetest
-+endif WITH_STORAGE_FS
-+
- if WITH_LINUX
- test_programs += virscsitest
- endif WITH_LINUX
-@@ -424,6 +430,7 @@ test_scripts += $(libvirtd_test_scripts)
- 
- test_programs += \
- 	eventtest \
-+	virdrivermoduletest \
- 	virdriverconnvalidatetest
- else ! WITH_LIBVIRTD
- EXTRA_DIST += $(libvirtd_test_scripts)
--- 
-2.27.0
-
diff --git a/Use-un-signed-printf-specifiers-correctly.patch b/Use-un-signed-printf-specifiers-correctly.patch
deleted file mode 100644
index 04f90f4bb9030ee122f79aee0ea0aa82202a926d..0000000000000000000000000000000000000000
--- a/Use-un-signed-printf-specifiers-correctly.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-From 37a05df2eb7e880c1bde301adf2b2eb32fc9a891 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
-Date: Tue, 22 Sep 2020 22:17:03 +0200
-Subject: [PATCH] Use (un)signed printf specifiers correctly
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Various places reported by cppcheck's invalidPrintfArgType_sint
-and invalidPrintfArgType_uint.
-
-Signed-off-by: Ján Tomko <jtomko@redhat.com>
-Reviewed-by: Peter Krempa <pkrempa@redhat.com>
-Signed-off-by: zhujun2 <zhujun2_yewu@cmss.chinamobile.com>
-(cherry-pick from 8b80d9f0f924ddf900b726871916f8ba5ae29243)
----
- examples/c/domain/domtop.c  | 2 +-
- examples/c/domain/suspend.c | 2 +-
- tests/qemusecuritymock.c    | 2 +-
- tests/virhashtest.c         | 4 ++--
- tests/virpcimock.c          | 2 +-
- 5 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/examples/c/domain/domtop.c b/examples/c/domain/domtop.c
-index 15611c586d..5228445b7c 100644
---- a/examples/c/domain/domtop.c
-+++ b/examples/c/domain/domtop.c
-@@ -115,7 +115,7 @@ parse_argv(int argc, char *argv[],
-             }
-             *milliseconds = val;
-             if (*milliseconds != val) {
--                ERROR("Integer overflow: %ld", val);
-+                ERROR("Integer overflow: %lu", val);
-                 exit(EXIT_FAILURE);
-             }
-             break;
-diff --git a/examples/c/domain/suspend.c b/examples/c/domain/suspend.c
-index 980c4584c7..3ff24f6861 100644
---- a/examples/c/domain/suspend.c
-+++ b/examples/c/domain/suspend.c
-@@ -105,7 +105,7 @@ parse_argv(int argc, char *argv[],
-             }
-             *seconds = val;
-             if (*seconds != val) {
--                ERROR("Integer overflow: %ld", val);
-+                ERROR("Integer overflow: %lu", val);
-                 return -1;
-             }
-             break;
-diff --git a/tests/qemusecuritymock.c b/tests/qemusecuritymock.c
-index ad182c7bf7..e1057bef7b 100644
---- a/tests/qemusecuritymock.c
-+++ b/tests/qemusecuritymock.c
-@@ -269,7 +269,7 @@ mock_chown(const char *path,
-     int ret = -1;
- 
-     if (gid >> 16 || uid >> 16) {
--        fprintf(stderr, "Attempt to set too high UID or GID: %lld %lld",
-+        fprintf(stderr, "Attempt to set too high UID or GID: %llu %llu",
-                (unsigned long long) uid, (unsigned long long) gid);
-         abort();
-     }
-diff --git a/tests/virhashtest.c b/tests/virhashtest.c
-index 4d05cbb0f8..af30791241 100644
---- a/tests/virhashtest.c
-+++ b/tests/virhashtest.c
-@@ -34,7 +34,7 @@ testHashInit(int size)
-         }
- 
-         if (virHashTableSize(hash) != oldsize) {
--            VIR_TEST_DEBUG("hash grown from %zd to %zd",
-+            VIR_TEST_DEBUG("hash grown from %zu to %zu",
-                      (size_t)oldsize, (size_t)virHashTableSize(hash));
-         }
-     }
-@@ -313,7 +313,7 @@ testHashRemoveSet(const void *data G_GNUC_UNUSED)
- 
-     if (count != rcount) {
-         VIR_TEST_VERBOSE("\nvirHashRemoveSet didn't remove expected number of"
--                  " entries, %d != %u",
-+                  " entries, %d != %d",
-                   rcount, count);
-         goto cleanup;
-     }
-diff --git a/tests/virpcimock.c b/tests/virpcimock.c
-index 92b6f810d8..d0fe11e5f1 100644
---- a/tests/virpcimock.c
-+++ b/tests/virpcimock.c
-@@ -120,7 +120,7 @@ struct pciDeviceAddress {
-     unsigned int device;
-     unsigned int function;
- };
--# define ADDR_STR_FMT "%04x:%02x:%02x.%d"
-+# define ADDR_STR_FMT "%04x:%02x:%02x.%u"
- 
- struct pciDevice {
-     struct pciDeviceAddress addr;
--- 
-2.27.0
-
diff --git a/add-phytium-2000plus-and-s2500-support-on-arm-archit.patch b/add-phytium-2000plus-and-s2500-support-on-arm-archit.patch
deleted file mode 100644
index 0501e10bf35c1b8449a7440817f0ef853751b29f..0000000000000000000000000000000000000000
--- a/add-phytium-2000plus-and-s2500-support-on-arm-archit.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From 0ef9a886d3d8bd468800ee3d6aadac2231359501 Mon Sep 17 00:00:00 2001
-From: root <root@openeuleropenstack.dev01>
-Date: Thu, 4 Feb 2021 17:35:46 +0800
-Subject: [PATCH] add phytium 2000plus and s2500 support on arm architecture
- for capability
-
----
- src/cpu_map/Makefile.inc.am       | 2 ++
- src/cpu_map/arm_FT-2000plus.xml   | 6 ++++++
- src/cpu_map/arm_Tengyun-S2500.xml | 6 ++++++
- src/cpu_map/arm_vendors.xml       | 1 +
- src/cpu_map/index.xml             | 4 ++++
- 5 files changed, 19 insertions(+)
- create mode 100644 src/cpu_map/arm_FT-2000plus.xml
- create mode 100644 src/cpu_map/arm_Tengyun-S2500.xml
-
-diff --git a/src/cpu_map/Makefile.inc.am b/src/cpu_map/Makefile.inc.am
-index 8663877b97..ab5268d94f 100644
---- a/src/cpu_map/Makefile.inc.am
-+++ b/src/cpu_map/Makefile.inc.am
-@@ -72,6 +72,8 @@ cpumap_DATA = \
- 	cpu_map/arm_cortex-a57.xml \
- 	cpu_map/arm_cortex-a72.xml \
- 	cpu_map/arm_Kunpeng-920.xml \
-+	cpu_map/arm_FT-2000plus.xml \
-+	cpu_map/arm_Tengyun-S2500.xml \
- 	$(NULL)
- 
- EXTRA_DIST += $(cpumap_DATA)
-diff --git a/src/cpu_map/arm_FT-2000plus.xml b/src/cpu_map/arm_FT-2000plus.xml
-new file mode 100644
-index 0000000000..b532f65f68
---- /dev/null
-+++ b/src/cpu_map/arm_FT-2000plus.xml
-@@ -0,0 +1,6 @@
-+<cpus>
-+  <model name='FT-2000+'>
-+    <vendor name='Phytium'/>
-+    <pvr value='0x662'/>
-+  </model>
-+</cpus>
-diff --git a/src/cpu_map/arm_Tengyun-S2500.xml b/src/cpu_map/arm_Tengyun-S2500.xml
-new file mode 100644
-index 0000000000..22b865e368
---- /dev/null
-+++ b/src/cpu_map/arm_Tengyun-S2500.xml
-@@ -0,0 +1,6 @@
-+<cpus>
-+  <model name='Tengyun-S2500'>
-+    <vendor name='Phytium'/>
-+    <pvr value='0x663'/>
-+  </model>
-+</cpus>
-diff --git a/src/cpu_map/arm_vendors.xml b/src/cpu_map/arm_vendors.xml
-index 840bf9a2f8..05175495a0 100644
---- a/src/cpu_map/arm_vendors.xml
-+++ b/src/cpu_map/arm_vendors.xml
-@@ -11,4 +11,5 @@
-   <vendor name="Qualcomm" value="0x51"/>
-   <vendor name="Marvell" value="0x56"/>
-   <vendor name="Intel" value="0x69"/>
-+  <vendor name='Phytium' value='0x70'/>
- </cpus>
-diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml
-index 985af86ba2..672d0a3c92 100644
---- a/src/cpu_map/index.xml
-+++ b/src/cpu_map/index.xml
-@@ -95,5 +95,9 @@
- 
-     <!-- Hisilicon-based CPU models -->
-     <include filename="arm_Kunpeng-920.xml"/>
-+
-+    <!-- Phytium-based CPU models -->
-+    <include filename='arm_FT-2000plus.xml'/>
-+    <include filename='arm_Tengyun-S2500.xml'/>
-   </arch>
- </cpus>
--- 
-2.27.0
-
diff --git a/admin-fix-leak-of-typed-parameters-on-error.patch b/admin-fix-leak-of-typed-parameters-on-error.patch
deleted file mode 100644
index 66b0adf94726c1a1fae0519abc6fdc170cb46fe4..0000000000000000000000000000000000000000
--- a/admin-fix-leak-of-typed-parameters-on-error.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 90b8168fd93490f3a0fadadb38030163712a0e85 Mon Sep 17 00:00:00 2001
-From: wangmeiyang <wangmeiyang@xfusion.com>
-Date: Fri, 21 Apr 2023 14:43:45 +0800
-Subject: [PATCH] admin: fix leak of typed parameters on error
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-A few admin client methods had the xdr_free call the wrong
-side of the cleanup label, so typed parameters would not
-be freed on error.
-
-origin commit: https://gitlab.com/libvirt/libvirt/-/commit/0edf44664e9f2f75c7ba5faab91e2e190b5626af
-Reviewed-by: Martin Kletzander <mkletzan@redhat.com>
-Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
-Signed-off-by: Meiyang Wang <wangmeiyang@xfusion.com>
----
- src/admin/admin_remote.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/admin/admin_remote.c b/src/admin/admin_remote.c
-index ca5e0c9fe4..2499fb8b0f 100644
---- a/src/admin/admin_remote.c
-+++ b/src/admin/admin_remote.c
-@@ -271,9 +271,9 @@ remoteAdminServerGetThreadPoolParameters(virAdmServerPtr srv,
-         goto cleanup;
- 
-     rv = 0;
--    xdr_free((xdrproc_t)xdr_admin_server_get_threadpool_parameters_ret, (char *) &ret);
- 
-  cleanup:
-+    xdr_free((xdrproc_t)xdr_admin_server_get_threadpool_parameters_ret, (char *) &ret);
-     virObjectUnlock(priv);
-     return rv;
- }
-@@ -344,9 +344,9 @@ remoteAdminClientGetInfo(virAdmClientPtr client,
-         goto cleanup;
- 
-     rv = 0;
--    xdr_free((xdrproc_t)xdr_admin_client_get_info_ret, (char *) &ret);
- 
-  cleanup:
-+    xdr_free((xdrproc_t)xdr_admin_client_get_info_ret, (char *) &ret);
-     virObjectUnlock(priv);
-     return rv;
- }
-@@ -382,10 +382,10 @@ remoteAdminServerGetClientLimits(virAdmServerPtr srv,
-         goto cleanup;
- 
-     rv = 0;
--    xdr_free((xdrproc_t) xdr_admin_server_get_client_limits_ret,
--             (char *) &ret);
- 
-  cleanup:
-+    xdr_free((xdrproc_t) xdr_admin_server_get_client_limits_ret,
-+             (char *) &ret);
-     virObjectUnlock(priv);
-     return rv;
- }
--- 
-2.27.0
-
diff --git a/apibuild-Fix-self.waring-method-call.patch b/apibuild-Fix-self.waring-method-call.patch
deleted file mode 100644
index 97ccecc7ad2cd614150792d2c8f25f3eb304ff56..0000000000000000000000000000000000000000
--- a/apibuild-Fix-self.waring-method-call.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 58d0830491d3be2fedec55f42f6f832d32783a73 Mon Sep 17 00:00:00 2001
-From: luzhipeng <luzhipeng@cestc.cn>
-Date: Sat, 7 May 2022 09:17:31 +0800
-Subject: [PATCH] apibuild: Fix self.waring method call
-
-The parameters of self.warning is inconsistent with its definition, So
-fix it.
-
-Signed-off-by: dinglimin <dinglimin@cmss.chinamobile.com>
-Signed-off-by: luzhipeng <luzhipeng@cestc.cn>
-Reviewed-by: Martin Kletzander <mkletzan@redhat.com>
----
- scripts/apibuild.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/scripts/apibuild.py b/scripts/apibuild.py
-index 05a169c30d..c98bcf6091 100755
---- a/scripts/apibuild.py
-+++ b/scripts/apibuild.py
-@@ -315,7 +315,7 @@ class index:
-             if type in type_map:
-                 type_map[type][name] = d
-             else:
--                self.warning("Unable to register type ", type)
-+                self.warning("Unable to register type %s" % type)
- 
-         if name == debugsym and not quiet:
-             print("New symbol: %s" % (d))
--- 
-2.27.0
-
diff --git a/apparmor-Permit-new-capabilities-required-by-libvirt.patch b/apparmor-Permit-new-capabilities-required-by-libvirt.patch
deleted file mode 100644
index 9efd2e6fd35f759f2168b6eb0d4998c81f5eb680..0000000000000000000000000000000000000000
--- a/apparmor-Permit-new-capabilities-required-by-libvirt.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 9abebfb36b2380829be4a901d7c9785a7a8f5f6a Mon Sep 17 00:00:00 2001
-From: Jim Fehlig <jfehlig@suse.com>
-Date: Mon, 7 Jun 2021 16:21:28 -0600
-Subject: [PATCH] apparmor: Permit new capabilities required by libvirtd
-
-The audit log contains the following denials from libvirtd
-
-apparmor="DENIED" operation="capable" profile="libvirtd" pid=6012 comm="daemon-init" capability=17  capname="sys_rawio"
-apparmor="DENIED" operation="capable" profile="libvirtd" pid=6012 comm="rpc-worker" capability=39  capname="bpf"
-apparmor="DENIED" operation="capable" profile="libvirtd" pid=6012 comm="rpc-worker" capability=38  capname="perfmon"
-
-Squelch the denials and allow the capabilities in the libvirtd
-apparmor profile.
-
-Signed-off-by: Jim Fehlig <jfehlig@suse.com>
-Reviewed-by: Neal Gompa <ngompa13@gmail.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
----
- src/security/apparmor/usr.sbin.libvirtd.in | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/src/security/apparmor/usr.sbin.libvirtd.in b/src/security/apparmor/usr.sbin.libvirtd.in
-index 1e137039e9..49266743f5 100644
---- a/src/security/apparmor/usr.sbin.libvirtd.in
-+++ b/src/security/apparmor/usr.sbin.libvirtd.in
-@@ -25,6 +25,9 @@ profile libvirtd @sbindir@/libvirtd flags=(attach_disconnected) {
-   capability fsetid,
-   capability audit_write,
-   capability ipc_lock,
-+  capability sys_rawio,
-+  capability bpf,
-+  capability perfmon,
- 
-   # Needed for vfio
-   capability sys_resource,
--- 
-2.27.0
-
diff --git a/backport-meson-drop-debug_logs-configure-argument.patch b/backport-meson-drop-debug_logs-configure-argument.patch
deleted file mode 100644
index fac1c12e8d21d2e888162dd1cc4d512aa365daf2..0000000000000000000000000000000000000000
--- a/backport-meson-drop-debug_logs-configure-argument.patch
+++ /dev/null
@@ -1,155 +0,0 @@
-From 2b3bbbc1b7f8723c4947c6d1e4fb43cabc25fb2e Mon Sep 17 00:00:00 2001
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Fri, 24 Jul 2020 16:30:06 +0200
-Subject: [PATCH 2/4] meson: drop debug_logs configure argument
-
-There is no point of having this option in libvirt because the debug
-logs can be configured using log filters.
-
-origin commit: https://gitlab.com/libvirt/libvirt/-/commit/da6d644ea7b49500680a3d4a403571234fecefad
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Reviewed-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Neal Gompa <ngompa13@gmail.com>
-Signed-off-by: Chenxi Mao <chenxi.mao@suse.com>
----
- configure.ac       |  3 ---
- m4/virt-debug.m4   | 33 ---------------------------------
- src/util/virlog.h  | 23 +----------------------
- tools/virsh.c      |  2 --
- tools/virt-admin.c |  2 --
- 5 files changed, 1 insertion(+), 62 deletions(-)
- delete mode 100644 m4/virt-debug.m4
-
-diff --git a/configure.ac b/configure.ac
-index cb62e5aac8..93d13496f3 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -496,7 +496,6 @@ dnl
- dnl Miscellaneous checks
- dnl
- 
--LIBVIRT_ARG_DEBUG
- LIBVIRT_ARG_DTRACE
- LIBVIRT_ARG_NUMAD
- LIBVIRT_ARG_INIT_SCRIPT
-@@ -509,7 +508,6 @@ LIBVIRT_ARG_TLS_PRIORITY
- LIBVIRT_ARG_SYSCTL_CONFIG
- 
- 
--LIBVIRT_CHECK_DEBUG
- LIBVIRT_CHECK_DTRACE
- LIBVIRT_CHECK_NUMAD
- LIBVIRT_CHECK_INIT_SCRIPT
-@@ -1038,7 +1036,6 @@ LIBVIRT_RESULT([Coverage], [$enable_test_coverage])
- AC_MSG_NOTICE([])
- AC_MSG_NOTICE([Miscellaneous])
- AC_MSG_NOTICE([])
--LIBVIRT_RESULT_DEBUG
- LIBVIRT_RESULT([Use -Werror], [$enable_werror])
- LIBVIRT_RESULT([Warning Flags], [$WARN_CFLAGS])
- LIBVIRT_RESULT_DTRACE
-diff --git a/m4/virt-debug.m4 b/m4/virt-debug.m4
-deleted file mode 100644
-index d3ac0564f2..0000000000
---- a/m4/virt-debug.m4
-+++ /dev/null
-@@ -1,33 +0,0 @@
--dnl The debug check
--dnl
--dnl Copyright (C) 2016 Red Hat, Inc.
--dnl
--dnl This library is free software; you can redistribute it and/or
--dnl modify it under the terms of the GNU Lesser General Public
--dnl License as published by the Free Software Foundation; either
--dnl version 2.1 of the License, or (at your option) any later version.
--dnl
--dnl This library is distributed in the hope that it will be useful,
--dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
--dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
--dnl Lesser General Public License for more details.
--dnl
--dnl You should have received a copy of the GNU Lesser General Public
--dnl License along with this library.  If not, see
--dnl <http://www.gnu.org/licenses/>.
--dnl
--
--AC_DEFUN([LIBVIRT_ARG_DEBUG], [
--  LIBVIRT_ARG_ENABLE([DEBUG], [enable debugging output], [yes])
--])
--
--AC_DEFUN([LIBVIRT_CHECK_DEBUG], [
--  AM_CONDITIONAL([ENABLE_DEBUG], test x"$enable_debug" = x"yes")
--  if test x"$enable_debug" = x"yes"; then
--    AC_DEFINE([ENABLE_DEBUG], [], [whether debugging is enabled])
--  fi
--])
--
--AC_DEFUN([LIBVIRT_RESULT_DEBUG], [
--  LIBVIRT_RESULT([Debug], [$enable_debug])
--])
-diff --git a/src/util/virlog.h b/src/util/virlog.h
-index feb2f85904..716fb9a378 100644
---- a/src/util/virlog.h
-+++ b/src/util/virlog.h
-@@ -78,29 +78,8 @@ struct _virLogSource {
-         .serial = 0, \
-     }
- 
--/*
-- * If configured with --enable-debug=yes then library calls
-- * are printed to stderr for debugging or to an appropriate channel
-- * defined at runtime from the libvirt daemon configuration file
-- */
--#ifdef ENABLE_DEBUG
--# define VIR_DEBUG_INT(src, filename, linenr, funcname, ...) \
-+#define VIR_DEBUG_INT(src, filename, linenr, funcname, ...) \
-     virLogMessage(src, VIR_LOG_DEBUG, filename, linenr, funcname, NULL, __VA_ARGS__)
--#else
--/**
-- * virLogEatParams:
-- *
-- * Do nothing but eat parameters.
-- */
--static inline void virLogEatParams(virLogSourcePtr unused, ...)
--{
--    /* Silence gcc */
--    unused = unused;
--}
--# define VIR_DEBUG_INT(src, filename, linenr, funcname, ...) \
--    virLogEatParams(src, filename, linenr, funcname, __VA_ARGS__)
--#endif /* !ENABLE_DEBUG */
--
- #define VIR_INFO_INT(src, filename, linenr, funcname, ...) \
-     virLogMessage(src, VIR_LOG_INFO, filename, linenr, funcname, NULL, __VA_ARGS__)
- #define VIR_WARN_INT(src, filename, linenr, funcname, ...) \
-diff --git a/tools/virsh.c b/tools/virsh.c
-index 197a90636d..06ff5e8336 100644
---- a/tools/virsh.c
-+++ b/tools/virsh.c
-@@ -614,9 +614,7 @@ virshShowVersion(vshControl *ctl G_GNUC_UNUSED)
- #ifdef WITH_SECRETS
-     vshPrint(ctl, " Secrets");
- #endif
--#ifdef ENABLE_DEBUG
-     vshPrint(ctl, " Debug");
--#endif
- #ifdef WITH_DTRACE_PROBES
-     vshPrint(ctl, " DTrace");
- #endif
-diff --git a/tools/virt-admin.c b/tools/virt-admin.c
-index a8e5e0a5af..df23330ee1 100644
---- a/tools/virt-admin.c
-+++ b/tools/virt-admin.c
-@@ -1277,9 +1277,7 @@ vshAdmShowVersion(vshControl *ctl G_GNUC_UNUSED)
- #ifdef WITH_LIBVIRTD
-     vshPrint(ctl, " Daemon");
- #endif
--#ifdef ENABLE_DEBUG
-     vshPrint(ctl, " Debug");
--#endif
- #if WITH_READLINE
-     vshPrint(ctl, " Readline");
- #endif
--- 
-2.33.0
-
diff --git a/backport-virhostcpu-Fix-build-with-clang-and-newest-kernel-he.patch b/backport-virhostcpu-Fix-build-with-clang-and-newest-kernel-he.patch
deleted file mode 100644
index 42211ca39f41e11ad09c403505cf546aceea4eae..0000000000000000000000000000000000000000
--- a/backport-virhostcpu-Fix-build-with-clang-and-newest-kernel-he.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From f6c9bb6adbee8f74172707845dcdf221e79e35d4 Mon Sep 17 00:00:00 2001
-From: Peter Krempa <pkrempa@redhat.com>
-Date: Tue, 23 Aug 2022 15:29:43 +0200
-Subject: [PATCH 1/4] virhostcpu: Fix build with clang and newest kernel
- headers
-
-The most recent environment e.g. present in our Fedora Rawhide builds
-fail to build the tree with clang with the following error:
-
-../src/util/virhostcpu.c:1291:25: error: field 'header' with variable sized type 'struct kvm_msrs' not at the end of a struct or class is a GNU extension [-Werror,-Wgnu-variable-sized-type-not-at-end]
-        struct kvm_msrs header;
-                        ^
-
-The problem seems to be that clang doesn't like the new way the
-'entries' field in struct kvm_msrs is declared.
-
-To work around the issue we can simply allocate the variable dynamically
-and use the 'entries' member as it was intended to to access the
-members.
-
-origin commit: https://gitlab.com/libvirt/libvirt/-/commit/56b3ee743916c8951a32a1650616621d78afe8c7
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
-Signed-off-by: Chenxi Mao <chenxi.mao@suse.com>
----
- src/util/virhostcpu.c | 15 ++++++---------
- 1 file changed, 6 insertions(+), 9 deletions(-)
-
-diff --git a/src/util/virhostcpu.c b/src/util/virhostcpu.c
-index ce3da7e6ec..8c8fc3a476 100644
---- a/src/util/virhostcpu.c
-+++ b/src/util/virhostcpu.c
-@@ -1275,25 +1275,22 @@ virHostCPUGetMSRFromKVM(unsigned long index,
-                         uint64_t *result)
- {
-     VIR_AUTOCLOSE fd = -1;
--    struct {
--        struct kvm_msrs header;
--        struct kvm_msr_entry entry;
--    } msr = {
--        .header = { .nmsrs = 1 },
--        .entry = { .index = index },
--    };
-+    g_autofree struct kvm_msrs *msr = g_malloc0(sizeof(struct kvm_msrs) +
-+                                                sizeof(struct kvm_msr_entry));
-+    msr->nmsrs = 1;
-+    msr->entries[0].index = index;
- 
-     if ((fd = open(KVM_DEVICE, O_RDONLY)) < 0) {
-         virReportSystemError(errno, _("Unable to open %s"), KVM_DEVICE);
-         return -1;
-     }
- 
--    if (ioctl(fd, KVM_GET_MSRS, &msr) < 0) {
-+    if (ioctl(fd, KVM_GET_MSRS, msr) < 0) {
-         VIR_DEBUG("Cannot get MSR 0x%lx from KVM", index);
-         return 1;
-     }
- 
--    *result = msr.entry.data;
-+    *result = msr->entries[0].data;
-     return 0;
- }
- 
--- 
-2.33.0
-
diff --git a/backport-vshCommandStringGetArg-Drop-sz.patch b/backport-vshCommandStringGetArg-Drop-sz.patch
deleted file mode 100644
index 0f19fcb82098b2bc735e835d4db5a95c5c137088..0000000000000000000000000000000000000000
--- a/backport-vshCommandStringGetArg-Drop-sz.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 6d3c4b49c08d5fcf42f324af0d04551619e4109f Mon Sep 17 00:00:00 2001
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Thu, 7 Jan 2021 17:59:55 +0100
-Subject: [PATCH 3/4] vshCommandStringGetArg: Drop @sz
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This variable is unused since introduction of the function in
-v0.8.5~150.
-
-origin commit: https://gitlab.com/libvirt/libvirt/-/commit/9b9542586cc047075469053606d1e12cb017b5ca
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Signed-off-by: Chenxi Mao <chenxi.mao@suse.com>
----
- tools/vsh.c | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/tools/vsh.c b/tools/vsh.c
-index 3646f37cea..f5fa7b6f6f 100644
---- a/tools/vsh.c
-+++ b/tools/vsh.c
-@@ -1641,7 +1641,6 @@ vshCommandStringGetArg(vshControl *ctl, vshCommandParser *parser, char **res,
- {
-     bool single_quote = false;
-     bool double_quote = false;
--    int sz = 0;
-     char *p = parser->pos;
-     char *q = g_strdup(p);
- 
-@@ -1695,7 +1694,6 @@ vshCommandStringGetArg(vshControl *ctl, vshCommandParser *parser, char **res,
-         }
- 
-         *q++ = *p++;
--        sz++;
-     }
-     if (double_quote) {
-         if (report)
--- 
-2.33.0
-
diff --git a/bash-completion-fix-variable-leaks-of-word.patch b/bash-completion-fix-variable-leaks-of-word.patch
deleted file mode 100644
index 07ec5d3d673c3bd0e84af975b1ebb47cff06bd98..0000000000000000000000000000000000000000
--- a/bash-completion-fix-variable-leaks-of-word.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 4bdf8aeb2e907b53cc71c07b3c6be8f82e3f1e4a Mon Sep 17 00:00:00 2001
-From: Xu Zheng <xuzheng_yewu@cmss.chinamobile.com>
-Date: Thu, 24 Nov 2022 17:58:28 +0800
-Subject: [PATCH 20/23] bash-completion: fix variable leaks of "word"
-
-cherry-pick from 097296c30b72f472bcf4e72cf8ab2aeb55903c49
-
-Signed-off-by: Koichi Murase <myoga.murase@gmail.com>
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-Signed-off-by: Xu Zheng <xuzheng_yewu@cmss.chinamobile.com>
----
- tools/bash-completion/vsh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tools/bash-completion/vsh b/tools/bash-completion/vsh
-index 8493cad28b..363097c601 100644
---- a/tools/bash-completion/vsh
-+++ b/tools/bash-completion/vsh
-@@ -21,7 +21,7 @@ _vsh_complete()
-     # See what URI is user trying to connect to and if they are
-     # connecting RO. Honour that.
-     while [ $c -le $COMP_CWORD ]; do
--        word="${COMP_WORDS[c]}"
-+        local word="${COMP_WORDS[c]}"
-         case "$word" in
-             -r|--readonly) RO=1 ;;
-             -c|--connect) c=$((++c)); URI=${COMP_WORDS[c]} ;;
--- 
-2.27.0
-
diff --git a/bugfix-move-the-check-function-qemuDomainDiskBlockIo.patch b/bugfix-move-the-check-function-qemuDomainDiskBlockIo.patch
deleted file mode 100644
index d5a1166e84a7f96694ac073475b87e9aa4cad477..0000000000000000000000000000000000000000
--- a/bugfix-move-the-check-function-qemuDomainDiskBlockIo.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 35de7404370eb24089b6160d109f6fe559a91864 Mon Sep 17 00:00:00 2001
-From: mayunlong <mayunlong6@huawei.com>
-Date: Fri, 24 Mar 2023 11:31:49 +0800
-Subject: [PATCH] bugfix: move the check function
- qemuDomainDiskBlockIoTuneIsSupported to currect place.
-
-move the check function qemuDomainDiskBlockIoTuneIsSupported for
-conf_disk to currect place in function: qemuDomainSetBlockIotTune.
-
-fix commit: e07709c7275349eac376660c08bacc6d18f28ff8
-origin commit: https://libvirt.org/git/?p=libvirt.git;a=commitdiff;h=d763466edc6e8d4965fb42092c6e8f4296acf6c6
-Signed-off-by:mayunlong<mayunlong6@huawei.com>
----
- src/qemu/qemu_driver.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
-index 32b3ef3cf1..c7545a7a98 100644
---- a/src/qemu/qemu_driver.c
-+++ b/src/qemu/qemu_driver.c
-@@ -19301,9 +19301,6 @@ qemuDomainSetBlockIoTune(virDomainPtr dom,
-                 goto endjob;
-         }
- 
--        if (!qemuDomainDiskBlockIoTuneIsSupported(conf_disk->src))
--            goto endjob;
--
-         cur_info = qemuDomainFindGroupBlockIoTune(def, disk, &info);
- 
-         if (qemuDomainSetBlockIoTuneDefaults(&info, cur_info,
-@@ -19386,6 +19383,9 @@ qemuDomainSetBlockIoTune(virDomainPtr dom,
-             goto endjob;
-         }
- 
-+	if (!qemuDomainDiskBlockIoTuneIsSupported(conf_disk->src))
-+            goto endjob;
-+
-         conf_cur_info = qemuDomainFindGroupBlockIoTune(persistentDef, conf_disk, &info);
- 
-         if (qemuDomainSetBlockIoTuneDefaults(&conf_info, conf_cur_info,
--- 
-2.25.1
-
diff --git a/check-for-NULL-before-calling-g_regex_unref.patch b/check-for-NULL-before-calling-g_regex_unref.patch
deleted file mode 100644
index bbb2212a8ff4714c859ee046ca6ad6ea931b4db0..0000000000000000000000000000000000000000
--- a/check-for-NULL-before-calling-g_regex_unref.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 61de276ed3cd5692b99ebc6d5b700a21b16ab5e8 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
-Date: Tue, 8 Sep 2020 14:57:14 +0200
-Subject: [PATCH 014/108] check for NULL before calling g_regex_unref
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-g_regex_unref reports an error if called with a NULL argument.
-
-We have two cases in the code where we (possibly) call it on a NULL
-argument. The interesting one is in virDomainQemuMonitorEventCleanup.
-
-Based on VIR_CONNECT_DOMAIN_QEMU_MONITOR_EVENT_REGISTER_REGEX, we unref
-data->regex, which has two problems:
-
-* On the client side, flags is -1 so the comparison is true even if no
-  regex was used, reproducible by:
-  $ virsh qemu-monitor-event --timeout 1
-  which results in an ugly error:
-(process:1289846): GLib-CRITICAL **: 14:58:42.631: g_regex_unref: assertion 'regex != NULL' failed
-* On the server side, we only create the regex if both the flag and the
-  string are present, so it's possible to trigger this message by:
-  $ virsh qemu-monitor-event --regex --timeout 1
-
-Use a non-NULL comparison instead of the flag to decide whether we need
-to unref the regex. And add a non-NULL check to the unref in the
-VirtualBox test too.
-
-Signed-off-by: Ján Tomko <jtomko@redhat.com>
-Fixes: 71efb59a4de7c51b1bc889a316f1796ebf55738f
-https://bugzilla.redhat.com/show_bug.cgi?id=1876907
-Reviewed-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Martin Kletzander <mkletzan@redhat.com>
-(cherry picked from commit 92b252456ee6d6ffc6e39e62ce1ce6c50113e00e)
----
- src/conf/domain_event.c     | 2 +-
- tests/vboxsnapshotxmltest.c | 3 ++-
- 2 files changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/src/conf/domain_event.c b/src/conf/domain_event.c
-index 33fbf10406..d3acde0236 100644
---- a/src/conf/domain_event.c
-+++ b/src/conf/domain_event.c
-@@ -2194,7 +2194,7 @@ virDomainQemuMonitorEventCleanup(void *opaque)
-     virDomainQemuMonitorEventData *data = opaque;
- 
-     VIR_FREE(data->event);
--    if (data->flags & VIR_CONNECT_DOMAIN_QEMU_MONITOR_EVENT_REGISTER_REGEX)
-+    if (data->regex)
-         g_regex_unref(data->regex);
-     if (data->freecb)
-         (data->freecb)(data->opaque);
-diff --git a/tests/vboxsnapshotxmltest.c b/tests/vboxsnapshotxmltest.c
-index 2ea460d8bd..853d930865 100644
---- a/tests/vboxsnapshotxmltest.c
-+++ b/tests/vboxsnapshotxmltest.c
-@@ -136,7 +136,8 @@ mymain(void)
-     DO_TEST("2disks-3snap-brother");
- 
-  cleanup:
--    g_regex_unref(testSnapshotXMLVariableLineRegex);
-+    if (testSnapshotXMLVariableLineRegex)
-+        g_regex_unref(testSnapshotXMLVariableLineRegex);
-     return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
- }
- 
--- 
-2.33.0
-
diff --git a/checkpoint-Fix-a-typo-of-comments.patch b/checkpoint-Fix-a-typo-of-comments.patch
deleted file mode 100644
index 31e7b36f9a8baa55f2938e0a811410c295df56e8..0000000000000000000000000000000000000000
--- a/checkpoint-Fix-a-typo-of-comments.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 5d84740e04d99a8503f20b2281f3fd70fa1f69ab Mon Sep 17 00:00:00 2001
-From: jipengfei <jipengfei_yewu@cmss.chinamobile.com>
-Date: Thu, 24 Nov 2022 16:43:51 +0800
-Subject: [PATCH 16/23] checkpoint: Fix a typo of comments
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-cherry-pick from 75134a3a7d1ca6976dfc2af7cd53461cb0aee529
-
-Signed-off-by: Han Han <hhan@redhat.com>
-Signed-off-by: jipengfei <jipengfei_yewu@cmss.chinamobile.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Signed-off-by: Ján Tomko <jtomko@redhat.com>
----
- src/libvirt-domain-checkpoint.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/libvirt-domain-checkpoint.c b/src/libvirt-domain-checkpoint.c
-index 432c2d5a52..58668c391c 100644
---- a/src/libvirt-domain-checkpoint.c
-+++ b/src/libvirt-domain-checkpoint.c
-@@ -236,7 +236,7 @@ virDomainCheckpointGetXMLDesc(virDomainCheckpointPtr checkpoint,
-  * @checkpoints: pointer to variable to store the array containing checkpoint
-  *               object, or NULL if the list is not required (just returns
-  *               number of checkpoints)
-- * @flags: bitwise-OR of supported virDomainCheckpoinListFlags
-+ * @flags: bitwise-OR of supported virDomainCheckpointListFlags
-  *
-  * Collect the list of domain checkpoints for the given domain and allocate
-  * an array to store those objects.
--- 
-2.27.0
-
diff --git a/client-fix-memory-leak-in-client-msg.patch b/client-fix-memory-leak-in-client-msg.patch
deleted file mode 100644
index cda543842c61c04dd0a283a5beec6eec816af20c..0000000000000000000000000000000000000000
--- a/client-fix-memory-leak-in-client-msg.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From ea9860d9f89252f0890dae01c6b92af2a82227f4 Mon Sep 17 00:00:00 2001
-From: tangbinzy <tangbin_yewu@cmss.chinamobile.com>
-Date: Tue, 29 Nov 2022 08:19:29 +0000
-Subject: [PATCH 02/24] client: fix memory leak in client msg When closing
- client->waitDispatch in virNetClientIOEventLoopRemoveAll or
- virNetClientIOEventLoopRemoveDone, VIR_FREE() is called to free call->msg
- directly, resulting in leak of the memory call->msg->buffer points to. Use
- virNetMessageFree(call->msg) instead of VIR_FREE(call->msg).
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Hao Wang <wanghao232@huawei.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Signed-off-by: Ján Tomko <jtomko@redhat.com>
-
-Signed-off-by: tangbin <tangbin_yewu@cmss.chinamobile.com>
-(cherry-pick from 0011ec3191a5bffff14fc2c53fbdf457a805cfb1)
----
- src/rpc/virnetclient.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/rpc/virnetclient.c b/src/rpc/virnetclient.c
-index 1c5bef86a1..70ace5d0e8 100644
---- a/src/rpc/virnetclient.c
-+++ b/src/rpc/virnetclient.c
-@@ -1519,7 +1519,7 @@ static bool virNetClientIOEventLoopRemoveDone(virNetClientCallPtr call,
-         if (call->expectReply)
-             VIR_WARN("Got a call expecting a reply but without a waiting thread");
-         virCondDestroy(&call->cond);
--        VIR_FREE(call->msg);
-+        virNetMessageFree(call->msg);
-         VIR_FREE(call);
-     }
- 
-@@ -1546,7 +1546,7 @@ virNetClientIOEventLoopRemoveAll(virNetClientCallPtr call,
- 
-     VIR_DEBUG("Removing call %p", call);
-     virCondDestroy(&call->cond);
--    VIR_FREE(call->msg);
-+    virNetMessageFree(call->msg);
-     VIR_FREE(call);
-     return true;
- }
--- 
-2.27.0
-
diff --git a/cmdCheckpointList-Fix-memory-leak.patch b/cmdCheckpointList-Fix-memory-leak.patch
deleted file mode 100644
index 89bae2606b58071c557a1fa79e65d0d5493fb135..0000000000000000000000000000000000000000
--- a/cmdCheckpointList-Fix-memory-leak.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From dd54dd905f334ee31ebd9d667dc0fd2db9ddeaf0 Mon Sep 17 00:00:00 2001
-From: Tim Wiederhake <twiederh@redhat.com>
-Date: Mon, 19 Apr 2021 13:54:13 +0200
-Subject: [PATCH 061/108] cmdCheckpointList: Fix memory leak
-
-Fixes: 3caa28dc50df7ec215713075d669b20bef6473a2
-Signed-off-by: Tim Wiederhake <twiederh@redhat.com>
-Reviewed-by: Laine Stump <laine@redhat.com>
-(cherry picked from commit 8b8c91f487592c6c067847ca59dde405ca17573f)
----
- tools/virsh-checkpoint.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tools/virsh-checkpoint.c b/tools/virsh-checkpoint.c
-index e82a67f075..1a3a74b2d5 100644
---- a/tools/virsh-checkpoint.c
-+++ b/tools/virsh-checkpoint.c
-@@ -720,7 +720,6 @@ cmdCheckpointList(vshControl *ctl,
-     virDomainCheckpointPtr checkpoint = NULL;
-     long long creation_longlong;
-     g_autoptr(GDateTime) then = NULL;
--    g_autofree gchar *thenstr = NULL;
-     bool tree = vshCommandOptBool(cmd, "tree");
-     bool name = vshCommandOptBool(cmd, "name");
-     bool from = vshCommandOptBool(cmd, "from");
-@@ -803,6 +802,7 @@ cmdCheckpointList(vshControl *ctl,
-     }
- 
-     for (i = 0; i < checkpointlist->nchks; i++) {
-+        g_autofree gchar *thenstr = NULL;
-         const char *chk_name;
- 
-         /* free up memory from previous iterations of the loop */
--- 
-2.33.0
-
diff --git a/cmdSnapshotList-Fix-memory-leak.patch b/cmdSnapshotList-Fix-memory-leak.patch
deleted file mode 100644
index 05e9f4ee029f986ab6cc2c2b61f01438794ee669..0000000000000000000000000000000000000000
--- a/cmdSnapshotList-Fix-memory-leak.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 4732cb4a9306ea9b8487b66fa14316caa05428ed Mon Sep 17 00:00:00 2001
-From: Tim Wiederhake <twiederh@redhat.com>
-Date: Mon, 19 Apr 2021 13:54:14 +0200
-Subject: [PATCH 062/108] cmdSnapshotList: Fix memory leak
-
-Fixes: 3caa28dc50df7ec215713075d669b20bef6473a2
-Signed-off-by: Tim Wiederhake <twiederh@redhat.com>
-Reviewed-by: Laine Stump <laine@redhat.com>
-(cherry picked from commit 89ce1ef86b0c8b0e039ae770221376497354f085)
----
- tools/virsh-snapshot.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tools/virsh-snapshot.c b/tools/virsh-snapshot.c
-index d5e68e4b18..376290d468 100644
---- a/tools/virsh-snapshot.c
-+++ b/tools/virsh-snapshot.c
-@@ -1493,7 +1493,6 @@ cmdSnapshotList(vshControl *ctl, const vshCmd *cmd)
-     char *state = NULL;
-     long long creation_longlong;
-     g_autoptr(GDateTime) then = NULL;
--    g_autofree gchar *thenstr = NULL;
-     bool tree = vshCommandOptBool(cmd, "tree");
-     bool name = vshCommandOptBool(cmd, "name");
-     bool from = vshCommandOptBool(cmd, "from");
-@@ -1588,6 +1587,7 @@ cmdSnapshotList(vshControl *ctl, const vshCmd *cmd)
-     }
- 
-     for (i = 0; i < snaplist->nsnaps; i++) {
-+        g_autofree gchar *thenstr = NULL;
-         const char *snap_name;
- 
-         /* free up memory from previous iterations of the loop */
--- 
-2.33.0
-
diff --git a/cpu_topo-support-for-cpu_topo-clusters-in-conf.patch b/conf-Allow-specifying-CPU-clusters.patch
similarity index 49%
rename from cpu_topo-support-for-cpu_topo-clusters-in-conf.patch
rename to conf-Allow-specifying-CPU-clusters.patch
index c8a96f7574f3a2ab14dcd361142cb026dd9f059c..bb950ddfaff86fc8aa0d2041f57d479708f42ef1 100644
--- a/cpu_topo-support-for-cpu_topo-clusters-in-conf.patch
+++ b/conf-Allow-specifying-CPU-clusters.patch
@@ -1,178 +1,102 @@
-From 576236efe092a457cd3c33fef139fb21985713c6 Mon Sep 17 00:00:00 2001
-From: zhangxinhao <zhangxinhao1@huawei.com>
-Date: Tue, 9 May 2023 15:23:48 +0800
-Subject: cpu_topo: support for cpu_topo "clusters” in conf
+From 3b90700f9e72cf98c5f6b943dfb82e2c06e6f15c Mon Sep 17 00:00:00 2001
+From: Andrea Bolognani <abologna@redhat.com>
+Date: Fri, 5 Jan 2024 18:20:14 +0100
+Subject: [PATCH] conf: Allow specifying CPU clusters
 
-Kunpeng920 support a new structure "cluster" in cpu topology. Support
-"clusters" in XML parser.
+The default number of CPU clusters is 1, and values other than
+that one are currently rejected by all hypervisor drivers.
 
-Signed-off-by: zhangxinhao <zhangxinhao1@huawei.com>
+Signed-off-by: Andrea Bolognani <abologna@redhat.com>
+Reviewed-by: Peter Krempa <pkrempa@redhat.com>
 ---
- docs/formatcaps.html.in                       |  2 +-
- docs/formatdomain.html.in                     | 23 +++++++++--------
- docs/schemas/cputypes.rng                     |  5 ++++
- src/conf/cpu_conf.c                           | 25 +++++++++++++++++--
- src/conf/cpu_conf.h                           |  1 +
- src/conf/domain_conf.c                        |  1 +
- src/cpu/cpu.c                                 |  1 +
- src/qemu/qemu_command.c                       |  5 ++++
- src/vmx/vmx.c                                 |  7 ++++++
- .../x86_64-host+guest,model486-result.xml     |  2 +-
- .../x86_64-host+guest,models-result.xml       |  2 +-
- .../cputestdata/x86_64-host+guest-result.xml  |  2 +-
- tests/cputestdata/x86_64-host+guest.xml       |  2 +-
- .../x86_64-host+host-model-nofallback.xml     |  2 +-
- ...t-Haswell-noTSX+Haswell,haswell-result.xml |  2 +-
- ...ell-noTSX+Haswell-noTSX,haswell-result.xml |  2 +-
- ...ost-Haswell-noTSX+Haswell-noTSX-result.xml |  2 +-
- .../x86_64-host-worse+guest-result.xml        |  2 +-
- .../ppc64-modern-bulk-result-conf.xml         |  2 +-
- .../ppc64-modern-bulk-result-live.xml         |  2 +-
- .../ppc64-modern-individual-result-conf.xml   |  2 +-
- .../ppc64-modern-individual-result-live.xml   |  2 +-
- .../x86-modern-bulk-result-conf.xml           |  2 +-
- .../x86-modern-bulk-result-live.xml           |  2 +-
- .../x86-modern-individual-add-result-conf.xml |  2 +-
- .../x86-modern-individual-add-result-live.xml |  2 +-
- .../x86-old-bulk-result-conf.xml              |  2 +-
- .../x86-old-bulk-result-live.xml              |  2 +-
- .../fd-memory-no-numa-topology.xml            |  2 +-
- .../fd-memory-numa-topology.xml               |  2 +-
- .../fd-memory-numa-topology2.xml              |  2 +-
- .../fd-memory-numa-topology3.xml              |  2 +-
- tests/qemuxml2argvdata/hugepages-nvdimm.xml   |  2 +-
- .../memfd-memory-default-hugepage.xml         |  2 +-
- tests/qemuxml2argvdata/memfd-memory-numa.xml  |  2 +-
- .../memory-hotplug-nvdimm-access.xml          |  2 +-
- .../memory-hotplug-nvdimm-align.xml           |  2 +-
- .../memory-hotplug-nvdimm-label.xml           |  2 +-
- .../memory-hotplug-nvdimm-pmem.xml            |  2 +-
- .../memory-hotplug-nvdimm-readonly.xml        |  2 +-
- .../memory-hotplug-nvdimm.xml                 |  2 +-
- .../qemuxml2xmloutdata/cpu-numa-disjoint.xml  |  2 +-
- .../cpu-numa-disordered.xml                   |  2 +-
- .../qemuxml2xmloutdata/cpu-numa-memshared.xml |  2 +-
- .../cpu-numa-no-memory-element.xml            |  2 +-
- tests/qemuxml2xmloutdata/cpu-numa1.xml        |  2 +-
- tests/qemuxml2xmloutdata/cpu-numa2.xml        |  2 +-
- .../fd-memory-no-numa-topology.xml            |  2 +-
- .../fd-memory-numa-topology.xml               |  2 +-
- .../fd-memory-numa-topology2.xml              |  2 +-
- .../fd-memory-numa-topology3.xml              |  2 +-
- .../graphics-spice-timeout.xml                |  2 +-
- tests/qemuxml2xmloutdata/hugepages-nvdimm.xml |  2 +-
- .../memfd-memory-default-hugepage.xml         |  2 +-
- .../qemuxml2xmloutdata/memfd-memory-numa.xml  |  2 +-
- .../memory-hotplug-dimm.xml                   |  2 +-
- .../memory-hotplug-nvdimm-access.xml          |  2 +-
- .../memory-hotplug-nvdimm-align.xml           |  2 +-
- .../memory-hotplug-nvdimm-label.xml           |  2 +-
- .../memory-hotplug-nvdimm-pmem.xml            |  2 +-
- .../memory-hotplug-nvdimm-ppc64.xml           |  2 +-
- .../memory-hotplug-nvdimm-readonly.xml        |  2 +-
- .../memory-hotplug-nvdimm.xml                 |  2 +-
- tests/qemuxml2xmloutdata/memory-hotplug.xml   |  2 +-
- .../numad-auto-memory-vcpu-cpuset.xml         |  2 +-
- ...to-memory-vcpu-no-cpuset-and-placement.xml |  2 +-
- .../numad-auto-vcpu-no-numatune.xml           |  2 +-
- .../numad-static-vcpu-no-numatune.xml         |  2 +-
- tests/qemuxml2xmloutdata/pci-expander-bus.xml |  2 +-
- .../qemuxml2xmloutdata/pcie-expander-bus.xml  |  2 +-
- .../pseries-phb-numa-node.xml                 |  2 +-
- tests/qemuxml2xmloutdata/smp.xml              |  2 +-
- .../vmx2xmldata/vmx2xml-esx-in-the-wild-8.xml |  2 +-
- .../vmx2xmldata/vmx2xml-esx-in-the-wild-9.xml |  2 +-
- 74 files changed, 121 insertions(+), 79 deletions(-)
+ src/bhyve/bhyve_command.c                        |  5 +++++
+ src/conf/cpu_conf.c                              | 16 +++++++++++++++-
+ src/conf/cpu_conf.h                              |  1 +
+ src/conf/domain_conf.c                           |  1 +
+ src/conf/schemas/cputypes.rng                    |  5 +++++
+ src/cpu/cpu.c                                    |  1 +
+ src/libxl/libxl_capabilities.c                   |  1 +
+ src/qemu/qemu_command.c                          |  5 +++++
+ src/vmx/vmx.c                                    |  7 +++++++
+ .../x86_64-host+guest,model486-result.xml        |  2 +-
+ .../x86_64-host+guest,models-result.xml          |  2 +-
+ tests/cputestdata/x86_64-host+guest-result.xml   |  2 +-
+ tests/cputestdata/x86_64-host+guest.xml          |  2 +-
+ .../x86_64-host+host-model-nofallback.xml        |  2 +-
+ ...host-Haswell-noTSX+Haswell,haswell-result.xml |  2 +-
+ ...aswell-noTSX+Haswell-noTSX,haswell-result.xml |  2 +-
+ ...4-host-Haswell-noTSX+Haswell-noTSX-result.xml |  2 +-
+ .../x86_64-host-worse+guest-result.xml           |  2 +-
+ .../ppc64-modern-bulk-result-conf.xml            |  2 +-
+ .../ppc64-modern-bulk-result-live.xml            |  2 +-
+ .../ppc64-modern-individual-result-conf.xml      |  2 +-
+ .../ppc64-modern-individual-result-live.xml      |  2 +-
+ .../x86-modern-bulk-result-conf.xml              |  2 +-
+ .../x86-modern-bulk-result-live.xml              |  2 +-
+ .../x86-modern-individual-add-result-conf.xml    |  2 +-
+ .../x86-modern-individual-add-result-live.xml    |  2 +-
+ ...e-timeout+graphics-spice-timeout-password.xml |  2 +-
+ .../qemuhotplug-graphics-spice-timeout.xml       |  2 +-
+ .../fd-memory-no-numa-topology.xml               |  2 +-
+ .../qemuxml2argvdata/fd-memory-numa-topology.xml |  2 +-
+ .../fd-memory-numa-topology2.xml                 |  2 +-
+ .../fd-memory-numa-topology3.xml                 |  2 +-
+ tests/qemuxml2argvdata/hugepages-nvdimm.xml      |  2 +-
+ .../memfd-memory-default-hugepage.xml            |  2 +-
+ tests/qemuxml2argvdata/memfd-memory-numa.xml     |  2 +-
+ .../memory-hotplug-nvdimm-access.xml             |  2 +-
+ .../memory-hotplug-nvdimm-align.xml              |  2 +-
+ .../memory-hotplug-nvdimm-label.xml              |  2 +-
+ .../memory-hotplug-nvdimm-pmem.xml               |  2 +-
+ .../memory-hotplug-nvdimm-readonly.xml           |  2 +-
+ tests/qemuxml2argvdata/memory-hotplug-nvdimm.xml |  2 +-
+ .../memory-hotplug-virtio-mem.xml                |  2 +-
+ .../memory-hotplug-virtio-pmem.xml               |  2 +-
+ .../cpu-numa-disjoint.x86_64-latest.xml          |  2 +-
+ .../cpu-numa-disordered.x86_64-latest.xml        |  2 +-
+ .../cpu-numa-memshared.x86_64-latest.xml         |  2 +-
+ .../cpu-numa-no-memory-element.x86_64-latest.xml |  2 +-
+ .../cpu-numa1.x86_64-latest.xml                  |  2 +-
+ .../cpu-numa2.x86_64-latest.xml                  |  2 +-
+ .../memory-hotplug-dimm-addr.x86_64-latest.xml   |  2 +-
+ .../memory-hotplug-dimm.x86_64-latest.xml        |  2 +-
+ .../memory-hotplug-multiple.x86_64-latest.xml    |  2 +-
+ ...plug-nvdimm-ppc64-abi-update.ppc64-latest.xml |  2 +-
+ .../memory-hotplug-nvdimm-ppc64.ppc64-latest.xml |  2 +-
+ .../memory-hotplug.x86_64-latest.xml             |  2 +-
+ ...mad-auto-memory-vcpu-cpuset.x86_64-latest.xml |  2 +-
+ ...cpu-no-cpuset-and-placement.x86_64-latest.xml |  2 +-
+ ...numad-auto-vcpu-no-numatune.x86_64-latest.xml |  2 +-
+ ...mad-static-vcpu-no-numatune.x86_64-latest.xml |  2 +-
+ .../pci-expander-bus.x86_64-latest.xml           |  2 +-
+ .../pcie-expander-bus.x86_64-latest.xml          |  2 +-
+ .../pseries-phb-numa-node.ppc64-latest.xml       |  2 +-
+ tests/vmx2xmldata/esx-in-the-wild-10.xml         |  2 +-
+ tests/vmx2xmldata/esx-in-the-wild-8.xml          |  2 +-
+ tests/vmx2xmldata/esx-in-the-wild-9.xml          |  2 +-
+ 65 files changed, 97 insertions(+), 57 deletions(-)
 
-diff --git a/docs/formatcaps.html.in b/docs/formatcaps.html.in
-index 59d21a7..ff40f06 100644
---- a/docs/formatcaps.html.in
-+++ b/docs/formatcaps.html.in
-@@ -173,7 +173,7 @@
-       &lt;/features&gt;
-       &lt;model&gt;core2duo&lt;/model&gt;
-       &lt;vendor&gt;Intel&lt;/vendor&gt;
--      &lt;topology sockets="1" dies="1" cores="2" threads="1"/&gt;
-+      &lt;topology sockets="1" dies="1" clusters="1" cores="2" threads="1"/&gt;
-       &lt;feature name="lahf_lm"/&gt;
-       &lt;feature name='xtpr'/&gt;
-       ...
-diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
-index 5860ec9..6e51c3b 100644
---- a/docs/formatdomain.html.in
-+++ b/docs/formatdomain.html.in
-@@ -1470,7 +1470,7 @@
- &lt;cpu match='exact'&gt;
-   &lt;model fallback='allow'&gt;core2duo&lt;/model&gt;
-   &lt;vendor&gt;Intel&lt;/vendor&gt;
--  &lt;topology sockets='1' dies='1' cores='2' threads='1'/&gt;
-+  &lt;topology sockets='1' dies='1' clusters="1" cores='2' threads='1'/&gt;
-   &lt;cache level='3' mode='emulate'/&gt;
-   &lt;feature policy='disable' name='lahf_lm'/&gt;
- &lt;/cpu&gt;
-@@ -1479,7 +1479,7 @@
- <pre>
- &lt;cpu mode='host-model'&gt;
-   &lt;model fallback='forbid'/&gt;
--  &lt;topology sockets='1' dies='1' cores='2' threads='1'/&gt;
-+  &lt;topology sockets='1' dies='1' clusters='1' cores='2' threads='1'/&gt;
- &lt;/cpu&gt;
- ...</pre>
- 
-@@ -1498,7 +1498,7 @@
- <pre>
- ...
- &lt;cpu&gt;
--  &lt;topology sockets='1' dies='1' cores='2' threads='1'/&gt;
-+  &lt;topology sockets='1' dies='1' clusters='1' cores='2' threads='1'/&gt;
- &lt;/cpu&gt;
- ...</pre>
- 
-@@ -1674,14 +1674,15 @@
-       <dt><code>topology</code></dt>
-       <dd>The <code>topology</code> element specifies requested topology of
-         virtual CPU provided to the guest. Four attributes, <code>sockets</code>,
--        <code>dies</code>, <code>cores</code>, and <code>threads</code>,
--        accept non-zero positive integer values. They refer to the total number
--        of CPU sockets, number of dies per socket, number of cores per die, and
--        number of threads per core, respectively. The <code>dies</code>
--        attribute is optional and will default to 1 if omitted, while the other
--        attributes are all mandatory. Hypervisors may require that the maximum
--        number of vCPUs specified by the <code>cpus</code> element equals to
--        the number of vcpus resulting from the topology.</dd>
-+        <code>dies</code>, <code>dies</code>, <code>cores</code>,
-+        and <code>threads</code>, accept non-zero positive integer values. They
-+        refer to the total number of CPU sockets, number of dies per socket,
-+        number of clusters per die, number of cores per cluster, and number of
-+        threads per core, respectively. The attribute <code>dies</code> and
-+        <code>clusters</code> are optional and will default to 1 if omitted,
-+        while the other attributes are all mandatory. Hypervisors may require
-+        that the maximum number of vCPUs specified by the <code>cpus</code>
-+        element equals to the number of vcpus resulting from the topology.</dd>
- 
-       <dt><code>feature</code></dt>
-       <dd>The <code>cpu</code> element can contain zero or more
-diff --git a/docs/schemas/cputypes.rng b/docs/schemas/cputypes.rng
-index e2744ac..699fd05 100644
---- a/docs/schemas/cputypes.rng
-+++ b/docs/schemas/cputypes.rng
-@@ -91,6 +91,11 @@
-           <ref name="positiveInteger"/>
-         </attribute>
-       </optional>
-+      <optional>
-+        <attribute name="clusters">
-+          <ref name="positiveInteger"/>
-+        </attribute>
-+      </optional>
-       <attribute name="cores">
-         <ref name="positiveInteger"/>
-       </attribute>
+diff --git a/src/bhyve/bhyve_command.c b/src/bhyve/bhyve_command.c
+index 5b388c7a8f..d05b01ae5d 100644
+--- a/src/bhyve/bhyve_command.c
++++ b/src/bhyve/bhyve_command.c
+@@ -672,6 +672,11 @@ virBhyveProcessBuildBhyveCmd(struct _bhyveConn *driver, virDomainDef *def,
+                            _("Only 1 die per socket is supported"));
+             return NULL;
+         }
++        if (def->cpu->clusters != 1) {
++            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
++                           _("Only 1 cluster per die is supported"));
++            return NULL;
++        }
+         if (nvcpus != def->cpu->sockets * def->cpu->cores * def->cpu->threads) {
+             virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+                            _("Invalid CPU topology: total number of vCPUs must equal the product of sockets, cores, and threads"));
 diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c
-index 989306b..3c2ee73 100644
+index 7abe489733..6e6e1b9a89 100644
 --- a/src/conf/cpu_conf.c
 +++ b/src/conf/cpu_conf.c
-@@ -240,6 +240,7 @@ virCPUDefCopyWithoutModel(const virCPUDef *cpu)
+@@ -241,6 +241,7 @@ virCPUDefCopyWithoutModel(const virCPUDef *cpu)
      copy->fallback = cpu->fallback;
      copy->sockets = cpu->sockets;
      copy->dies = cpu->dies;
@@ -180,41 +104,25 @@ index 989306b..3c2ee73 100644
      copy->cores = cpu->cores;
      copy->threads = cpu->threads;
      copy->arch = cpu->arch;
-@@ -547,6 +548,17 @@ virCPUDefParseXML(xmlXPathContextPtr ctxt,
-             def->dies = 1;
+@@ -572,6 +573,12 @@ virCPUDefParseXML(xmlXPathContextPtr ctxt,
+             return -1;
          }
  
-+        if (virXPathNode("./topology[1]/@clusters", ctxt)) {
-+            if (virXPathULong("string(./topology[1]/@clusters)", ctxt, &ul) < 0) {
-+                virReportError(VIR_ERR_XML_ERROR, "%s",
-+                               _("Malformed 'clusters' attribute in CPU topology"));
-+                goto cleanup;
-+            }
-+            def->clusters = (unsigned int) ul;
-+        } else {
-+            def->clusters = 1;
++        if (virXMLPropUIntDefault(topology, "clusters", 10,
++                                  VIR_XML_PROP_NONZERO,
++                                  &def->clusters, 1) < 0) {
++            return -1;
 +        }
 +
-         if (virXPathULong("string(./topology[1]/@cores)", ctxt, &ul) < 0) {
-             virReportError(VIR_ERR_XML_ERROR, "%s",
-                            _("Missing 'cores' attribute in CPU topology"));
-@@ -561,7 +573,8 @@ virCPUDefParseXML(xmlXPathContextPtr ctxt,
-         }
-         def->threads = (unsigned int) ul;
- 
--        if (!def->sockets || !def->cores || !def->threads || !def->dies) {
-+        if (!def->sockets || !def->cores || !def->threads || !def->dies ||
-+            !def -> clusters) {
-             virReportError(VIR_ERR_XML_ERROR, "%s",
-                            _("Invalid CPU topology"));
-             goto cleanup;
-@@ -833,10 +846,12 @@ virCPUDefFormatBuf(virBufferPtr buf,
+         if (virXMLPropUInt(topology, "cores", 10,
+                            VIR_XML_PROP_REQUIRED | VIR_XML_PROP_NONZERO,
+                            &def->cores) < 0) {
+@@ -827,10 +834,11 @@ virCPUDefFormatBuf(virBuffer *buf,
          virBufferAddLit(buf, "/>\n");
      }
  
 -    if (def->sockets && def->dies && def->cores && def->threads) {
-+    if (def->sockets && def->dies && def->clusters && def->cores &&
-+        def->threads) {
++    if (def->sockets && def->dies && def->clusters && def->cores && def->threads) {
          virBufferAddLit(buf, "<topology");
          virBufferAsprintf(buf, " sockets='%u'", def->sockets);
          virBufferAsprintf(buf, " dies='%u'", def->dies);
@@ -222,36 +130,36 @@ index 989306b..3c2ee73 100644
          virBufferAsprintf(buf, " cores='%u'", def->cores);
          virBufferAsprintf(buf, " threads='%u'", def->threads);
          virBufferAddLit(buf, "/>\n");
-@@ -1081,6 +1096,12 @@ virCPUDefIsEqual(virCPUDefPtr src,
+@@ -1106,6 +1114,12 @@ virCPUDefIsEqual(virCPUDef *src,
          return false;
      }
  
 +    if (src->clusters != dst->clusters) {
-+        MISMATCH(_("Target CPU clusters %d does not match source %d"),
++        MISMATCH(_("Target CPU clusters %1$d does not match source %2$d"),
 +                 dst->clusters, src->clusters);
 +        return false;
 +    }
 +
      if (src->cores != dst->cores) {
-         MISMATCH(_("Target CPU cores %d does not match source %d"),
+         MISMATCH(_("Target CPU cores %1$d does not match source %2$d"),
                   dst->cores, src->cores);
 diff --git a/src/conf/cpu_conf.h b/src/conf/cpu_conf.h
-index 1b297ed..10a2252 100644
+index 3e4c53675c..2694022fed 100644
 --- a/src/conf/cpu_conf.h
 +++ b/src/conf/cpu_conf.h
-@@ -134,6 +134,7 @@ struct _virCPUDef {
+@@ -148,6 +148,7 @@ struct _virCPUDef {
      unsigned int microcodeVersion;
      unsigned int sockets;
      unsigned int dies;
 +    unsigned int clusters;
      unsigned int cores;
      unsigned int threads;
-     size_t nfeatures;
+     unsigned int sigFamily;
 diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
-index b8cf1ad..7ae4034 100644
+index e56eb02f61..4798d01d12 100644
 --- a/src/conf/domain_conf.c
 +++ b/src/conf/domain_conf.c
-@@ -2088,6 +2088,7 @@ virDomainDefGetVcpusTopology(const virDomainDef *def,
+@@ -2325,6 +2325,7 @@ virDomainDefGetVcpusTopology(const virDomainDef *def,
  
      /* multiplication of 32bit numbers fits into a 64bit variable */
      if ((tmp *= def->cpu->dies) > UINT_MAX ||
@@ -259,11 +167,27 @@ index b8cf1ad..7ae4034 100644
          (tmp *= def->cpu->cores) > UINT_MAX ||
          (tmp *= def->cpu->threads) > UINT_MAX) {
          virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+diff --git a/src/conf/schemas/cputypes.rng b/src/conf/schemas/cputypes.rng
+index db1aa57158..3a8910e09f 100644
+--- a/src/conf/schemas/cputypes.rng
++++ b/src/conf/schemas/cputypes.rng
+@@ -92,6 +92,11 @@
+           <ref name="positiveInteger"/>
+         </attribute>
+       </optional>
++      <optional>
++        <attribute name="clusters">
++          <ref name="positiveInteger"/>
++        </attribute>
++      </optional>
+       <attribute name="cores">
+         <ref name="positiveInteger"/>
+       </attribute>
 diff --git a/src/cpu/cpu.c b/src/cpu/cpu.c
-index df78a0d..27d26fc 100644
+index bc43aa4e93..4f048d0dad 100644
 --- a/src/cpu/cpu.c
 +++ b/src/cpu/cpu.c
-@@ -426,6 +426,7 @@ virCPUGetHost(virArch arch,
+@@ -435,6 +435,7 @@ virCPUGetHost(virArch arch,
      if (nodeInfo) {
          cpu->sockets = nodeInfo->sockets;
          cpu->dies = 1;
@@ -271,27 +195,39 @@ index df78a0d..27d26fc 100644
          cpu->cores = nodeInfo->cores;
          cpu->threads = nodeInfo->threads;
      }
+diff --git a/src/libxl/libxl_capabilities.c b/src/libxl/libxl_capabilities.c
+index 177e8b988e..c3736bd0a9 100644
+--- a/src/libxl/libxl_capabilities.c
++++ b/src/libxl/libxl_capabilities.c
+@@ -159,6 +159,7 @@ libxlCapsInitCPU(virCaps *caps, libxl_physinfo *phy_info)
+     cpu->cores = phy_info->cores_per_socket;
+     cpu->threads = phy_info->threads_per_core;
+     cpu->dies = 1;
++    cpu->clusters = 1;
+     cpu->sockets = phy_info->nr_cpus / (cpu->cores * cpu->threads);
+ 
+     if (!(data = libxlCapsNodeData(cpu, phy_info->hw_cap)) ||
 diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
-index 5f7e847..85f95b4 100644
+index 9cff03632c..461584566f 100644
 --- a/src/qemu/qemu_command.c
 +++ b/src/qemu/qemu_command.c
-@@ -7335,6 +7335,11 @@ qemuBuildSmpCommandLine(virCommandPtr cmd,
+@@ -7217,6 +7217,11 @@ qemuBuildSmpCommandLine(virCommand *cmd,
                             _("Only 1 die per socket is supported"));
              return -1;
          }
 +        if (def->cpu->clusters != 1) {
 +            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-+                           _("Only 1 cluster per dies is supported"));
++                           _("Only 1 cluster per die is supported"));
 +            return -1;
 +        }
          virBufferAsprintf(&buf, ",sockets=%u", def->cpu->sockets);
          if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_SMP_DIES))
              virBufferAsprintf(&buf, ",dies=%u", def->cpu->dies);
 diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c
-index 5f2ada6..76e5e66 100644
+index 26b89776e1..4ac2320251 100644
 --- a/src/vmx/vmx.c
 +++ b/src/vmx/vmx.c
-@@ -1494,6 +1494,7 @@ virVMXParseConfig(virVMXContext *ctx,
+@@ -1583,6 +1583,7 @@ virVMXParseConfig(virVMXContext *ctx,
              goto cleanup;
          }
          cpu->dies = 1;
@@ -299,7 +235,7 @@ index 5f2ada6..76e5e66 100644
          cpu->cores = coresPerSocket;
          cpu->threads = 1;
  
-@@ -3222,6 +3223,12 @@ virVMXFormatConfig(virVMXContext *ctx, virDomainXMLOptionPtr xmlopt, virDomainDe
+@@ -3377,6 +3378,12 @@ virVMXFormatConfig(virVMXContext *ctx, virDomainXMLOption *xmlopt, virDomainDef
              goto cleanup;
          }
  
@@ -313,7 +249,7 @@ index 5f2ada6..76e5e66 100644
          if (calculated_vcpus != maxvcpus) {
              virReportError(VIR_ERR_INTERNAL_ERROR,
 diff --git a/tests/cputestdata/x86_64-host+guest,model486-result.xml b/tests/cputestdata/x86_64-host+guest,model486-result.xml
-index ea8e2d3..b533f22 100644
+index ea8e2d3a48..b533f22b88 100644
 --- a/tests/cputestdata/x86_64-host+guest,model486-result.xml
 +++ b/tests/cputestdata/x86_64-host+guest,model486-result.xml
 @@ -1,6 +1,6 @@
@@ -325,19 +261,19 @@ index ea8e2d3..b533f22 100644
    <feature policy='require' name='tsc'/>
    <feature policy='require' name='msr'/>
 diff --git a/tests/cputestdata/x86_64-host+guest,models-result.xml b/tests/cputestdata/x86_64-host+guest,models-result.xml
-index 0dd6955..f476022 100644
+index 42664a48b4..e975d9bc18 100644
 --- a/tests/cputestdata/x86_64-host+guest,models-result.xml
 +++ b/tests/cputestdata/x86_64-host+guest,models-result.xml
 @@ -1,6 +1,6 @@
  <cpu mode='custom' match='exact'>
-   <model fallback='allow'>Nehalem</model>
+   <model fallback='allow'>qemu64</model>
 -  <topology sockets='2' dies='1' cores='4' threads='1'/>
 +  <topology sockets='2' dies='1' clusters='1' cores='4' threads='1'/>
    <feature policy='force' name='pbe'/>
    <feature policy='force' name='monitor'/>
-   <feature policy='require' name='xtpr'/>
+   <feature policy='require' name='ssse3'/>
 diff --git a/tests/cputestdata/x86_64-host+guest-result.xml b/tests/cputestdata/x86_64-host+guest-result.xml
-index 28e3152..cf41b3f 100644
+index 28e3152cbf..cf41b3f872 100644
 --- a/tests/cputestdata/x86_64-host+guest-result.xml
 +++ b/tests/cputestdata/x86_64-host+guest-result.xml
 @@ -1,6 +1,6 @@
@@ -349,7 +285,7 @@ index 28e3152..cf41b3f 100644
    <feature policy='require' name='xtpr'/>
    <feature policy='disable' name='sse4.2'/>
 diff --git a/tests/cputestdata/x86_64-host+guest.xml b/tests/cputestdata/x86_64-host+guest.xml
-index 28e3152..cf41b3f 100644
+index 28e3152cbf..cf41b3f872 100644
 --- a/tests/cputestdata/x86_64-host+guest.xml
 +++ b/tests/cputestdata/x86_64-host+guest.xml
 @@ -1,6 +1,6 @@
@@ -361,7 +297,7 @@ index 28e3152..cf41b3f 100644
    <feature policy='require' name='xtpr'/>
    <feature policy='disable' name='sse4.2'/>
 diff --git a/tests/cputestdata/x86_64-host+host-model-nofallback.xml b/tests/cputestdata/x86_64-host+host-model-nofallback.xml
-index 16d6e1d..881eea7 100644
+index 16d6e1daf2..881eea7bd0 100644
 --- a/tests/cputestdata/x86_64-host+host-model-nofallback.xml
 +++ b/tests/cputestdata/x86_64-host+host-model-nofallback.xml
 @@ -1,7 +1,7 @@
@@ -374,7 +310,7 @@ index 16d6e1d..881eea7 100644
    <feature policy='require' name='xtpr'/>
    <feature policy='require' name='tm2'/>
 diff --git a/tests/cputestdata/x86_64-host-Haswell-noTSX+Haswell,haswell-result.xml b/tests/cputestdata/x86_64-host-Haswell-noTSX+Haswell,haswell-result.xml
-index 8eda668..67994c6 100644
+index 8eda6684a0..67994c62cc 100644
 --- a/tests/cputestdata/x86_64-host-Haswell-noTSX+Haswell,haswell-result.xml
 +++ b/tests/cputestdata/x86_64-host-Haswell-noTSX+Haswell,haswell-result.xml
 @@ -1,6 +1,6 @@
@@ -386,7 +322,7 @@ index 8eda668..67994c6 100644
    <feature policy='disable' name='hle'/>
  </cpu>
 diff --git a/tests/cputestdata/x86_64-host-Haswell-noTSX+Haswell-noTSX,haswell-result.xml b/tests/cputestdata/x86_64-host-Haswell-noTSX+Haswell-noTSX,haswell-result.xml
-index cb02449..4804c0b 100644
+index cb02449d60..4804c0b818 100644
 --- a/tests/cputestdata/x86_64-host-Haswell-noTSX+Haswell-noTSX,haswell-result.xml
 +++ b/tests/cputestdata/x86_64-host-Haswell-noTSX+Haswell-noTSX,haswell-result.xml
 @@ -1,6 +1,6 @@
@@ -398,7 +334,7 @@ index cb02449..4804c0b 100644
    <feature policy='disable' name='rtm'/>
  </cpu>
 diff --git a/tests/cputestdata/x86_64-host-Haswell-noTSX+Haswell-noTSX-result.xml b/tests/cputestdata/x86_64-host-Haswell-noTSX+Haswell-noTSX-result.xml
-index 7ee926a..c21b331 100644
+index 7ee926aba8..c21b331248 100644
 --- a/tests/cputestdata/x86_64-host-Haswell-noTSX+Haswell-noTSX-result.xml
 +++ b/tests/cputestdata/x86_64-host-Haswell-noTSX+Haswell-noTSX-result.xml
 @@ -1,4 +1,4 @@
@@ -408,7 +344,7 @@ index 7ee926a..c21b331 100644
 +  <topology sockets='1' dies='1' clusters='1' cores='2' threads='2'/>
  </cpu>
 diff --git a/tests/cputestdata/x86_64-host-worse+guest-result.xml b/tests/cputestdata/x86_64-host-worse+guest-result.xml
-index 9d54c66..712c3ad 100644
+index 9d54c66a8f..712c3ad341 100644
 --- a/tests/cputestdata/x86_64-host-worse+guest-result.xml
 +++ b/tests/cputestdata/x86_64-host-worse+guest-result.xml
 @@ -1,6 +1,6 @@
@@ -420,711 +356,594 @@ index 9d54c66..712c3ad 100644
    <feature policy='disable' name='xtpr'/>
    <feature policy='disable' name='sse4.2'/>
 diff --git a/tests/qemuhotplugtestcpus/ppc64-modern-bulk-result-conf.xml b/tests/qemuhotplugtestcpus/ppc64-modern-bulk-result-conf.xml
-index f80c436..e976c00 100644
+index ad11b2f8a6..1a0d28257e 100644
 --- a/tests/qemuhotplugtestcpus/ppc64-modern-bulk-result-conf.xml
 +++ b/tests/qemuhotplugtestcpus/ppc64-modern-bulk-result-conf.xml
-@@ -43,7 +43,7 @@
-     <boot dev='network'/>
+@@ -44,7 +44,7 @@
    </os>
-   <cpu>
+   <cpu mode='custom' match='exact' check='none'>
+     <model fallback='forbid'>POWER9</model>
 -    <topology sockets='1' dies='1' cores='4' threads='8'/>
 +    <topology sockets='1' dies='1' clusters='1' cores='4' threads='8'/>
    </cpu>
    <clock offset='utc'/>
    <on_poweroff>destroy</on_poweroff>
 diff --git a/tests/qemuhotplugtestcpus/ppc64-modern-bulk-result-live.xml b/tests/qemuhotplugtestcpus/ppc64-modern-bulk-result-live.xml
-index 7998b97..21666a0 100644
+index 2a3b4a495f..b127883b36 100644
 --- a/tests/qemuhotplugtestcpus/ppc64-modern-bulk-result-live.xml
 +++ b/tests/qemuhotplugtestcpus/ppc64-modern-bulk-result-live.xml
-@@ -43,7 +43,7 @@
-     <boot dev='network'/>
+@@ -44,7 +44,7 @@
    </os>
-   <cpu>
+   <cpu mode='custom' match='exact' check='none'>
+     <model fallback='forbid'>POWER9</model>
 -    <topology sockets='1' dies='1' cores='4' threads='8'/>
 +    <topology sockets='1' dies='1' clusters='1' cores='4' threads='8'/>
    </cpu>
    <clock offset='utc'/>
    <on_poweroff>destroy</on_poweroff>
 diff --git a/tests/qemuhotplugtestcpus/ppc64-modern-individual-result-conf.xml b/tests/qemuhotplugtestcpus/ppc64-modern-individual-result-conf.xml
-index 2a48a97..2740737 100644
+index 34aec9b965..29f1a5ac45 100644
 --- a/tests/qemuhotplugtestcpus/ppc64-modern-individual-result-conf.xml
 +++ b/tests/qemuhotplugtestcpus/ppc64-modern-individual-result-conf.xml
-@@ -43,7 +43,7 @@
-     <boot dev='network'/>
+@@ -44,7 +44,7 @@
    </os>
-   <cpu>
+   <cpu mode='custom' match='exact' check='none'>
+     <model fallback='forbid'>POWER9</model>
 -    <topology sockets='1' dies='1' cores='4' threads='8'/>
 +    <topology sockets='1' dies='1' clusters='1' cores='4' threads='8'/>
    </cpu>
    <clock offset='utc'/>
    <on_poweroff>destroy</on_poweroff>
 diff --git a/tests/qemuhotplugtestcpus/ppc64-modern-individual-result-live.xml b/tests/qemuhotplugtestcpus/ppc64-modern-individual-result-live.xml
-index 90518d1..b9e325d 100644
+index 5ce2cfd0b0..76a85ac9f0 100644
 --- a/tests/qemuhotplugtestcpus/ppc64-modern-individual-result-live.xml
 +++ b/tests/qemuhotplugtestcpus/ppc64-modern-individual-result-live.xml
-@@ -43,7 +43,7 @@
-     <boot dev='network'/>
+@@ -44,7 +44,7 @@
    </os>
-   <cpu>
+   <cpu mode='custom' match='exact' check='none'>
+     <model fallback='forbid'>POWER9</model>
 -    <topology sockets='1' dies='1' cores='4' threads='8'/>
 +    <topology sockets='1' dies='1' clusters='1' cores='4' threads='8'/>
    </cpu>
    <clock offset='utc'/>
    <on_poweroff>destroy</on_poweroff>
 diff --git a/tests/qemuhotplugtestcpus/x86-modern-bulk-result-conf.xml b/tests/qemuhotplugtestcpus/x86-modern-bulk-result-conf.xml
-index 0d622fc..0b86f3a 100644
+index 8d52ffedb4..bec46987ff 100644
 --- a/tests/qemuhotplugtestcpus/x86-modern-bulk-result-conf.xml
 +++ b/tests/qemuhotplugtestcpus/x86-modern-bulk-result-conf.xml
-@@ -19,7 +19,7 @@
-     <boot dev='network'/>
+@@ -20,7 +20,7 @@
    </os>
-   <cpu>
+   <cpu mode='custom' match='exact' check='none'>
+     <model fallback='forbid'>qemu64</model>
 -    <topology sockets='4' dies='1' cores='2' threads='1'/>
 +    <topology sockets='4' dies='1' clusters='1' cores='2' threads='1'/>
    </cpu>
    <clock offset='utc'/>
    <on_poweroff>destroy</on_poweroff>
 diff --git a/tests/qemuhotplugtestcpus/x86-modern-bulk-result-live.xml b/tests/qemuhotplugtestcpus/x86-modern-bulk-result-live.xml
-index ed9deae..c21b000 100644
+index f416397e33..be9769c686 100644
 --- a/tests/qemuhotplugtestcpus/x86-modern-bulk-result-live.xml
 +++ b/tests/qemuhotplugtestcpus/x86-modern-bulk-result-live.xml
-@@ -19,7 +19,7 @@
-     <boot dev='network'/>
+@@ -20,7 +20,7 @@
    </os>
-   <cpu>
+   <cpu mode='custom' match='exact' check='none'>
+     <model fallback='forbid'>qemu64</model>
 -    <topology sockets='4' dies='1' cores='2' threads='1'/>
 +    <topology sockets='4' dies='1' clusters='1' cores='2' threads='1'/>
    </cpu>
    <clock offset='utc'/>
    <on_poweroff>destroy</on_poweroff>
 diff --git a/tests/qemuhotplugtestcpus/x86-modern-individual-add-result-conf.xml b/tests/qemuhotplugtestcpus/x86-modern-individual-add-result-conf.xml
-index 342f172..bef1189 100644
+index 0bd2af8e43..539f607818 100644
 --- a/tests/qemuhotplugtestcpus/x86-modern-individual-add-result-conf.xml
 +++ b/tests/qemuhotplugtestcpus/x86-modern-individual-add-result-conf.xml
-@@ -19,7 +19,7 @@
-     <boot dev='network'/>
+@@ -20,7 +20,7 @@
    </os>
-   <cpu>
+   <cpu mode='custom' match='exact' check='none'>
+     <model fallback='forbid'>qemu64</model>
 -    <topology sockets='4' dies='1' cores='2' threads='1'/>
 +    <topology sockets='4' dies='1' clusters='1' cores='2' threads='1'/>
    </cpu>
    <clock offset='utc'/>
    <on_poweroff>destroy</on_poweroff>
 diff --git a/tests/qemuhotplugtestcpus/x86-modern-individual-add-result-live.xml b/tests/qemuhotplugtestcpus/x86-modern-individual-add-result-live.xml
-index b8341c7..aa63e72 100644
+index b31e6ebe55..acbdd3cfd5 100644
 --- a/tests/qemuhotplugtestcpus/x86-modern-individual-add-result-live.xml
 +++ b/tests/qemuhotplugtestcpus/x86-modern-individual-add-result-live.xml
-@@ -19,7 +19,7 @@
-     <boot dev='network'/>
-   </os>
-   <cpu>
--    <topology sockets='4' dies='1' cores='2' threads='1'/>
-+    <topology sockets='4' dies='1' clusters='1' cores='2' threads='1'/>
-   </cpu>
-   <clock offset='utc'/>
-   <on_poweroff>destroy</on_poweroff>
-diff --git a/tests/qemuhotplugtestcpus/x86-old-bulk-result-conf.xml b/tests/qemuhotplugtestcpus/x86-old-bulk-result-conf.xml
-index 29da89f..2952fba 100644
---- a/tests/qemuhotplugtestcpus/x86-old-bulk-result-conf.xml
-+++ b/tests/qemuhotplugtestcpus/x86-old-bulk-result-conf.xml
-@@ -9,7 +9,7 @@
-     <boot dev='network'/>
-   </os>
-   <cpu>
--    <topology sockets='4' dies='1' cores='2' threads='1'/>
-+    <topology sockets='4' dies='1' clusters='1' cores='2' threads='1'/>
-   </cpu>
-   <clock offset='utc'/>
-   <on_poweroff>destroy</on_poweroff>
-diff --git a/tests/qemuhotplugtestcpus/x86-old-bulk-result-live.xml b/tests/qemuhotplugtestcpus/x86-old-bulk-result-live.xml
-index f81194d..a5087a7 100644
---- a/tests/qemuhotplugtestcpus/x86-old-bulk-result-live.xml
-+++ b/tests/qemuhotplugtestcpus/x86-old-bulk-result-live.xml
-@@ -9,7 +9,7 @@
-     <boot dev='network'/>
+@@ -20,7 +20,7 @@
    </os>
-   <cpu>
+   <cpu mode='custom' match='exact' check='none'>
+     <model fallback='forbid'>qemu64</model>
 -    <topology sockets='4' dies='1' cores='2' threads='1'/>
 +    <topology sockets='4' dies='1' clusters='1' cores='2' threads='1'/>
    </cpu>
    <clock offset='utc'/>
    <on_poweroff>destroy</on_poweroff>
+diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-graphics-spice-timeout+graphics-spice-timeout-password.xml b/tests/qemuhotplugtestdomains/qemuhotplug-graphics-spice-timeout+graphics-spice-timeout-password.xml
+index 03964ad01c..ee53339338 100644
+--- a/tests/qemuhotplugtestdomains/qemuhotplug-graphics-spice-timeout+graphics-spice-timeout-password.xml
++++ b/tests/qemuhotplugtestdomains/qemuhotplug-graphics-spice-timeout+graphics-spice-timeout-password.xml
+@@ -18,7 +18,7 @@
+   <cpu mode='custom' match='exact' check='partial'>
+     <model fallback='allow'>core2duo</model>
+     <vendor>Intel</vendor>
+-    <topology sockets='1' dies='1' cores='2' threads='1'/>
++    <topology sockets='1' dies='1' clusters='1' cores='2' threads='1'/>
+     <feature policy='require' name='lahf_lm'/>
+     <feature policy='require' name='xtpr'/>
+     <feature policy='require' name='cx16'/>
+diff --git a/tests/qemuhotplugtestdomains/qemuhotplug-graphics-spice-timeout.xml b/tests/qemuhotplugtestdomains/qemuhotplug-graphics-spice-timeout.xml
+index e6b0cc833a..eb9b902fc5 100644
+--- a/tests/qemuhotplugtestdomains/qemuhotplug-graphics-spice-timeout.xml
++++ b/tests/qemuhotplugtestdomains/qemuhotplug-graphics-spice-timeout.xml
+@@ -18,7 +18,7 @@
+   <cpu mode='custom' match='exact' check='partial'>
+     <model fallback='allow'>core2duo</model>
+     <vendor>Intel</vendor>
+-    <topology sockets='1' dies='1' cores='2' threads='1'/>
++    <topology sockets='1' dies='1' clusters='1' cores='2' threads='1'/>
+     <feature policy='require' name='lahf_lm'/>
+     <feature policy='require' name='xtpr'/>
+     <feature policy='require' name='cx16'/>
 diff --git a/tests/qemuxml2argvdata/fd-memory-no-numa-topology.xml b/tests/qemuxml2argvdata/fd-memory-no-numa-topology.xml
-index 0749952..d9e20d4 100644
+index 2090bb8288..92f418fb88 100644
 --- a/tests/qemuxml2argvdata/fd-memory-no-numa-topology.xml
 +++ b/tests/qemuxml2argvdata/fd-memory-no-numa-topology.xml
-@@ -14,7 +14,7 @@
-     <boot dev='hd'/>
+@@ -15,7 +15,7 @@
    </os>
-   <cpu>
+   <cpu mode='custom' match='exact' check='none'>
+     <model fallback='forbid'>qemu64</model>
 -    <topology sockets='8' dies='1' cores='1' threads='1'/>
 +    <topology sockets='8' dies='1' clusters='1' cores='1' threads='1'/>
    </cpu>
    <clock offset='utc'/>
    <on_poweroff>destroy</on_poweroff>
 diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology.xml b/tests/qemuxml2argvdata/fd-memory-numa-topology.xml
-index 05ea164..7e082eb 100644
+index 2f94690656..543509d832 100644
 --- a/tests/qemuxml2argvdata/fd-memory-numa-topology.xml
 +++ b/tests/qemuxml2argvdata/fd-memory-numa-topology.xml
-@@ -14,7 +14,7 @@
-     <boot dev='hd'/>
+@@ -15,7 +15,7 @@
    </os>
-   <cpu>
+   <cpu mode='custom' match='exact' check='none'>
+     <model fallback='forbid'>qemu64</model>
 -    <topology sockets='1' dies='1' cores='8' threads='1'/>
 +    <topology sockets='1' dies='1' clusters='1' cores='8' threads='1'/>
      <numa>
        <cell id='0' cpus='0-7' memory='14680064' unit='KiB'/>
      </numa>
 diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology2.xml b/tests/qemuxml2argvdata/fd-memory-numa-topology2.xml
-index 904e64f..919b30a 100644
+index 3a4e9b478e..d3b98da3c6 100644
 --- a/tests/qemuxml2argvdata/fd-memory-numa-topology2.xml
 +++ b/tests/qemuxml2argvdata/fd-memory-numa-topology2.xml
-@@ -14,7 +14,7 @@
-     <boot dev='hd'/>
+@@ -15,7 +15,7 @@
    </os>
-   <cpu>
--    <topology sockets='1' dies='1' cores='8' threads='1'/>
-+    <topology sockets='1' dies='1' clusters='1' cores='8' threads='1'/>
+   <cpu mode='custom' match='exact' check='none'>
+     <model fallback='forbid'>qemu64</model>
+-    <topology sockets='1' dies='1' cores='20' threads='1'/>
++    <topology sockets='1' dies='1' clusters='1' cores='20' threads='1'/>
      <numa>
-       <cell id='0' cpus='0-7' memory='14680064' unit='KiB'/>
+       <cell id='0' cpus='0-7,16-19' memory='14680064' unit='KiB'/>
        <cell id='1' cpus='8-15' memory='14680064' unit='KiB' memAccess='shared'/>
 diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology3.xml b/tests/qemuxml2argvdata/fd-memory-numa-topology3.xml
-index 9785609..a429a27 100644
+index 0f7f74283b..459d1b9d1d 100644
 --- a/tests/qemuxml2argvdata/fd-memory-numa-topology3.xml
 +++ b/tests/qemuxml2argvdata/fd-memory-numa-topology3.xml
-@@ -14,7 +14,7 @@
-     <boot dev='hd'/>
+@@ -15,7 +15,7 @@
    </os>
-   <cpu>
--    <topology sockets='1' dies='1' cores='24' threads='1'/>
-+    <topology sockets='1' dies='1' clusters='1' cores='24' threads='1'/>
+   <cpu mode='custom' match='exact' check='none'>
+     <model fallback='forbid'>qemu64</model>
+-    <topology sockets='1' dies='1' cores='32' threads='1'/>
++    <topology sockets='1' dies='1' clusters='1' cores='32' threads='1'/>
      <numa>
-       <cell id='0' cpus='0-1' memory='14680064' unit='KiB'/>
+       <cell id='0' cpus='0-1,6-31' memory='14680064' unit='KiB'/>
        <cell id='1' cpus='2-3' memory='14680064' unit='KiB' memAccess='shared'/>
 diff --git a/tests/qemuxml2argvdata/hugepages-nvdimm.xml b/tests/qemuxml2argvdata/hugepages-nvdimm.xml
-index 144d02b..f8a5a2f 100644
+index 1a1500895b..b786b0d3dd 100644
 --- a/tests/qemuxml2argvdata/hugepages-nvdimm.xml
 +++ b/tests/qemuxml2argvdata/hugepages-nvdimm.xml
-@@ -16,7 +16,7 @@
-     <boot dev='hd'/>
+@@ -17,7 +17,7 @@
    </os>
-   <cpu>
+   <cpu mode='custom' match='exact' check='none'>
+     <model fallback='forbid'>qemu64</model>
 -    <topology sockets='2' dies='1' cores='1' threads='1'/>
 +    <topology sockets='2' dies='1' clusters='1' cores='1' threads='1'/>
      <numa>
        <cell id='0' cpus='0-1' memory='1048576' unit='KiB'/>
      </numa>
 diff --git a/tests/qemuxml2argvdata/memfd-memory-default-hugepage.xml b/tests/qemuxml2argvdata/memfd-memory-default-hugepage.xml
-index 69d27ef..f3e155a 100644
+index 238d4c6b52..a70bd53134 100644
 --- a/tests/qemuxml2argvdata/memfd-memory-default-hugepage.xml
 +++ b/tests/qemuxml2argvdata/memfd-memory-default-hugepage.xml
-@@ -18,7 +18,7 @@
-     <boot dev='hd'/>
+@@ -19,7 +19,7 @@
    </os>
-   <cpu>
+   <cpu mode='custom' match='exact' check='none'>
+     <model fallback='forbid'>qemu64</model>
 -    <topology sockets='1' dies='1' cores='8' threads='1'/>
 +    <topology sockets='1' dies='1' clusters='1' cores='8' threads='1'/>
      <numa>
        <cell id='0' cpus='0-7' memory='14680064' unit='KiB'/>
      </numa>
 diff --git a/tests/qemuxml2argvdata/memfd-memory-numa.xml b/tests/qemuxml2argvdata/memfd-memory-numa.xml
-index e3d5d92..ed814a0 100644
+index 1ac87e3aef..0c5d7ba4ef 100644
 --- a/tests/qemuxml2argvdata/memfd-memory-numa.xml
 +++ b/tests/qemuxml2argvdata/memfd-memory-numa.xml
-@@ -20,7 +20,7 @@
-     <boot dev='hd'/>
+@@ -22,7 +22,7 @@
    </os>
-   <cpu>
+   <cpu mode='custom' match='exact' check='none'>
+     <model fallback='forbid'>qemu64</model>
 -    <topology sockets='1' dies='1' cores='8' threads='1'/>
 +    <topology sockets='1' dies='1' clusters='1' cores='8' threads='1'/>
      <numa>
        <cell id='0' cpus='0-7' memory='14680064' unit='KiB'/>
      </numa>
 diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.xml b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.xml
-index a1cc126..5e74f58 100644
+index bee0346aca..84baf82bf5 100644
 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.xml
 +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.xml
-@@ -14,7 +14,7 @@
-     <gid start='0' target='1000' count='10'/>
+@@ -15,7 +15,7 @@
    </idmap>
-   <cpu>
+   <cpu mode='custom' match='exact' check='none'>
+     <model fallback='forbid'>qemu64</model>
 -    <topology sockets='2' dies='1' cores='1' threads='1'/>
 +    <topology sockets='2' dies='1' clusters='1' cores='1' threads='1'/>
      <numa>
        <cell id='0' cpus='0-1' memory='219136' unit='KiB'/>
      </numa>
 diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.xml b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.xml
-index 018a693..c1de357 100644
+index decf87db63..664418e805 100644
 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.xml
 +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.xml
-@@ -14,7 +14,7 @@
-     <gid start='0' target='1000' count='10'/>
+@@ -15,7 +15,7 @@
    </idmap>
-   <cpu>
+   <cpu mode='custom' match='exact' check='none'>
+     <model fallback='forbid'>qemu64</model>
 -    <topology sockets='2' dies='1' cores='1' threads='1'/>
 +    <topology sockets='2' dies='1' clusters='1' cores='1' threads='1'/>
      <numa>
        <cell id='0' cpus='0-1' memory='219136' unit='KiB'/>
      </numa>
 diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.xml b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.xml
-index c9d54a6..db0d67e 100644
+index 8a0dab3908..f998f7f276 100644
 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.xml
 +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.xml
-@@ -14,7 +14,7 @@
-     <gid start='0' target='1000' count='10'/>
+@@ -15,7 +15,7 @@
    </idmap>
-   <cpu>
+   <cpu mode='custom' match='exact' check='none'>
+     <model fallback='forbid'>qemu64</model>
 -    <topology sockets='2' dies='1' cores='1' threads='1'/>
 +    <topology sockets='2' dies='1' clusters='1' cores='1' threads='1'/>
      <numa>
        <cell id='0' cpus='0-1' memory='219136' unit='KiB'/>
      </numa>
 diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.xml b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.xml
-index 391d70f..bfa1589 100644
+index a712adfe1e..d66481fd35 100644
 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.xml
 +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.xml
-@@ -14,7 +14,7 @@
-     <gid start='0' target='1000' count='10'/>
+@@ -15,7 +15,7 @@
    </idmap>
-   <cpu>
+   <cpu mode='custom' match='exact' check='none'>
+     <model fallback='forbid'>qemu64</model>
 -    <topology sockets='2' dies='1' cores='1' threads='1'/>
 +    <topology sockets='2' dies='1' clusters='1' cores='1' threads='1'/>
      <numa>
        <cell id='0' cpus='0-1' memory='219136' unit='KiB'/>
      </numa>
 diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.xml b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.xml
-index 09b2c5c..bff89db 100644
+index 57629ccb8c..56d6b7b712 100644
 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.xml
 +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.xml
-@@ -14,7 +14,7 @@
-     <gid start='0' target='1000' count='10'/>
+@@ -15,7 +15,7 @@
    </idmap>
-   <cpu>
+   <cpu mode='custom' match='exact' check='none'>
+     <model fallback='forbid'>qemu64</model>
 -    <topology sockets='2' dies='1' cores='1' threads='1'/>
 +    <topology sockets='2' dies='1' clusters='1' cores='1' threads='1'/>
      <numa>
        <cell id='0' cpus='0-1' memory='219136' unit='KiB'/>
      </numa>
 diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm.xml b/tests/qemuxml2argvdata/memory-hotplug-nvdimm.xml
-index a32474d..827a7ca 100644
+index 865ddcf0ea..ff6e3b7b0f 100644
 --- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm.xml
 +++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm.xml
-@@ -14,7 +14,7 @@
-     <gid start='0' target='1000' count='10'/>
+@@ -15,7 +15,7 @@
    </idmap>
-   <cpu>
+   <cpu mode='custom' match='exact' check='none'>
+     <model fallback='forbid'>qemu64</model>
 -    <topology sockets='2' dies='1' cores='1' threads='1'/>
 +    <topology sockets='2' dies='1' clusters='1' cores='1' threads='1'/>
      <numa>
        <cell id='0' cpus='0-1' memory='1048576' unit='KiB'/>
      </numa>
-diff --git a/tests/qemuxml2xmloutdata/cpu-numa-disjoint.xml b/tests/qemuxml2xmloutdata/cpu-numa-disjoint.xml
-index d7f5372..2e4c53c 100644
---- a/tests/qemuxml2xmloutdata/cpu-numa-disjoint.xml
-+++ b/tests/qemuxml2xmloutdata/cpu-numa-disjoint.xml
-@@ -9,7 +9,7 @@
-     <boot dev='network'/>
+diff --git a/tests/qemuxml2argvdata/memory-hotplug-virtio-mem.xml b/tests/qemuxml2argvdata/memory-hotplug-virtio-mem.xml
+index c578209d8a..52fa6b14e9 100644
+--- a/tests/qemuxml2argvdata/memory-hotplug-virtio-mem.xml
++++ b/tests/qemuxml2argvdata/memory-hotplug-virtio-mem.xml
+@@ -11,7 +11,7 @@
    </os>
-   <cpu>
+   <cpu mode='custom' match='exact' check='none'>
+     <model fallback='forbid'>qemu64</model>
+-    <topology sockets='2' dies='1' cores='1' threads='1'/>
++    <topology sockets='2' dies='1' clusters='1' cores='1' threads='1'/>
+     <numa>
+       <cell id='0' cpus='0-1' memory='2095104' unit='KiB'/>
+     </numa>
+diff --git a/tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.xml b/tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.xml
+index a8b22dd3c5..2786a739ad 100644
+--- a/tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.xml
++++ b/tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.xml
+@@ -11,7 +11,7 @@
+   </os>
+   <cpu mode='custom' match='exact' check='none'>
+     <model fallback='forbid'>qemu64</model>
+-    <topology sockets='2' dies='1' cores='1' threads='1'/>
++    <topology sockets='2' dies='1' clusters='1' cores='1' threads='1'/>
+     <numa>
+       <cell id='0' cpus='0-1' memory='2095104' unit='KiB'/>
+     </numa>
+diff --git a/tests/qemuxml2xmloutdata/cpu-numa-disjoint.x86_64-latest.xml b/tests/qemuxml2xmloutdata/cpu-numa-disjoint.x86_64-latest.xml
+index fa2ec31463..4f33094949 100644
+--- a/tests/qemuxml2xmloutdata/cpu-numa-disjoint.x86_64-latest.xml
++++ b/tests/qemuxml2xmloutdata/cpu-numa-disjoint.x86_64-latest.xml
+@@ -10,7 +10,7 @@
+   </os>
+   <cpu mode='custom' match='exact' check='none'>
+     <model fallback='forbid'>qemu64</model>
 -    <topology sockets='2' dies='1' cores='4' threads='2'/>
 +    <topology sockets='2' dies='1' clusters='1' cores='4' threads='2'/>
      <numa>
        <cell id='0' cpus='0-3,8-11' memory='109550' unit='KiB'/>
        <cell id='1' cpus='4-7,12-15' memory='109550' unit='KiB'/>
-diff --git a/tests/qemuxml2xmloutdata/cpu-numa-disordered.xml b/tests/qemuxml2xmloutdata/cpu-numa-disordered.xml
-index 487ced1..e5979c3 100644
---- a/tests/qemuxml2xmloutdata/cpu-numa-disordered.xml
-+++ b/tests/qemuxml2xmloutdata/cpu-numa-disordered.xml
-@@ -9,7 +9,7 @@
-     <boot dev='network'/>
+diff --git a/tests/qemuxml2xmloutdata/cpu-numa-disordered.x86_64-latest.xml b/tests/qemuxml2xmloutdata/cpu-numa-disordered.x86_64-latest.xml
+index 1b4d0bfa67..75dcb8c9e2 100644
+--- a/tests/qemuxml2xmloutdata/cpu-numa-disordered.x86_64-latest.xml
++++ b/tests/qemuxml2xmloutdata/cpu-numa-disordered.x86_64-latest.xml
+@@ -10,7 +10,7 @@
    </os>
-   <cpu>
+   <cpu mode='custom' match='exact' check='none'>
+     <model fallback='forbid'>qemu64</model>
 -    <topology sockets='2' dies='1' cores='4' threads='2'/>
 +    <topology sockets='2' dies='1' clusters='1' cores='4' threads='2'/>
      <numa>
        <cell id='0' cpus='0-5' memory='109550' unit='KiB'/>
        <cell id='1' cpus='11-15' memory='109550' unit='KiB'/>
-diff --git a/tests/qemuxml2xmloutdata/cpu-numa-memshared.xml b/tests/qemuxml2xmloutdata/cpu-numa-memshared.xml
-index f472bff..f4af5be 100644
---- a/tests/qemuxml2xmloutdata/cpu-numa-memshared.xml
-+++ b/tests/qemuxml2xmloutdata/cpu-numa-memshared.xml
-@@ -9,7 +9,7 @@
-     <boot dev='network'/>
+diff --git a/tests/qemuxml2xmloutdata/cpu-numa-memshared.x86_64-latest.xml b/tests/qemuxml2xmloutdata/cpu-numa-memshared.x86_64-latest.xml
+index 47ed9efd69..c45e295921 100644
+--- a/tests/qemuxml2xmloutdata/cpu-numa-memshared.x86_64-latest.xml
++++ b/tests/qemuxml2xmloutdata/cpu-numa-memshared.x86_64-latest.xml
+@@ -10,7 +10,7 @@
    </os>
-   <cpu>
+   <cpu mode='custom' match='exact' check='none'>
+     <model fallback='forbid'>qemu64</model>
 -    <topology sockets='2' dies='1' cores='4' threads='2'/>
 +    <topology sockets='2' dies='1' clusters='1' cores='4' threads='2'/>
      <numa>
        <cell id='0' cpus='0-7' memory='109550' unit='KiB' memAccess='shared'/>
        <cell id='1' cpus='8-15' memory='109550' unit='KiB' memAccess='private'/>
-diff --git a/tests/qemuxml2xmloutdata/cpu-numa-no-memory-element.xml b/tests/qemuxml2xmloutdata/cpu-numa-no-memory-element.xml
-index 2ef7f84..d583f86 100644
---- a/tests/qemuxml2xmloutdata/cpu-numa-no-memory-element.xml
-+++ b/tests/qemuxml2xmloutdata/cpu-numa-no-memory-element.xml
-@@ -9,7 +9,7 @@
-     <boot dev='network'/>
+diff --git a/tests/qemuxml2xmloutdata/cpu-numa-no-memory-element.x86_64-latest.xml b/tests/qemuxml2xmloutdata/cpu-numa-no-memory-element.x86_64-latest.xml
+index 57bbacdff0..663d137ff5 100644
+--- a/tests/qemuxml2xmloutdata/cpu-numa-no-memory-element.x86_64-latest.xml
++++ b/tests/qemuxml2xmloutdata/cpu-numa-no-memory-element.x86_64-latest.xml
+@@ -10,7 +10,7 @@
    </os>
-   <cpu>
+   <cpu mode='custom' match='exact' check='none'>
+     <model fallback='forbid'>qemu64</model>
 -    <topology sockets='2' dies='1' cores='4' threads='2'/>
 +    <topology sockets='2' dies='1' clusters='1' cores='4' threads='2'/>
      <numa>
        <cell id='0' cpus='0-7' memory='109550' unit='KiB'/>
        <cell id='1' cpus='8-15' memory='109550' unit='KiB'/>
-diff --git a/tests/qemuxml2xmloutdata/cpu-numa1.xml b/tests/qemuxml2xmloutdata/cpu-numa1.xml
-index 2ef7f84..d583f86 100644
---- a/tests/qemuxml2xmloutdata/cpu-numa1.xml
-+++ b/tests/qemuxml2xmloutdata/cpu-numa1.xml
-@@ -9,7 +9,7 @@
-     <boot dev='network'/>
+diff --git a/tests/qemuxml2xmloutdata/cpu-numa1.x86_64-latest.xml b/tests/qemuxml2xmloutdata/cpu-numa1.x86_64-latest.xml
+index 57bbacdff0..663d137ff5 100644
+--- a/tests/qemuxml2xmloutdata/cpu-numa1.x86_64-latest.xml
++++ b/tests/qemuxml2xmloutdata/cpu-numa1.x86_64-latest.xml
+@@ -10,7 +10,7 @@
    </os>
-   <cpu>
+   <cpu mode='custom' match='exact' check='none'>
+     <model fallback='forbid'>qemu64</model>
 -    <topology sockets='2' dies='1' cores='4' threads='2'/>
 +    <topology sockets='2' dies='1' clusters='1' cores='4' threads='2'/>
      <numa>
        <cell id='0' cpus='0-7' memory='109550' unit='KiB'/>
        <cell id='1' cpus='8-15' memory='109550' unit='KiB'/>
-diff --git a/tests/qemuxml2xmloutdata/cpu-numa2.xml b/tests/qemuxml2xmloutdata/cpu-numa2.xml
-index 2ef7f84..d583f86 100644
---- a/tests/qemuxml2xmloutdata/cpu-numa2.xml
-+++ b/tests/qemuxml2xmloutdata/cpu-numa2.xml
-@@ -9,7 +9,7 @@
-     <boot dev='network'/>
+diff --git a/tests/qemuxml2xmloutdata/cpu-numa2.x86_64-latest.xml b/tests/qemuxml2xmloutdata/cpu-numa2.x86_64-latest.xml
+index 57bbacdff0..663d137ff5 100644
+--- a/tests/qemuxml2xmloutdata/cpu-numa2.x86_64-latest.xml
++++ b/tests/qemuxml2xmloutdata/cpu-numa2.x86_64-latest.xml
+@@ -10,7 +10,7 @@
    </os>
-   <cpu>
+   <cpu mode='custom' match='exact' check='none'>
+     <model fallback='forbid'>qemu64</model>
 -    <topology sockets='2' dies='1' cores='4' threads='2'/>
 +    <topology sockets='2' dies='1' clusters='1' cores='4' threads='2'/>
      <numa>
        <cell id='0' cpus='0-7' memory='109550' unit='KiB'/>
        <cell id='1' cpus='8-15' memory='109550' unit='KiB'/>
-diff --git a/tests/qemuxml2xmloutdata/fd-memory-no-numa-topology.xml b/tests/qemuxml2xmloutdata/fd-memory-no-numa-topology.xml
-index 0749952..d9e20d4 100644
---- a/tests/qemuxml2xmloutdata/fd-memory-no-numa-topology.xml
-+++ b/tests/qemuxml2xmloutdata/fd-memory-no-numa-topology.xml
-@@ -14,7 +14,7 @@
-     <boot dev='hd'/>
-   </os>
-   <cpu>
--    <topology sockets='8' dies='1' cores='1' threads='1'/>
-+    <topology sockets='8' dies='1' clusters='1' cores='1' threads='1'/>
-   </cpu>
-   <clock offset='utc'/>
-   <on_poweroff>destroy</on_poweroff>
-diff --git a/tests/qemuxml2xmloutdata/fd-memory-numa-topology.xml b/tests/qemuxml2xmloutdata/fd-memory-numa-topology.xml
-index 05ea164..7e082eb 100644
---- a/tests/qemuxml2xmloutdata/fd-memory-numa-topology.xml
-+++ b/tests/qemuxml2xmloutdata/fd-memory-numa-topology.xml
-@@ -14,7 +14,7 @@
-     <boot dev='hd'/>
-   </os>
-   <cpu>
--    <topology sockets='1' dies='1' cores='8' threads='1'/>
-+    <topology sockets='1' dies='1' clusters='1' cores='8' threads='1'/>
-     <numa>
-       <cell id='0' cpus='0-7' memory='14680064' unit='KiB'/>
-     </numa>
-diff --git a/tests/qemuxml2xmloutdata/fd-memory-numa-topology2.xml b/tests/qemuxml2xmloutdata/fd-memory-numa-topology2.xml
-index 904e64f..919b30a 100644
---- a/tests/qemuxml2xmloutdata/fd-memory-numa-topology2.xml
-+++ b/tests/qemuxml2xmloutdata/fd-memory-numa-topology2.xml
-@@ -14,7 +14,7 @@
-     <boot dev='hd'/>
-   </os>
-   <cpu>
--    <topology sockets='1' dies='1' cores='8' threads='1'/>
-+    <topology sockets='1' dies='1' clusters='1' cores='8' threads='1'/>
-     <numa>
-       <cell id='0' cpus='0-7' memory='14680064' unit='KiB'/>
-       <cell id='1' cpus='8-15' memory='14680064' unit='KiB' memAccess='shared'/>
-diff --git a/tests/qemuxml2xmloutdata/fd-memory-numa-topology3.xml b/tests/qemuxml2xmloutdata/fd-memory-numa-topology3.xml
-index 9785609..a429a27 100644
---- a/tests/qemuxml2xmloutdata/fd-memory-numa-topology3.xml
-+++ b/tests/qemuxml2xmloutdata/fd-memory-numa-topology3.xml
-@@ -14,7 +14,7 @@
-     <boot dev='hd'/>
-   </os>
-   <cpu>
--    <topology sockets='1' dies='1' cores='24' threads='1'/>
-+    <topology sockets='1' dies='1' clusters='1' cores='24' threads='1'/>
-     <numa>
-       <cell id='0' cpus='0-1' memory='14680064' unit='KiB'/>
-       <cell id='1' cpus='2-3' memory='14680064' unit='KiB' memAccess='shared'/>
-diff --git a/tests/qemuxml2xmloutdata/graphics-spice-timeout.xml b/tests/qemuxml2xmloutdata/graphics-spice-timeout.xml
-index 6e23652..f7a7c87 100644
---- a/tests/qemuxml2xmloutdata/graphics-spice-timeout.xml
-+++ b/tests/qemuxml2xmloutdata/graphics-spice-timeout.xml
-@@ -18,7 +18,7 @@
-   <cpu mode='custom' match='exact' check='partial'>
-     <model fallback='allow'>core2duo</model>
-     <vendor>Intel</vendor>
--    <topology sockets='1' dies='1' cores='2' threads='1'/>
-+    <topology sockets='1' dies='1' clusters='1' cores='2' threads='1'/>
-     <feature policy='require' name='ds'/>
-     <feature policy='require' name='acpi'/>
-     <feature policy='require' name='ss'/>
-diff --git a/tests/qemuxml2xmloutdata/hugepages-nvdimm.xml b/tests/qemuxml2xmloutdata/hugepages-nvdimm.xml
-index 144d02b..f8a5a2f 100644
---- a/tests/qemuxml2xmloutdata/hugepages-nvdimm.xml
-+++ b/tests/qemuxml2xmloutdata/hugepages-nvdimm.xml
-@@ -16,7 +16,7 @@
-     <boot dev='hd'/>
-   </os>
-   <cpu>
--    <topology sockets='2' dies='1' cores='1' threads='1'/>
-+    <topology sockets='2' dies='1' clusters='1' cores='1' threads='1'/>
-     <numa>
-       <cell id='0' cpus='0-1' memory='1048576' unit='KiB'/>
-     </numa>
-diff --git a/tests/qemuxml2xmloutdata/memfd-memory-default-hugepage.xml b/tests/qemuxml2xmloutdata/memfd-memory-default-hugepage.xml
-index 69d27ef..f3e155a 100644
---- a/tests/qemuxml2xmloutdata/memfd-memory-default-hugepage.xml
-+++ b/tests/qemuxml2xmloutdata/memfd-memory-default-hugepage.xml
-@@ -18,7 +18,7 @@
-     <boot dev='hd'/>
-   </os>
-   <cpu>
--    <topology sockets='1' dies='1' cores='8' threads='1'/>
-+    <topology sockets='1' dies='1' clusters='1' cores='8' threads='1'/>
-     <numa>
-       <cell id='0' cpus='0-7' memory='14680064' unit='KiB'/>
-     </numa>
-diff --git a/tests/qemuxml2xmloutdata/memfd-memory-numa.xml b/tests/qemuxml2xmloutdata/memfd-memory-numa.xml
-index e3d5d92..ed814a0 100644
---- a/tests/qemuxml2xmloutdata/memfd-memory-numa.xml
-+++ b/tests/qemuxml2xmloutdata/memfd-memory-numa.xml
-@@ -20,7 +20,7 @@
-     <boot dev='hd'/>
+diff --git a/tests/qemuxml2xmloutdata/memory-hotplug-dimm-addr.x86_64-latest.xml b/tests/qemuxml2xmloutdata/memory-hotplug-dimm-addr.x86_64-latest.xml
+index 0a32d5491a..38b41e6719 100644
+--- a/tests/qemuxml2xmloutdata/memory-hotplug-dimm-addr.x86_64-latest.xml
++++ b/tests/qemuxml2xmloutdata/memory-hotplug-dimm-addr.x86_64-latest.xml
+@@ -11,7 +11,7 @@
    </os>
-   <cpu>
--    <topology sockets='1' dies='1' cores='8' threads='1'/>
-+    <topology sockets='1' dies='1' clusters='1' cores='8' threads='1'/>
-     <numa>
-       <cell id='0' cpus='0-7' memory='14680064' unit='KiB'/>
-     </numa>
-diff --git a/tests/qemuxml2xmloutdata/memory-hotplug-dimm.xml b/tests/qemuxml2xmloutdata/memory-hotplug-dimm.xml
-index 326b5c9..378b262 100644
---- a/tests/qemuxml2xmloutdata/memory-hotplug-dimm.xml
-+++ b/tests/qemuxml2xmloutdata/memory-hotplug-dimm.xml
-@@ -14,7 +14,7 @@
-     <gid start='0' target='1000' count='10'/>
-   </idmap>
-   <cpu>
+   <cpu mode='custom' match='exact' check='none'>
+     <model fallback='forbid'>qemu64</model>
 -    <topology sockets='2' dies='1' cores='1' threads='1'/>
 +    <topology sockets='2' dies='1' clusters='1' cores='1' threads='1'/>
      <numa>
        <cell id='0' cpus='0-1' memory='219136' unit='KiB'/>
      </numa>
-diff --git a/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-access.xml b/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-access.xml
-index a1cc126..5e74f58 100644
---- a/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-access.xml
-+++ b/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-access.xml
-@@ -14,7 +14,7 @@
-     <gid start='0' target='1000' count='10'/>
+diff --git a/tests/qemuxml2xmloutdata/memory-hotplug-dimm.x86_64-latest.xml b/tests/qemuxml2xmloutdata/memory-hotplug-dimm.x86_64-latest.xml
+index 7c1b7b2c5d..7f0dc85c0e 100644
+--- a/tests/qemuxml2xmloutdata/memory-hotplug-dimm.x86_64-latest.xml
++++ b/tests/qemuxml2xmloutdata/memory-hotplug-dimm.x86_64-latest.xml
+@@ -15,7 +15,7 @@
    </idmap>
-   <cpu>
+   <cpu mode='custom' match='exact' check='none'>
+     <model fallback='forbid'>qemu64</model>
 -    <topology sockets='2' dies='1' cores='1' threads='1'/>
 +    <topology sockets='2' dies='1' clusters='1' cores='1' threads='1'/>
      <numa>
        <cell id='0' cpus='0-1' memory='219136' unit='KiB'/>
      </numa>
-diff --git a/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-align.xml b/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-align.xml
-index 018a693..c1de357 100644
---- a/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-align.xml
-+++ b/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-align.xml
-@@ -14,7 +14,7 @@
-     <gid start='0' target='1000' count='10'/>
-   </idmap>
-   <cpu>
--    <topology sockets='2' dies='1' cores='1' threads='1'/>
-+    <topology sockets='2' dies='1' clusters='1' cores='1' threads='1'/>
-     <numa>
-       <cell id='0' cpus='0-1' memory='219136' unit='KiB'/>
-     </numa>
-diff --git a/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-label.xml b/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-label.xml
-index c9d54a6..db0d67e 100644
---- a/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-label.xml
-+++ b/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-label.xml
-@@ -14,7 +14,7 @@
-     <gid start='0' target='1000' count='10'/>
-   </idmap>
-   <cpu>
--    <topology sockets='2' dies='1' cores='1' threads='1'/>
-+    <topology sockets='2' dies='1' clusters='1' cores='1' threads='1'/>
-     <numa>
-       <cell id='0' cpus='0-1' memory='219136' unit='KiB'/>
-     </numa>
-diff --git a/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-pmem.xml b/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-pmem.xml
-index 391d70f..bfa1589 100644
---- a/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-pmem.xml
-+++ b/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-pmem.xml
-@@ -14,7 +14,7 @@
-     <gid start='0' target='1000' count='10'/>
-   </idmap>
-   <cpu>
+diff --git a/tests/qemuxml2xmloutdata/memory-hotplug-multiple.x86_64-latest.xml b/tests/qemuxml2xmloutdata/memory-hotplug-multiple.x86_64-latest.xml
+index 42b0f7b880..b3306fb569 100644
+--- a/tests/qemuxml2xmloutdata/memory-hotplug-multiple.x86_64-latest.xml
++++ b/tests/qemuxml2xmloutdata/memory-hotplug-multiple.x86_64-latest.xml
+@@ -11,7 +11,7 @@
+   </os>
+   <cpu mode='custom' match='exact' check='none'>
+     <model fallback='forbid'>qemu64</model>
 -    <topology sockets='2' dies='1' cores='1' threads='1'/>
 +    <topology sockets='2' dies='1' clusters='1' cores='1' threads='1'/>
      <numa>
-       <cell id='0' cpus='0-1' memory='219136' unit='KiB'/>
+       <cell id='0' cpus='0-1' memory='2095104' unit='KiB'/>
      </numa>
-diff --git a/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-ppc64.xml b/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-ppc64.xml
-index ae5a17d..e90b462 100644
---- a/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-ppc64.xml
-+++ b/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-ppc64.xml
-@@ -10,7 +10,7 @@
-     <boot dev='hd'/>
+diff --git a/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-ppc64-abi-update.ppc64-latest.xml b/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-ppc64-abi-update.ppc64-latest.xml
+index ae157c4849..4cc0c674df 100644
+--- a/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-ppc64-abi-update.ppc64-latest.xml
++++ b/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-ppc64-abi-update.ppc64-latest.xml
+@@ -11,7 +11,7 @@
    </os>
-   <cpu>
+   <cpu mode='custom' match='exact' check='none'>
+     <model fallback='forbid'>POWER9</model>
 -    <topology sockets='2' dies='1' cores='1' threads='1'/>
 +    <topology sockets='2' dies='1' clusters='1' cores='1' threads='1'/>
      <numa>
        <cell id='0' cpus='0-1' memory='1048576' unit='KiB'/>
      </numa>
-diff --git a/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-readonly.xml b/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-readonly.xml
-index 09b2c5c..bff89db 100644
---- a/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-readonly.xml
-+++ b/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-readonly.xml
-@@ -14,7 +14,7 @@
-     <gid start='0' target='1000' count='10'/>
-   </idmap>
-   <cpu>
--    <topology sockets='2' dies='1' cores='1' threads='1'/>
-+    <topology sockets='2' dies='1' clusters='1' cores='1' threads='1'/>
-     <numa>
-       <cell id='0' cpus='0-1' memory='219136' unit='KiB'/>
-     </numa>
-diff --git a/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm.xml b/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm.xml
-index a32474d..827a7ca 100644
---- a/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm.xml
-+++ b/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm.xml
-@@ -14,7 +14,7 @@
-     <gid start='0' target='1000' count='10'/>
-   </idmap>
-   <cpu>
+diff --git a/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-ppc64.ppc64-latest.xml b/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-ppc64.ppc64-latest.xml
+index 3c1cbc731d..a5c26e3c5b 100644
+--- a/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-ppc64.ppc64-latest.xml
++++ b/tests/qemuxml2xmloutdata/memory-hotplug-nvdimm-ppc64.ppc64-latest.xml
+@@ -11,7 +11,7 @@
+   </os>
+   <cpu mode='custom' match='exact' check='none'>
+     <model fallback='forbid'>POWER9</model>
 -    <topology sockets='2' dies='1' cores='1' threads='1'/>
 +    <topology sockets='2' dies='1' clusters='1' cores='1' threads='1'/>
      <numa>
        <cell id='0' cpus='0-1' memory='1048576' unit='KiB'/>
      </numa>
-diff --git a/tests/qemuxml2xmloutdata/memory-hotplug.xml b/tests/qemuxml2xmloutdata/memory-hotplug.xml
-index 0e5295d..547f613 100644
---- a/tests/qemuxml2xmloutdata/memory-hotplug.xml
-+++ b/tests/qemuxml2xmloutdata/memory-hotplug.xml
-@@ -10,7 +10,7 @@
-     <boot dev='hd'/>
+diff --git a/tests/qemuxml2xmloutdata/memory-hotplug.x86_64-latest.xml b/tests/qemuxml2xmloutdata/memory-hotplug.x86_64-latest.xml
+index 083102e8d6..697819387f 100644
+--- a/tests/qemuxml2xmloutdata/memory-hotplug.x86_64-latest.xml
++++ b/tests/qemuxml2xmloutdata/memory-hotplug.x86_64-latest.xml
+@@ -11,7 +11,7 @@
    </os>
-   <cpu>
+   <cpu mode='custom' match='exact' check='none'>
+     <model fallback='forbid'>qemu64</model>
 -    <topology sockets='2' dies='1' cores='1' threads='1'/>
 +    <topology sockets='2' dies='1' clusters='1' cores='1' threads='1'/>
      <numa>
        <cell id='0' cpus='0-1' memory='219136' unit='KiB'/>
      </numa>
-diff --git a/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-cpuset.xml b/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-cpuset.xml
-index 841ea69..f438a7c 100644
---- a/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-cpuset.xml
-+++ b/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-cpuset.xml
-@@ -12,7 +12,7 @@
-     <boot dev='hd'/>
+diff --git a/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-cpuset.x86_64-latest.xml b/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-cpuset.x86_64-latest.xml
+index 2d04bc23c2..6068a76464 100644
+--- a/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-cpuset.x86_64-latest.xml
++++ b/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-cpuset.x86_64-latest.xml
+@@ -13,7 +13,7 @@
    </os>
-   <cpu>
+   <cpu mode='custom' match='exact' check='none'>
+     <model fallback='forbid'>qemu64</model>
 -    <topology sockets='2' dies='1' cores='1' threads='1'/>
 +    <topology sockets='2' dies='1' clusters='1' cores='1' threads='1'/>
    </cpu>
    <clock offset='utc'/>
    <on_poweroff>destroy</on_poweroff>
-diff --git a/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-no-cpuset-and-placement.xml b/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-no-cpuset-and-placement.xml
-index 2e3998e..4d37383 100644
---- a/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-no-cpuset-and-placement.xml
-+++ b/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-no-cpuset-and-placement.xml
-@@ -12,7 +12,7 @@
-     <boot dev='hd'/>
+diff --git a/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-no-cpuset-and-placement.x86_64-latest.xml b/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-no-cpuset-and-placement.x86_64-latest.xml
+index 80f7284126..6c558526e9 100644
+--- a/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-no-cpuset-and-placement.x86_64-latest.xml
++++ b/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-no-cpuset-and-placement.x86_64-latest.xml
+@@ -13,7 +13,7 @@
    </os>
-   <cpu>
+   <cpu mode='custom' match='exact' check='none'>
+     <model fallback='forbid'>qemu64</model>
 -    <topology sockets='2' dies='1' cores='1' threads='1'/>
 +    <topology sockets='2' dies='1' clusters='1' cores='1' threads='1'/>
    </cpu>
    <clock offset='utc'/>
    <on_poweroff>destroy</on_poweroff>
-diff --git a/tests/qemuxml2xmloutdata/numad-auto-vcpu-no-numatune.xml b/tests/qemuxml2xmloutdata/numad-auto-vcpu-no-numatune.xml
-index 7c1f18c..051606f 100644
---- a/tests/qemuxml2xmloutdata/numad-auto-vcpu-no-numatune.xml
-+++ b/tests/qemuxml2xmloutdata/numad-auto-vcpu-no-numatune.xml
-@@ -12,7 +12,7 @@
-     <boot dev='hd'/>
+diff --git a/tests/qemuxml2xmloutdata/numad-auto-vcpu-no-numatune.x86_64-latest.xml b/tests/qemuxml2xmloutdata/numad-auto-vcpu-no-numatune.x86_64-latest.xml
+index 724209f6e3..6e1fecb488 100644
+--- a/tests/qemuxml2xmloutdata/numad-auto-vcpu-no-numatune.x86_64-latest.xml
++++ b/tests/qemuxml2xmloutdata/numad-auto-vcpu-no-numatune.x86_64-latest.xml
+@@ -13,7 +13,7 @@
    </os>
-   <cpu>
+   <cpu mode='custom' match='exact' check='none'>
+     <model fallback='forbid'>qemu64</model>
 -    <topology sockets='2' dies='1' cores='1' threads='1'/>
 +    <topology sockets='2' dies='1' clusters='1' cores='1' threads='1'/>
    </cpu>
    <clock offset='utc'/>
    <on_poweroff>destroy</on_poweroff>
-diff --git a/tests/qemuxml2xmloutdata/numad-static-vcpu-no-numatune.xml b/tests/qemuxml2xmloutdata/numad-static-vcpu-no-numatune.xml
-index 3d05790..2479852 100644
---- a/tests/qemuxml2xmloutdata/numad-static-vcpu-no-numatune.xml
-+++ b/tests/qemuxml2xmloutdata/numad-static-vcpu-no-numatune.xml
-@@ -9,7 +9,7 @@
-     <boot dev='hd'/>
+diff --git a/tests/qemuxml2xmloutdata/numad-static-vcpu-no-numatune.x86_64-latest.xml b/tests/qemuxml2xmloutdata/numad-static-vcpu-no-numatune.x86_64-latest.xml
+index 2a4ee0d496..c42d7066f9 100644
+--- a/tests/qemuxml2xmloutdata/numad-static-vcpu-no-numatune.x86_64-latest.xml
++++ b/tests/qemuxml2xmloutdata/numad-static-vcpu-no-numatune.x86_64-latest.xml
+@@ -10,7 +10,7 @@
    </os>
-   <cpu>
+   <cpu mode='custom' match='exact' check='none'>
+     <model fallback='forbid'>qemu64</model>
 -    <topology sockets='2' dies='1' cores='1' threads='1'/>
 +    <topology sockets='2' dies='1' clusters='1' cores='1' threads='1'/>
    </cpu>
    <clock offset='utc'/>
    <on_poweroff>destroy</on_poweroff>
-diff --git a/tests/qemuxml2xmloutdata/pci-expander-bus.xml b/tests/qemuxml2xmloutdata/pci-expander-bus.xml
-index 60e4e4a..6f8103b 100644
---- a/tests/qemuxml2xmloutdata/pci-expander-bus.xml
-+++ b/tests/qemuxml2xmloutdata/pci-expander-bus.xml
-@@ -9,7 +9,7 @@
-     <boot dev='hd'/>
+diff --git a/tests/qemuxml2xmloutdata/pci-expander-bus.x86_64-latest.xml b/tests/qemuxml2xmloutdata/pci-expander-bus.x86_64-latest.xml
+index b63c8c145a..2a6c329a40 100644
+--- a/tests/qemuxml2xmloutdata/pci-expander-bus.x86_64-latest.xml
++++ b/tests/qemuxml2xmloutdata/pci-expander-bus.x86_64-latest.xml
+@@ -10,7 +10,7 @@
    </os>
-   <cpu>
+   <cpu mode='custom' match='exact' check='none'>
+     <model fallback='forbid'>qemu64</model>
 -    <topology sockets='2' dies='1' cores='4' threads='2'/>
 +    <topology sockets='2' dies='1' clusters='1' cores='4' threads='2'/>
      <numa>
        <cell id='0' cpus='0-7' memory='109550' unit='KiB'/>
        <cell id='1' cpus='8-15' memory='109550' unit='KiB'/>
-diff --git a/tests/qemuxml2xmloutdata/pcie-expander-bus.xml b/tests/qemuxml2xmloutdata/pcie-expander-bus.xml
-index 452d476..80d5ece 100644
---- a/tests/qemuxml2xmloutdata/pcie-expander-bus.xml
-+++ b/tests/qemuxml2xmloutdata/pcie-expander-bus.xml
-@@ -9,7 +9,7 @@
-     <boot dev='hd'/>
+diff --git a/tests/qemuxml2xmloutdata/pcie-expander-bus.x86_64-latest.xml b/tests/qemuxml2xmloutdata/pcie-expander-bus.x86_64-latest.xml
+index a441be8ebe..99612740b2 100644
+--- a/tests/qemuxml2xmloutdata/pcie-expander-bus.x86_64-latest.xml
++++ b/tests/qemuxml2xmloutdata/pcie-expander-bus.x86_64-latest.xml
+@@ -10,7 +10,7 @@
    </os>
-   <cpu>
+   <cpu mode='custom' match='exact' check='none'>
+     <model fallback='forbid'>qemu64</model>
 -    <topology sockets='2' dies='1' cores='4' threads='2'/>
 +    <topology sockets='2' dies='1' clusters='1' cores='4' threads='2'/>
      <numa>
        <cell id='0' cpus='0-7' memory='109550' unit='KiB'/>
        <cell id='1' cpus='8-15' memory='109550' unit='KiB'/>
-diff --git a/tests/qemuxml2xmloutdata/pseries-phb-numa-node.xml b/tests/qemuxml2xmloutdata/pseries-phb-numa-node.xml
-index b05ac33..35c0e18 100644
---- a/tests/qemuxml2xmloutdata/pseries-phb-numa-node.xml
-+++ b/tests/qemuxml2xmloutdata/pseries-phb-numa-node.xml
-@@ -13,7 +13,7 @@
-     <boot dev='hd'/>
+diff --git a/tests/qemuxml2xmloutdata/pseries-phb-numa-node.ppc64-latest.xml b/tests/qemuxml2xmloutdata/pseries-phb-numa-node.ppc64-latest.xml
+index 59015846fb..0a044f50b0 100644
+--- a/tests/qemuxml2xmloutdata/pseries-phb-numa-node.ppc64-latest.xml
++++ b/tests/qemuxml2xmloutdata/pseries-phb-numa-node.ppc64-latest.xml
+@@ -14,7 +14,7 @@
    </os>
-   <cpu>
+   <cpu mode='custom' match='exact' check='none'>
+     <model fallback='forbid'>POWER9</model>
 -    <topology sockets='2' dies='1' cores='1' threads='4'/>
 +    <topology sockets='2' dies='1' clusters='1' cores='1' threads='4'/>
      <numa>
        <cell id='0' cpus='0-3' memory='1048576' unit='KiB'/>
        <cell id='1' cpus='4-7' memory='1048576' unit='KiB'/>
-diff --git a/tests/qemuxml2xmloutdata/smp.xml b/tests/qemuxml2xmloutdata/smp.xml
-index 3e00f57..0816d5f 100644
---- a/tests/qemuxml2xmloutdata/smp.xml
-+++ b/tests/qemuxml2xmloutdata/smp.xml
-@@ -9,7 +9,7 @@
-     <boot dev='hd'/>
+diff --git a/tests/vmx2xmldata/esx-in-the-wild-10.xml b/tests/vmx2xmldata/esx-in-the-wild-10.xml
+index 47ed637920..78129682bd 100644
+--- a/tests/vmx2xmldata/esx-in-the-wild-10.xml
++++ b/tests/vmx2xmldata/esx-in-the-wild-10.xml
+@@ -12,7 +12,7 @@
+     <type arch='x86_64'>hvm</type>
    </os>
    <cpu>
--    <topology sockets='2' dies='1' cores='1' threads='1'/>
-+    <topology sockets='2' dies='1' clusters='1' cores='1' threads='1'/>
+-    <topology sockets='1' dies='1' cores='2' threads='1'/>
++    <topology sockets='1' dies='1' clusters='1' cores='2' threads='1'/>
    </cpu>
    <clock offset='utc'/>
    <on_poweroff>destroy</on_poweroff>
-diff --git a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-8.xml b/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-8.xml
-index 2011bfb..4b1a9d1 100644
---- a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-8.xml
-+++ b/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-8.xml
+diff --git a/tests/vmx2xmldata/esx-in-the-wild-8.xml b/tests/vmx2xmldata/esx-in-the-wild-8.xml
+index 0eea610709..47d22ced2a 100644
+--- a/tests/vmx2xmldata/esx-in-the-wild-8.xml
++++ b/tests/vmx2xmldata/esx-in-the-wild-8.xml
 @@ -11,7 +11,7 @@
      <type arch='x86_64'>hvm</type>
    </os>
@@ -1134,10 +953,10 @@ index 2011bfb..4b1a9d1 100644
    </cpu>
    <clock offset='utc'/>
    <on_poweroff>destroy</on_poweroff>
-diff --git a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-9.xml b/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-9.xml
-index fa428c1..f7b6eb6 100644
---- a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-9.xml
-+++ b/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-9.xml
+diff --git a/tests/vmx2xmldata/esx-in-the-wild-9.xml b/tests/vmx2xmldata/esx-in-the-wild-9.xml
+index 66eca400dd..ee6be2527f 100644
+--- a/tests/vmx2xmldata/esx-in-the-wild-9.xml
++++ b/tests/vmx2xmldata/esx-in-the-wild-9.xml
 @@ -12,7 +12,7 @@
      <type arch='x86_64'>hvm</type>
    </os>
@@ -1148,5 +967,5 @@ index fa428c1..f7b6eb6 100644
    <clock offset='utc'/>
    <on_poweroff>destroy</on_poweroff>
 -- 
-2.25.1
+2.27.0
 
diff --git a/cpu_topo-support-for-reporting-cluster_id-in-NUMA-to.patch b/conf-Report-CPU-clusters-in-capabilities-XML.patch
similarity index 66%
rename from cpu_topo-support-for-reporting-cluster_id-in-NUMA-to.patch
rename to conf-Report-CPU-clusters-in-capabilities-XML.patch
index 9a214ba8c0152a9086055734662aebcd52495ce5..cea041509b92e463d1fd8248776e267ba70a1da7 100644
--- a/cpu_topo-support-for-reporting-cluster_id-in-NUMA-to.patch
+++ b/conf-Report-CPU-clusters-in-capabilities-XML.patch
@@ -1,62 +1,54 @@
-From baa40f939ab38d80597651aec82779af25599bb0 Mon Sep 17 00:00:00 2001
-From: zhangxinhao <zhangxinhao1@huawei.com>
-Date: Tue, 9 May 2023 23:28:59 +0800
-Subject: cpu_topo: support for reporting cluster_id in NUMA
- topology
+From 6a7873a8facab024a6192a7d1199877ccb22168d Mon Sep 17 00:00:00 2001
+From: Andrea Bolognani <abologna@redhat.com>
+Date: Fri, 5 Jan 2024 16:03:54 +0100
+Subject: [PATCH] conf: Report CPU clusters in capabilities XML
 
-Support report the die_id in the NUMA topology capabilities.
+For machines that don't expose useful information through sysfs,
+the dummy ID 0 is used.
 
-Signed-off-by: zhangxinhao <zhangxinhao1@huawei.com>
+https://issues.redhat.com/browse/RHEL-7043
+
+Signed-off-by: Andrea Bolognani <abologna@redhat.com>
+Reviewed-by: Peter Krempa <pkrempa@redhat.com>
 ---
- docs/schemas/capability.rng                   |  3 ++
- src/conf/capabilities.c                       |  4 ++-
+ src/conf/capabilities.c                       |  5 +-
  src/conf/capabilities.h                       |  1 +
+ src/conf/schemas/capability.rng               |  3 ++
  src/libvirt_linux.syms                        |  1 +
- src/util/virhostcpu.c                         | 22 +++++++++++++
+ src/util/virhostcpu.c                         | 22 +++++++++
  src/util/virhostcpu.h                         |  1 +
- .../vircaps2xmldata/vircaps-aarch64-basic.xml | 32 +++++++++----------
- .../vircaps-x86_64-basic-dies.xml             | 24 +++++++-------
- .../vircaps2xmldata/vircaps-x86_64-basic.xml  | 32 +++++++++----------
- .../vircaps2xmldata/vircaps-x86_64-caches.xml | 16 +++++-----
- .../vircaps-x86_64-resctrl-cdp.xml            | 24 +++++++-------
- .../vircaps-x86_64-resctrl-cmt.xml            | 24 +++++++-------
- .../vircaps-x86_64-resctrl-fake-feature.xml   | 24 +++++++-------
+ tests/capabilityschemadata/caps-qemu-kvm.xml  | 32 ++++++-------
+ .../vircaps-aarch64-basic-clusters.xml        | 16 +++----
+ .../vircaps2xmldata/vircaps-aarch64-basic.xml | 32 ++++++-------
+ .../vircaps-x86_64-basic-dies.xml             | 24 +++++-----
+ .../vircaps2xmldata/vircaps-x86_64-basic.xml  | 32 ++++++-------
+ .../vircaps2xmldata/vircaps-x86_64-caches.xml | 16 +++----
+ tests/vircaps2xmldata/vircaps-x86_64-hmat.xml | 48 +++++++++----------
+ .../vircaps-x86_64-resctrl-cdp.xml            | 24 +++++-----
+ .../vircaps-x86_64-resctrl-cmt.xml            | 24 +++++-----
+ .../vircaps-x86_64-resctrl-fake-feature.xml   | 24 +++++-----
  .../vircaps-x86_64-resctrl-skx-twocaches.xml  |  2 +-
  .../vircaps-x86_64-resctrl-skx.xml            |  2 +-
- .../vircaps-x86_64-resctrl.xml                | 24 +++++++-------
- 16 files changed, 133 insertions(+), 103 deletions(-)
+ .../vircaps-x86_64-resctrl.xml                | 24 +++++-----
+ 19 files changed, 182 insertions(+), 151 deletions(-)
 
-diff --git a/docs/schemas/capability.rng b/docs/schemas/capability.rng
-index 031c55bf20..f5b37d8c18 100644
---- a/docs/schemas/capability.rng
-+++ b/docs/schemas/capability.rng
-@@ -268,6 +268,9 @@
-         <attribute name='die_id'>
-           <ref name='unsignedInt'/>
-         </attribute>
-+        <attribute name='cluster_id'>
-+          <ref name='unsignedInt'/>
-+        </attribute>
-         <attribute name='core_id'>
-           <ref name='unsignedInt'/>
-         </attribute>
 diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c
-index 12c8c3a324..3c3a66a78a 100644
+index 32badee7b3..02298e40a3 100644
 --- a/src/conf/capabilities.c
 +++ b/src/conf/capabilities.c
-@@ -874,9 +874,10 @@ virCapabilitiesHostNUMAFormat(virCapsHostNUMAPtr caps,
-                     return -1;
+@@ -811,9 +811,10 @@ virCapsHostNUMACellCPUFormat(virBuffer *buf,
+                 return -1;
  
-                 virBufferAsprintf(buf,
--                                  " socket_id='%d' die_id='%d' core_id='%d' siblings='%s'",
-+                                  " socket_id='%d' die_id='%d' cluster_id='%d' core_id='%d' siblings='%s'",
-                                   cell->cpus[j].socket_id,
-                                   cell->cpus[j].die_id,
-+                                  cell->cpus[j].cluster_id,
-                                   cell->cpus[j].core_id,
-                                   siblings);
-                 VIR_FREE(siblings);
-@@ -1465,6 +1466,7 @@ virCapabilitiesFillCPUInfo(int cpu_id G_GNUC_UNUSED,
+             virBufferAsprintf(&childBuf,
+-                              " socket_id='%d' die_id='%d' core_id='%d' siblings='%s'",
++                              " socket_id='%d' die_id='%d' cluster_id='%d' core_id='%d' siblings='%s'",
+                               cpus[j].socket_id,
+                               cpus[j].die_id,
++                              cpus[j].cluster_id,
+                               cpus[j].core_id,
+                               siblings);
+         }
+@@ -1453,6 +1454,7 @@ virCapabilitiesFillCPUInfo(int cpu_id G_GNUC_UNUSED,
  
      if (virHostCPUGetSocket(cpu_id, &cpu->socket_id) < 0 ||
          virHostCPUGetDie(cpu_id, &cpu->die_id) < 0 ||
@@ -64,8 +56,16 @@ index 12c8c3a324..3c3a66a78a 100644
          virHostCPUGetCore(cpu_id, &cpu->core_id) < 0)
          return -1;
  
+@@ -1712,6 +1714,7 @@ virCapabilitiesHostNUMAInitFake(virCapsHostNUMA *caps)
+                     if (tmp) {
+                         cpus[cid].id = id;
+                         cpus[cid].die_id = 0;
++                        cpus[cid].cluster_id = 0;
+                         cpus[cid].socket_id = s;
+                         cpus[cid].core_id = c;
+                         cpus[cid].siblings = virBitmapNewCopy(siblings);
 diff --git a/src/conf/capabilities.h b/src/conf/capabilities.h
-index e2581fac8b..f88bb412b5 100644
+index 9eaf6e2807..52e395de14 100644
 --- a/src/conf/capabilities.h
 +++ b/src/conf/capabilities.h
 @@ -89,6 +89,7 @@ struct _virCapsHostNUMACellCPU {
@@ -74,8 +74,22 @@ index e2581fac8b..f88bb412b5 100644
      unsigned int die_id;
 +    unsigned int cluster_id;
      unsigned int core_id;
-     virBitmapPtr siblings;
+     virBitmap *siblings;
  };
+diff --git a/src/conf/schemas/capability.rng b/src/conf/schemas/capability.rng
+index b1968df258..a1606941e7 100644
+--- a/src/conf/schemas/capability.rng
++++ b/src/conf/schemas/capability.rng
+@@ -201,6 +201,9 @@
+         <attribute name="die_id">
+           <ref name="unsignedInt"/>
+         </attribute>
++        <attribute name="cluster_id">
++          <ref name="unsignedInt"/>
++        </attribute>
+         <attribute name="core_id">
+           <ref name="unsignedInt"/>
+         </attribute>
 diff --git a/src/libvirt_linux.syms b/src/libvirt_linux.syms
 index 55649ae39c..004cbfee97 100644
 --- a/src/libvirt_linux.syms
@@ -89,10 +103,10 @@ index 55649ae39c..004cbfee97 100644
  virHostCPUGetDie;
  virHostCPUGetInfoPopulateLinux;
 diff --git a/src/util/virhostcpu.c b/src/util/virhostcpu.c
-index 8c8fc3a476..d2ac31e784 100644
+index 4027547e1e..a3781ca870 100644
 --- a/src/util/virhostcpu.c
 +++ b/src/util/virhostcpu.c
-@@ -240,6 +240,28 @@ virHostCPUGetDie(unsigned int cpu, unsigned int *die)
+@@ -232,6 +232,28 @@ virHostCPUGetDie(unsigned int cpu, unsigned int *die)
      return 0;
  }
  
@@ -103,13 +117,13 @@ index 8c8fc3a476..d2ac31e784 100644
 +    int ret = virFileReadValueInt(&cluster_id,
 +                                  "%s/cpu/cpu%u/topology/cluster_id",
 +                                  SYSFS_SYSTEM_PATH, cpu);
++
 +    if (ret == -1)
 +        return -1;
 +
-+    /* If the file is not there, it's 0.
-+     * Another alternative is cluster_id set to -1, meaning that
-+     * the arch does not have cluster_id support. Set @cluster to
-+     * 0 in this case too. */
++    /* If the file doesn't exists (old kernel) or the value contained
++     * in it is -1 (architecture without CPU clusters), report 0 to
++     * indicate the lack of information */
 +    if (ret == -2 || cluster_id < 0)
 +        cluster_id = 0;
 +
@@ -122,17 +136,101 @@ index 8c8fc3a476..d2ac31e784 100644
  virHostCPUGetCore(unsigned int cpu, unsigned int *core)
  {
 diff --git a/src/util/virhostcpu.h b/src/util/virhostcpu.h
-index 9be2e51a38..e3a04c2eeb 100644
+index 5f0d43e069..d7e09bff22 100644
 --- a/src/util/virhostcpu.h
 +++ b/src/util/virhostcpu.h
-@@ -66,6 +66,7 @@ int virHostCPUStatsAssign(virNodeCPUStatsPtr param,
+@@ -68,6 +68,7 @@ int virHostCPUStatsAssign(virNodeCPUStatsPtr param,
  #ifdef __linux__
  int virHostCPUGetSocket(unsigned int cpu, unsigned int *socket);
  int virHostCPUGetDie(unsigned int cpu, unsigned int *die);
 +int virHostCPUGetCluster(unsigned int cpu, unsigned int *cluster);
  int virHostCPUGetCore(unsigned int cpu, unsigned int *core);
  
- virBitmapPtr virHostCPUGetSiblingsList(unsigned int cpu);
+ virBitmap *virHostCPUGetSiblingsList(unsigned int cpu);
+diff --git a/tests/capabilityschemadata/caps-qemu-kvm.xml b/tests/capabilityschemadata/caps-qemu-kvm.xml
+index acdbb362cc..317fa0885f 100644
+--- a/tests/capabilityschemadata/caps-qemu-kvm.xml
++++ b/tests/capabilityschemadata/caps-qemu-kvm.xml
+@@ -64,14 +64,14 @@
+             <sibling id='1' value='21'/>
+           </distances>
+           <cpus num='8'>
+-            <cpu id='0' socket_id='0' die_id='0' core_id='0' siblings='0'/>
+-            <cpu id='2' socket_id='0' die_id='0' core_id='1' siblings='2'/>
+-            <cpu id='4' socket_id='0' die_id='0' core_id='2' siblings='4'/>
+-            <cpu id='6' socket_id='0' die_id='0' core_id='3' siblings='6'/>
+-            <cpu id='8' socket_id='0' die_id='0' core_id='4' siblings='8'/>
+-            <cpu id='10' socket_id='0' die_id='0' core_id='5' siblings='10'/>
+-            <cpu id='12' socket_id='0' die_id='0' core_id='6' siblings='12'/>
+-            <cpu id='14' socket_id='0' die_id='0' core_id='7' siblings='14'/>
++            <cpu id='0' socket_id='0' die_id='0' cluster_id='0' core_id='0' siblings='0'/>
++            <cpu id='2' socket_id='0' die_id='0' cluster_id='0' core_id='1' siblings='2'/>
++            <cpu id='4' socket_id='0' die_id='0' cluster_id='0' core_id='2' siblings='4'/>
++            <cpu id='6' socket_id='0' die_id='0' cluster_id='0' core_id='3' siblings='6'/>
++            <cpu id='8' socket_id='0' die_id='0' cluster_id='0' core_id='4' siblings='8'/>
++            <cpu id='10' socket_id='0' die_id='0' cluster_id='0' core_id='5' siblings='10'/>
++            <cpu id='12' socket_id='0' die_id='0' cluster_id='0' core_id='6' siblings='12'/>
++            <cpu id='14' socket_id='0' die_id='0' cluster_id='0' core_id='7' siblings='14'/>
+           </cpus>
+         </cell>
+         <cell id='1'>
+@@ -84,14 +84,14 @@
+             <sibling id='1' value='10'/>
+           </distances>
+           <cpus num='8'>
+-            <cpu id='1' socket_id='1' die_id='0' core_id='0' siblings='1'/>
+-            <cpu id='3' socket_id='1' die_id='0' core_id='1' siblings='3'/>
+-            <cpu id='5' socket_id='1' die_id='0' core_id='2' siblings='5'/>
+-            <cpu id='7' socket_id='1' die_id='0' core_id='3' siblings='7'/>
+-            <cpu id='9' socket_id='1' die_id='0' core_id='4' siblings='9'/>
+-            <cpu id='11' socket_id='1' die_id='0' core_id='5' siblings='11'/>
+-            <cpu id='13' socket_id='1' die_id='0' core_id='6' siblings='13'/>
+-            <cpu id='15' socket_id='1' die_id='0' core_id='7' siblings='15'/>
++            <cpu id='1' socket_id='1' die_id='0' cluster_id='0' core_id='0' siblings='1'/>
++            <cpu id='3' socket_id='1' die_id='0' cluster_id='0' core_id='1' siblings='3'/>
++            <cpu id='5' socket_id='1' die_id='0' cluster_id='0' core_id='2' siblings='5'/>
++            <cpu id='7' socket_id='1' die_id='0' cluster_id='0' core_id='3' siblings='7'/>
++            <cpu id='9' socket_id='1' die_id='0' cluster_id='0' core_id='4' siblings='9'/>
++            <cpu id='11' socket_id='1' die_id='0' cluster_id='0' core_id='5' siblings='11'/>
++            <cpu id='13' socket_id='1' die_id='0' cluster_id='0' core_id='6' siblings='13'/>
++            <cpu id='15' socket_id='1' die_id='0' cluster_id='0' core_id='7' siblings='15'/>
+           </cpus>
+         </cell>
+       </cells>
+diff --git a/tests/vircaps2xmldata/vircaps-aarch64-basic-clusters.xml b/tests/vircaps2xmldata/vircaps-aarch64-basic-clusters.xml
+index fe61fc42cc..b37c8e7a20 100644
+--- a/tests/vircaps2xmldata/vircaps-aarch64-basic-clusters.xml
++++ b/tests/vircaps2xmldata/vircaps-aarch64-basic-clusters.xml
+@@ -14,10 +14,10 @@
+           <pages unit='KiB' size='2048'>4096</pages>
+           <pages unit='KiB' size='1048576'>6144</pages>
+           <cpus num='4'>
+-            <cpu id='0' socket_id='36' die_id='0' core_id='0' siblings='0-1'/>
+-            <cpu id='1' socket_id='36' die_id='0' core_id='0' siblings='0-1'/>
+-            <cpu id='2' socket_id='36' die_id='0' core_id='1' siblings='2-3'/>
+-            <cpu id='3' socket_id='36' die_id='0' core_id='1' siblings='2-3'/>
++            <cpu id='0' socket_id='36' die_id='0' cluster_id='0' core_id='0' siblings='0-1'/>
++            <cpu id='1' socket_id='36' die_id='0' cluster_id='0' core_id='0' siblings='0-1'/>
++            <cpu id='2' socket_id='36' die_id='0' cluster_id='1' core_id='1' siblings='2-3'/>
++            <cpu id='3' socket_id='36' die_id='0' cluster_id='1' core_id='1' siblings='2-3'/>
+           </cpus>
+         </cell>
+         <cell id='1'>
+@@ -26,10 +26,10 @@
+           <pages unit='KiB' size='2048'>6144</pages>
+           <pages unit='KiB' size='1048576'>8192</pages>
+           <cpus num='4'>
+-            <cpu id='4' socket_id='3180' die_id='0' core_id='256' siblings='4-5'/>
+-            <cpu id='5' socket_id='3180' die_id='0' core_id='256' siblings='4-5'/>
+-            <cpu id='6' socket_id='3180' die_id='0' core_id='257' siblings='6-7'/>
+-            <cpu id='7' socket_id='3180' die_id='0' core_id='257' siblings='6-7'/>
++            <cpu id='4' socket_id='3180' die_id='0' cluster_id='256' core_id='256' siblings='4-5'/>
++            <cpu id='5' socket_id='3180' die_id='0' cluster_id='256' core_id='256' siblings='4-5'/>
++            <cpu id='6' socket_id='3180' die_id='0' cluster_id='257' core_id='257' siblings='6-7'/>
++            <cpu id='7' socket_id='3180' die_id='0' cluster_id='257' core_id='257' siblings='6-7'/>
+           </cpus>
+         </cell>
+       </cells>
 diff --git a/tests/vircaps2xmldata/vircaps-aarch64-basic.xml b/tests/vircaps2xmldata/vircaps-aarch64-basic.xml
 index 0a04052c40..5533ae0586 100644
 --- a/tests/vircaps2xmldata/vircaps-aarch64-basic.xml
@@ -323,6 +421,65 @@ index 28f00c0a90..05b33147b7 100644
            </cpus>
          </cell>
        </cells>
+diff --git a/tests/vircaps2xmldata/vircaps-x86_64-hmat.xml b/tests/vircaps2xmldata/vircaps-x86_64-hmat.xml
+index 6fe5751666..2b97354bf3 100644
+--- a/tests/vircaps2xmldata/vircaps-x86_64-hmat.xml
++++ b/tests/vircaps2xmldata/vircaps-x86_64-hmat.xml
+@@ -25,30 +25,30 @@
+             <line value='16' unit='B'/>
+           </cache>
+           <cpus num='24'>
+-            <cpu id='0' socket_id='0' die_id='0' core_id='0' siblings='0'/>
+-            <cpu id='1' socket_id='1' die_id='0' core_id='0' siblings='1'/>
+-            <cpu id='2' socket_id='2' die_id='0' core_id='0' siblings='2'/>
+-            <cpu id='3' socket_id='3' die_id='0' core_id='0' siblings='3'/>
+-            <cpu id='4' socket_id='4' die_id='0' core_id='0' siblings='4'/>
+-            <cpu id='5' socket_id='5' die_id='0' core_id='0' siblings='5'/>
+-            <cpu id='6' socket_id='6' die_id='0' core_id='0' siblings='6'/>
+-            <cpu id='7' socket_id='7' die_id='0' core_id='0' siblings='7'/>
+-            <cpu id='8' socket_id='8' die_id='0' core_id='0' siblings='8'/>
+-            <cpu id='9' socket_id='9' die_id='0' core_id='0' siblings='9'/>
+-            <cpu id='10' socket_id='10' die_id='0' core_id='0' siblings='10'/>
+-            <cpu id='11' socket_id='11' die_id='0' core_id='0' siblings='11'/>
+-            <cpu id='12' socket_id='12' die_id='0' core_id='0' siblings='12'/>
+-            <cpu id='13' socket_id='13' die_id='0' core_id='0' siblings='13'/>
+-            <cpu id='14' socket_id='14' die_id='0' core_id='0' siblings='14'/>
+-            <cpu id='15' socket_id='15' die_id='0' core_id='0' siblings='15'/>
+-            <cpu id='16' socket_id='16' die_id='0' core_id='0' siblings='16'/>
+-            <cpu id='17' socket_id='17' die_id='0' core_id='0' siblings='17'/>
+-            <cpu id='18' socket_id='18' die_id='0' core_id='0' siblings='18'/>
+-            <cpu id='19' socket_id='19' die_id='0' core_id='0' siblings='19'/>
+-            <cpu id='20' socket_id='20' die_id='0' core_id='0' siblings='20'/>
+-            <cpu id='21' socket_id='21' die_id='0' core_id='0' siblings='21'/>
+-            <cpu id='22' socket_id='22' die_id='0' core_id='0' siblings='22'/>
+-            <cpu id='23' socket_id='23' die_id='0' core_id='0' siblings='23'/>
++            <cpu id='0' socket_id='0' die_id='0' cluster_id='0' core_id='0' siblings='0'/>
++            <cpu id='1' socket_id='1' die_id='0' cluster_id='0' core_id='0' siblings='1'/>
++            <cpu id='2' socket_id='2' die_id='0' cluster_id='0' core_id='0' siblings='2'/>
++            <cpu id='3' socket_id='3' die_id='0' cluster_id='0' core_id='0' siblings='3'/>
++            <cpu id='4' socket_id='4' die_id='0' cluster_id='0' core_id='0' siblings='4'/>
++            <cpu id='5' socket_id='5' die_id='0' cluster_id='0' core_id='0' siblings='5'/>
++            <cpu id='6' socket_id='6' die_id='0' cluster_id='0' core_id='0' siblings='6'/>
++            <cpu id='7' socket_id='7' die_id='0' cluster_id='0' core_id='0' siblings='7'/>
++            <cpu id='8' socket_id='8' die_id='0' cluster_id='0' core_id='0' siblings='8'/>
++            <cpu id='9' socket_id='9' die_id='0' cluster_id='0' core_id='0' siblings='9'/>
++            <cpu id='10' socket_id='10' die_id='0' cluster_id='0' core_id='0' siblings='10'/>
++            <cpu id='11' socket_id='11' die_id='0' cluster_id='0' core_id='0' siblings='11'/>
++            <cpu id='12' socket_id='12' die_id='0' cluster_id='0' core_id='0' siblings='12'/>
++            <cpu id='13' socket_id='13' die_id='0' cluster_id='0' core_id='0' siblings='13'/>
++            <cpu id='14' socket_id='14' die_id='0' cluster_id='0' core_id='0' siblings='14'/>
++            <cpu id='15' socket_id='15' die_id='0' cluster_id='0' core_id='0' siblings='15'/>
++            <cpu id='16' socket_id='16' die_id='0' cluster_id='0' core_id='0' siblings='16'/>
++            <cpu id='17' socket_id='17' die_id='0' cluster_id='0' core_id='0' siblings='17'/>
++            <cpu id='18' socket_id='18' die_id='0' cluster_id='0' core_id='0' siblings='18'/>
++            <cpu id='19' socket_id='19' die_id='0' cluster_id='0' core_id='0' siblings='19'/>
++            <cpu id='20' socket_id='20' die_id='0' cluster_id='0' core_id='0' siblings='20'/>
++            <cpu id='21' socket_id='21' die_id='0' cluster_id='0' core_id='0' siblings='21'/>
++            <cpu id='22' socket_id='22' die_id='0' cluster_id='0' core_id='0' siblings='22'/>
++            <cpu id='23' socket_id='23' die_id='0' cluster_id='0' core_id='0' siblings='23'/>
+           </cpus>
+         </cell>
+         <cell id='1'>
 diff --git a/tests/vircaps2xmldata/vircaps-x86_64-resctrl-cdp.xml b/tests/vircaps2xmldata/vircaps-x86_64-resctrl-cdp.xml
 index ee26fe9464..167b217d8e 100644
 --- a/tests/vircaps2xmldata/vircaps-x86_64-resctrl-cdp.xml
@@ -408,7 +565,7 @@ index acdd97ec58..311bb58e6a 100644
          </cell>
        </cells>
 diff --git a/tests/vircaps2xmldata/vircaps-x86_64-resctrl-fake-feature.xml b/tests/vircaps2xmldata/vircaps-x86_64-resctrl-fake-feature.xml
-index 5f3678e072..8f64bcad63 100644
+index 1327d85c98..d85407f0b1 100644
 --- a/tests/vircaps2xmldata/vircaps-x86_64-resctrl-fake-feature.xml
 +++ b/tests/vircaps2xmldata/vircaps-x86_64-resctrl-fake-feature.xml
 @@ -17,12 +17,12 @@
@@ -476,7 +633,7 @@ index bc52480905..38ea0bdc27 100644
          </cell>
        </cells>
 diff --git a/tests/vircaps2xmldata/vircaps-x86_64-resctrl.xml b/tests/vircaps2xmldata/vircaps-x86_64-resctrl.xml
-index c386edd4b0..ea9e2613d7 100644
+index b638bbd1c9..fd854ee91e 100644
 --- a/tests/vircaps2xmldata/vircaps-x86_64-resctrl.xml
 +++ b/tests/vircaps2xmldata/vircaps-x86_64-resctrl.xml
 @@ -17,12 +17,12 @@
@@ -518,5 +675,5 @@ index c386edd4b0..ea9e2613d7 100644
          </cell>
        </cells>
 -- 
-2.25.1
+2.27.0
 
diff --git a/conf-Use-unsigned-long-long-for-timer-frequency.patch b/conf-Use-unsigned-long-long-for-timer-frequency.patch
deleted file mode 100644
index 635ad7a3c2d195b240167cfe4a92eff410ce6f8e..0000000000000000000000000000000000000000
--- a/conf-Use-unsigned-long-long-for-timer-frequency.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From efd4f6469f9f5f6d3a34d250cd80faf59a8dc373 Mon Sep 17 00:00:00 2001
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Wed, 11 Nov 2020 16:50:16 +0100
-Subject: [PATCH 068/108] conf: Use unsigned long long for timer frequency
-
-Although the code in qemuProcessStartValidateTSC works as if the
-timer frequency was already unsigned long long (by using an appropriate
-temporary variable), the virDomainTimerDef structure actually defines
-frequency as unsigned long, which is not guaranteed to be 64b.
-
-Fixes support for frequencies higher than 2^32 - 1 on 32b systems.
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Martin Kletzander <mkletzan@redhat.com>
-(cherry picked from commit 3c7c7cd4d82c2f9a5a59bbd06673b8cd1eb23ce3)
----
- src/conf/domain_conf.c  | 6 +++---
- src/conf/domain_conf.h  | 2 +-
- src/qemu/qemu_command.c | 2 +-
- 3 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
-index a33f9144f5..9c83f4e347 100644
---- a/src/conf/domain_conf.c
-+++ b/src/conf/domain_conf.c
-@@ -13951,7 +13951,7 @@ virDomainTimerDefParseXML(xmlNodePtr node,
-         }
-     }
- 
--    ret = virXPathULong("string(./@frequency)", ctxt, &def->frequency);
-+    ret = virXPathULongLong("string(./@frequency)", ctxt, &def->frequency);
-     if (ret == -1) {
-         def->frequency = 0;
-     } else if (ret < 0) {
-@@ -22259,7 +22259,7 @@ virDomainTimerDefCheckABIStability(virDomainTimerDefPtr src,
-     if (src->name == VIR_DOMAIN_TIMER_NAME_TSC) {
-         if (src->frequency != dst->frequency) {
-             virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
--                           _("Target TSC frequency %lu does not match source %lu"),
-+                           _("Target TSC frequency %llu does not match source %llu"),
-                            dst->frequency, src->frequency);
-             return false;
-         }
-@@ -27355,7 +27355,7 @@ virDomainTimerDefFormat(virBufferPtr buf,
- 
-     if (def->name == VIR_DOMAIN_TIMER_NAME_TSC) {
-         if (def->frequency > 0)
--            virBufferAsprintf(buf, " frequency='%lu'", def->frequency);
-+            virBufferAsprintf(buf, " frequency='%llu'", def->frequency);
- 
-         if (def->mode != -1) {
-             const char *mode
-diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
-index 15b9e79d69..c0a323d465 100644
---- a/src/conf/domain_conf.h
-+++ b/src/conf/domain_conf.h
-@@ -2078,7 +2078,7 @@ struct _virDomainTimerDef {
-     int track;  /* host|guest */
- 
-     /* frequency & mode are only valid for name='tsc' */
--    unsigned long frequency; /* in Hz, unspecified = 0 */
-+    unsigned long long frequency; /* in Hz, unspecified = 0 */
-     int mode;       /* auto|native|emulate|paravirt */
- };
- 
-diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
-index 27b2eef8e5..42f6e10b33 100644
---- a/src/qemu/qemu_command.c
-+++ b/src/qemu/qemu_command.c
-@@ -6761,7 +6761,7 @@ qemuBuildCpuCommandLine(virCommandPtr cmd,
-             break;
-         case VIR_DOMAIN_TIMER_NAME_TSC:
-             if (timer->frequency > 0)
--                virBufferAsprintf(&buf, ",tsc-frequency=%lu", timer->frequency);
-+                virBufferAsprintf(&buf, ",tsc-frequency=%llu", timer->frequency);
-             break;
-         case VIR_DOMAIN_TIMER_NAME_ARMVTIMER:
-             switch (timer->tickpolicy) {
--- 
-2.33.0
-
diff --git a/conf-domain_conf-pin-the-retry_interval-and-retry_ti.patch b/conf-domain_conf-pin-the-retry_interval-and-retry_ti.patch
index 14c09d7e1f80341e17f8f2438cda708a3b0582cf..d8ab57aca60319a9796f8300994d3f0f512bfb60 100644
--- a/conf-domain_conf-pin-the-retry_interval-and-retry_ti.patch
+++ b/conf-domain_conf-pin-the-retry_interval-and-retry_ti.patch
@@ -1,4 +1,4 @@
-From 5d762303253a8cf15204839e93cc3f6e562d3708 Mon Sep 17 00:00:00 2001
+From ca03e9837c3f79217b9375bd1f5f4fda0034ff6b Mon Sep 17 00:00:00 2001
 From: Mao Zhongyi <maozhongyi@cmss.chinamobile.com>
 Date: Sat, 18 Sep 2021 14:20:24 +0800
 Subject: [PATCH] conf/domain_conf: pin the retry_interval and retry_timeout
@@ -10,21 +10,21 @@ Signed-off-by: Mao Zhongyi <maozhongyi@cmss.chinamobile.com>
  1 file changed, 6 insertions(+)
 
 diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
-index a4e9b3290c..4e3bcf479c 100644
+index 0aa514bda3..779130671f 100644
 --- a/src/conf/domain_conf.c
 +++ b/src/conf/domain_conf.c
-@@ -24977,6 +24977,12 @@ virDomainDiskDefFormatDriver(virBufferPtr buf,
-         virBufferAsprintf(&driverBuf, " rerror_policy='%s'",
+@@ -22669,6 +22669,12 @@ virDomainDiskDefFormatDriver(virBuffer *buf,
+         virBufferAsprintf(&attrBuf, " rerror_policy='%s'",
                            virDomainDiskErrorPolicyTypeToString(disk->rerror_policy));
  
 +    if (disk->retry_interval)
-+        virBufferAsprintf(&driverBuf, " retry_interval='%ld'", disk->retry_interval);
++        virBufferAsprintf(&attrBuf, " retry_interval='%lld'", disk->retry_interval);
 +
 +    if (disk->retry_timeout)
-+        virBufferAsprintf(&driverBuf, " retry_timeout='%ld'", disk->retry_timeout);
++        virBufferAsprintf(&attrBuf, " retry_timeout='%lld'", disk->retry_timeout);
 +
      if (disk->iomode)
-         virBufferAsprintf(&driverBuf, " io='%s'",
+         virBufferAsprintf(&attrBuf, " io='%s'",
                            virDomainDiskIoTypeToString(disk->iomode));
 -- 
 2.27.0
diff --git a/conf-implement-support-for-vhostuser-disk.patch b/conf-implement-support-for-vhostuser-disk.patch
deleted file mode 100644
index a7c61fed87bd2885230f20ba67917b9b1291c5e7..0000000000000000000000000000000000000000
--- a/conf-implement-support-for-vhostuser-disk.patch
+++ /dev/null
@@ -1,617 +0,0 @@
-From 02565aca5158fb4d9870546ea29be85278649511 Mon Sep 17 00:00:00 2001
-From: Luo Yifan <luoyifan_yewu@cmss.chinamobile.com>
-Date: Wed, 30 Nov 2022 18:13:36 +0800
-Subject: [PATCH 15/24] conf: implement support for vhostuser disk
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Reviewed-by: Peter Krempa <pkrempa@redhat.com>
-(cherry picked from commit f00fe96eb045eed2b6b40d5046449bec6d495875)
-Signed-off-by: Luo Yifan <luoyifan_yewu@cmss.chinamobile.com>
----
- src/conf/domain_conf.c                        | 254 ++++++++++++++++++
- src/libxl/xen_xl.c                            |   1 +
- src/qemu/qemu_block.c                         |   6 +
- src/qemu/qemu_command.c                       |   1 +
- src/qemu/qemu_driver.c                        |   4 +
- src/qemu/qemu_migration.c                     |   2 +
- src/util/virstoragefile.c                     |   4 +
- src/util/virstoragefile.h                     |   4 +
- tests/qemuxml2argvdata/disk-vhostuser.xml     |  30 +++
- .../disk-vhostuser.x86_64-latest.xml          |  48 ++++
- tests/qemuxml2xmltest.c                       |   1 +
- 11 files changed, 355 insertions(+)
- create mode 100644 tests/qemuxml2argvdata/disk-vhostuser.xml
- create mode 100644 tests/qemuxml2xmloutdata/disk-vhostuser.x86_64-latest.xml
-
-diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
-index b60b9d31a1..8b1ca76d39 100644
---- a/src/conf/domain_conf.c
-+++ b/src/conf/domain_conf.c
-@@ -1278,6 +1278,17 @@ static virClassPtr virDomainXMLOptionClass;
- static void virDomainObjDispose(void *obj);
- static void virDomainXMLOptionDispose(void *obj);
- 
-+static int
-+virDomainChrSourceDefFormat(virBufferPtr buf,
-+                            virDomainChrSourceDefPtr def,
-+                            unsigned int flags);
-+
-+
-+static int
-+virDomainChrSourceReconnectDefParseXML(virDomainChrSourceReconnectDefPtr def,
-+                                       xmlNodePtr node,
-+                                       xmlXPathContextPtr ctxt);
-+
- static int virDomainObjOnceInit(void)
- {
-     if (!VIR_CLASS_NEW(virDomainObj, virClassForObjectLockable()))
-@@ -5200,6 +5211,12 @@ virDomainDiskDefPostParse(virDomainDiskDefPtr disk,
-             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_NONE;
-+    }
-+
-     if (disk->info.type == VIR_DOMAIN_DEVICE_ADDRESS_TYPE_NONE &&
-         virDomainDiskDefAssignAddress(xmlopt, disk, def) < 0) {
-         return -1;
-@@ -5995,6 +6012,174 @@ virDomainDiskAddressDiskBusCompatibility(virDomainDiskBus bus,
-     return true;
- }
- 
-+static int
-+virDomainDiskVhostUserValidate(const virDomainDiskDef *disk)
-+{
-+    if (disk->bus != VIR_DOMAIN_DISK_BUS_VIRTIO) {
-+        virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-+                       _("vhostuser disk supports only virtio bus"));
-+        return -1;
-+    }
-+
-+    if (disk->snapshot != VIR_DOMAIN_SNAPSHOT_LOCATION_NONE) {
-+        virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-+                       _("only snapshot=no is supported with vhostuser disk"));
-+        return -1;
-+    }
-+
-+    /* Unsupported driver attributes */
-+
-+    if (disk->cachemode != VIR_DOMAIN_DISK_CACHE_DEFAULT) {
-+        virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-+                       _("cache is not supported with vhostuser disk"));
-+        return -1;
-+    }
-+
-+    if (disk->error_policy || disk->rerror_policy) {
-+        virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-+                       _("error_policy is not supported with vhostuser disk"));
-+        return -1;
-+    }
-+
-+    if (disk->iomode) {
-+        virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-+                       _("io is not supported with vhostuser disk"));
-+        return -1;
-+    }
-+
-+    if (disk->ioeventfd != VIR_TRISTATE_SWITCH_ABSENT) {
-+        virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-+                       _("ioeventfd is not supported with vhostuser disk"));
-+        return -1;
-+    }
-+
-+    if (disk->copy_on_read) {
-+        virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-+                       _("copy_on_read is not supported with vhostuser disk"));
-+        return -1;
-+    }
-+
-+    if (disk->discard) {
-+        virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-+                       _("discard is not supported with vhostuser disk"));
-+        return -1;
-+    }
-+
-+    if (disk->iothread) {
-+        virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-+                       _("iothread is not supported with vhostuser disk"));
-+        return -1;
-+    }
-+
-+    if (disk->detect_zeroes) {
-+        virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-+                       _("detect_zeroes is not supported with vhostuser disk"));
-+        return -1;
-+    }
-+
-+    /* Unsupported driver elements */
-+
-+    if (disk->virtio) {
-+        if (disk->virtio->iommu != VIR_TRISTATE_SWITCH_ABSENT) {
-+            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-+                           _("iommu is not supported with vhostuser disk"));
-+            return -1;
-+        }
-+
-+        if (disk->virtio->ats != VIR_TRISTATE_SWITCH_ABSENT) {
-+            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-+                           _("ats is not supported with vhostuser disk"));
-+            return -1;
-+        }
-+    }
-+
-+    /* Unsupported disk elements */
-+
-+    if (disk->blkdeviotune.group_name ||
-+        virDomainBlockIoTuneInfoHasAny(&disk->blkdeviotune)) {
-+        virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-+                       _("iotune is not supported with vhostuser disk"));
-+        return -1;
-+    }
-+
-+    if (disk->src->backingStore) {
-+        virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-+                       _("backingStore is not supported with vhostuser disk"));
-+        return -1;
-+    }
-+
-+    if (disk->src->encryption) {
-+        virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-+                       _("encryption is not supported with vhostuser disk"));
-+        return -1;
-+    }
-+
-+    if (disk->src->readonly) {
-+        virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-+                       _("readonly is not supported with vhostuser disk"));
-+        return -1;
-+    }
-+
-+    if (disk->src->shared) {
-+        virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-+                       _("shareable is not supported with vhostuser disk"));
-+        return -1;
-+    }
-+
-+    if (disk->transient) {
-+        virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-+                       _("transient is not supported with vhostuser disk"));
-+        return -1;
-+    }
-+
-+    if (disk->serial) {
-+        virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-+                       _("serial is not supported with vhostuser disk"));
-+        return -1;
-+    }
-+
-+    if (disk->wwn) {
-+        virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-+                       _("wwn is not supported with vhostuser disk"));
-+        return -1;
-+    }
-+
-+    if (disk->vendor) {
-+        virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-+                       _("vendor is not supported with vhostuser disk"));
-+        return -1;
-+    }
-+
-+    if (disk->product) {
-+        virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-+                       _("product is not supported with vhostuser disk"));
-+        return -1;
-+    }
-+
-+    if (disk->src->auth) {
-+        virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-+                       _("auth is not supported with vhostuser disk"));
-+        return -1;
-+    }
-+
-+    if (disk->geometry.cylinders > 0 ||
-+        disk->geometry.heads > 0 ||
-+        disk->geometry.sectors > 0 ||
-+        disk->geometry.trans != VIR_DOMAIN_DISK_TRANS_DEFAULT) {
-+        virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-+                       _("geometry is not supported with vhostuser disk"));
-+        return -1;
-+    }
-+
-+    if (disk->blockio.logical_block_size > 0 ||
-+        disk->blockio.physical_block_size > 0) {
-+        virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-+                       _("blockio is not supported with vhostuser disk"));
-+        return -1;
-+    }
-+
-+    return 0;
-+}
- 
- static int
- virSecurityDeviceLabelDefValidateXML(virSecurityDeviceLabelDefPtr *seclabels,
-@@ -6095,6 +6280,11 @@ virDomainDiskDefValidate(const virDomainDef *def,
-         }
-     }
- 
-+    if (disk->src->type == VIR_STORAGE_TYPE_VHOST_USER &&
-+        virDomainDiskVhostUserValidate(disk) < 0) {
-+        return -1;
-+    }
-+
-     for (next = disk->src; next; next = next->backingStore) {
-         if (virSecurityDeviceLabelDefValidateXML(next->seclabels,
-                                                  next->nseclabels,
-@@ -9530,6 +9720,47 @@ virDomainDiskSourceNetworkParse(xmlNodePtr node,
-     return 0;
- }
- 
-+static int
-+virDomainDiskSourceVHostUserParse(xmlNodePtr node,
-+                                  virStorageSourcePtr src,
-+                                  virDomainXMLOptionPtr xmlopt,
-+                                  xmlXPathContextPtr ctxt)
-+{
-+    g_autofree char *type = virXMLPropString(node, "type");
-+    g_autofree char *path = virXMLPropString(node, "path");
-+
-+    if (!type) {
-+        virReportError(VIR_ERR_XML_ERROR, "%s",
-+                       _("missing 'type' attribute for vhostuser disk source"));
-+        return -1;
-+    }
-+
-+    if (STRNEQ(type, "unix")) {
-+        virReportError(VIR_ERR_XML_ERROR, "%s",
-+                       _("invalid 'type' attribute for vhostuser disk source"));
-+        return -1;
-+    }
-+
-+    if (!path) {
-+        virReportError(VIR_ERR_XML_ERROR, "%s",
-+                       _("missing 'path' attribute for vhostuser disk source"));
-+        return -1;
-+    }
-+
-+    if (!(src->vhostuser = virDomainChrSourceDefNew(xmlopt)))
-+        return -1;
-+
-+    src->vhostuser->type = virDomainChrTypeFromString(type);
-+    src->vhostuser->data.nix.path = g_steal_pointer(&path);
-+
-+    if (virDomainChrSourceReconnectDefParseXML(&src->vhostuser->data.nix.reconnect,
-+                                               node,
-+                                               ctxt) < 0) {
-+        return -1;
-+    }
-+
-+    return 0;
-+}
- 
- static int
- virDomainDiskSourceNVMeParse(xmlNodePtr node,
-@@ -9746,6 +9977,10 @@ virDomainStorageSourceParse(xmlNodePtr node,
-         if (virDomainDiskSourceNVMeParse(node, ctxt, src) < 0)
-             return -1;
-         break;
-+    case VIR_STORAGE_TYPE_VHOST_USER:
-+        if (virDomainDiskSourceVHostUserParse(node, src, xmlopt, ctxt) < 0)
-+            return -1;
-+        break;
-     case VIR_STORAGE_TYPE_NONE:
-     case VIR_STORAGE_TYPE_LAST:
-         virReportError(VIR_ERR_INTERNAL_ERROR,
-@@ -24682,6 +24917,21 @@ virDomainDiskSourceNVMeFormat(virBufferPtr attrBuf,
-     virPCIDeviceAddressFormat(childBuf, nvme->pciAddr, false);
- }
- 
-+static void
-+virDomainChrSourceReconnectDefFormat(virBufferPtr buf,
-+                                     virDomainChrSourceReconnectDefPtr def);
-+
-+
-+static void
-+virDomainDiskSourceVhostuserFormat(virBufferPtr attrBuf,
-+                                   virBufferPtr childBuf,
-+                                   virDomainChrSourceDefPtr vhostuser)
-+{
-+    virBufferAddLit(attrBuf, " type='unix'");
-+    virBufferAsprintf(attrBuf, " path='%s'", vhostuser->data.nix.path);
-+
-+    virDomainChrSourceReconnectDefFormat(childBuf, &vhostuser->data.nix.reconnect);
-+}
- 
- static int
- virDomainDiskSourceFormatPrivateData(virBufferPtr buf,
-@@ -24796,6 +25046,10 @@ virDomainDiskSourceFormat(virBufferPtr buf,
-         virDomainDiskSourceNVMeFormat(&attrBuf, &childBuf, src->nvme);
-         break;
- 
-+    case VIR_STORAGE_TYPE_VHOST_USER:
-+        virDomainDiskSourceVhostuserFormat(&attrBuf, &childBuf, src->vhostuser);
-+        break;
-+
-     case VIR_STORAGE_TYPE_NONE:
-     case VIR_STORAGE_TYPE_LAST:
-         virReportError(VIR_ERR_INTERNAL_ERROR,
-diff --git a/src/libxl/xen_xl.c b/src/libxl/xen_xl.c
-index 91b1825399..08eea48d6c 100644
---- a/src/libxl/xen_xl.c
-+++ b/src/libxl/xen_xl.c
-@@ -1641,6 +1641,7 @@ xenFormatXLDiskSrc(virStorageSourcePtr src, char **srcstr)
- 
-     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;
-diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c
-index d32277d7fd..8bd6238238 100644
---- a/src/qemu/qemu_block.c
-+++ b/src/qemu/qemu_block.c
-@@ -1108,6 +1108,11 @@ qemuBlockStorageSourceGetBackendProps(virStorageSourcePtr src,
-             return NULL;
-         break;
- 
-+    case VIR_STORAGE_TYPE_VHOST_USER:
-+        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-+                       _("unable to create blockdev props for vhostuser disk type"));
-+        return NULL;
-+
-     case VIR_STORAGE_TYPE_VOLUME:
-         virReportError(VIR_ERR_INTERNAL_ERROR,
-                        _("storage source pool '%s' volume '%s' is not translated"),
-@@ -2491,6 +2496,7 @@ qemuBlockStorageSourceCreateGetStorageProps(virStorageSourcePtr src,
-     case VIR_STORAGE_TYPE_DIR:
-     case VIR_STORAGE_TYPE_VOLUME:
-     case VIR_STORAGE_TYPE_NVME:
-+    case VIR_STORAGE_TYPE_VHOST_USER:
-         return 0;
- 
-     case VIR_STORAGE_TYPE_NONE:
-diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
-index 9157008b73..bc62843783 100644
---- a/src/qemu/qemu_command.c
-+++ b/src/qemu/qemu_command.c
-@@ -1166,6 +1166,7 @@ qemuGetDriveSourceString(virStorageSourcePtr src,
- 
-     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;
-diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
-index 854b56a563..b2ad021e4d 100644
---- a/src/qemu/qemu_driver.c
-+++ b/src/qemu/qemu_driver.c
-@@ -14536,6 +14536,7 @@ qemuDomainSnapshotPrepareDiskExternalInactive(virDomainSnapshotDiskDefPtr snapdi
-     case VIR_STORAGE_TYPE_DIR:
-     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:
-         virReportError(VIR_ERR_INTERNAL_ERROR,
-@@ -14553,6 +14554,7 @@ qemuDomainSnapshotPrepareDiskExternalInactive(virDomainSnapshotDiskDefPtr snapdi
-     case VIR_STORAGE_TYPE_DIR:
-     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:
-         virReportError(VIR_ERR_INTERNAL_ERROR,
-@@ -14621,6 +14623,7 @@ qemuDomainSnapshotPrepareDiskExternalActive(virDomainSnapshotDiskDefPtr snapdisk
-     case VIR_STORAGE_TYPE_DIR:
-     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:
-         virReportError(VIR_ERR_INTERNAL_ERROR,
-@@ -14749,6 +14752,7 @@ qemuDomainSnapshotPrepareDiskInternal(virDomainDiskDefPtr disk,
-     case VIR_STORAGE_TYPE_DIR:
-     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:
-         virReportError(VIR_ERR_INTERNAL_ERROR,
-diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
-index 1c48138ce3..faf4e223a8 100644
---- a/src/qemu/qemu_migration.c
-+++ b/src/qemu/qemu_migration.c
-@@ -228,6 +228,7 @@ qemuMigrationDstPrecreateDisk(virConnectPtr conn,
-     case VIR_STORAGE_TYPE_BLOCK:
-     case VIR_STORAGE_TYPE_DIR:
-     case VIR_STORAGE_TYPE_NVME:
-+    case VIR_STORAGE_TYPE_VHOST_USER:
-     case VIR_STORAGE_TYPE_NONE:
-     case VIR_STORAGE_TYPE_LAST:
-         virReportError(VIR_ERR_INTERNAL_ERROR,
-@@ -1358,6 +1359,7 @@ qemuMigrationSrcIsSafe(virDomainDefPtr def,
-             unsafe = true;
-             break;
- 
-+        case VIR_STORAGE_TYPE_VHOST_USER:
-         case VIR_STORAGE_TYPE_NONE:
-         case VIR_STORAGE_TYPE_BLOCK:
-         case VIR_STORAGE_TYPE_DIR:
-diff --git a/src/util/virstoragefile.c b/src/util/virstoragefile.c
-index ffc8bdb344..2515dbf5ed 100644
---- a/src/util/virstoragefile.c
-+++ b/src/util/virstoragefile.c
-@@ -56,6 +56,7 @@ VIR_ENUM_IMPL(virStorage,
-               "network",
-               "volume",
-               "nvme",
-+              "vhostuser",
- );
- 
- VIR_ENUM_IMPL(virStorageFileFormat,
-@@ -2617,6 +2618,7 @@ virStorageSourceIsLocalStorage(const virStorageSource *src)
-         /* While NVMe disks are local, they are not accessible via src->path.
-          * Therefore, we have to return false here. */
-     case VIR_STORAGE_TYPE_NVME:
-+    case VIR_STORAGE_TYPE_VHOST_USER:
-     case VIR_STORAGE_TYPE_LAST:
-     case VIR_STORAGE_TYPE_NONE:
-         return false;
-@@ -4164,6 +4166,7 @@ virStorageSourceUpdatePhysicalSize(virStorageSourcePtr src,
-     /* We shouldn't get VOLUME, but the switch requires all cases */
-     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:
-         return -1;
-@@ -4610,6 +4613,7 @@ virStorageSourceIsRelative(virStorageSourcePtr src)
-     case VIR_STORAGE_TYPE_NETWORK:
-     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:
-         return false;
-diff --git a/src/util/virstoragefile.h b/src/util/virstoragefile.h
-index 7939c09cd5..f2096b8705 100644
---- a/src/util/virstoragefile.h
-+++ b/src/util/virstoragefile.h
-@@ -28,6 +28,7 @@
- #include "virseclabel.h"
- #include "virstorageencryption.h"
- #include "virsecret.h"
-+#include "../conf/virconftypes.h"
- #include "virenum.h"
- #include "virpci.h"
- 
-@@ -52,6 +53,7 @@ typedef enum {
-     VIR_STORAGE_TYPE_NETWORK,
-     VIR_STORAGE_TYPE_VOLUME,
-     VIR_STORAGE_TYPE_NVME,
-+    VIR_STORAGE_TYPE_VHOST_USER,
- 
-     VIR_STORAGE_TYPE_LAST
- } virStorageType;
-@@ -302,6 +304,8 @@ struct _virStorageSource {
- 
-     virStorageSourceNVMeDefPtr nvme; /* type == VIR_STORAGE_TYPE_NVME */
- 
-+    virDomainChrSourceDefPtr vhostuser; /* type == VIR_STORAGE_TYPE_VHOST_USER */
-+
-     virStorageSourceInitiatorDef initiator;
- 
-     virObjectPtr privateData;
-diff --git a/tests/qemuxml2argvdata/disk-vhostuser.xml b/tests/qemuxml2argvdata/disk-vhostuser.xml
-new file mode 100644
-index 0000000000..c96ef9119c
---- /dev/null
-+++ b/tests/qemuxml2argvdata/disk-vhostuser.xml
-@@ -0,0 +1,30 @@
-+<domain type='qemu'>
-+  <name>QEMUGuest1</name>
-+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
-+  <memory unit='KiB'>219136</memory>
-+  <currentMemory unit='KiB'>219136</currentMemory>
-+  <memoryBacking>
-+    <source type='memfd'/>
-+    <access mode='shared'/>
-+  </memoryBacking>
-+  <vcpu placement='static'>1</vcpu>
-+  <os>
-+    <type arch='i686' machine='pc'>hvm</type>
-+  </os>
-+  <devices>
-+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
-+    <disk type='vhostuser' device='disk'>
-+      <driver name='qemu' type='raw'/>
-+      <source type='unix' path='/tmp/vhost1.sock'/>
-+      <target dev='vda' bus='virtio'/>
-+      <boot order='1'/>
-+    </disk>
-+    <disk type='vhostuser' device='disk'>
-+      <driver name='qemu' type='raw'/>
-+      <source type='unix' path='/tmp/vhost1.sock'>
-+        <reconnect enabled='yes' timeout='10'/>
-+      </source>
-+      <target dev='vdb' bus='virtio'/>
-+    </disk>
-+  </devices>
-+</domain>
-diff --git a/tests/qemuxml2xmloutdata/disk-vhostuser.x86_64-latest.xml b/tests/qemuxml2xmloutdata/disk-vhostuser.x86_64-latest.xml
-new file mode 100644
-index 0000000000..9712dc0b12
---- /dev/null
-+++ b/tests/qemuxml2xmloutdata/disk-vhostuser.x86_64-latest.xml
-@@ -0,0 +1,48 @@
-+<domain type='qemu'>
-+  <name>QEMUGuest1</name>
-+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
-+  <memory unit='KiB'>219136</memory>
-+  <currentMemory unit='KiB'>219136</currentMemory>
-+  <memoryBacking>
-+    <source type='memfd'/>
-+    <access mode='shared'/>
-+  </memoryBacking>
-+  <vcpu placement='static'>1</vcpu>
-+  <os>
-+    <type arch='i686' machine='pc'>hvm</type>
-+  </os>
-+  <cpu mode='custom' match='exact' check='none'>
-+    <model fallback='forbid'>qemu64</model>
-+  </cpu>
-+  <clock offset='utc'/>
-+  <on_poweroff>destroy</on_poweroff>
-+  <on_reboot>restart</on_reboot>
-+  <on_crash>destroy</on_crash>
-+  <devices>
-+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
-+    <disk type='vhostuser' device='disk' snapshot='no'>
-+      <driver name='qemu' type='raw'/>
-+      <source type='unix' path='/tmp/vhost1.sock'/>
-+      <target dev='vda' bus='virtio'/>
-+      <boot order='1'/>
-+      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
-+    </disk>
-+    <disk type='vhostuser' device='disk' snapshot='no'>
-+      <driver name='qemu' type='raw'/>
-+      <source type='unix' path='/tmp/vhost1.sock'>
-+        <reconnect enabled='yes' timeout='10'/>
-+      </source>
-+      <target dev='vdb' bus='virtio'/>
-+      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
-+    </disk>
-+    <controller type='usb' index='0' model='piix3-uhci'>
-+      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
-+    </controller>
-+    <controller type='pci' index='0' model='pci-root'/>
-+    <input type='mouse' bus='ps2'/>
-+    <input type='keyboard' bus='ps2'/>
-+    <memballoon model='virtio'>
-+      <address type='pci' domain='0x0000' bus='0x00' slot='0x04' function='0x0'/>
-+    </memballoon>
-+  </devices>
-+</domain>
-diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
-index 3a2539596b..2569c27261 100644
---- a/tests/qemuxml2xmltest.c
-+++ b/tests/qemuxml2xmltest.c
-@@ -338,6 +338,7 @@ mymain(void)
-     DO_TEST("disk-network-vxhs", NONE);
-     DO_TEST("disk-network-tlsx509", NONE);
-     DO_TEST("disk-nvme", QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_QCOW2_LUKS);
-+    DO_TEST_CAPS_LATEST("disk-vhostuser");
-     DO_TEST("disk-scsi", QEMU_CAPS_SCSI_LSI, QEMU_CAPS_SCSI_MEGASAS,
-             QEMU_CAPS_SCSI_MPTSAS1068, QEMU_CAPS_SCSI_DISK_WWN);
-     DO_TEST("disk-virtio-scsi-reservations",
--- 
-2.27.0
-
diff --git a/conf-properly-clear-out-autogenerated-macvtap-names-.patch b/conf-properly-clear-out-autogenerated-macvtap-names-.patch
deleted file mode 100644
index 74d94991972e64a6b63d93706e4a2e7b6ba3d570..0000000000000000000000000000000000000000
--- a/conf-properly-clear-out-autogenerated-macvtap-names-.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-From a5ec03f25b225408a9e7ebbf7b9fc9e3e2f15166 Mon Sep 17 00:00:00 2001
-From: Laine Stump <laine@redhat.com>
-Date: Sat, 22 Aug 2020 23:42:52 -0400
-Subject: [PATCH 049/108] conf: properly clear out autogenerated macvtap names
- when formatting/parsing
-
-Back when macvtap support was added in commit 315baab9443 in Feb. 2010
-(libvirt-0.7.7), it was setup to autogenerate a name for the device if
-one wasn't supplied, in the pattern "macvtap%d" (or "macvlan%d"),
-similar to the way an unspecified standard tap device name will lead
-to an autogenerated "vnet%d".
-
-As a matter of fact, in commit ca1b7cc8e45 added in May 2010, the code
-was changed to *always* ignore a supplied device name for macvtap
-interfaces by deleting *any* name immediately during the <interface>
-parsing (this was intended to prevent one domain which had failed to
-completely start from deleting the macvtap device of another domain
-which had subsequently been provided the same device name (this will
-seem mildly ironic later). This was later fixed to only clear the
-device name when inactive XML was being parsed. HOWEVER - this was
-only done if the xml was <interface type='direct'> - autogenerated
-names were not cleared for <interface type='network'> (which could
-also result in a macvtap device).
-
-Although the names of "vnetX" tap devices had always been
-automatically cleared when parsing <interface> (see commit d1304583d
-from July 2008 (!)), at the time macvtap support was added, both vnetX
-and macvtapX device names were always included when formatting the
-XML.
-
-Then in commit a8be259d0cc (July 2011, libvirt-0.9.4), <interface>
-formatting was changed to also clear out "vnetX" device names during
-XML formatting as well. However the same treatment wasn't given to
-"macvtapX".
-
-Now in 2020, there has been a report that a failed migration leads to
-the macvtap device of some other unrelated guest on the destination
-host losing its network connectivity. It was determined that this was
-due to the domain XML in the migration containing a macvtap device
-name, e.g. "macvtap0", that was already in use by the other guest on
-the destination. Normally this wouldn't be a problem, because libvirt
-would see that the device was already in use, and then find a
-different unused name. But in this case, other external problems were
-causing the migration to fail prior to selecting a macvtap device and
-successfully opening it, and during error recovery, qemuProcessStop()
-was called, which went through all def->nets objects and (if they were
-macvtap) deleted the device specified in net->ifname; since libvirt
-hadn't gotten to the point of replacing the incoming "macvtap0" with
-the name of a device it actually created for this guest, that meant
-that "macvtap0" was deleted, *even though it was currently in use by a
-different guest*!
-
-Whew!
-
-So, it turns out that when formatting "migratable" XML, "vnetX"
-devices are omitted, just as when formatting "inactive" XML. By making
-the code in both interface parsing and formatting consistent for
-"vnetX", "macvtapX", and "macvlanX", we can thus make sure that the
-autogenerated (and unneeded / completely *not* wanted) macvtap device
-name will not be sent with the migration XML. This way when a
-migration fails, net->ifname will be NULL, and libvirt won't have any
-device to try and (erroneously) delete.
-
-Signed-off-by: Laine Stump <laine@redhat.com>
-Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
-(cherry picked from commit 282d135ddbb7203565cd5527b451469b14953994)
----
- src/conf/domain_conf.c | 12 ++++--------
- 1 file changed, 4 insertions(+), 8 deletions(-)
-
-diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
-index 54228a2151..d3565ececf 100644
---- a/src/conf/domain_conf.c
-+++ b/src/conf/domain_conf.c
-@@ -12357,14 +12357,6 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt,
-         }
- 
-         def->data.direct.linkdev = g_steal_pointer(&dev);
--
--        if (ifname &&
--            flags & VIR_DOMAIN_DEF_PARSE_INACTIVE &&
--            (STRPREFIX(ifname, VIR_NET_GENERATED_MACVTAP_PREFIX) ||
--             STRPREFIX(ifname, VIR_NET_GENERATED_MACVLAN_PREFIX))) {
--            VIR_FREE(ifname);
--        }
--
-         break;
- 
-     case VIR_DOMAIN_NET_TYPE_HOSTDEV:
-@@ -12410,6 +12402,8 @@ virDomainNetDefParseXML(virDomainXMLOptionPtr xmlopt,
-     if (def->managed_tap != VIR_TRISTATE_BOOL_NO && ifname &&
-         (flags & VIR_DOMAIN_DEF_PARSE_INACTIVE) &&
-         (STRPREFIX(ifname, VIR_NET_GENERATED_TAP_PREFIX) ||
-+         STRPREFIX(ifname, VIR_NET_GENERATED_MACVTAP_PREFIX) ||
-+         STRPREFIX(ifname, VIR_NET_GENERATED_MACVLAN_PREFIX) ||
-          (prefix && STRPREFIX(ifname, prefix)))) {
-         /* An auto-generated target name, blank it out */
-         VIR_FREE(ifname);
-@@ -26263,6 +26257,8 @@ virDomainNetDefFormat(virBufferPtr buf,
-         (def->managed_tap == VIR_TRISTATE_BOOL_NO ||
-          !((flags & VIR_DOMAIN_DEF_FORMAT_INACTIVE) &&
-            (STRPREFIX(def->ifname, VIR_NET_GENERATED_TAP_PREFIX) ||
-+            STRPREFIX(def->ifname, VIR_NET_GENERATED_MACVTAP_PREFIX) ||
-+            STRPREFIX(def->ifname, VIR_NET_GENERATED_MACVLAN_PREFIX) ||
-             (prefix && STRPREFIX(def->ifname, prefix)))))) {
-         /* Skip auto-generated target names for inactive config. */
-         virBufferEscapeString(&attrBuf, " dev='%s'", def->ifname);
--- 
-2.33.0
-
diff --git a/conf-validate-serial-port-model-in-ABI-checks.patch b/conf-validate-serial-port-model-in-ABI-checks.patch
deleted file mode 100644
index 926e02ff7a6cca269a81318300cf94fcb86f6844..0000000000000000000000000000000000000000
--- a/conf-validate-serial-port-model-in-ABI-checks.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 0e6fcb0eb5e3eb499a3cc7232fa1b7bf9f1813a2 Mon Sep 17 00:00:00 2001
-From: jiangdawei15 <jiangdawei15@huawei.com>
-Date: Thu, 11 Aug 2022 21:24:35 +0800
-Subject: [PATCH 06/22] conf: validate serial port model in ABI checks
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The serial port model cannot be allowed to
-change across migration as it affects ABI.
-
-Reviewed-by: Andrea Bolognani <abologna@redhat.com>
-
-Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
-Signed-off-by: Dawei Jiang jiangdawei15@huawei.com
----
- src/conf/domain_conf.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
-index 1689d92c51..2d1726af8f 100644
---- a/src/conf/domain_conf.c
-+++ b/src/conf/domain_conf.c
-@@ -23058,6 +23058,14 @@ virDomainSerialDefCheckABIStability(virDomainChrDefPtr src,
-         return false;
-     }
- 
-+    if (src->targetModel != dst->targetModel) {
-+        virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-+                       _("Target serial model %s does not match source %s"),
-+                       virDomainChrSerialTargetModelTypeToString(dst->targetModel),
-+                       virDomainChrSerialTargetModelTypeToString(src->targetModel));
-+        return false;
-+    }
-+
-     if (src->target.port != dst->target.port) {
-         virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-                        _("Target serial port %d does not match source %d"),
--- 
-2.33.0
-
diff --git a/libvirt-cpu-aarch64-enable-host-model-cpu-for-AArch64-archit.patch b/cpu-aarch64-enable-host-model-cpu-for-AArch64-archit.patch
similarity index 45%
rename from libvirt-cpu-aarch64-enable-host-model-cpu-for-AArch64-archit.patch
rename to cpu-aarch64-enable-host-model-cpu-for-AArch64-archit.patch
index 5391de0b24ee36bda680762a6cd2b07618c45c64..528c761f874b8dbaf497d37294dc1ef690cb9d1d 100644
--- a/libvirt-cpu-aarch64-enable-host-model-cpu-for-AArch64-archit.patch
+++ b/cpu-aarch64-enable-host-model-cpu-for-AArch64-archit.patch
@@ -1,4 +1,4 @@
-From 1e6875a732d896138d3bc2351e5284d1ad13dd59 Mon Sep 17 00:00:00 2001
+From 3650de04c4dc99416b7a2d4edd283217657e77c5 Mon Sep 17 00:00:00 2001
 From: Xu Yandong <xuyandong2@huawei.com>
 Date: Wed, 20 May 2020 02:33:27 -0400
 Subject: [PATCH] cpu/aarch64: enable host-model cpu for AArch64 architecture
@@ -8,16 +8,16 @@ suit, skip hypervisor host-model externsion checking on AArch64
 architecture.
 
 Signed-off-by: Xu Yandong <xuyandong2@huawei.com>
+Signed-off-by: lishusen <lishusen2@huawei.com>
 ---
- src/qemu/qemu_command.c  | 2 +-
- tests/qemuxml2argvtest.c | 2 --
- 2 files changed, 1 insertion(+), 3 deletions(-)
+ src/qemu/qemu_command.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
-index 2f0e919..2f65b8d 100644
+index d54149ed2d..e3cf092828 100644
 --- a/src/qemu/qemu_command.c
 +++ b/src/qemu/qemu_command.c
-@@ -6582,7 +6582,7 @@ qemuBuildCpuModelArgStr(virQEMUDriverPtr driver,
+@@ -6278,7 +6278,7 @@ qemuBuildCpuModelArgStr(virQEMUDriver *driver,
          break;
      }
  
@@ -26,19 +26,6 @@ index 2f0e919..2f65b8d 100644
          cpu->features &&
          !virQEMUCapsGet(qemuCaps, QEMU_CAPS_QUERY_CPU_MODEL_EXPANSION)) {
          virReportError(VIR_ERR_INTERNAL_ERROR,
-diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
-index 596dd7a..2153e44 100644
---- a/tests/qemuxml2argvtest.c
-+++ b/tests/qemuxml2argvtest.c
-@@ -2736,8 +2736,6 @@ mymain(void)
-     DO_TEST("aarch64-noacpi-nouefi", NONE);
-     DO_TEST_PARSE_ERROR("aarch64-acpi-nouefi", NONE);
- 
--    /* 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 */
 -- 
-1.8.3.1
+2.27.0
 
diff --git a/cpu_map-Add-Cooperlake-x86-CPU-model.patch b/cpu_map-Add-Cooperlake-x86-CPU-model.patch
deleted file mode 100644
index 96d36bbad7454f0b8fb3a0fece69ed2e4de02bd4..0000000000000000000000000000000000000000
--- a/cpu_map-Add-Cooperlake-x86-CPU-model.patch
+++ /dev/null
@@ -1,167 +0,0 @@
-From 41717af8988db9c2d9d8b753f306f6deaa1cec8d Mon Sep 17 00:00:00 2001
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Tue, 19 May 2020 15:08:11 +0200
-Subject: [PATCH 2/3] cpu_map: Add Cooperlake x86 CPU model
-
-The stepping range (10-11) is likely incomplete. QEMU uses 10 and the
-CPUID data for Cooperlake show 11. We will update the range if needed
-once more details about he CPU are available.
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
-Signed-off-by: Jingyi Wang <wangjingyi11@huawei.com>
----
- src/cpu_map/index.xml                         |  1 +
- src/cpu_map/x86_Cooperlake.xml                | 89 +++++++++++++++++++
- .../domaincapsdata/qemu_5.0.0-q35.x86_64.xml  |  1 +
- .../domaincapsdata/qemu_5.0.0-tcg.x86_64.xml  |  1 +
- tests/domaincapsdata/qemu_5.0.0.x86_64.xml    |  1 +
- 5 files changed, 93 insertions(+)
- create mode 100644 src/cpu_map/x86_Cooperlake.xml
-
-diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml
-index 672d0a3c92..3ccc76b9ed 100644
---- a/src/cpu_map/index.xml
-+++ b/src/cpu_map/index.xml
-@@ -54,6 +54,7 @@
-     <include filename="x86_Icelake-Client-noTSX.xml"/>
-     <include filename="x86_Icelake-Server.xml"/>
-     <include filename="x86_Icelake-Server-noTSX.xml"/>
-+    <include filename="x86_Cooperlake.xml"/>
- 
-     <!-- AMD CPUs -->
-     <include filename="x86_athlon.xml"/>
-diff --git a/src/cpu_map/x86_Cooperlake.xml b/src/cpu_map/x86_Cooperlake.xml
-new file mode 100644
-index 0000000000..77e695aea4
---- /dev/null
-+++ b/src/cpu_map/x86_Cooperlake.xml
-@@ -0,0 +1,89 @@
-+<cpus>
-+  <model name='Cooperlake'>
-+    <decode host='on' guest='on'/>
-+    <vendor name='Intel'/>
-+    <feature name="3dnowprefetch"/>
-+    <feature name="abm"/>
-+    <feature name="adx"/>
-+    <feature name="aes"/>
-+    <feature name="apic"/>
-+    <feature name="arat"/>
-+    <feature name="arch-capabilities"/>
-+    <feature name="avx"/>
-+    <feature name="avx2"/>
-+    <feature name="avx512-bf16"/>
-+    <feature name="avx512bw"/>
-+    <feature name="avx512cd"/>
-+    <feature name="avx512dq"/>
-+    <feature name="avx512f"/>
-+    <feature name="avx512vl"/>
-+    <feature name="avx512vnni"/>
-+    <feature name="bmi1"/>
-+    <feature name="bmi2"/>
-+    <feature name="clflush"/>
-+    <feature name="clflushopt"/>
-+    <feature name="clwb"/>
-+    <feature name="cmov"/>
-+    <feature name="cx16"/>
-+    <feature name="cx8"/>
-+    <feature name="de"/>
-+    <feature name="erms"/>
-+    <feature name="f16c"/>
-+    <feature name="fma"/>
-+    <feature name="fpu"/>
-+    <feature name="fsgsbase"/>
-+    <feature name="fxsr"/>
-+    <feature name="hle"/>
-+    <feature name="ibrs-all"/>
-+    <feature name="invpcid"/>
-+    <feature name="lahf_lm"/>
-+    <feature name="lm"/>
-+    <feature name="mca"/>
-+    <feature name="mce"/>
-+    <feature name="mds-no"/>
-+    <feature name="mmx"/>
-+    <feature name="movbe"/>
-+    <feature name="msr"/>
-+    <feature name="mtrr"/>
-+    <feature name="nx"/>
-+    <feature name="pae"/>
-+    <feature name="pat"/>
-+    <feature name="pcid"/>
-+    <feature name="pclmuldq"/>
-+    <feature name="pdpe1gb"/>
-+    <feature name="pge"/>
-+    <feature name="pku"/>
-+    <feature name="pni"/>
-+    <feature name="popcnt"/>
-+    <feature name="pschange-mc-no"/>
-+    <feature name="pse"/>
-+    <feature name="pse36"/>
-+    <feature name="rdctl-no"/>
-+    <feature name="rdrand"/>
-+    <feature name="rdseed"/>
-+    <feature name="rdtscp"/>
-+    <feature name="rtm"/>
-+    <feature name="sep"/>
-+    <feature name="skip-l1dfl-vmentry"/>
-+    <feature name="smap"/>
-+    <feature name="smep"/>
-+    <feature name="spec-ctrl"/>
-+    <feature name="ssbd"/>
-+    <feature name="sse"/>
-+    <feature name="sse2"/>
-+    <feature name="sse4.1"/>
-+    <feature name="sse4.2"/>
-+    <feature name="ssse3"/>
-+    <feature name="stibp"/>
-+    <feature name="syscall"/>
-+    <feature name="taa-no"/>
-+    <feature name="tsc"/>
-+    <feature name="tsc-deadline"/>
-+    <feature name="vme"/>
-+    <feature name="x2apic"/>
-+    <feature name="xgetbv1"/>
-+    <feature name="xsave"/>
-+    <feature name="xsavec"/>
-+    <feature name="xsaveopt"/>
-+  </model>
-+</cpus>
-diff --git a/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml
-index ff721530cd..fa945fc002 100644
---- a/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml
-@@ -93,6 +93,7 @@
-       <model usable='no'>EPYC-IBPB</model>
-       <model usable='no'>EPYC</model>
-       <model usable='no'>Dhyana</model>
-+      <model usable='no'>Cooperlake</model>
-       <model usable='yes'>Conroe</model>
-       <model usable='no'>Cascadelake-Server-noTSX</model>
-       <model usable='no'>Cascadelake-Server</model>
-diff --git a/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml b/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml
-index d567863f49..a0eeed7c2d 100644
---- a/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_5.0.0-tcg.x86_64.xml
-@@ -101,6 +101,7 @@
-       <model usable='no'>EPYC-IBPB</model>
-       <model usable='no'>EPYC</model>
-       <model usable='no'>Dhyana</model>
-+      <model usable='no'>Cooperlake</model>
-       <model usable='yes'>Conroe</model>
-       <model usable='no'>Cascadelake-Server-noTSX</model>
-       <model usable='no'>Cascadelake-Server</model>
-diff --git a/tests/domaincapsdata/qemu_5.0.0.x86_64.xml b/tests/domaincapsdata/qemu_5.0.0.x86_64.xml
-index 2c6066003d..fbde7a6ba2 100644
---- a/tests/domaincapsdata/qemu_5.0.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_5.0.0.x86_64.xml
-@@ -92,6 +92,7 @@
-       <model usable='no'>EPYC-IBPB</model>
-       <model usable='no'>EPYC</model>
-       <model usable='no'>Dhyana</model>
-+      <model usable='no'>Cooperlake</model>
-       <model usable='yes'>Conroe</model>
-       <model usable='no'>Cascadelake-Server-noTSX</model>
-       <model usable='no'>Cascadelake-Server</model>
--- 
-2.27.0
-
diff --git a/cpu_map-Add-pschange-mc-no-bit-in-IA32_ARCH_CAPABILI.patch b/cpu_map-Add-pschange-mc-no-bit-in-IA32_ARCH_CAPABILI.patch
deleted file mode 100644
index 79420a720918c2f968903cc9af093e76cb67de66..0000000000000000000000000000000000000000
--- a/cpu_map-Add-pschange-mc-no-bit-in-IA32_ARCH_CAPABILI.patch
+++ /dev/null
@@ -1,131 +0,0 @@
-From 9696e88e150fce9ea82eadb16726c8c3a7a197ae Mon Sep 17 00:00:00 2001
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Mon, 18 May 2020 20:55:42 +0200
-Subject: [PATCH 1/3] cpu_map: Add pschange-mc-no bit in IA32_ARCH_CAPABILITIES
- MSR
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
-Signed-off-by: Jingyi Wang <wangjingyi11@huawei.com>
----
- src/cpu_map/x86_features.xml                             | 3 +++
- tests/cputestdata/x86_64-cpuid-Core-i7-8550U-enabled.xml | 2 +-
- tests/cputestdata/x86_64-cpuid-Core-i7-8550U-guest.xml   | 1 +
- tests/cputestdata/x86_64-cpuid-Core-i7-8550U-host.xml    | 1 +
- tests/cputestdata/x86_64-cpuid-Core-i7-8550U-json.xml    | 1 +
- tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml           | 1 +
- tests/domaincapsdata/qemu_4.2.0.x86_64.xml               | 1 +
- tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml           | 1 +
- tests/domaincapsdata/qemu_5.0.0.x86_64.xml               | 1 +
- 9 files changed, 11 insertions(+), 1 deletion(-)
-
-diff --git a/src/cpu_map/x86_features.xml b/src/cpu_map/x86_features.xml
-index 2c4c29dc99..8525ae0fa5 100644
---- a/src/cpu_map/x86_features.xml
-+++ b/src/cpu_map/x86_features.xml
-@@ -509,6 +509,9 @@
-   <feature name='mds-no'>
-     <msr index='0x10a' edx='0x00000000' eax='0x00000020'/>
-   </feature>
-+  <feature name='pschange-mc-no'>
-+    <msr index='0x10a' edx='0x00000000' eax='0x00000040'/>
-+  </feature>
-   <feature name='tsx-ctrl'>
-     <msr index='0x10a' edx='0x00000000' eax='0x00000080'/>
-   </feature>
-diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-enabled.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-enabled.xml
-index 6c480eeacf..57f8ebabba 100644
---- a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-enabled.xml
-+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-enabled.xml
-@@ -5,5 +5,5 @@
-   <cpuid eax_in='0x00000007' ecx_in='0x00' eax='0x00000000' ebx='0x009c47ab' ecx='0x00000004' edx='0xac000400'/>
-   <cpuid eax_in='0x0000000d' ecx_in='0x01' eax='0x0000000f' ebx='0x00000000' ecx='0x00000000' edx='0x00000000'/>
-   <cpuid eax_in='0x80000001' ecx_in='0x00' eax='0x00000000' ebx='0x00000000' ecx='0x00000121' edx='0x2c100800'/>
--  <msr index='0x10a' edx='0x00000000' eax='0x00000008'/>
-+  <msr index='0x10a' edx='0x00000000' eax='0x00000048'/>
- </cpudata>
-diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-guest.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-guest.xml
-index 92404e4d03..ed06515e99 100644
---- a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-guest.xml
-+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-guest.xml
-@@ -26,6 +26,7 @@
-   <feature policy='require' name='pdpe1gb'/>
-   <feature policy='require' name='invtsc'/>
-   <feature policy='require' name='skip-l1dfl-vmentry'/>
-+  <feature policy='require' name='pschange-mc-no'/>
-   <feature policy='disable' name='hle'/>
-   <feature policy='disable' name='rtm'/>
- </cpu>
-diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-host.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-host.xml
-index 7f6fe2eac3..7681c94649 100644
---- a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-host.xml
-+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-host.xml
-@@ -27,4 +27,5 @@
-   <feature name='pdpe1gb'/>
-   <feature name='invtsc'/>
-   <feature name='skip-l1dfl-vmentry'/>
-+  <feature name='pschange-mc-no'/>
- </cpu>
-diff --git a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-json.xml b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-json.xml
-index 645c0934c2..4774d39c7e 100644
---- a/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-json.xml
-+++ b/tests/cputestdata/x86_64-cpuid-Core-i7-8550U-json.xml
-@@ -14,6 +14,7 @@
-   <feature policy='require' name='xsaves'/>
-   <feature policy='require' name='pdpe1gb'/>
-   <feature policy='require' name='skip-l1dfl-vmentry'/>
-+  <feature policy='require' name='pschange-mc-no'/>
-   <feature policy='disable' name='hle'/>
-   <feature policy='disable' name='rtm'/>
- </cpu>
-diff --git a/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml
-index 1b8b8be2f5..fcb0505da0 100644
---- a/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_4.2.0-q35.x86_64.xml
-@@ -47,6 +47,7 @@
-       <feature policy='require' name='pdpe1gb'/>
-       <feature policy='require' name='invtsc'/>
-       <feature policy='require' name='skip-l1dfl-vmentry'/>
-+      <feature policy='require' name='pschange-mc-no'/>
-     </mode>
-     <mode name='custom' supported='yes'>
-       <model usable='yes'>qemu64</model>
-diff --git a/tests/domaincapsdata/qemu_4.2.0.x86_64.xml b/tests/domaincapsdata/qemu_4.2.0.x86_64.xml
-index 213dcc5a08..e22ef8e032 100644
---- a/tests/domaincapsdata/qemu_4.2.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_4.2.0.x86_64.xml
-@@ -46,6 +46,7 @@
-       <feature policy='require' name='pdpe1gb'/>
-       <feature policy='require' name='invtsc'/>
-       <feature policy='require' name='skip-l1dfl-vmentry'/>
-+      <feature policy='require' name='pschange-mc-no'/>
-     </mode>
-     <mode name='custom' supported='yes'>
-       <model usable='yes'>qemu64</model>
-diff --git a/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml b/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml
-index 45c3e00b1e..ff721530cd 100644
---- a/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_5.0.0-q35.x86_64.xml
-@@ -47,6 +47,7 @@
-       <feature policy='require' name='pdpe1gb'/>
-       <feature policy='require' name='invtsc'/>
-       <feature policy='require' name='skip-l1dfl-vmentry'/>
-+      <feature policy='require' name='pschange-mc-no'/>
-     </mode>
-     <mode name='custom' supported='yes'>
-       <model usable='yes'>qemu64</model>
-diff --git a/tests/domaincapsdata/qemu_5.0.0.x86_64.xml b/tests/domaincapsdata/qemu_5.0.0.x86_64.xml
-index d2a884eed1..2c6066003d 100644
---- a/tests/domaincapsdata/qemu_5.0.0.x86_64.xml
-+++ b/tests/domaincapsdata/qemu_5.0.0.x86_64.xml
-@@ -46,6 +46,7 @@
-       <feature policy='require' name='pdpe1gb'/>
-       <feature policy='require' name='invtsc'/>
-       <feature policy='require' name='skip-l1dfl-vmentry'/>
-+      <feature policy='require' name='pschange-mc-no'/>
-     </mode>
-     <mode name='custom' supported='yes'>
-       <model usable='yes'>qemu64</model>
--- 
-2.27.0
-
diff --git a/cpu_map-Distribute-x86_Cooperlake.xml.patch b/cpu_map-Distribute-x86_Cooperlake.xml.patch
deleted file mode 100644
index bcef2fb93ac2ca71d00dee664026063e027f2834..0000000000000000000000000000000000000000
--- a/cpu_map-Distribute-x86_Cooperlake.xml.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From fc20e12b3be7a4c96ff0a71112d69181408506d1 Mon Sep 17 00:00:00 2001
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Tue, 26 May 2020 12:52:00 +0200
-Subject: [PATCH 3/3] cpu_map: Distribute x86_Cooperlake.xml
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
-Signed-off-by: Jingyi Wang <wangjingyi11@huawei.com>
----
- src/cpu_map/Makefile.inc.am | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/cpu_map/Makefile.inc.am b/src/cpu_map/Makefile.inc.am
-index ab5268d94f..8eb818706a 100644
---- a/src/cpu_map/Makefile.inc.am
-+++ b/src/cpu_map/Makefile.inc.am
-@@ -22,6 +22,7 @@ cpumap_DATA = \
- 	cpu_map/x86_Cascadelake-Server.xml \
- 	cpu_map/x86_Cascadelake-Server-noTSX.xml \
- 	cpu_map/x86_Conroe.xml \
-+	cpu_map/x86_Cooperlake.xml \
- 	cpu_map/x86_core2duo.xml \
- 	cpu_map/x86_coreduo.xml \
- 	cpu_map/x86_cpu64-rhel5.xml \
--- 
-2.27.0
-
diff --git a/cpu_map-Fix-Icelake-Server-model-number.patch b/cpu_map-Fix-Icelake-Server-model-number.patch
deleted file mode 100644
index 0261661c3459f6750598e8b6e95c4e75f1822926..0000000000000000000000000000000000000000
--- a/cpu_map-Fix-Icelake-Server-model-number.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From a70f3b2d8b707063c63fb3b43751651e5fedebb9 Mon Sep 17 00:00:00 2001
-From: Tim Wiederhake <twiederh@redhat.com>
-Date: Wed, 2 Dec 2020 11:38:22 +0100
-Subject: [PATCH 012/108] cpu_map: Fix Icelake Server model number
-
-See arch/x86/include/asm/intel-family.h in the Kernel:
-  #define INTEL_FAM6_ICELAKE_X		0x6A
-
-Signed-off-by: Tim Wiederhake <twiederh@redhat.com>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
-(cherry picked from commit 1278ac6265589cd83cc2e661056c860e98105507)
----
- src/cpu_map/x86_Icelake-Server-noTSX.xml | 2 +-
- src/cpu_map/x86_Icelake-Server.xml       | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/cpu_map/x86_Icelake-Server-noTSX.xml b/src/cpu_map/x86_Icelake-Server-noTSX.xml
-index 2fd6906406..34a0f7c18c 100644
---- a/src/cpu_map/x86_Icelake-Server-noTSX.xml
-+++ b/src/cpu_map/x86_Icelake-Server-noTSX.xml
-@@ -1,7 +1,7 @@
- <cpus>
-   <model name='Icelake-Server-noTSX'>
-     <decode host='on' guest='off'/>
--    <signature family='6' model='134'/> <!-- 080660 -->
-+    <signature family='6' model='106'/> <!-- 0606A5 -->
-     <vendor name='Intel'/>
-     <feature name='3dnowprefetch'/>
-     <feature name='abm'/>
-diff --git a/src/cpu_map/x86_Icelake-Server.xml b/src/cpu_map/x86_Icelake-Server.xml
-index 367ade7240..1ee4ea9cd4 100644
---- a/src/cpu_map/x86_Icelake-Server.xml
-+++ b/src/cpu_map/x86_Icelake-Server.xml
-@@ -1,7 +1,7 @@
- <cpus>
-   <model name='Icelake-Server'>
-     <decode host='on' guest='on'/>
--    <signature family='6' model='134'/> <!-- 080660 -->
-+    <signature family='6' model='106'/> <!-- 0606A5 -->
-     <vendor name='Intel'/>
-     <feature name='3dnowprefetch'/>
-     <feature name='abm'/>
--- 
-2.33.0
-
diff --git a/libvirt-cpu_map-add-kunpeng-920-features-as-known-features.patch b/cpu_map-add-kunpeng-920-features-to-arm-features.patch
similarity index 87%
rename from libvirt-cpu_map-add-kunpeng-920-features-as-known-features.patch
rename to cpu_map-add-kunpeng-920-features-to-arm-features.patch
index aefd050dc689daa3ee80c1f3995977625de7ba0e..a504ad57060a8af380d2e4f88e57f39878d5fe4d 100644
--- a/libvirt-cpu_map-add-kunpeng-920-features-as-known-features.patch
+++ b/cpu_map-add-kunpeng-920-features-to-arm-features.patch
@@ -1,15 +1,16 @@
-From f67e57fa41c76e21effd9e61773319ef424a5265 Mon Sep 17 00:00:00 2001
+From 1fafc7b5a9392fce83e8f1701ccec289d11d4344 Mon Sep 17 00:00:00 2001
 From: Xu Yandong <xuyandong2@huawei.com>
 Date: Tue, 26 May 2020 20:08:07 +0800
 Subject: [PATCH] cpu_map: add kunpeng-920 features to arm features
 
 Signed-off-by: Xu Yandong <xuyandong2@huawei.com>
+Signed-off-by: lishusen <lishusen2@huawei.com>
 ---
  src/cpu_map/arm_features.xml | 19 +++++++++++++++++++
  1 file changed, 19 insertions(+)
 
 diff --git a/src/cpu_map/arm_features.xml b/src/cpu_map/arm_features.xml
-index 8a53384..5bed298 100644
+index 8a53384463..5bed298071 100644
 --- a/src/cpu_map/arm_features.xml
 +++ b/src/cpu_map/arm_features.xml
 @@ -19,4 +19,23 @@
@@ -37,5 +38,5 @@ index 8a53384..5bed298 100644
 +  <feature name='asimdfhm'/>
  </cpus>
 -- 
-2.23.0
+2.27.0
 
diff --git a/cpu_ppc64-compare-CPU-function-is-ignoring-return-va.patch b/cpu_ppc64-compare-CPU-function-is-ignoring-return-va.patch
deleted file mode 100644
index 369d6621b6e1c6e5c0a22190a6f68151211de3e5..0000000000000000000000000000000000000000
--- a/cpu_ppc64-compare-CPU-function-is-ignoring-return-va.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 9549d796fd310e41ec58f1c438328d1bedc0cb93 Mon Sep 17 00:00:00 2001
-From: tangbinzy <tangbin_yewu@cmss.chinamobile.com>
-Date: Tue, 29 Nov 2022 12:12:58 +0000
-Subject: [PATCH 09/24] cpu_ppc64: compare CPU function is ignoring  return
- value Function to compare CPU on 64-bits PowerPC is ignoring the flag to
- avoid failure in case of CPUs (host and guest) are incompatible. Basically,
- the function is returning -1 even if it is set to continue.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Julio Faracco jcfaracco@gmail.com
-Reviewed-by: Ján Tomko jtomko@redhat.com
-Signed-off-by: Ján Tomko jtomko@redhat.com
-
-Signed-off-by: tangbin tangbin_yewu@cmss.chinamobile.com
-(cherry-pick from b356d81b8960c3a43212f8c0e9eab66465c8c10a)
----
- src/cpu/cpu_ppc64.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/cpu/cpu_ppc64.c b/src/cpu/cpu_ppc64.c
-index 6b3590ab6a..9cbb28cbc5 100644
---- a/src/cpu/cpu_ppc64.c
-+++ b/src/cpu/cpu_ppc64.c
-@@ -561,11 +561,11 @@ virCPUppc64Compare(virCPUDefPtr host,
-         if (failIncompatible) {
-             virReportError(VIR_ERR_CPU_INCOMPATIBLE, "%s",
-                            _("unknown host CPU"));
--        } else {
--            VIR_WARN("unknown host CPU");
--            ret = VIR_CPU_COMPARE_INCOMPATIBLE;
-+            return VIR_CPU_COMPARE_ERROR;
-         }
--        return -1;
-+
-+        VIR_WARN("unknown host CPU");
-+        return VIR_CPU_COMPARE_INCOMPATIBLE;
-     }
- 
-     ret = ppc64Compute(host, cpu, NULL, &message);
--- 
-2.27.0
-
diff --git a/cpu_topo-support-for-specifying-clusters-in-qemu-com.patch b/cpu_topo-support-for-specifying-clusters-in-qemu-com.patch
deleted file mode 100644
index 08c5cc8313015def65920fd2c6bcd26250718609..0000000000000000000000000000000000000000
--- a/cpu_topo-support-for-specifying-clusters-in-qemu-com.patch
+++ /dev/null
@@ -1,163 +0,0 @@
-From 2e275763162623b59b1872a16c0c9f0f3837f530 Mon Sep 17 00:00:00 2001
-From: zhangxinhao <zhangxinhao1@huawei.com>
-Date: Tue, 9 May 2023 23:01:36 +0800
-Subject: cpu_topo: support for specifying "clusters" in qemu
- comand
-
-Support for cpu topology "clusters" for qemu command parameter "-smp".
-
-Signed-off-by: zhangxinhao <zhangxinhao1@huawei.com>
----
- src/qemu/qemu_capabilities.c             |  2 ++
- src/qemu/qemu_capabilities.h             |  1 +
- src/qemu/qemu_command.c                  |  7 ++---
- tests/qemuxml2argvdata/smp-clusters.args | 30 +++++++++++++++++++++
- tests/qemuxml2argvdata/smp-clusters.xml  | 33 ++++++++++++++++++++++++
- tests/qemuxml2argvtest.c                 |  1 +
- 6 files changed, 69 insertions(+), 5 deletions(-)
- create mode 100644 tests/qemuxml2argvdata/smp-clusters.args
- create mode 100644 tests/qemuxml2argvdata/smp-clusters.xml
-
-diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
-index 21b477cd4d..19030b2040 100644
---- a/src/qemu/qemu_capabilities.c
-+++ b/src/qemu/qemu_capabilities.c
-@@ -579,6 +579,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
-               /* 365 */
-               "calc-dirty-rate",
-               "dirtyrate-param.mode",
-+              "smp-clusters",
-     );
- 
- 
-@@ -3218,6 +3219,7 @@ static struct virQEMUCapsCommandLineProps virQEMUCapsCommandLine[] = {
-     { "chardev", "fd", QEMU_CAPS_CHARDEV_FD_PASS },
-     { "overcommit", NULL, QEMU_CAPS_OVERCOMMIT },
-     { "smp-opts", "dies", QEMU_CAPS_SMP_DIES },
-+    { "smp-opts", "clusters", QEMU_CAPS_SMP_CLUSTERS },
- };
- 
- static int
-diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
-index 00682eb52c..43507760c8 100644
---- a/src/qemu/qemu_capabilities.h
-+++ b/src/qemu/qemu_capabilities.h
-@@ -560,6 +560,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
-     /* 365 */
-     QEMU_CAPS_CALC_DIRTY_RATE, /* accepts calc-dirty-rate */
-     QEMU_CAPS_DIRTYRATE_MODE , /* calc-dirty-rate accepts mode parameter */
-+    QEMU_CAPS_SMP_CLUSTERS, /*  -smp clusters= */
- 
-     QEMU_CAPS_LAST /* this must always be the last item */
- } virQEMUCapsFlags;
-diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
-index 85f95b41c3..dc7fb871e7 100644
---- a/src/qemu/qemu_command.c
-+++ b/src/qemu/qemu_command.c
-@@ -7335,14 +7335,11 @@ qemuBuildSmpCommandLine(virCommandPtr cmd,
-                            _("Only 1 die per socket is supported"));
-             return -1;
-         }
--        if (def->cpu->clusters != 1) {
--            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
--                           _("Only 1 cluster per dies is supported"));
--            return -1;
--        }
-         virBufferAsprintf(&buf, ",sockets=%u", def->cpu->sockets);
-         if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_SMP_DIES))
-             virBufferAsprintf(&buf, ",dies=%u", def->cpu->dies);
-+        if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_SMP_CLUSTERS))
-+            virBufferAsprintf(&buf, ",clusters=%u", def->cpu->clusters);
-         virBufferAsprintf(&buf, ",cores=%u", def->cpu->cores);
-         virBufferAsprintf(&buf, ",threads=%u", def->cpu->threads);
-     } else {
-diff --git a/tests/qemuxml2argvdata/smp-clusters.args b/tests/qemuxml2argvdata/smp-clusters.args
-new file mode 100644
-index 0000000000..ab91ad7218
---- /dev/null
-+++ b/tests/qemuxml2argvdata/smp-clusters.args
-@@ -0,0 +1,30 @@
-+LC_ALL=C \
-+PATH=/bin \
-+HOME=/tmp/lib/domain--1-QEMUGuest1 \
-+USER=test \
-+LOGNAME=test \
-+XDG_DATA_HOME=/tmp/lib/domain--1-QEMUGuest1/.local/share \
-+XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
-+XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
-+QEMU_AUDIO_DRV=none \
-+/usr/bin/qemu-system-i386 \
-+-name QEMUGuest1 \
-+-S \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
-+-m 214 \
-+-realtime mlock=off \
-+-smp 1,maxcpus=4,sockets=2,clusters=2,cores=1,threads=1 \
-+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-+-display none \
-+-no-user-config \
-+-nodefaults \
-+-chardev socket,id=charmonitor,path=/tmp/lib/domain--1-QEMUGuest1/monitor.sock,\
-+server,nowait \
-+-mon chardev=charmonitor,id=monitor,mode=control \
-+-rtc base=utc \
-+-no-shutdown \
-+-no-acpi \
-+-usb \
-+-drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
-+-device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1
-diff --git a/tests/qemuxml2argvdata/smp-clusters.xml b/tests/qemuxml2argvdata/smp-clusters.xml
-new file mode 100644
-index 0000000000..c1845b8213
---- /dev/null
-+++ b/tests/qemuxml2argvdata/smp-clusters.xml
-@@ -0,0 +1,33 @@
-+<domain type='qemu'>
-+  <name>QEMUGuest1</name>
-+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
-+  <memory unit='KiB'>219136</memory>
-+  <currentMemory unit='KiB'>219136</currentMemory>
-+  <vcpu placement='static' current='1'>4</vcpu>
-+  <os>
-+    <type arch='i686' machine='pc'>hvm</type>
-+    <boot dev='hd'/>
-+  </os>
-+  <cpu>
-+    <topology sockets='2' clusters='2' cores='1' threads='1'/>
-+  </cpu>
-+  <clock offset='utc'/>
-+  <on_poweroff>destroy</on_poweroff>
-+  <on_reboot>restart</on_reboot>
-+  <on_crash>destroy</on_crash>
-+  <devices>
-+    <emulator>/usr/bin/qemu-system-i386</emulator>
-+    <disk type='block' device='disk'>
-+      <driver name='qemu' type='raw'/>
-+      <source dev='/dev/HostVG/QEMUGuest1'/>
-+      <target dev='hda' bus='ide'/>
-+      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
-+    </disk>
-+    <controller type='usb' index='0'/>
-+    <controller type='ide' index='0'/>
-+    <controller type='pci' index='0' model='pci-root'/>
-+    <input type='mouse' bus='ps2'/>
-+    <input type='keyboard' bus='ps2'/>
-+    <memballoon model='none'/>
-+  </devices>
-+</domain>
-diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
-index ec90532b5f..df62dfacb6 100644
---- a/tests/qemuxml2argvtest.c
-+++ b/tests/qemuxml2argvtest.c
-@@ -1828,6 +1828,7 @@ mymain(void)
- 
-     DO_TEST("smp", NONE);
-     DO_TEST("smp-dies", QEMU_CAPS_SMP_DIES);
-+    DO_TEST("smp-clusters", QEMU_CAPS_SMP_CLUSTERS);
- 
-     DO_TEST("iothreads", QEMU_CAPS_OBJECT_IOTHREAD);
-     DO_TEST("iothreads-ids", QEMU_CAPS_OBJECT_IOTHREAD);
--- 
-2.25.1
-
diff --git a/disk-storage-fix-allocation-size-for-pool-format-dos.patch b/disk-storage-fix-allocation-size-for-pool-format-dos.patch
deleted file mode 100644
index 061ba4fd1f83fe10d80ce84412829831f10e7903..0000000000000000000000000000000000000000
--- a/disk-storage-fix-allocation-size-for-pool-format-dos.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 9e4751b3a9c0435c4cb199c353144acb55458473 Mon Sep 17 00:00:00 2001
-From: Sebastian Mitterle <smitterl@redhat.com>
-Date: Sat, 29 Aug 2020 00:49:07 +0000
-Subject: [PATCH 027/108] disk storage: fix allocation size for pool format dos
-
-The changed condition was always false because the function was always
-called with boundary values 0.
-
-Use the free extent's start value to get its start offset from the
-cylinder boundary and determine if the needed size for allocation
-needs to be expanded too in case the offset doesn't fit within extra
-bytes for alignment.
-
-This fixes an issue where vol-create-from will call qemu-img convert
-to create a destination volume of same capacity as the source volume
-and qemu-img will error 'Cannot grow device files' due to the partition
-being too small for the source although both destination partition and
-source volume have the same capacity.
-
-Signed-off-by: Sebastian Mitterle <smitterl@redhat.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-(cherry picked from commit 653fdf48e352814efdbff72aa5421f65385088ac)
----
- src/storage/storage_backend_disk.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/storage/storage_backend_disk.c b/src/storage/storage_backend_disk.c
-index eae23ec24a..da06357b90 100644
---- a/src/storage/storage_backend_disk.c
-+++ b/src/storage/storage_backend_disk.c
-@@ -691,7 +691,7 @@ virStorageBackendDiskPartBoundaries(virStoragePoolObjPtr pool,
-          if (def->source.format == VIR_STORAGE_POOL_DISK_DOS) {
-              /* align to cylinder boundary */
-              neededSize += extraBytes;
--             if ((*start % cylinderSize) > extraBytes) {
-+             if ((dev->freeExtents[i].start % cylinderSize) > extraBytes) {
-                  /* add an extra cylinder if the offset can't fit within
-                     the extra bytes we have */
-                  neededSize += cylinderSize;
--- 
-2.33.0
-
diff --git a/docs-Document-CPU-clusters.patch b/docs-Document-CPU-clusters.patch
new file mode 100644
index 0000000000000000000000000000000000000000..7b8a280a45cf2ae9d8e1d89771183f5af0469652
--- /dev/null
+++ b/docs-Document-CPU-clusters.patch
@@ -0,0 +1,124 @@
+From 0041b76d5b82a15cbb0b1d6f70fe12e5017b940a Mon Sep 17 00:00:00 2001
+From: Andrea Bolognani <abologna@redhat.com>
+Date: Mon, 8 Jan 2024 16:11:51 +0100
+Subject: [PATCH] docs: Document CPU clusters
+
+Signed-off-by: Andrea Bolognani <abologna@redhat.com>
+Reviewed-by: Peter Krempa <pkrempa@redhat.com>
+---
+ docs/formatcaps.rst   | 26 ++++++++++++++++----------
+ docs/formatdomain.rst | 18 ++++++++++--------
+ 2 files changed, 26 insertions(+), 18 deletions(-)
+
+diff --git a/docs/formatcaps.rst b/docs/formatcaps.rst
+index 60f8b7caca..f37532296f 100644
+--- a/docs/formatcaps.rst
++++ b/docs/formatcaps.rst
+@@ -77,6 +77,12 @@ The ``<host/>`` element consists of the following child elements:
+      Note that not all architectures support CPU dies: if the current
+      architecture doesn't, the value will be 0 for all CPUs.
+ 
++   ``cluster_id``
++     Identifier for the cluster the CPU is in.
++
++     Note that not all architectures support CPU clusters: if the current
++     architecture doesn't, the value will be 0 for all CPUs.
++
+    ``core_id``
+      Identifier for the core the CPU is in.
+ 
+@@ -84,7 +90,7 @@ The ``<host/>`` element consists of the following child elements:
+      List of CPUs that are in the same core.
+ 
+      The list will include the current CPU, plus all other CPUs that have the
+-     same values for ``socket_id``, ``die_id`` and ``core_id``.
++     same values for ``socket_id``, ``die_id``, ``cluster_id`` and ``core_id``.
+ 
+ ``secmodel``
+    To find out default security labels for different security models you need to
+@@ -196,7 +202,7 @@ capabilities enabled in the chip and BIOS you will see:
+         <microcode version='236'/>
+         <signature family='6' model='142' stepping='12'/>
+         <counter name='tsc' frequency='2303997000' scaling='no'/>
+-        <topology sockets='1' dies='1' cores='4' threads='2'/>
++        <topology sockets='1' dies='1' clusters='1' cores='4' threads='2'/>
+         <maxphysaddr mode='emulate' bits='39'/>
+         <feature name='ds'/>
+         <feature name='acpi'/>
+@@ -261,14 +267,14 @@ capabilities enabled in the chip and BIOS you will see:
+               <sibling id='0' value='10'/>
+             </distances>
+             <cpus num='8'>
+-              <cpu id='0' socket_id='0' die_id='0' core_id='0' siblings='0,4'/>
+-              <cpu id='1' socket_id='0' die_id='0' core_id='1' siblings='1,5'/>
+-              <cpu id='2' socket_id='0' die_id='0' core_id='2' siblings='2,6'/>
+-              <cpu id='3' socket_id='0' die_id='0' core_id='3' siblings='3,7'/>
+-              <cpu id='4' socket_id='0' die_id='0' core_id='0' siblings='0,4'/>
+-              <cpu id='5' socket_id='0' die_id='0' core_id='1' siblings='1,5'/>
+-              <cpu id='6' socket_id='0' die_id='0' core_id='2' siblings='2,6'/>
+-              <cpu id='7' socket_id='0' die_id='0' core_id='3' siblings='3,7'/>
++              <cpu id='0' socket_id='0' die_id='0' cluster_id='0' core_id='0' siblings='0,4'/>
++              <cpu id='1' socket_id='0' die_id='0' cluster_id='0' core_id='1' siblings='1,5'/>
++              <cpu id='2' socket_id='0' die_id='0' cluster_id='0' core_id='2' siblings='2,6'/>
++              <cpu id='3' socket_id='0' die_id='0' cluster_id='0' core_id='3' siblings='3,7'/>
++              <cpu id='4' socket_id='0' die_id='0' cluster_id='0' core_id='0' siblings='0,4'/>
++              <cpu id='5' socket_id='0' die_id='0' cluster_id='0' core_id='1' siblings='1,5'/>
++              <cpu id='6' socket_id='0' die_id='0' cluster_id='0' core_id='2' siblings='2,6'/>
++              <cpu id='7' socket_id='0' die_id='0' cluster_id='0' core_id='3' siblings='3,7'/>
+             </cpus>
+           </cell>
+         </cells>
+diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst
+index 366918b32c..2d794cc8a2 100644
+--- a/docs/formatdomain.rst
++++ b/docs/formatdomain.rst
+@@ -1377,7 +1377,7 @@ following collection of elements. :since:`Since 0.7.5`
+    <cpu match='exact'>
+      <model fallback='allow'>core2duo</model>
+      <vendor>Intel</vendor>
+-     <topology sockets='1' dies='1' cores='2' threads='1'/>
++     <topology sockets='1' dies='1' clusters='1' cores='2' threads='1'/>
+      <cache level='3' mode='emulate'/>
+      <maxphysaddr mode='emulate' bits='42'/>
+      <feature policy='disable' name='lahf_lm'/>
+@@ -1388,7 +1388,7 @@ following collection of elements. :since:`Since 0.7.5`
+ 
+    <cpu mode='host-model'>
+      <model fallback='forbid'/>
+-     <topology sockets='1' dies='1' cores='2' threads='1'/>
++     <topology sockets='1' dies='1' clusters='1' cores='2' threads='1'/>
+    </cpu>
+    ...
+ 
+@@ -1414,7 +1414,7 @@ In case no restrictions need to be put on CPU model and its features, a simpler
+ 
+    ...
+    <cpu>
+-     <topology sockets='1' dies='1' cores='2' threads='1'/>
++     <topology sockets='1' dies='1' clusters='1' cores='2' threads='1'/>
+    </cpu>
+    ...
+ 
+@@ -1579,12 +1579,14 @@ In case no restrictions need to be put on CPU model and its features, a simpler
+ ``topology``
+    The ``topology`` element specifies requested topology of virtual CPU provided
+    to the guest.
+-   Its attributes ``sockets``, ``dies`` (:since:`Since 6.1.0`), ``cores``,
+-   and ``threads`` accept non-zero positive integer values.
++   Its attributes ``sockets``, ``dies`` (:since:`Since 6.1.0`), ``clusters``
++   (:since:`Since 10.1.0`), ``cores``, and ``threads`` accept non-zero positive
++   integer values.
+    They refer to the total number of CPU sockets, number of dies per socket,
+-   number of cores per die, and number of threads per core, respectively.
+-   The ``dies`` attribute is optional and will default to 1 if omitted, while
+-   the other attributes are all mandatory.
++   number of clusters per die, number of cores per cluster, and number of
++   threads per core, respectively.
++   The ``dies`` and ``clusters`` attributes are optional and will default to 1
++   if omitted, while the other attributes are all mandatory.
+    Hypervisors may require that the maximum number of vCPUs specified
+    by the ``cpus`` element equals to the number of vcpus resulting from the
+    topology.
+-- 
+2.27.0
+
diff --git a/docs-Fix-template-matching-in-page.xsl.patch b/docs-Fix-template-matching-in-page.xsl.patch
deleted file mode 100644
index 29478d685730448df473d651dc7e57082390a24a..0000000000000000000000000000000000000000
--- a/docs-Fix-template-matching-in-page.xsl.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 2fc51790318ec17fbca46185991fac8cc3302ec0 Mon Sep 17 00:00:00 2001
-From: Martin Kletzander <mkletzan@redhat.com>
-Date: Mon, 21 Feb 2022 09:26:13 +0100
-Subject: [PATCH] docs: Fix template matching in page.xsl
-
-Our last default template had a match of "node()" which incidentally matched
-everything, including text nodes.  Since this has the same priority according to
-the XSLT spec, section 5.5:
-
-  https://www.w3.org/TR/1999/REC-xslt-19991116#conflict
-
-this is an error.  Also according to the same spec section, the XSLT processor
-may signal the error or pick the last rule.
-
-This was uncovered with libxslt 1.1.35 which contains the following commit:
-
-  https://gitlab.gnome.org/GNOME/libxslt/-/commit/b0074eeca3c6b21b4da14fdf712b853900c51635
-
-which makes the build fail with:
-
-  runtime error: file ../docs/page.xsl line 223 element element
-  xsl:element: The effective name '' is not a valid QName.
-
-because our last rule also matches text nodes and we are trying to extract the
-node name out of them.
-
-To fix this we change the match to "*" which only matches elements and not all
-the nodes, and to avoid any possible errors with different XSLT processors we
-also bump the priority of the match="text()" rule a little higher, just in case
-someone needs to use an XSLT processor that chooses signalling the error instead
-of the optional recovery.
-
-https://bugs.gentoo.org/833586
-
-Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
----
- docs/page.xsl | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/docs/page.xsl b/docs/page.xsl
-index ddae5ab508..5dc46329fd 100644
---- a/docs/page.xsl
-+++ b/docs/page.xsl
-@@ -194,11 +194,11 @@
-     </xsl:element>
-   </xsl:template>
- 
--  <xsl:template match="text()" mode="copy">
-+  <xsl:template match="text()" mode="copy" priority="0">
-     <xsl:value-of select="."/>
-   </xsl:template>
- 
--  <xsl:template match="node()" mode="copy">
-+  <xsl:template match="*" mode="copy">
-     <xsl:element name="{name()}">
-       <xsl:copy-of select="./@*"/>
-       <xsl:apply-templates mode="copy" />
--- 
-2.27.0
-
diff --git a/docs-Improve-documentation-for-CPU-topology.patch b/docs-Improve-documentation-for-CPU-topology.patch
new file mode 100644
index 0000000000000000000000000000000000000000..8d620c9afb7afdf8d9a1c5c2b88a8b03d70613bc
--- /dev/null
+++ b/docs-Improve-documentation-for-CPU-topology.patch
@@ -0,0 +1,119 @@
+From 35d7f3c8b34744d8430eb9487a106e3a98f372e4 Mon Sep 17 00:00:00 2001
+From: Andrea Bolognani <abologna@redhat.com>
+Date: Mon, 8 Jan 2024 16:13:25 +0100
+Subject: [PATCH] docs: Improve documentation for CPU topology
+
+On the guest configuration side, mention that support for the
+"dies" attribute was introduced in libvirt 6.1.0 and clarify
+that the ability to use non-default values is subject to
+architecture and machine limitations.
+
+On the host capabilities side, the documentation was pretty
+much entirely missing. It's still far from perfect, but anything
+is better than having no information at all.
+
+Signed-off-by: Andrea Bolognani <abologna@redhat.com>
+Reviewed-by: Peter Krempa <pkrempa@redhat.com>
+---
+ docs/formatcaps.rst   | 48 +++++++++++++++++++++++++++++++++++++------
+ docs/formatdomain.rst | 16 +++++++++------
+ 2 files changed, 52 insertions(+), 12 deletions(-)
+
+diff --git a/docs/formatcaps.rst b/docs/formatcaps.rst
+index 3cccf70882..60f8b7caca 100644
+--- a/docs/formatcaps.rst
++++ b/docs/formatcaps.rst
+@@ -37,6 +37,12 @@ The ``<host/>`` element consists of the following child elements:
+    The host UUID.
+ ``cpu``
+    The host CPU architecture and features.
++
++   Note that, while this element contains a ``topology`` sub-element,
++   the information contained therein is farily high-level and likely
++   not very useful when it comes to optimizing guest vCPU placement.
++   Look into the ``topology`` *element*, described below, for more
++   detailed information.
+ ``power_management``
+    whether host is capable of memory suspend, disk hibernation, or hybrid
+    suspend.
+@@ -44,12 +50,42 @@ The ``<host/>`` element consists of the following child elements:
+    This element exposes information on the hypervisor's migration capabilities,
+    like live migration, supported URI transports, and so on.
+ ``topology``
+-   This element embodies the host internal topology. Management applications may
+-   want to learn this information when orchestrating new guests - e.g. due to
+-   reduce inter-NUMA node transfers. Note that the ``sockets`` value reported
+-   here is per-NUMA-node; this is in contrast to the value given in domain
+-   definitions, which is interpreted as a total number of sockets for the
+-   domain.
++   This element describes the host CPU topology in detail.
++
++   Management applications may want to use this information when defining new
++   guests: for example, in order to ensure that all vCPUs are scheduled on
++   CPUs that are in the same NUMA node or even CPU core.
++
++   The ``cells`` sub-element contains a list of NUMA nodes, each one
++   represented by a single ``cell`` element. Within each ``cell``, a ``cpus``
++   sub-element contains a list of logical CPUs, each one represented by a
++   single ``cpu`` element. In both cases, the ``num`` attribute of the
++   top-level element contains the number of children.
++
++   Each ``cpu`` element contains the following attributes:
++
++   ``id``
++     CPU identifier. Can be used to refer to it in the context of
++     `CPU tuning <formatdomain.html#cpu-tuning>`__.
++
++   ``socket_id``
++     Identifier for the physical package the CPU is in.
++
++   ``die_id``
++     Identifier for the die the CPU is in.
++
++     Note that not all architectures support CPU dies: if the current
++     architecture doesn't, the value will be 0 for all CPUs.
++
++   ``core_id``
++     Identifier for the core the CPU is in.
++
++   ``siblings``
++     List of CPUs that are in the same core.
++
++     The list will include the current CPU, plus all other CPUs that have the
++     same values for ``socket_id``, ``die_id`` and ``core_id``.
++
+ ``secmodel``
+    To find out default security labels for different security models you need to
+    parse this element. In contrast with the former elements, this is repeated
+diff --git a/docs/formatdomain.rst b/docs/formatdomain.rst
+index 310d2bc427..366918b32c 100644
+--- a/docs/formatdomain.rst
++++ b/docs/formatdomain.rst
+@@ -1578,14 +1578,18 @@ In case no restrictions need to be put on CPU model and its features, a simpler
+    supported vendors can be found in ``cpu_map/*_vendors.xml``.
+ ``topology``
+    The ``topology`` element specifies requested topology of virtual CPU provided
+-   to the guest. Four attributes, ``sockets``, ``dies``, ``cores``, and
+-   ``threads``, accept non-zero positive integer values. They refer to the
+-   total number of CPU sockets, number of dies per socket, number of cores per
+-   die, and number of threads per core, respectively. The ``dies`` attribute is
+-   optional and will default to 1 if omitted, while the other attributes are all
+-   mandatory. Hypervisors may require that the maximum number of vCPUs specified
++   to the guest.
++   Its attributes ``sockets``, ``dies`` (:since:`Since 6.1.0`), ``cores``,
++   and ``threads`` accept non-zero positive integer values.
++   They refer to the total number of CPU sockets, number of dies per socket,
++   number of cores per die, and number of threads per core, respectively.
++   The ``dies`` attribute is optional and will default to 1 if omitted, while
++   the other attributes are all mandatory.
++   Hypervisors may require that the maximum number of vCPUs specified
+    by the ``cpus`` element equals to the number of vcpus resulting from the
+    topology.
++   Moreover, not all architectures and machine types support specifying a value
++   other than 1 for all attributes.
+ ``feature``
+    The ``cpu`` element can contain zero or more ``feature`` elements used to
+    fine-tune features provided by the selected CPU model. The list of known
+-- 
+2.27.0
+
diff --git a/docs-build-Don-t-include-stylesheet-in-intermediate-.patch b/docs-build-Don-t-include-stylesheet-in-intermediate-.patch
deleted file mode 100644
index b13d5e0987f025a28ecc6b4060a979496e7a688d..0000000000000000000000000000000000000000
--- a/docs-build-Don-t-include-stylesheet-in-intermediate-.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From c99e7e8abe1e22f504173a976a82e1a72551bdc1 Mon Sep 17 00:00:00 2001
-From: Peter Krempa <pkrempa@redhat.com>
-Date: Mon, 3 Aug 2020 07:32:29 +0200
-Subject: [PATCH] docs: build: Don't include stylesheet in intermediate html
- files generated from RST
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-'docutils' add a stylesheet to the output html file for direct
-consumption. Since we use the html files just as an intermediate step
-which is post-processed to add our own stylesheet and drop the docutils
-one in the process we can ask 'rst2html' to not add any for an
-intermediate file with less garbage.
-
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Signed-off-by: rpm-build <rpm-build>
----
- docs/Makefile.am | 4 ++--
- docs/Makefile.in | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/docs/Makefile.am b/docs/Makefile.am
-index 61862c4..4c44504 100644
---- a/docs/Makefile.am
-+++ b/docs/Makefile.am
-@@ -420,11 +420,11 @@ manpages/%.html.in: manpages/%.rst
- 	 grep -v '^:Manual ' < $< | \
- 	  sed -e 's|SYSCONFDIR|$(sysconfdir)|g' \
- 	     -e 's|RUNSTATEDIR|$(runstatedir)|g' | \
--	  $(RST2HTML) --strict > $@ || { rm $@ && exit 1; }
-+	  $(RST2HTML) --stylesheet= --strict > $@ || { rm $@ && exit 1; }
- 
- %.html.in: %.rst
- 	$(AM_V_GEN)$(MKDIR_P) `dirname $@` && \
--	  $(RST2HTML) --strict $< > $@ || { rm $@ && exit 1; }
-+	  $(RST2HTML) --stylesheet= --strict $< > $@ || { rm $@ && exit 1; }
- 
- %.html.tmp: %.html.in site.xsl subsite.xsl page.xsl \
- 		$(acl_generated)
-diff --git a/docs/Makefile.in b/docs/Makefile.in
-index 61eac52..1836655 100644
---- a/docs/Makefile.in
-+++ b/docs/Makefile.in
-@@ -1469,11 +1469,11 @@ manpages/%.html.in: manpages/%.rst
- 	 grep -v '^:Manual ' < $< | \
- 	  sed -e 's|SYSCONFDIR|$(sysconfdir)|g' \
- 	     -e 's|RUNSTATEDIR|$(runstatedir)|g' | \
--	  $(RST2HTML) --strict > $@ || { rm $@ && exit 1; }
-+	  $(RST2HTML) --stylesheet= --strict > $@ || { rm $@ && exit 1; }
- 
- %.html.in: %.rst
- 	$(AM_V_GEN)$(MKDIR_P) `dirname $@` && \
--	  $(RST2HTML) --strict $< > $@ || { rm $@ && exit 1; }
-+	  $(RST2HTML) --stylesheet= --strict $< > $@ || { rm $@ && exit 1; }
- 
- %.html.tmp: %.html.in site.xsl subsite.xsl page.xsl \
- 		$(acl_generated)
--- 
-2.27.0
-
diff --git a/docs-introduces-new-vhostuser-disk-type.patch b/docs-introduces-new-vhostuser-disk-type.patch
deleted file mode 100644
index f08325387090ff3f3be44f502417e43d3f638762..0000000000000000000000000000000000000000
--- a/docs-introduces-new-vhostuser-disk-type.patch
+++ /dev/null
@@ -1,149 +0,0 @@
-From 0b8ff5672665c3792c27c02d9d05e0951c03d440 Mon Sep 17 00:00:00 2001
-From: Luo Yifan <luoyifan_yewu@cmss.chinamobile.com>
-Date: Wed, 30 Nov 2022 18:13:36 +0800
-Subject: [PATCH 14/24] docs: introduces new vhostuser disk type
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-     <disk type='vhostuser' device='disk'>
-       <driver name='qemu' type='raw'/>
-       <source type='unix' path='/tmp/vhost-blk.sock'>
-         <reconnect enabled='yes' timeout='10'/>
-       </source>
-       <target dev='vda' bus='virtio'/>
-     </disk>
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Reviewed-by: Peter Krempa <pkrempa@redhat.com>
-(cherry picked from commit e88bdaf789b6f1cc5347b217240f15afd86a94c1)
-Signed-off-by: Luo Yifan <luoyifan_yewu@cmss.chinamobile.com>
----
- docs/formatdomain.html.in     | 51 ++++++++++++++++++++++++++++++++++-
- docs/schemas/domaincommon.rng | 19 +++++++++++++
- 2 files changed, 69 insertions(+), 1 deletion(-)
-
-diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
-index aaeb05961f..5860ec9f20 100644
---- a/docs/formatdomain.html.in
-+++ b/docs/formatdomain.html.in
-@@ -2977,6 +2977,13 @@
-     &lt;/source&gt;
-     &lt;target dev='vde' bus='virtio'/&gt;
-   &lt;/disk&gt;
-+  &lt;disk type='vhostuser' device='disk'&gt;
-+    &lt;driver name='qemu' type='raw'/&gt;
-+    &lt;source type='unix' path='/tmp/vhost-blk.sock'&gt;
-+      &lt;reconnect enabled='yes' timeout='10'/&gt;
-+    &lt;/source&gt;
-+    &lt;target dev='vdf' bus='virtio'/&gt;
-+  &lt;/disk&gt;
- &lt;/devices&gt;
- ...</pre>
- 
-@@ -2991,7 +2998,8 @@
-             "dir" (<span class="since">since 0.7.5</span>),
-             "network" (<span class="since">since 0.8.7</span>), or
-             "volume" (<span class="since">since 1.0.5</span>), or
--            "nvme" (<span class="since">since 6.0.0</span>)
-+            "nvme" (<span class="since">since 6.0.0</span>), or
-+            "vhostuser" (<span class="since">since 6.2.0</span>)
-             and refer to the underlying source for the disk.
-             <span class="since">Since 0.0.3</span>
-             </dd>
-@@ -3217,6 +3225,31 @@
-               <code>&lt;disk type='block'&gt;</code> and therefore lower
-               latencies can be achieved.
-               </dd>
-+              <dt><code>vhostuser</code></dt>
-+              <dd>
-+              Enables the hypervisor to connect to another process using vhost-user
-+              protocol. Requires shared memory configured for the VM, for more details
-+              see <code>access</code> mode for
-+              <code>memoryBacking &lt;#elementsMemoryBacking&gt;</code> element.
-+
-+              The <code>source</code> element has following mandatory attributes:
-+              <dl>
-+                <dt><code>type</code></dt>
-+                <dd>The type of char device. Currently only <code>unix</code> type
-+                is supported.
-+                </dd>
-+
-+                <dt><code>path</code></dt>
-+                <dd>Path to the unix socket to be used as disk source.
-+                </dd>
-+              </dl>
-+
-+              Note that the vhost server replaces both the disk frontend and backend
-+              thus almost all of the disk properties can't be configured via the
-+              <code>&lt;disk&gt;</code> XML for this disk type. Additionally features
-+              such as blockjobs, incremental backups and snapshots are not supported 
-+              for this disk type.
-+              </dd>
-           </dl>
-         With "file", "block", and "volume", one or more optional
-         sub-elements <code>seclabel</code>, <a href="#seclabel">described
-@@ -3424,6 +3457,22 @@
-             Note that '0' is considered as if the value is not provided.
-             <span class="since">Since 6.2.0</span>
-           </dd>
-+          <dt><code>reconnect</code></dt>
-+          <dd>
-+            For disk type <code>vhostuser</code> configures reconnect timeout 
-+            if the connection is lost. It has two mandatory attributes:
-+            <dl>
-+              <dt><code>enabled</code></dt>
-+              <dd>If the reconnect feature is enabled, accepts<code>yes</code>
-+              and <code>no</code>
-+              </dd>
-+
-+              <dt><code>timeout</code></dt>
-+              <dd>The amount of seconds after which hypervisor tries to reconnect.
-+              </dd>
-+            </dl>
-+            <span class="since">Since 6.2.0</span>
-+          </dd>
-         </dl>
- 
-         <p>
-diff --git a/docs/schemas/domaincommon.rng b/docs/schemas/domaincommon.rng
-index 1807df521c..764f826df4 100644
---- a/docs/schemas/domaincommon.rng
-+++ b/docs/schemas/domaincommon.rng
-@@ -1631,6 +1631,7 @@
-       <ref name="diskSourceNetwork"/>
-       <ref name="diskSourceVolume"/>
-       <ref name="diskSourceNvme"/>
-+      <ref name="diskSourceVhostUser"/>
-     </choice>
-   </define>
- 
-@@ -2103,6 +2104,24 @@
-     </optional>
-   </define>
- 
-+  <define name="diskSourceVhostUser">
-+    <attribute name="type">
-+      <value>vhostuser</value>
-+    </attribute>
-+    <element name="source">
-+      <attribute name="type">
-+        <value>unix</value>
-+      </attribute>
-+      <attribute name="path">
-+        <ref name="absFilePath"/>
-+      </attribute>
-+      <optional>
-+         <ref name="reconnect"/>
-+      </optional>
-+      <empty/>
-+    </element>
-+  </define>
-+
-   <define name="diskTarget">
-     <data type="string">
-       <param name="pattern">(ioemu:)?(fd|hd|sd|vd|xvd|ubd)[a-zA-Z0-9_]+</param>
--- 
-2.27.0
-
diff --git a/domain-add-logs-for-virDomainHotpatchManage.patch b/domain-add-logs-for-virDomainHotpatchManage.patch
index ef63bf495abf03a2d6f94e65d3489eb050205505..e0c062155553c9cfc7da741af5ec2ad8120bcb9f 100644
--- a/domain-add-logs-for-virDomainHotpatchManage.patch
+++ b/domain-add-logs-for-virDomainHotpatchManage.patch
@@ -1,4 +1,4 @@
-From e59b2064ffefbc94c729d38ec0180197e2b1f8ed Mon Sep 17 00:00:00 2001
+From a7f63f8c85e3bc287920ed83361e4f44ce2e25d7 Mon Sep 17 00:00:00 2001
 From: AlexChen <alex.chen@huawei.com>
 Date: Mon, 12 Jul 2021 21:28:41 +0800
 Subject: [PATCH] domain: add logs for virDomainHotpatchManage
@@ -13,10 +13,10 @@ Signed-off-by: AlexChen <alex.chen@huawei.com>
  1 file changed, 11 insertions(+), 2 deletions(-)
 
 diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c
-index 068ab52f54..3cf6bcb3b4 100644
+index 21b01110fe..b1c5a8c52c 100644
 --- a/src/libvirt-domain.c
 +++ b/src/libvirt-domain.c
-@@ -12777,12 +12777,21 @@ virDomainHotpatchManage(virDomainPtr domain,
+@@ -13829,12 +13829,21 @@ virDomainHotpatchManage(virDomainPtr domain,
      if (action == VIR_DOMAIN_HOTPATCH_UNAPPLY)
          virCheckNonNullArgGoto(id, error);
  
diff --git a/domain_capabilities-Assert-enums-fit-into-unsigned-i.patch b/domain_capabilities-Assert-enums-fit-into-unsigned-i.patch
deleted file mode 100644
index db0eadb4379d4681fc3dd7a997b25f8544077e39..0000000000000000000000000000000000000000
--- a/domain_capabilities-Assert-enums-fit-into-unsigned-i.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-From 11073a79e7c7275436a43a43dd6b6e772b05588f Mon Sep 17 00:00:00 2001
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Wed, 18 Nov 2020 11:58:01 +0100
-Subject: [PATCH 066/108] domain_capabilities: Assert enums fit into unsigned
- int bitmask
-
-The way our domain capabilities work currently, is that we have
-virDomainCapsEnum struct which contains 'unsigned int values'
-member which serves as a bitmask. More complicated structs are
-composed from this struct, giving us whole virDomainCaps
-eventually.
-
-Whenever we want to report that a certain value is supported, the
-'1 << value' bit is set in the corresponding unsigned int member.
-This works as long as the resulting value after bitshift does not
-overflow unsigned int. There is a check inside
-virDomainCapsEnumSet() which ensures exactly this, but no caller
-really checks whether virDomainCapsEnumSet() succeeded. Also,
-checking at runtime is a bit too late.
-
-Fortunately, we know the largest value we want to store in each
-member, because each enum of ours ends with _LAST member.
-Therefore, we can check at build time whether an overflow can
-occur.
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Erik Skultety <eskultet@redhat.com>
-(cherry picked from commit 912421e7b63a358d552b79fac62a5518ec58f4e5)
----
- src/conf/domain_capabilities.h | 19 +++++++++++++++++++
- 1 file changed, 19 insertions(+)
-
-diff --git a/src/conf/domain_capabilities.h b/src/conf/domain_capabilities.h
-index 9f4a23d015..0345c84855 100644
---- a/src/conf/domain_capabilities.h
-+++ b/src/conf/domain_capabilities.h
-@@ -36,6 +36,9 @@ struct _virDomainCapsEnum {
-     unsigned int values; /* Bitmask of values supported in the corresponding enum */
- };
- 
-+#define STATIC_ASSERT_ENUM(last) \
-+    G_STATIC_ASSERT(last <= sizeof(unsigned int) * CHAR_BIT)
-+
- typedef struct _virDomainCapsStringValues virDomainCapsStringValues;
- typedef virDomainCapsStringValues *virDomainCapsStringValuesPtr;
- struct _virDomainCapsStringValues {
-@@ -43,6 +46,8 @@ struct _virDomainCapsStringValues {
-     size_t nvalues; /* number of strings */
- };
- 
-+STATIC_ASSERT_ENUM(VIR_DOMAIN_LOADER_TYPE_LAST);
-+STATIC_ASSERT_ENUM(VIR_TRISTATE_BOOL_LAST);
- typedef struct _virDomainCapsLoader virDomainCapsLoader;
- typedef virDomainCapsLoader *virDomainCapsLoaderPtr;
- struct _virDomainCapsLoader {
-@@ -53,6 +58,7 @@ struct _virDomainCapsLoader {
-     virDomainCapsEnum secure;   /* Info about secure:virTristateBool */
- };
- 
-+STATIC_ASSERT_ENUM(VIR_DOMAIN_OS_DEF_FIRMWARE_LAST);
- typedef struct _virDomainCapsOS virDomainCapsOS;
- typedef virDomainCapsOS *virDomainCapsOSPtr;
- struct _virDomainCapsOS {
-@@ -61,6 +67,9 @@ struct _virDomainCapsOS {
-     virDomainCapsLoader loader;     /* Info about virDomainLoaderDef */
- };
- 
-+STATIC_ASSERT_ENUM(VIR_DOMAIN_DISK_DEVICE_LAST);
-+STATIC_ASSERT_ENUM(VIR_DOMAIN_DISK_BUS_LAST);
-+STATIC_ASSERT_ENUM(VIR_DOMAIN_DISK_MODEL_LAST);
- typedef struct _virDomainCapsDeviceDisk virDomainCapsDeviceDisk;
- typedef virDomainCapsDeviceDisk *virDomainCapsDeviceDiskPtr;
- struct _virDomainCapsDeviceDisk {
-@@ -71,6 +80,7 @@ struct _virDomainCapsDeviceDisk {
-     /* add new fields here */
- };
- 
-+STATIC_ASSERT_ENUM(VIR_DOMAIN_GRAPHICS_TYPE_LAST);
- typedef struct _virDomainCapsDeviceGraphics virDomainCapsDeviceGraphics;
- typedef virDomainCapsDeviceGraphics *virDomainCapsDeviceGraphicsPtr;
- struct _virDomainCapsDeviceGraphics {
-@@ -78,6 +88,7 @@ struct _virDomainCapsDeviceGraphics {
-     virDomainCapsEnum type;   /* virDomainGraphicsType */
- };
- 
-+STATIC_ASSERT_ENUM(VIR_DOMAIN_VIDEO_TYPE_LAST);
- typedef struct _virDomainCapsDeviceVideo virDomainCapsDeviceVideo;
- typedef virDomainCapsDeviceVideo *virDomainCapsDeviceVideoPtr;
- struct _virDomainCapsDeviceVideo {
-@@ -85,6 +96,11 @@ struct _virDomainCapsDeviceVideo {
-     virDomainCapsEnum modelType;   /* virDomainVideoType */
- };
- 
-+STATIC_ASSERT_ENUM(VIR_DOMAIN_HOSTDEV_MODE_LAST);
-+STATIC_ASSERT_ENUM(VIR_DOMAIN_STARTUP_POLICY_LAST);
-+STATIC_ASSERT_ENUM(VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_LAST);
-+STATIC_ASSERT_ENUM(VIR_DOMAIN_HOSTDEV_CAPS_TYPE_LAST);
-+STATIC_ASSERT_ENUM(VIR_DOMAIN_HOSTDEV_PCI_BACKEND_TYPE_LAST);
- typedef struct _virDomainCapsDeviceHostdev virDomainCapsDeviceHostdev;
- typedef virDomainCapsDeviceHostdev *virDomainCapsDeviceHostdevPtr;
- struct _virDomainCapsDeviceHostdev {
-@@ -97,6 +113,8 @@ struct _virDomainCapsDeviceHostdev {
-     /* add new fields here */
- };
- 
-+STATIC_ASSERT_ENUM(VIR_DOMAIN_RNG_MODEL_LAST);
-+STATIC_ASSERT_ENUM(VIR_DOMAIN_RNG_BACKEND_LAST);
- typedef struct _virDomainCapsDeviceRNG virDomainCapsDeviceRNG;
- typedef virDomainCapsDeviceRNG *virDomainCapsDeviceRNGPtr;
- struct _virDomainCapsDeviceRNG {
-@@ -105,6 +123,7 @@ struct _virDomainCapsDeviceRNG {
-     virDomainCapsEnum backendModel;   /* virDomainRNGBackend */
- };
- 
-+STATIC_ASSERT_ENUM(VIR_GIC_VERSION_LAST);
- typedef struct _virDomainCapsFeatureGIC virDomainCapsFeatureGIC;
- typedef virDomainCapsFeatureGIC *virDomainCapsFeatureGICPtr;
- struct _virDomainCapsFeatureGIC {
--- 
-2.33.0
-
diff --git a/domain_cgroup.c-update-domain-after-setting-blkio.we.patch b/domain_cgroup.c-update-domain-after-setting-blkio.we.patch
deleted file mode 100644
index c7e8c4d3a4a5a108b0ec9343e159dbb5dcea01bd..0000000000000000000000000000000000000000
--- a/domain_cgroup.c-update-domain-after-setting-blkio.we.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From da99b4e69fab6a14f55873a0b27f962ed6ed5f11 Mon Sep 17 00:00:00 2001
-From: Daniel Henrique Barboza <danielhb413@gmail.com>
-Date: Mon, 22 Mar 2021 16:28:59 -0300
-Subject: [PATCH 091/108] domain_cgroup.c: update domain after setting
- blkio.weight
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Commit ac87d3520ad5 consolidated common cgroup code between the QEMU and
-lxc drivers in domain_cgroup.c. In this process, in
-virDomainCgroupSetupDomainBlkioParameters(), a call to
-virCgroupGetBlkioWeight() went missing.
-
-The result is that 'virsh blkiotune' is setting the blkio.weight for the
-guest in the host cgroup, but not on the domain XML, because
-virCgroupGetBlkioWeight() is also used to write the blkio.weight value
-in the domain object.
-
-Fix it by adding the virCgroupGetBlkioWeight() call in the
-virDomainCgroupSetupDomainBlkioParameters() helper.
-
-Fixes: ac87d3520ad542d558854a72b0ae0a81fddc6747
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1941407
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
-(cherry picked from commit e2602f2bb186da100116a5668d95ca829b7f2767)
----
- src/hypervisor/domain_cgroup.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/hypervisor/domain_cgroup.c b/src/hypervisor/domain_cgroup.c
-index eb4fa20a9e..05e3aa7e6a 100644
---- a/src/hypervisor/domain_cgroup.c
-+++ b/src/hypervisor/domain_cgroup.c
-@@ -104,7 +104,8 @@ virDomainCgroupSetupDomainBlkioParameters(virCgroupPtr cgroup,
-         virTypedParameterPtr param = &params[i];
- 
-         if (STREQ(param->field, VIR_DOMAIN_BLKIO_WEIGHT)) {
--            if (virCgroupSetBlkioWeight(cgroup, params[i].value.ui) < 0)
-+            if (virCgroupSetBlkioWeight(cgroup, params[i].value.ui) < 0 ||
-+                virCgroupGetBlkioWeight(cgroup, &def->blkio.weight) < 0)
-                 ret = -1;
-         } else if (STREQ(param->field, VIR_DOMAIN_BLKIO_DEVICE_WEIGHT) ||
-                    STREQ(param->field, VIR_DOMAIN_BLKIO_DEVICE_READ_IOPS) ||
--- 
-2.33.0
-
diff --git a/domain_conf-fix-NULL-dereference-on-error-in-virDoma.patch b/domain_conf-fix-NULL-dereference-on-error-in-virDoma.patch
deleted file mode 100644
index 8806010b31d6ad9da25f7d173c10072c02d0b32f..0000000000000000000000000000000000000000
--- a/domain_conf-fix-NULL-dereference-on-error-in-virDoma.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 5862d4429c3c3b813b46c32830800df34c6dafe0 Mon Sep 17 00:00:00 2001
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Wed, 11 Mar 2020 13:25:59 +0100
-Subject: [PATCH 074/108] domain_conf: fix NULL dereference on error in
- virDomainObjCopyPersistentDef
-
-The issue was introduced together with the function itself by commit
-<da1eba6bc8f58bfce34136710d1979a3a44adb17>.  Calling
-`virDomainObjGetPersistentDef` may return NULL which is later passed
-to `virDomainDefFormat` where the `def` attribute is marked as NONNULL
-and later in `virDomainDefFormatInternalSetRootName` it is actually
-defererenced without any other check.
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Reviewed-by: Peter Krempa <pkrempa@redhat.com>
-(cherry picked from commit b96174d9f2dcf0197bb6e58eea3fbbda17043478)
----
- src/conf/domain_conf.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
-index 9c83f4e347..b60b9d31a1 100644
---- a/src/conf/domain_conf.c
-+++ b/src/conf/domain_conf.c
-@@ -30074,6 +30074,12 @@ virDomainObjCopyPersistentDef(virDomainObjPtr dom,
-     virDomainDefPtr cur;
- 
-     cur = virDomainObjGetPersistentDef(xmlopt, dom, parseOpaque);
-+    if (!cur) {
-+        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-+                       _("failed to get persistent definition object"));
-+        return NULL;
-+    }
-+
-     return virDomainDefCopy(cur, xmlopt, parseOpaque, false);
- }
- 
--- 
-2.33.0
-
diff --git a/domain_conf.c-do-not-leak-video-in-virDomainDefParse.patch b/domain_conf.c-do-not-leak-video-in-virDomainDefParse.patch
deleted file mode 100644
index 084a3f74aad798dad60275c2b890e474f3412c5f..0000000000000000000000000000000000000000
--- a/domain_conf.c-do-not-leak-video-in-virDomainDefParse.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From fbb537ad89c6820e8763a57722cebc5a3db363e0 Mon Sep 17 00:00:00 2001
-From: Daniel Henrique Barboza <danielhb413@gmail.com>
-Date: Thu, 19 Nov 2020 13:57:43 -0300
-Subject: [PATCH 067/108] domain_conf.c: do not leak 'video' in
- virDomainDefParseXML()
-
-The 'video' pointer is only being freed on error path, meaning
-that we're leaking it after each loop restart.
-
-There are more opportunities for auto cleanups of virDomainVideoDef
-pointers, so let's register AUTOPTR_CLEANUP_FUNC for it to use
-g_autoptr() later on.
-
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
-(cherry picked from commit 18d29844c616fb633f7042dbe4cf80819cdd2f1d)
----
- src/conf/domain_conf.c | 4 +---
- src/conf/domain_conf.h | 1 +
- 2 files changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
-index d3565ececf..a33f9144f5 100644
---- a/src/conf/domain_conf.c
-+++ b/src/conf/domain_conf.c
-@@ -21631,7 +21631,7 @@ virDomainDefParseXML(xmlDocPtr xml,
-     if (n && VIR_ALLOC_N(def->videos, n) < 0)
-         goto error;
-     for (i = 0; i < n; i++) {
--        virDomainVideoDefPtr video;
-+        g_autoptr(virDomainVideoDef) video = NULL;
-         ssize_t insertAt = -1;
- 
-         if (!(video = virDomainVideoDefParseXML(xmlopt, nodes[i],
-@@ -21640,7 +21640,6 @@ virDomainDefParseXML(xmlDocPtr xml,
- 
-         if (video->primary) {
-             if (def->nvideos != 0 && def->videos[0]->primary) {
--                virDomainVideoDefFree(video);
-                 virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                                _("Only one primary video device is supported"));
-                 goto error;
-@@ -21652,7 +21651,6 @@ virDomainDefParseXML(xmlDocPtr xml,
-                                        insertAt,
-                                        def->nvideos,
-                                        video) < 0) {
--            virDomainVideoDefFree(video);
-             goto error;
-         }
-     }
-diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
-index e057c384c6..15b9e79d69 100644
---- a/src/conf/domain_conf.h
-+++ b/src/conf/domain_conf.h
-@@ -2938,6 +2938,7 @@ void virDomainNVRAMDefFree(virDomainNVRAMDefPtr def);
- void virDomainWatchdogDefFree(virDomainWatchdogDefPtr def);
- virDomainVideoDefPtr virDomainVideoDefNew(virDomainXMLOptionPtr xmlopt);
- void virDomainVideoDefFree(virDomainVideoDefPtr def);
-+G_DEFINE_AUTOPTR_CLEANUP_FUNC(virDomainVideoDef, virDomainVideoDefFree);
- void virDomainVideoDefClear(virDomainVideoDefPtr def);
- virDomainHostdevDefPtr virDomainHostdevDefNew(void);
- void virDomainHostdevDefClear(virDomainHostdevDefPtr def);
--- 
-2.33.0
-
diff --git a/enum-Add-helpers-for-converting-virTristate-to-a-pla.patch b/enum-Add-helpers-for-converting-virTristate-to-a-pla.patch
deleted file mode 100644
index 78c611b96b2ef9fca983766f8559fdef67e0449e..0000000000000000000000000000000000000000
--- a/enum-Add-helpers-for-converting-virTristate-to-a-pla.patch
+++ /dev/null
@@ -1,125 +0,0 @@
-From 04c5fee85547da11323b66b2fb79fb590e8307a1 Mon Sep 17 00:00:00 2001
-From: jiangdawei15 <jiangdawei15@huawei.com>
-Date: Thu, 18 Aug 2022 20:15:54 +0800
-Subject: [PATCH 22/22] enum: Add helpers for converting virTristate* to a
- plain bool
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The helpers will update the passed boolean if the tristate's value is
-not _ABSENT.
-
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/libvirt_private.syms |  2 ++
- src/util/virenum.c       | 54 ++++++++++++++++++++++++++++++++++++++++
- src/util/virenum.h       |  2 ++
- 3 files changed, 58 insertions(+)
-
-diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
-index f30eb7ffb5..a00e354859 100644
---- a/src/libvirt_private.syms
-+++ b/src/libvirt_private.syms
-@@ -1965,9 +1965,11 @@ ebtablesRemoveForwardAllowIn;
- virEnumFromString;
- virEnumToString;
- virTristateBoolFromBool;
-+virTristateBoolToBool;
- virTristateBoolTypeFromString;
- virTristateBoolTypeToString;
- virTristateSwitchFromBool;
-+virTristateSwitchToBool;
- virTristateSwitchTypeFromString;
- virTristateSwitchTypeToString;
- 
-diff --git a/src/util/virenum.c b/src/util/virenum.c
-index 26093bd795..dfedc28ba7 100644
---- a/src/util/virenum.c
-+++ b/src/util/virenum.c
-@@ -47,6 +47,33 @@ virTristateBoolFromBool(bool val)
- }
- 
- 
-+/**
-+ * virTristateBoolToBool: The value pointed to by @b is
-+ * updated if the tristate value @t is not absent.
-+ *
-+ * @t: a virTristateBool value
-+ * @b: pointer to a boolean to be updated according to the value of @t
-+ */
-+void
-+virTristateBoolToBool(virTristateBool t,
-+                      bool *b)
-+{
-+    switch (t) {
-+        case VIR_TRISTATE_BOOL_YES:
-+            *b = true;
-+            break;
-+
-+        case VIR_TRISTATE_BOOL_NO:
-+            *b = false;
-+            break;
-+
-+        case VIR_TRISTATE_BOOL_ABSENT:
-+        case VIR_TRISTATE_BOOL_LAST:
-+            break;
-+    }
-+}
-+
-+
- virTristateSwitch
- virTristateSwitchFromBool(bool val)
- {
-@@ -57,6 +84,33 @@ virTristateSwitchFromBool(bool val)
- }
- 
- 
-+/**
-+ * virTristateSwitchToBool: The value pointed to by @b
-+ * is updated if the tristate value @t is not absent.
-+ *
-+ * @t: a virTristateSwitch value
-+ * @b: pointer to a boolean to be updated according to the value of @t
-+ */
-+void
-+virTristateSwitchToBool(virTristateSwitch t,
-+                        bool *b)
-+{
-+    switch (t) {
-+        case VIR_TRISTATE_SWITCH_ON:
-+            *b = true;
-+            break;
-+
-+        case VIR_TRISTATE_SWITCH_OFF:
-+            *b = false;
-+            break;
-+
-+        case VIR_TRISTATE_SWITCH_ABSENT:
-+        case VIR_TRISTATE_SWITCH_LAST:
-+            break;
-+    }
-+}
-+
-+
- int
- virEnumFromString(const char * const *types,
-                   unsigned int ntypes,
-diff --git a/src/util/virenum.h b/src/util/virenum.h
-index d74af35530..98f01d574d 100644
---- a/src/util/virenum.h
-+++ b/src/util/virenum.h
-@@ -68,7 +68,9 @@ VIR_ENUM_DECL(virTristateBool);
- VIR_ENUM_DECL(virTristateSwitch);
- 
- virTristateBool virTristateBoolFromBool(bool val);
-+void virTristateBoolToBool(virTristateBool t, bool *b);
- virTristateSwitch virTristateSwitchFromBool(bool val);
-+void virTristateSwitchToBool(virTristateSwitch t, bool *b);
- 
- /* the two enums must be in sync to be able to use helpers interchangeably in
-  * some special cases */
--- 
-2.33.0
-
diff --git a/esx-call-freeaddrinfo-earlier-in-esxUtil_ResolveHost.patch b/esx-call-freeaddrinfo-earlier-in-esxUtil_ResolveHost.patch
deleted file mode 100644
index ec363101af232c3bb162feb8fd92a875a279d1d2..0000000000000000000000000000000000000000
--- a/esx-call-freeaddrinfo-earlier-in-esxUtil_ResolveHost.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 9b80543fb6ebccf64d0bcbe91a2e97873886164c Mon Sep 17 00:00:00 2001
-From: tangbinzy <tangbin_yewu@cmss.chinamobile.com>
-Date: Thu, 16 Mar 2023 07:03:51 +0000
-Subject: [PATCH] esx: call freeaddrinfo earlier in esxUtil_ResolveHostname
- Call freeaddrinfo() as soon as @result is not needed anymore, i.e. right
- after getnameinfo(); this avoids calling freeaddrinfo() in two branches.
-
-Signed-off-by: Pino Toscano <ptoscano@redhat.com>
-Reviewed-by: Laine Stump <laine@redhat.com>
-
-Signed-off-by: tangbin <tangbin_yewu@cmss.chinamobile.com>
-(cherry-pick from 3aaf23ff69cea9abb7b7a43d9ff3eb687a916a2e)
----
- src/esx/esx_util.c | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/src/esx/esx_util.c b/src/esx/esx_util.c
-index 89d136248f..98ce462ff0 100644
---- a/src/esx/esx_util.c
-+++ b/src/esx/esx_util.c
-@@ -311,17 +311,15 @@ esxUtil_ResolveHostname(const char *hostname,
- 
-     errcode = getnameinfo(result->ai_addr, result->ai_addrlen, ipAddress,
-                           ipAddress_length, NULL, 0, NI_NUMERICHOST);
-+    freeaddrinfo(result);
- 
-     if (errcode != 0) {
-         virReportError(VIR_ERR_INTERNAL_ERROR,
-                        _("Formatting IP address for host '%s' failed: %s"), hostname,
-                        gai_strerror(errcode));
--        freeaddrinfo(result);
-         return -1;
-     }
- 
--    freeaddrinfo(result);
--
-     return 0;
- }
- 
--- 
-2.27.0
-
diff --git a/examples-hellolibvirt-fix-argc-check.patch b/examples-hellolibvirt-fix-argc-check.patch
deleted file mode 100644
index 7b56c05695ac804764a06bf1703da479e42bd970..0000000000000000000000000000000000000000
--- a/examples-hellolibvirt-fix-argc-check.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 7a13a72308b5ad5887497e13995522ab151e6293 Mon Sep 17 00:00:00 2001
-From: wangmeiyang <wangmeiyang_yewu@cmss.chinamobile.com>
-Date: Wed, 30 Nov 2022 19:47:10 +0800
-Subject: [PATCH 20/24] examples: hellolibvirt: fix argc check
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-https://gitlab.com/libvirt/libvirt/-/issues/255
-
-cherry-pick from dacf616b788a989ecaa1679845a07ff8010372cf
-
-Reported-by: Jeremy Alcim
-Signed-off-by: Ján Tomko <jtomko@redhat.com>
-Signed-off-by: Meiyang Wang <wangmeiyang_yewu@cmss.chinamobile.com>
----
- examples/c/misc/hellolibvirt.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/examples/c/misc/hellolibvirt.c b/examples/c/misc/hellolibvirt.c
-index a598e01be2..39cefe934c 100644
---- a/examples/c/misc/hellolibvirt.c
-+++ b/examples/c/misc/hellolibvirt.c
-@@ -107,11 +107,12 @@ main(int argc, char *argv[])
- {
-     int ret = 0;
-     virConnectPtr conn;
--    char *uri;
-+    char *uri = NULL;
- 
-     printf("Attempting to connect to hypervisor\n");
- 
--    uri = (argc > 0 ? argv[1] : NULL);
-+    if (argc > 1)
-+        uri = argv[1];
- 
-     /* virConnectOpenAuth is called here with all default parameters,
-      * except, possibly, the URI of the hypervisor. */
--- 
-2.27.0
-
diff --git a/fix-error-in-printf-format-string.patch b/fix-error-in-printf-format-string.patch
deleted file mode 100644
index 78edba3e6614031ba36d9bf14b38247cdc13ef07..0000000000000000000000000000000000000000
--- a/fix-error-in-printf-format-string.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 56dc1a61719f5133b30676afe71c4d1482c84476 Mon Sep 17 00:00:00 2001
-From: Zhenyu Ye <yezhenyu2@huawei.com>
-Date: Thu, 19 Aug 2021 20:14:11 +0800
-Subject: [PATCH] fix error in printf format string
-
-Use %s to print NULLSTR(duri).
-
-Reported-by: Peng Liang <liangpeng10@huawei.com>
-Signed-off-by: Zhenyu Ye <yezhenyu2@huawei.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-Signed-off-by: zhujun2 <zhujun2_yewu@cmss.chinamobile.com>
-(cherry-pick from 94ac9d55fd9067326c483372c858bb4233826880)
----
- src/libvirt-domain.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c
-index 6ce4a6715c..8f6ff2fe22 100644
---- a/src/libvirt-domain.c
-+++ b/src/libvirt-domain.c
-@@ -4086,7 +4086,7 @@ virDomainMigrateToURI(virDomainPtr domain,
-     const char *dconnuri = NULL;
-     const char *miguri = NULL;
- 
--    VIR_DOMAIN_DEBUG(domain, "duri=%p, flags=0x%lx, dname=%s, bandwidth=%lu",
-+    VIR_DOMAIN_DEBUG(domain, "duri=%s, flags=0x%lx, dname=%s, bandwidth=%lu",
-                      NULLSTR(duri), flags, NULLSTR(dname), bandwidth);
- 
-     virResetLastError();
--- 
-2.41.0.windows.1
-
diff --git a/fix-the-issue-of-errors-when-saving-after-virsh-edit.patch b/fix-the-issue-of-errors-when-saving-after-virsh-edit.patch
deleted file mode 100644
index 7a0e38ae565279cfa7b538e930caa8780054e9b4..0000000000000000000000000000000000000000
--- a/fix-the-issue-of-errors-when-saving-after-virsh-edit.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From d5c1bd627d522b16eb87e2684a912c16ce79c12b Mon Sep 17 00:00:00 2001
-From: lifeng 71117973 <lif121@chinatelecom.cn>
-Date: Mon, 15 May 2023 15:39:32 +0800
-Subject: [PATCH] fix the issue of errors when saving after 'virsh edit'
-
----
- docs/schemas/basictypes.rng | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/docs/schemas/basictypes.rng b/docs/schemas/basictypes.rng
-index 34d285db48..8b430e71a6 100644
---- a/docs/schemas/basictypes.rng
-+++ b/docs/schemas/basictypes.rng
-@@ -440,6 +440,7 @@
-       <value>sh4eb</value>
-       <value>sparc</value>
-       <value>sparc64</value>
-+      <value>sw_64</value>
-       <value>unicore32</value>
-       <value>x86_64</value>
-       <value>xtensa</value>
--- 
-2.27.0
-
diff --git a/glibcompat-Provide-implementation-for-G_GNUC_NO_INLI.patch b/glibcompat-Provide-implementation-for-G_GNUC_NO_INLI.patch
deleted file mode 100644
index 2c6042f7f34b977608e665a08ba58addcd90a6b6..0000000000000000000000000000000000000000
--- a/glibcompat-Provide-implementation-for-G_GNUC_NO_INLI.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 1ac928729853d29d030944ece5e10db69d54267d Mon Sep 17 00:00:00 2001
-From: mayunlong <mayunlong6@huawei.com>
-Date: Tue, 14 Feb 2023 19:09:08 +0800
-Subject: [PATCH] glibcompat: Provide implementation for G_GNUC_NO_INLINE
-
-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@redhat.com>
-Reviewed-by: Pavel Hrdina <phrdina@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 302fddba34..440f01d370 100644
---- a/src/internal.h
-+++ b/src/internal.h
-@@ -94,18 +94,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 6f50a76f3c..15d3266686 100644
---- a/src/util/glibcompat.h
-+++ b/src/util/glibcompat.h
-@@ -37,3 +37,12 @@ char *vir_g_strdup_vprintf(const char *msg, va_list args)
- #define g_canonicalize_filename vir_g_canonicalize_filename
- #undef g_fsync
- #define g_fsync vir_g_fsync
-+
-+/* 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.25.1
-
diff --git a/vdpa-Introduce-the-new-device-type-vdpa-to-hostdev.patch b/hostdev-Introduce-vDPA-device-to-hostdev-subsystem-a.patch
similarity index 40%
rename from vdpa-Introduce-the-new-device-type-vdpa-to-hostdev.patch
rename to hostdev-Introduce-vDPA-device-to-hostdev-subsystem-a.patch
index 22439955d50cccf46270c3afd610afa727b70637..f98bd557a5bc3fc1661ce5a0cafe5fa2bc378c3d 100644
--- a/vdpa-Introduce-the-new-device-type-vdpa-to-hostdev.patch
+++ b/hostdev-Introduce-vDPA-device-to-hostdev-subsystem-a.patch
@@ -1,39 +1,54 @@
-From ccb6ee3cd899a2209cbe29f6c3b70522b86323ba Mon Sep 17 00:00:00 2001
+From 5d9ad485395b057739736ea31efa82d275c57324 Mon Sep 17 00:00:00 2001
 From: AlexChen <alex.chen@huawei.com>
-Date: Sat, 25 Nov 2023 10:34:05 +0800
-Subject: [PATCH] vdpa: Introduce the new device type vdpa to hostdev
+Date: Fri, 29 Mar 2024 15:27:46 +0800
+Subject: [PATCH] hostdev:Introduce vDPA device to hostdev subsystem as a new
+ subtype
 
-Introduce the new device type vdpa to hostdev
+The following is the xml of vdpa device:
+<devices>
+    <hostdev mode='subsystem' type='vdpa'>
+        <source dev='/dev/vhost-vdpa-0'/>
+    </hostdev>
+</devices>
+And the command line passed to QEMU is as follows:
+-device {"driver":"vhost-vdpa-device-pci","vhostdev":"/dev/vhost-vdpa-0"}
+
+This solution is selected according to the previous discussion
+on the solution of supporting the vDPA device.
+For details, see the following:
+https://listman.redhat.com/archives/libvir-list/2023-March/239018.html
 
-Signed-off-by: libai <libai12@huawei.com>
-Signed-off-by: jiangdongxu <jiangdongxu1@huawei.com>
 Signed-off-by: AlexChen <alex.chen@huawei.com>
 ---
- src/conf/domain_audit.c         |  4 ++++
- src/conf/domain_conf.c          | 38 +++++++++++++++++++++++++++++++++
- src/conf/domain_conf.h          |  6 ++++++
- src/conf/virconftypes.h         |  3 +++
- src/qemu/qemu_command.c         | 29 +++++++++++++++++++++++++
- src/qemu/qemu_command.h         |  4 ++++
+ src/conf/domain_audit.c         |  4 +++
+ src/conf/domain_conf.c          | 43 +++++++++++++++++++++++++++++++++
+ src/conf/domain_conf.h          |  6 +++++
+ src/conf/domain_postparse.c     |  1 +
+ src/conf/domain_validate.c      |  1 +
+ src/conf/virconftypes.h         |  2 ++
+ src/qemu/qemu_command.c         | 19 +++++++++++++++
+ src/qemu/qemu_command.h         |  3 +++
  src/qemu/qemu_domain.c          |  7 ++++++
- src/qemu/qemu_domain_address.c  |  6 ++++--
+ src/qemu/qemu_hotplug.c         |  3 +++
+ src/qemu/qemu_migration.c       |  2 ++
+ src/qemu/qemu_validate.c        |  2 ++
  src/security/security_dac.c     |  2 ++
  src/security/security_selinux.c |  2 ++
- 10 files changed, 99 insertions(+), 2 deletions(-)
+ 14 files changed, 97 insertions(+)
 
 diff --git a/src/conf/domain_audit.c b/src/conf/domain_audit.c
-index 1b0abb21a0..d920dcbf09 100644
+index 7a6bb02203..e4d4d6d912 100644
 --- a/src/conf/domain_audit.c
 +++ b/src/conf/domain_audit.c
-@@ -350,6 +350,7 @@ virDomainAuditHostdev(virDomainObjPtr vm, virDomainHostdevDefPtr hostdev,
-     virDomainHostdevSubsysSCSIPtr scsisrc = &hostdev->source.subsys.u.scsi;
-     virDomainHostdevSubsysSCSIVHostPtr hostsrc = &hostdev->source.subsys.u.scsi_host;
-     virDomainHostdevSubsysMediatedDevPtr mdevsrc = &hostdev->source.subsys.u.mdev;
-+    virDomainHostdevSubsysVDPAPtr vdpasrc = &hostdev->source.subsys.u.vdpa;
+@@ -344,6 +344,7 @@ virDomainAuditHostdev(virDomainObj *vm, virDomainHostdevDef *hostdev,
+     virDomainHostdevSubsysSCSI *scsisrc = &hostdev->source.subsys.u.scsi;
+     virDomainHostdevSubsysSCSIVHost *hostsrc = &hostdev->source.subsys.u.scsi_host;
+     virDomainHostdevSubsysMediatedDev *mdevsrc = &hostdev->source.subsys.u.mdev;
++    virDomainHostdevSubsysVDPA *vdpasrc = &hostdev->source.subsys.u.vdpa;
  
      virUUIDFormat(vm->def->uuid, uuidstr);
      if (!(vmname = virAuditEncode("vm", vm->def->name))) {
-@@ -393,6 +394,9 @@ virDomainAuditHostdev(virDomainObjPtr vm, virDomainHostdevDefPtr hostdev,
+@@ -383,6 +384,9 @@ virDomainAuditHostdev(virDomainObj *vm, virDomainHostdevDef *hostdev,
          case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_MDEV:
              address = g_strdup(mdevsrc->uuidstr);
              break;
@@ -44,10 +59,10 @@ index 1b0abb21a0..d920dcbf09 100644
          default:
              VIR_WARN("Unexpected hostdev type while encoding audit message: %d",
 diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
-index 7ae403424d..5a04d1b5d1 100644
+index f54f99f379..0f4c9012c1 100644
 --- a/src/conf/domain_conf.c
 +++ b/src/conf/domain_conf.c
-@@ -911,6 +911,7 @@ VIR_ENUM_IMPL(virDomainHostdevSubsys,
+@@ -1052,6 +1052,7 @@ VIR_ENUM_IMPL(virDomainHostdevSubsys,
                "scsi",
                "scsi_host",
                "mdev",
@@ -55,39 +70,31 @@ index 7ae403424d..5a04d1b5d1 100644
  );
  
  VIR_ENUM_IMPL(virDomainHostdevSubsysPCIBackend,
-@@ -2980,6 +2981,9 @@ void virDomainHostdevDefClear(virDomainHostdevDefPtr def)
-         case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI_HOST:
-             VIR_FREE(def->source.subsys.u.scsi_host.wwpn);
+@@ -2645,6 +2646,9 @@ virDomainHostdevDefClear(virDomainHostdevDef *def)
+         case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI:
+             g_clear_pointer(&def->source.subsys.u.pci.origstates, virBitmapFree);
              break;
 +        case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_VDPA:
 +            VIR_FREE(def->source.subsys.u.vdpa.devpath);
 +            break;
          case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB:
-         case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI:
          case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_MDEV:
-@@ -6706,6 +6710,7 @@ virDomainHostdevDefValidate(const virDomainHostdevDef *hostdev)
-             }
-             break;
-         case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_MDEV:
-+        case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_VDPA:
          case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_LAST:
-             break;
-         }
-@@ -8590,6 +8595,22 @@ virDomainHostdevSubsysMediatedDevDefParseXML(virDomainHostdevDefPtr def,
+@@ -6170,6 +6174,22 @@ virDomainHostdevSubsysMediatedDevDefParseXML(virDomainHostdevDef *def,
      return 0;
  }
  
 +static int
-+virDomainHostdevSubsysVDPADefParseXML(virDomainHostdevDefPtr def,
-+                                      xmlNodePtr sourcenode)
++virDomainHostdevSubsysVDPADefParseXML(xmlNodePtr sourcenode,
++                                      virDomainHostdevDef *def)
 +{
 +    g_autofree char *devpath = NULL;
-+    virDomainHostdevSubsysVDPAPtr vdpa = &def->source.subsys.u.vdpa;
++    virDomainHostdevSubsysVDPA *vdpa = &def->source.subsys.u.vdpa;
 +
-+    if (!(devpath = virXMLPropString(sourcenode, "dev"))) {
-+        virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-+                       _("Missing 'dev' attribute for element <source>"));
-+        return -1;
++    if(!(devpath = virXMLPropString(sourcenode, "dev"))) {
++       virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
++                      _("Missing 'dev' attribute for element <source>"));
++       return -1;
 +    }
 +    vdpa->devpath = g_steal_pointer(&devpath);
 +    return 0;
@@ -96,19 +103,19 @@ index 7ae403424d..5a04d1b5d1 100644
  static int
  virDomainHostdevDefParseXMLSubsys(xmlNodePtr node,
                                    xmlXPathContextPtr ctxt,
-@@ -8779,6 +8800,11 @@ virDomainHostdevDefParseXMLSubsys(xmlNodePtr node,
+@@ -6315,6 +6335,11 @@ virDomainHostdevDefParseXMLSubsys(xmlNodePtr node,
          if (virDomainHostdevSubsysMediatedDevDefParseXML(def, ctxt) < 0)
              return -1;
          break;
 +    case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_VDPA:
-+        if (virDomainHostdevSubsysVDPADefParseXML(def, sourcenode) < 0) {
++        if (virDomainHostdevSubsysVDPADefParseXML(sourcenode, def) < 0) {
 +            return -1;
 +        }
 +        break;
  
+     case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_LAST:
      default:
-         virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-@@ -16328,6 +16354,7 @@ virDomainHostdevDefParseXML(virDomainXMLOptionPtr xmlopt,
+@@ -13005,6 +13030,7 @@ virDomainHostdevDefParseXML(virDomainXMLOption *xmlopt,
          case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI:
          case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI_HOST:
          case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_MDEV:
@@ -116,7 +123,7 @@ index 7ae403424d..5a04d1b5d1 100644
          case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_LAST:
              break;
          }
-@@ -17407,6 +17434,9 @@ virDomainHostdevMatchSubsys(virDomainHostdevDefPtr a,
+@@ -14152,6 +14178,9 @@ virDomainHostdevMatchSubsys(virDomainHostdevDef *a,
              return 0;
      case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_MDEV:
          return virDomainHostdevMatchSubsysMediatedDev(a, b);
@@ -126,40 +133,39 @@ index 7ae403424d..5a04d1b5d1 100644
      case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_LAST:
          return 0;
      }
-@@ -25891,6 +25921,7 @@ virDomainHostdevDefFormatSubsys(virBufferPtr buf,
-     virDomainHostdevSubsysSCSIPtr scsisrc = &def->source.subsys.u.scsi;
-     virDomainHostdevSubsysSCSIVHostPtr hostsrc = &def->source.subsys.u.scsi_host;
-     virDomainHostdevSubsysMediatedDevPtr mdevsrc = &def->source.subsys.u.mdev;
-+    virDomainHostdevSubsysVDPAPtr vdpasrc = &def->source.subsys.u.vdpa;
-     virDomainHostdevSubsysSCSIHostPtr scsihostsrc = &scsisrc->u.host;
-     virDomainHostdevSubsysSCSIiSCSIPtr iscsisrc = &scsisrc->u.iscsi;
- 
-@@ -25940,6 +25971,11 @@ virDomainHostdevDefFormatSubsys(virBufferPtr buf,
-                           protocol, hostsrc->wwpn);
-     }
+@@ -23501,6 +23530,16 @@ virDomainHostdevDefFormatSubsysMdev(virBuffer *buf,
+     virXMLFormatElement(buf, "source", NULL, &sourceChildBuf);
+ }
  
-+    if (def->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_VDPA) {
-+        closedSource = true;
-+        virBufferAsprintf(buf, " dev='%s'/", vdpasrc->devpath);
-+    }
++static void
++virDomainHostdevDefFormatSubsysVDPA(virBuffer *buf,
++                                    virDomainHostdevDef *def)
++{
++    g_auto(virBuffer) sourceAttrBuf = VIR_BUFFER_INITIALIZER;
++    virDomainHostdevSubsysVDPA *vdpasrc = &def->source.subsys.u.vdpa;
++    virBufferAsprintf(&sourceAttrBuf, " dev='%s'", vdpasrc->devpath);
++    virXMLFormatElement(buf, "source", &sourceAttrBuf, NULL);
++}
 +
-     virBufferAddLit(buf, ">\n");
  
-     virBufferAdjustIndent(buf, 2);
-@@ -25998,6 +26034,8 @@ virDomainHostdevDefFormatSubsys(virBufferPtr buf,
-         virBufferAsprintf(buf, "<address uuid='%s'/>\n",
-                           mdevsrc->uuidstr);
-         break;
+ static int
+ virDomainHostdevDefFormatSubsys(virBuffer *buf,
+@@ -23528,6 +23567,10 @@ virDomainHostdevDefFormatSubsys(virBuffer *buf,
+         virDomainHostdevDefFormatSubsysMdev(buf, def);
+         return 0;
+ 
 +    case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_VDPA:
-+        break;
++        virDomainHostdevDefFormatSubsysVDPA(buf, def);
++        return 0;
++
+     case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_LAST:
      default:
-         virReportError(VIR_ERR_INTERNAL_ERROR,
-                        _("unexpected hostdev type %d"),
+         virReportEnumRangeError(virDomainHostdevSubsysType, def->source.subsys.type);
 diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
-index 98fa323679..6d56ef0282 100644
+index 196053d950..2a85f7bcf0 100644
 --- a/src/conf/domain_conf.h
 +++ b/src/conf/domain_conf.h
-@@ -199,6 +199,7 @@ typedef enum {
+@@ -198,6 +198,7 @@ typedef enum {
      VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI,
      VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI_HOST,
      VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_MDEV,
@@ -167,8 +173,8 @@ index 98fa323679..6d56ef0282 100644
  
      VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_LAST
  } virDomainHostdevSubsysType;
-@@ -267,6 +268,10 @@ struct _virDomainHostdevSubsysMediatedDev {
-     int ramfb; /* virTristateSwitch */
+@@ -290,6 +291,10 @@ struct _virDomainHostdevSubsysMediatedDev {
+     virTristateSwitch ramfb;
  };
  
 +struct _virDomainHostdevSubsysVDPA {
@@ -176,9 +182,9 @@ index 98fa323679..6d56ef0282 100644
 +};
 +
  typedef enum {
-     VIR_DOMAIN_HOSTDEV_SUBSYS_SCSI_HOST_PROTOCOL_TYPE_NONE,
+     VIR_DOMAIN_HOSTDEV_SUBSYS_SCSI_HOST_PROTOCOL_TYPE_NONE = 0,
      VIR_DOMAIN_HOSTDEV_SUBSYS_SCSI_HOST_PROTOCOL_TYPE_VHOST,
-@@ -301,6 +306,7 @@ struct _virDomainHostdevSubsys {
+@@ -324,6 +329,7 @@ struct _virDomainHostdevSubsys {
          virDomainHostdevSubsysSCSI scsi;
          virDomainHostdevSubsysSCSIVHost scsi_host;
          virDomainHostdevSubsysMediatedDev mdev;
@@ -186,104 +192,108 @@ index 98fa323679..6d56ef0282 100644
      } u;
  };
  
+diff --git a/src/conf/domain_postparse.c b/src/conf/domain_postparse.c
+index e79913b73f..b948bf0653 100644
+--- a/src/conf/domain_postparse.c
++++ b/src/conf/domain_postparse.c
+@@ -351,6 +351,7 @@ virDomainHostdevDefPostParse(virDomainHostdevDef *dev,
+     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_VDPA:
+     case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_LAST:
+         break;
+     }
+diff --git a/src/conf/domain_validate.c b/src/conf/domain_validate.c
+index c72108886e..d88ef6b915 100644
+--- a/src/conf/domain_validate.c
++++ b/src/conf/domain_validate.c
+@@ -2190,6 +2190,7 @@ virDomainHostdevDefValidate(const virDomainHostdevDef *hostdev)
+             }
+             break;
+         case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_MDEV:
++        case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_VDPA:
+         case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_LAST:
+             break;
+         }
 diff --git a/src/conf/virconftypes.h b/src/conf/virconftypes.h
-index 1c62cde251..ca1a17b262 100644
+index 26cb966194..bcdcb8b825 100644
 --- a/src/conf/virconftypes.h
 +++ b/src/conf/virconftypes.h
-@@ -174,6 +174,9 @@ typedef virDomainHostdevSubsys *virDomainHostdevSubsysPtr;
+@@ -120,6 +120,8 @@ typedef struct _virDomainHostdevSubsys virDomainHostdevSubsys;
+ 
  typedef struct _virDomainHostdevSubsysMediatedDev virDomainHostdevSubsysMediatedDev;
- typedef virDomainHostdevSubsysMediatedDev *virDomainHostdevSubsysMediatedDevPtr;
  
 +typedef struct _virDomainHostdevSubsysVDPA virDomainHostdevSubsysVDPA;
-+typedef virDomainHostdevSubsysVDPA *virDomainHostdevSubsysVDPAPtr;
 +
  typedef struct _virDomainHostdevSubsysPCI virDomainHostdevSubsysPCI;
- typedef virDomainHostdevSubsysPCI *virDomainHostdevSubsysPCIPtr;
  
+ typedef struct _virDomainHostdevSubsysSCSI virDomainHostdevSubsysSCSI;
 diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
-index 832c17b602..d7db30d19b 100644
+index d54149ed2d..de3be7fc1c 100644
 --- a/src/qemu/qemu_command.c
 +++ b/src/qemu/qemu_command.c
-@@ -5476,6 +5476,25 @@ qemuBuildHostdevMediatedDevStr(const virDomainDef *def,
-     return virBufferContentAndReset(&buf);
+@@ -5004,6 +5004,18 @@ qemuBuildHostdevMediatedDevProps(const virDomainDef *def,
+     return g_steal_pointer(&props);
  }
  
-+char *
-+qemuBuildHostdevVDPAStr(const virDomainDef *def,
-+                        virDomainHostdevDefPtr dev,
-+                        virQEMUCapsPtr qemuCaps)
++virJSONValue *
++qemuBuildHostdevVDPADevProps(virDomainHostdevDef *dev)
 +{
-+    g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
-+    virDomainHostdevSubsysVDPAPtr vdpa = &dev->source.subsys.u.vdpa;
-+    if (!vdpa->devpath) {
++    g_autoptr(virJSONValue) props = NULL;
++    virDomainHostdevSubsysVDPA *vdpasrc = &dev->source.subsys.u.vdpa;
++    if (virJSONValueObjectAdd(&props,
++                              "s:driver", "vhost-vdpa-device-pci",
++                              "s:vhostdev", vdpasrc->devpath,
++                              NULL) < 0)
 +        return NULL;
-+    }
-+
-+    virBufferAdd(&buf, "vhost-vdpa-device-pci", -1);
-+    virBufferAsprintf(&buf, ",id=%s", dev->info->alias);
-+    virBufferAsprintf(&buf, ",vhostdev=%s", vdpa->devpath);
-+    if (qemuBuildDeviceAddressStr(&buf, def, dev->info, qemuCaps) < 0)
-+        return NULL;
-+    return virBufferContentAndReset(&buf);
++    return g_steal_pointer(&props);
 +}
-+
- static int
- qemuBuildHostdevCommandLine(virCommandPtr cmd,
-                             const virDomainDef *def,
-@@ -5607,6 +5626,16 @@ qemuBuildHostdevCommandLine(virCommandPtr cmd,
  
+ qemuBlockStorageSourceAttachData *
+ qemuBuildHostdevSCSIDetachPrepare(virDomainHostdevDef *hostdev,
+@@ -5199,6 +5211,13 @@ qemuBuildHostdevCommandLine(virCommand *cmd,
+                 return -1;
              break;
  
-+        /* VDPA */
 +        case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_VDPA:
-+            virCommandAddArg(cmd, "-device");
-+            if (!(devstr = qemuBuildHostdevVDPAStr(def, hostdev, qemuCaps))) {
++            if (!(devprops = qemuBuildHostdevVDPADevProps(hostdev)))
++                return -1;
++            if (qemuBuildDeviceCommandlineFromJSON(cmd, devprops, def, qemuCaps) < 0)
 +                return -1;
-+            }
-+            virCommandAddArg(cmd, devstr);
-+
 +            break;
 +
          case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_LAST:
              break;
          }
 diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h
-index 283aaf358c..080cf41b81 100644
+index 341ec43f9a..432ea59310 100644
 --- a/src/qemu/qemu_command.h
 +++ b/src/qemu/qemu_command.h
-@@ -198,6 +198,10 @@ char *
- qemuBuildHostdevMediatedDevStr(const virDomainDef *def,
-                                virDomainHostdevDefPtr dev,
-                                virQEMUCapsPtr qemuCaps);
-+char *
-+qemuBuildHostdevVDPAStr(const virDomainDef *def,
-+                        virDomainHostdevDefPtr dev,
-+                        virQEMUCapsPtr qemuCaps);
+@@ -198,6 +198,9 @@ virJSONValue *
+ qemuBuildHostdevMediatedDevProps(const virDomainDef *def,
+                                  virDomainHostdevDef *dev);
  
- char *qemuBuildRedirdevDevStr(const virDomainDef *def,
-                               virDomainRedirdevDefPtr dev,
++virJSONValue *
++qemuBuildHostdevVDPADevProps(virDomainHostdevDef *dev);
++
+ virJSONValue *
+ qemuBuildRedirdevDevProps(const virDomainDef *def,
+                           virDomainRedirdevDef *dev);
 diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
-index 5933039f5c..fd3e3f64c0 100644
+index f8a6c43797..5a7e8d2607 100644
 --- a/src/qemu/qemu_domain.c
 +++ b/src/qemu/qemu_domain.c
-@@ -6879,6 +6879,8 @@ qemuDomainDeviceDefValidateHostdev(const virDomainHostdevDef *hostdev,
-             break;
-         case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_MDEV:
-             return qemuDomainMdevDefValidate(hostdev, def, qemuCaps);
-+        case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_VDPA:
-+            break;
-         case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_LAST:
-         default:
-             virReportEnumRangeError(virDomainHostdevSubsysType,
-@@ -14442,6 +14444,7 @@ qemuDomainGetHostdevPath(virDomainHostdevDefPtr dev,
-     virDomainHostdevSubsysSCSIPtr scsisrc = &dev->source.subsys.u.scsi;
-     virDomainHostdevSubsysSCSIVHostPtr hostsrc = &dev->source.subsys.u.scsi_host;
-     virDomainHostdevSubsysMediatedDevPtr mdevsrc = &dev->source.subsys.u.mdev;
-+    virDomainHostdevSubsysVDPAPtr vdpasrc = &dev->source.subsys.u.vdpa;
+@@ -10528,6 +10528,8 @@ qemuDomainGetHostdevPath(virDomainHostdevDef *dev,
+     virDomainHostdevSubsysSCSI *scsisrc = &dev->source.subsys.u.scsi;
+     virDomainHostdevSubsysSCSIVHost *hostsrc = &dev->source.subsys.u.scsi_host;
+     virDomainHostdevSubsysMediatedDev *mdevsrc = &dev->source.subsys.u.mdev;
++    virDomainHostdevSubsysVDPA *vdpasrc = &dev->source.subsys.u.vdpa;
++
      g_autoptr(virUSBDevice) usb = NULL;
      g_autoptr(virSCSIDevice) scsi = NULL;
      g_autoptr(virSCSIVHostDevice) host = NULL;
-@@ -14512,6 +14515,10 @@ qemuDomainGetHostdevPath(virDomainHostdevDefPtr dev,
+@@ -10598,6 +10600,10 @@ qemuDomainGetHostdevPath(virDomainHostdevDef *dev,
              if (!(tmpPath = virMediatedDeviceGetIOMMUGroupDev(mdevsrc->uuidstr)))
                  return -1;
  
@@ -294,35 +304,73 @@ index 5933039f5c..fd3e3f64c0 100644
              perm = VIR_CGROUP_DEVICE_RW;
              break;
          case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_LAST:
-diff --git a/src/qemu/qemu_domain_address.c b/src/qemu/qemu_domain_address.c
-index 7f48773832..6649553486 100644
---- a/src/qemu/qemu_domain_address.c
-+++ b/src/qemu/qemu_domain_address.c
-@@ -792,7 +792,8 @@ qemuDomainDeviceCalculatePCIConnectFlags(virDomainDeviceDefPtr dev,
-         if (!virHostdevIsMdevDevice(hostdev) &&
-             (hostdev->mode != VIR_DOMAIN_HOSTDEV_MODE_SUBSYS ||
-              (hostdev->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI &&
--              hostdev->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI_HOST))) {
-+              hostdev->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI_HOST &&
-+              hostdev->source.subsys.type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_VDPA))) {
-             return 0;
-         }
- 
-@@ -2418,7 +2419,8 @@ qemuDomainAssignDevicePCISlots(virDomainDefPtr def,
-         if (subsys->type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI &&
-             subsys->type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI_HOST &&
-             !(subsys->type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_MDEV &&
--              subsys->u.mdev.model == VIR_MDEV_MODEL_TYPE_VFIO_PCI)) {
-+              subsys->u.mdev.model == VIR_MDEV_MODEL_TYPE_VFIO_PCI) &&
-+            subsys->type != VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_VDPA) {
-             continue;
-         }
+@@ -11373,6 +11379,7 @@ qemuDomainPrepareHostdev(virDomainHostdevDef *hostdev,
+     case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB:
+     case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI_HOST:
+     case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_MDEV:
++    case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_VDPA:
+     case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_LAST:
+         break;
+     }
+diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
+index 4e2fc724c0..29c0856f62 100644
+--- a/src/qemu/qemu_hotplug.c
++++ b/src/qemu/qemu_hotplug.c
+@@ -2805,6 +2805,7 @@ qemuDomainAttachHostDevice(virQEMUDriver *driver,
+             return -1;
+         break;
  
++    case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_VDPA:
+     case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_LAST:
+     default:
+         virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+@@ -4717,6 +4718,7 @@ qemuDomainRemoveHostDevice(virQEMUDriver *driver,
+     case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_MDEV:
+         qemuDomainRemoveMediatedDevice(driver, vm, hostdev);
+         break;
++    case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_VDPA:
+     case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_LAST:
+         break;
+     }
+@@ -5743,6 +5745,7 @@ qemuDomainDetachPrepHostdev(virDomainObj *vm,
+             break;
+         case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI_HOST:
+             break;
++        case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_VDPA:
+         case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_LAST:
+         default:
+             virReportError(VIR_ERR_INTERNAL_ERROR,
+diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
+index 41ce565ede..0a89d102df 100644
+--- a/src/qemu/qemu_migration.c
++++ b/src/qemu/qemu_migration.c
+@@ -1310,6 +1310,8 @@ qemuMigrationSrcIsAllowedHostdev(const virDomainDef *def)
+             case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI:
+             case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI_HOST:
+             case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_MDEV:
++                /* The vDPA devices don't support migration for now */
++            case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_VDPA:
+                 virReportError(VIR_ERR_OPERATION_UNSUPPORTED,
+                                _("cannot migrate a domain with <hostdev mode='subsystem' type='%1$s'>"),
+                                virDomainHostdevSubsysTypeToString(hostdev->source.subsys.type));
+diff --git a/src/qemu/qemu_validate.c b/src/qemu/qemu_validate.c
+index e475ad035e..18c5b60a35 100644
+--- a/src/qemu/qemu_validate.c
++++ b/src/qemu/qemu_validate.c
+@@ -2496,6 +2496,8 @@ qemuValidateDomainDeviceDefHostdev(const virDomainHostdevDef *hostdev,
+             break;
+         case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_MDEV:
+             return qemuValidateDomainMdevDef(hostdev, def, qemuCaps);
++        case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_VDPA:
++            break;
+         case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_LAST:
+         default:
+             virReportEnumRangeError(virDomainHostdevSubsysType,
 diff --git a/src/security/security_dac.c b/src/security/security_dac.c
-index 51cabf1961..52b3c156e4 100644
+index c07e488db7..96aebfce5b 100644
 --- a/src/security/security_dac.c
 +++ b/src/security/security_dac.c
-@@ -1357,6 +1357,7 @@ virSecurityDACSetHostdevLabel(virSecurityManagerPtr mgr,
+@@ -1313,6 +1313,7 @@ virSecurityDACSetHostdevLabel(virSecurityManager *mgr,
          break;
      }
  
@@ -330,7 +378,7 @@ index 51cabf1961..52b3c156e4 100644
      case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_LAST:
          ret = 0;
          break;
-@@ -1520,6 +1521,7 @@ virSecurityDACRestoreHostdevLabel(virSecurityManagerPtr mgr,
+@@ -1469,6 +1470,7 @@ virSecurityDACRestoreHostdevLabel(virSecurityManager *mgr,
          break;
      }
  
@@ -339,10 +387,10 @@ index 51cabf1961..52b3c156e4 100644
          ret = 0;
          break;
 diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c
-index cb4dc3e101..54cb42fb8d 100644
+index 84c5ce75ed..652c086cb0 100644
 --- a/src/security/security_selinux.c
 +++ b/src/security/security_selinux.c
-@@ -2213,6 +2213,7 @@ virSecuritySELinuxSetHostdevSubsysLabel(virSecurityManagerPtr mgr,
+@@ -2256,6 +2256,7 @@ virSecuritySELinuxSetHostdevSubsysLabel(virSecurityManager *mgr,
          break;
      }
  
@@ -350,7 +398,7 @@ index cb4dc3e101..54cb42fb8d 100644
      case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_LAST:
          ret = 0;
          break;
-@@ -2449,6 +2450,7 @@ virSecuritySELinuxRestoreHostdevSubsysLabel(virSecurityManagerPtr mgr,
+@@ -2487,6 +2488,7 @@ virSecuritySELinuxRestoreHostdevSubsysLabel(virSecurityManager *mgr,
          break;
      }
  
diff --git a/hostdev-Update-mdev-pointer-reference-after-checking.patch b/hostdev-Update-mdev-pointer-reference-after-checking.patch
deleted file mode 100644
index b49c96d049b659c076a8697f382ece6039791ae4..0000000000000000000000000000000000000000
--- a/hostdev-Update-mdev-pointer-reference-after-checking.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 24ae6a276d538a31f42feb5e988d15b08b444b4a Mon Sep 17 00:00:00 2001
-From: Erik Skultety <eskultet@redhat.com>
-Date: Thu, 7 Jan 2021 16:48:40 +0100
-Subject: [PATCH 078/108] hostdev: Update mdev pointer reference after checking
- device type
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-We set the pointer to some garbage packed structure data without
-knowing whether we were actually handling the type of device we
-expected to be handling. On its own, this was harmless, because we'd
-never use the pointer as we'd skip the device if it were not the
-expected type. However, it's better to make the logic even more
-explicit - we first check the device and only when we're sure we have
-the expected type we then update the pointer shortcut.
-
-Signed-off-by: Erik Skultety <eskultet@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 964738cff3d949d90fc5c3317a2618fcd8d217b4)
----
- src/hypervisor/virhostdev.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/hypervisor/virhostdev.c b/src/hypervisor/virhostdev.c
-index 9017cc3be8..c88c8bee0e 100644
---- a/src/hypervisor/virhostdev.c
-+++ b/src/hypervisor/virhostdev.c
-@@ -1986,11 +1986,11 @@ virHostdevReAttachMediatedDevices(virHostdevManagerPtr mgr,
-         virDomainHostdevSubsysMediatedDevPtr mdevsrc;
-         virDomainHostdevDefPtr hostdev = hostdevs[i];
- 
--        mdevsrc = &hostdev->source.subsys.u.mdev;
--
-         if (!virHostdevIsMdevDevice(hostdev))
-             continue;
- 
-+        mdevsrc = &hostdev->source.subsys.u.mdev;
-+
-         if (!(mdev = virMediatedDeviceNew(mdevsrc->uuidstr,
-                                           mdevsrc->model)))
-             continue;
--- 
-2.33.0
-
diff --git a/hostdev-mdev-Lookup-mdevs-by-sysfs-path-rather-than-.patch b/hostdev-mdev-Lookup-mdevs-by-sysfs-path-rather-than-.patch
deleted file mode 100644
index 44953b358ff2e9759e1e680251a21b0be83c3573..0000000000000000000000000000000000000000
--- a/hostdev-mdev-Lookup-mdevs-by-sysfs-path-rather-than-.patch
+++ /dev/null
@@ -1,161 +0,0 @@
-From 7b752336bd26048514d55bb222531c0b0183fa9c Mon Sep 17 00:00:00 2001
-From: Erik Skultety <eskultet@redhat.com>
-Date: Thu, 7 Jan 2021 16:53:21 +0100
-Subject: [PATCH 079/108] hostdev: mdev: Lookup mdevs by sysfs path rather than
- mdev struct
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The lookup didn't do anything apart from comparing the sysfs paths
-anyway since that's what makes each mdev unique.
-The most ridiculous usage of the old logic was in
-virHostdevReAttachMediatedDevices where in order to drop an mdev
-hostdev from the list of active devices we first had to create a new
-mdev and use it in the lookup call. Why couldn't we have used the
-hostdev directly? Because the hostdev and mdev structures are
-incompatible.
-
-The way mdevs are currently removed is via a write to a specific sysfs
-attribute. If you do it while the machine which has the mdev assigned
-is running, the write call may block (with a new enough kernel, with
-older kernels it would return a write error!) until the device
-is no longer in use which is when the QEMU process exits.
-
-The interesting part here comes afterwards when we're cleaning up and
-call virHostdevReAttachMediatedDevices. The domain doesn't exist
-anymore, so the list of active hostdevs needs to be updated and the
-respective hostdevs removed from the list, but remember we had to
-create an mdev object in the memory in order to find it in the list
-first which will fail because the write to sysfs had already removed
-the mdev instance from the host system.
-And so the next time you try to start the same domain you'll get:
-
-"Requested operation is not valid: mediated device <path> is in use by
-driver QEMU, domain <name>"
-
-Fixes: https://gitlab.com/libvirt/libvirt/-/issues/119
-
-Signed-off-by: Erik Skultety <eskultet@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 49cb59778a4e6c2d04bb9383a9d97fbbc83f9fce)
----
- src/hypervisor/virhostdev.c | 10 ++++------
- src/util/virmdev.c          | 16 ++++++++--------
- src/util/virmdev.h          |  4 ++--
- 3 files changed, 14 insertions(+), 16 deletions(-)
-
-diff --git a/src/hypervisor/virhostdev.c b/src/hypervisor/virhostdev.c
-index c88c8bee0e..4057f7b25f 100644
---- a/src/hypervisor/virhostdev.c
-+++ b/src/hypervisor/virhostdev.c
-@@ -1981,7 +1981,7 @@ virHostdevReAttachMediatedDevices(virHostdevManagerPtr mgr,
- 
-     virObjectLock(mgr->activeMediatedHostdevs);
-     for (i = 0; i < nhostdevs; i++) {
--        g_autoptr(virMediatedDevice) mdev = NULL;
-+        g_autofree char *sysfspath = NULL;
-         virMediatedDevicePtr tmp;
-         virDomainHostdevSubsysMediatedDevPtr mdevsrc;
-         virDomainHostdevDefPtr hostdev = hostdevs[i];
-@@ -1990,14 +1990,12 @@ virHostdevReAttachMediatedDevices(virHostdevManagerPtr mgr,
-             continue;
- 
-         mdevsrc = &hostdev->source.subsys.u.mdev;
--
--        if (!(mdev = virMediatedDeviceNew(mdevsrc->uuidstr,
--                                          mdevsrc->model)))
--            continue;
-+        sysfspath = virMediatedDeviceGetSysfsPath(mdevsrc->uuidstr);
- 
-         /* Remove from the list only mdevs assigned to @drv_name/@dom_name */
- 
--        tmp = virMediatedDeviceListFind(mgr->activeMediatedHostdevs, mdev);
-+        tmp = virMediatedDeviceListFind(mgr->activeMediatedHostdevs,
-+                                        sysfspath);
- 
-         /* skip inactive devices */
-         if (!tmp)
-diff --git a/src/util/virmdev.c b/src/util/virmdev.c
-index c2499c0a20..bae4a7d2c1 100644
---- a/src/util/virmdev.c
-+++ b/src/util/virmdev.c
-@@ -312,7 +312,7 @@ int
- virMediatedDeviceListAdd(virMediatedDeviceListPtr list,
-                          virMediatedDevicePtr *dev)
- {
--    if (virMediatedDeviceListFind(list, *dev)) {
-+    if (virMediatedDeviceListFind(list, (*dev)->path)) {
-         virReportError(VIR_ERR_INTERNAL_ERROR,
-                        _("device %s is already in use"), (*dev)->path);
-         return -1;
-@@ -358,7 +358,7 @@ virMediatedDevicePtr
- virMediatedDeviceListSteal(virMediatedDeviceListPtr list,
-                            virMediatedDevicePtr dev)
- {
--    int idx = virMediatedDeviceListFindIndex(list, dev);
-+    int idx = virMediatedDeviceListFindIndex(list, dev->path);
- 
-     return virMediatedDeviceListStealIndex(list, idx);
- }
-@@ -374,13 +374,13 @@ virMediatedDeviceListDel(virMediatedDeviceListPtr list,
- 
- int
- virMediatedDeviceListFindIndex(virMediatedDeviceListPtr list,
--                               virMediatedDevicePtr dev)
-+                               const char *sysfspath)
- {
-     size_t i;
- 
-     for (i = 0; i < list->count; i++) {
--        virMediatedDevicePtr other = list->devs[i];
--        if (STREQ(other->path, dev->path))
-+        virMediatedDevicePtr dev = list->devs[i];
-+        if (STREQ(sysfspath, dev->path))
-             return i;
-     }
-     return -1;
-@@ -389,11 +389,11 @@ virMediatedDeviceListFindIndex(virMediatedDeviceListPtr list,
- 
- virMediatedDevicePtr
- virMediatedDeviceListFind(virMediatedDeviceListPtr list,
--                          virMediatedDevicePtr dev)
-+                          const char *sysfspath)
- {
-     int idx;
- 
--    if ((idx = virMediatedDeviceListFindIndex(list, dev)) >= 0)
-+    if ((idx = virMediatedDeviceListFindIndex(list, sysfspath)) >= 0)
-         return list->devs[idx];
-     else
-         return NULL;
-@@ -407,7 +407,7 @@ virMediatedDeviceIsUsed(virMediatedDevicePtr dev,
-     const char *drvname, *domname;
-     virMediatedDevicePtr tmp = NULL;
- 
--    if ((tmp = virMediatedDeviceListFind(list, dev))) {
-+    if ((tmp = virMediatedDeviceListFind(list, dev->path))) {
-         virMediatedDeviceGetUsedBy(tmp, &drvname, &domname);
-         virReportError(VIR_ERR_OPERATION_INVALID,
-                        _("mediated device %s is in use by "
-diff --git a/src/util/virmdev.h b/src/util/virmdev.h
-index 51f7f608a2..1d97f7d44f 100644
---- a/src/util/virmdev.h
-+++ b/src/util/virmdev.h
-@@ -119,11 +119,11 @@ virMediatedDeviceListDel(virMediatedDeviceListPtr list,
- 
- virMediatedDevicePtr
- virMediatedDeviceListFind(virMediatedDeviceListPtr list,
--                          virMediatedDevicePtr dev);
-+                          const char *sysfspath);
- 
- int
- virMediatedDeviceListFindIndex(virMediatedDeviceListPtr list,
--                               virMediatedDevicePtr dev);
-+                               const char *sysfspath);
- 
- int
- virMediatedDeviceListMarkDevices(virMediatedDeviceListPtr dst,
--- 
-2.33.0
-
diff --git a/hotpatch-Implement-qemuDomainHotpatchManage.patch b/hotpatch-Implement-qemuDomainHotpatchManage.patch
index 79bcd38a37d2ee86a6278a2bd08d8df245736644..0b3fae0be0008aed1e5b2cb334fa3684d949415c 100644
--- a/hotpatch-Implement-qemuDomainHotpatchManage.patch
+++ b/hotpatch-Implement-qemuDomainHotpatchManage.patch
@@ -1,46 +1,97 @@
-From b255a024007eb236745b703586a2fed8bdedae6c Mon Sep 17 00:00:00 2001
+From 2721c0ce65045c90e54fcab383d4af83415bd3f3 Mon Sep 17 00:00:00 2001
 From: AlexChen <alex.chen@huawei.com>
-Date: Tue, 19 Oct 2021 22:11:45 +0800
+Date: Tue, 19 Oct 2021 14:50:32 +0800
 Subject: [PATCH] hotpatch: Implement qemuDomainHotpatchManage
 
 Signed-off-by: Hao Wang <wanghao232@huawei.com>
 Signed-off-by: Bihong Yu <yubihong@huawei.com>
 Signed-off-by: AlexChen <alex.chen@huawei.com>
 ---
- src/qemu/Makefile.inc.am |   2 +
- src/qemu/qemu_driver.c   |  48 +++++++++++
- src/qemu/qemu_hotpatch.c | 182 +++++++++++++++++++++++++++++++++++++++
- src/qemu/qemu_hotpatch.h |  36 ++++++++
- 4 files changed, 268 insertions(+)
+ include/libvirt/libvirt-domain.h |  10 +-
+ src/libvirt-domain.c             |   2 +-
+ src/libvirt_public.syms          |   2 +-
+ src/qemu/meson.build             |   1 +
+ src/qemu/qemu_driver.c           |  48 ++++++++
+ src/qemu/qemu_hotpatch.c         | 182 +++++++++++++++++++++++++++++++
+ src/qemu/qemu_hotpatch.h         |  36 ++++++
+ 7 files changed, 274 insertions(+), 7 deletions(-)
  create mode 100644 src/qemu/qemu_hotpatch.c
  create mode 100644 src/qemu/qemu_hotpatch.h
 
-diff --git a/src/qemu/Makefile.inc.am b/src/qemu/Makefile.inc.am
-index 51cd79879d..a1a8bfa17c 100644
---- a/src/qemu/Makefile.inc.am
-+++ b/src/qemu/Makefile.inc.am
-@@ -73,6 +73,8 @@ QEMU_DRIVER_SOURCES = \
- 	qemu/qemu_checkpoint.h \
- 	qemu/qemu_backup.c \
- 	qemu/qemu_backup.h \
-+	qemu/qemu_hotpatch.c \
-+	qemu/qemu_hotpatch.h \
- 	$(NULL)
+diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h
+index f8def59032..e786ecfab2 100644
+--- a/include/libvirt/libvirt-domain.h
++++ b/include/libvirt/libvirt-domain.h
+@@ -6422,13 +6422,13 @@ int virDomainAuthorizedSSHKeysGet(virDomainPtr domain,
+  * Since: 6.2.0
+  */
+ typedef enum {
+-    VIR_DOMAIN_HOTPATCH_NONE = 0, /* No action */
+-    VIR_DOMAIN_HOTPATCH_APPLY,    /* Apply hotpatch */
+-    VIR_DOMAIN_HOTPATCH_UNAPPLY,  /* Unapply hotpatch */
+-    VIR_DOMAIN_HOTPATCH_QUERY,    /* Query hotpatch */
++    VIR_DOMAIN_HOTPATCH_NONE = 0, /* No action (Since: 6.2.0) */
++    VIR_DOMAIN_HOTPATCH_APPLY,    /* Apply hotpatch (Since: 6.2.0) */
++    VIR_DOMAIN_HOTPATCH_UNAPPLY,  /* Unapply hotpatch (Since: 6.2.0) */
++    VIR_DOMAIN_HOTPATCH_QUERY,    /* Query hotpatch (Since: 6.2.0) */
  
+ # ifdef VIR_ENUM_SENTINELS
+-    VIR_DOMAIN_HOTPATCH_LAST
++    VIR_DOMAIN_HOTPATCH_LAST      /* Last index (Since: 6.2.0) */
+ # endif
+ } virDomainHotpatchAction;
  
+diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c
+index 26833efd0e..21b01110fe 100644
+--- a/src/libvirt-domain.c
++++ b/src/libvirt-domain.c
+@@ -13805,7 +13805,7 @@ virDomainBackupGetXMLDesc(virDomainPtr domain,
+  *
+  * Returns success messages in case of success, NULL otherwise.
+  *
+- * Since: 6.10.0
++ * Since: 6.2.0
+  */
+ char *
+ virDomainHotpatchManage(virDomainPtr domain,
+diff --git a/src/libvirt_public.syms b/src/libvirt_public.syms
+index 52a5d03240..8b38fe9a5f 100644
+--- a/src/libvirt_public.syms
++++ b/src/libvirt_public.syms
+@@ -882,7 +882,7 @@ LIBVIRT_6.10.0 {
+     global:
+         virDomainAuthorizedSSHKeysGet;
+         virDomainAuthorizedSSHKeysSet;
+-} LIBVIRT_6.0.0;
++} LIBVIRT_6.2.0;
+ 
+ LIBVIRT_7.1.0 {
+     global:
+diff --git a/src/qemu/meson.build b/src/qemu/meson.build
+index 2279fef2ca..9d5b4da35d 100644
+--- a/src/qemu/meson.build
++++ b/src/qemu/meson.build
+@@ -42,6 +42,7 @@ qemu_driver_sources = [
+   'qemu_vhost_user.c',
+   'qemu_vhost_user_gpu.c',
+   'qemu_virtiofs.c',
++  'qemu_hotpatch.c',
+ ]
+ 
+ driver_source_files += files(qemu_driver_sources)
 diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
-index 5901f922bf..f6d99957a5 100644
+index d00d2a27c6..3dd82d6f12 100644
 --- a/src/qemu/qemu_driver.c
 +++ b/src/qemu/qemu_driver.c
-@@ -50,6 +50,7 @@
- #include "qemu_security.h"
- #include "qemu_checkpoint.h"
- #include "qemu_backup.h"
+@@ -105,6 +105,7 @@
+ #include "virdomaincheckpointobjlist.h"
+ #include "virutil.h"
+ #include "backup_conf.h"
 +#include "qemu_hotpatch.h"
  
- #include "virerror.h"
- #include "virlog.h"
-@@ -23171,6 +23172,52 @@ qemuDomainAgentSetResponseTimeout(virDomainPtr dom,
+ #define VIR_FROM_THIS VIR_FROM_QEMU
+ 
+@@ -19934,6 +19935,52 @@ qemuDomainFDAssociate(virDomainPtr domain,
      return ret;
  }
  
@@ -93,17 +144,17 @@ index 5901f922bf..f6d99957a5 100644
  
  static virHypervisorDriver qemuHypervisorDriver = {
      .name = QEMU_DRIVER_NAME,
-@@ -23411,6 +23458,7 @@ static virHypervisorDriver qemuHypervisorDriver = {
+@@ -20178,6 +20225,7 @@ static virHypervisorDriver qemuHypervisorDriver = {
      .domainAgentSetResponseTimeout = qemuDomainAgentSetResponseTimeout, /* 5.10.0 */
      .domainBackupBegin = qemuDomainBackupBegin, /* 6.0.0 */
      .domainBackupGetXMLDesc = qemuDomainBackupGetXMLDesc, /* 6.0.0 */
 +    .domainHotpatchManage = qemuDomainHotpatchManage, /* 6.2.0 */
- };
- 
- 
+     .domainAuthorizedSSHKeysGet = qemuDomainAuthorizedSSHKeysGet, /* 6.10.0 */
+     .domainAuthorizedSSHKeysSet = qemuDomainAuthorizedSSHKeysSet, /* 6.10.0 */
+     .domainGetMessages = qemuDomainGetMessages, /* 7.1.0 */
 diff --git a/src/qemu/qemu_hotpatch.c b/src/qemu/qemu_hotpatch.c
 new file mode 100644
-index 0000000000..45796b3f24
+index 0000000000..c1a4ab7aca
 --- /dev/null
 +++ b/src/qemu/qemu_hotpatch.c
 @@ -0,0 +1,182 @@
@@ -147,7 +198,7 @@ index 0000000000..45796b3f24
 +VIR_LOG_INIT("qemu_hotpatch");
 +
 +char *
-+qemuDomainHotpatchQuery(virDomainObjPtr vm)
++qemuDomainHotpatchQuery(virDomainObj *vm)
 +{
 +    g_autoptr(virCommand) cmd = NULL;
 +    g_autofree char *binary = NULL;
@@ -183,7 +234,7 @@ index 0000000000..45796b3f24
 +}
 +
 +char *
-+qemuDomainHotpatchApply(virDomainObjPtr vm,
++qemuDomainHotpatchApply(virDomainObj *vm,
 +                        const char *patch)
 +{
 +    g_autoptr(virCommand) cmd = NULL;
@@ -247,7 +298,7 @@ index 0000000000..45796b3f24
 +}
 +
 +char *
-+qemuDomainHotpatchUnapply(virDomainObjPtr vm,
++qemuDomainHotpatchUnapply(virDomainObj *vm,
 +                          const char *id)
 +{
 +    g_autoptr(virCommand) cmd = NULL;
@@ -291,7 +342,7 @@ index 0000000000..45796b3f24
 +}
 diff --git a/src/qemu/qemu_hotpatch.h b/src/qemu/qemu_hotpatch.h
 new file mode 100644
-index 0000000000..4c84a57950
+index 0000000000..3cf22f7fc4
 --- /dev/null
 +++ b/src/qemu/qemu_hotpatch.h
 @@ -0,0 +1,36 @@
@@ -322,14 +373,14 @@ index 0000000000..4c84a57950
 +#include "qemu/qemu_conf.h"
 +
 +char *
-+qemuDomainHotpatchQuery(virDomainObjPtr vm);
++qemuDomainHotpatchQuery(virDomainObj *vm);
 +
 +char *
-+qemuDomainHotpatchApply(virDomainObjPtr vm,
++qemuDomainHotpatchApply(virDomainObj *vm,
 +                        const char *patch);
 +
 +char *
-+qemuDomainHotpatchUnapply(virDomainObjPtr vm,
++qemuDomainHotpatchUnapply(virDomainObj *vm,
 +                          const char *id);
 -- 
 2.27.0
diff --git a/hotpatch-check-vm-id-and-pid-before-using-hotpatch-a.patch b/hotpatch-check-vm-id-and-pid-before-using-hotpatch-a.patch
index 13d997c3364985fffd88de1446d769b24badaf8b..a1bb62055d28f744617f68faa6727249b53bb3bd 100644
--- a/hotpatch-check-vm-id-and-pid-before-using-hotpatch-a.patch
+++ b/hotpatch-check-vm-id-and-pid-before-using-hotpatch-a.patch
@@ -1,4 +1,4 @@
-From 58121fbc3085296364e6b90bc16cb56eeaf36f77 Mon Sep 17 00:00:00 2001
+From ebdf0312a590ba60f3d304f338737155f469dd7a Mon Sep 17 00:00:00 2001
 From: AlexChen <alex.chen@huawei.com>
 Date: Fri, 9 Jul 2021 10:50:07 +0800
 Subject: [PATCH] hotpatch: check vm id and pid before using hotpatch api
@@ -10,26 +10,42 @@ qemuDomainHotpatchCheckPid() to check vm pid.
 Signed-off-by: Bihong Yu <yubihong@huawei.com>
 Signed-off-by: AlexChen <alex.chen@huawei.com>
 ---
- src/qemu/qemu_driver.c   |  3 +++
+ src/qemu/qemu_driver.c   |  9 ++++++---
  src/qemu/qemu_hotpatch.c | 36 ++++++++++++++++++++++++++++++------
- 2 files changed, 33 insertions(+), 6 deletions(-)
+ 2 files changed, 36 insertions(+), 9 deletions(-)
 
 diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
-index d4c5f073bb..2b24881f75 100644
+index 31917ef591..05cc0db3ae 100644
 --- a/src/qemu/qemu_driver.c
 +++ b/src/qemu/qemu_driver.c
-@@ -23196,6 +23196,9 @@ qemuDomainHotpatchManage(virDomainPtr domain,
+@@ -19954,11 +19954,14 @@ qemuDomainHotpatchManage(virDomainPtr domain,
+     if (!(vm = qemuDomainObjFromDomain(domain)))
+         goto cleanup;
+ 
+-    if (VirDomainObjBeginAsyncJob(driver, vm, QEMU_ASYNC_JOB_HOTPATCH,
++    if (virDomainObjBeginAsyncJob(vm, VIR_ASYNC_JOB_HOTPATCH,
                                     VIR_DOMAIN_JOB_OPERATION_HOTPATCH, 0) < 0)
          goto cleanup;
  
+-    qemuDomainObjSetAsyncJobMask(vm, QEMU_JOB_DEFAULT_MASK);
 +    if (virDomainObjCheckActive(vm) < 0)
 +        goto endjob;
 +
-     qemuDomainObjSetAsyncJobMask(vm, QEMU_JOB_DEFAULT_MASK);
++    qemuDomainObjSetAsyncJobMask(vm, VIR_JOB_DEFAULT_MASK);
  
      switch (action) {
+     case VIR_DOMAIN_HOTPATCH_APPLY:
+@@ -19987,7 +19990,7 @@ qemuDomainHotpatchManage(virDomainPtr domain,
+         ret[len - 1] = '\0';
+ 
+  endjob:
+-    qemuDomainObjEndAsyncJob(driver, vm);
++    virDomainObjEndAsyncJob(vm);
+ 
+  cleanup:
+     virDomainObjEndAPI(&vm);
 diff --git a/src/qemu/qemu_hotpatch.c b/src/qemu/qemu_hotpatch.c
-index 45796b3f24..03e63c1341 100644
+index c1a4ab7aca..31ef5bb7f2 100644
 --- a/src/qemu/qemu_hotpatch.c
 +++ b/src/qemu/qemu_hotpatch.c
 @@ -37,12 +37,25 @@
@@ -49,7 +65,7 @@ index 45796b3f24..03e63c1341 100644
 +}
 +
  char *
- qemuDomainHotpatchQuery(virDomainObjPtr vm)
+ qemuDomainHotpatchQuery(virDomainObj *vm)
  {
      g_autoptr(virCommand) cmd = NULL;
      g_autofree char *binary = NULL;
@@ -58,7 +74,7 @@ index 45796b3f24..03e63c1341 100644
      int ret = -1;
  
      if (!(binary = virFindFileInPath(LIBCARE_CTL))) {
-@@ -51,12 +64,15 @@ qemuDomainHotpatchQuery(virDomainObjPtr vm)
+@@ -51,12 +64,15 @@ qemuDomainHotpatchQuery(virDomainObj *vm)
          return NULL;
      }
  
@@ -76,7 +92,7 @@ index 45796b3f24..03e63c1341 100644
  
      if (virCommandRun(cmd, &ret) < 0)
          goto error;
-@@ -80,6 +96,7 @@ qemuDomainHotpatchApply(virDomainObjPtr vm,
+@@ -80,6 +96,7 @@ qemuDomainHotpatchApply(virDomainObj *vm,
      g_autoptr(virCommand) cmd = NULL;
      g_autofree char *binary = NULL;
      char *output = NULL;
@@ -84,7 +100,7 @@ index 45796b3f24..03e63c1341 100644
      int ret = -1;
  
      if (!patch || !virFileExists(patch)) {
-@@ -94,13 +111,16 @@ qemuDomainHotpatchApply(virDomainObjPtr vm,
+@@ -94,13 +111,16 @@ qemuDomainHotpatchApply(virDomainObj *vm,
          return NULL;
      }
  
@@ -103,7 +119,7 @@ index 45796b3f24..03e63c1341 100644
  
      if (virCommandRun(cmd, &ret) < 0)
          goto error;
-@@ -144,6 +164,7 @@ qemuDomainHotpatchUnapply(virDomainObjPtr vm,
+@@ -144,6 +164,7 @@ qemuDomainHotpatchUnapply(virDomainObj *vm,
      g_autoptr(virCommand) cmd = NULL;
      g_autofree char *binary = NULL;
      char *output = NULL;
@@ -111,7 +127,7 @@ index 45796b3f24..03e63c1341 100644
      int ret = -1;
  
      if (!id || !qemuDomainHotpatchIsPatchidValid(id)) {
-@@ -158,13 +179,16 @@ qemuDomainHotpatchUnapply(virDomainObjPtr vm,
+@@ -158,13 +179,16 @@ qemuDomainHotpatchUnapply(virDomainObj *vm,
          return NULL;
      }
  
diff --git a/hotpatch-if-hotpatch_path-not-in-qemu.conf-the-hotpa.patch b/hotpatch-if-hotpatch_path-not-in-qemu.conf-the-hotpa.patch
new file mode 100644
index 0000000000000000000000000000000000000000..f3f1a9edb1c04beefda6609d4c216b8ef51bf614
--- /dev/null
+++ b/hotpatch-if-hotpatch_path-not-in-qemu.conf-the-hotpa.patch
@@ -0,0 +1,34 @@
+From 033b8d177e4512f0ba3af8ed46ee38a4251c7e1c Mon Sep 17 00:00:00 2001
+From: Dawei Jiang <jiangdawei15@huawei.com>
+Date: Mon, 8 Apr 2024 19:59:11 +0800
+Subject: [PATCH] hotpatch: if hotpatch_path not in qemu.conf,the hotpatch
+ doesn't antoload
+
+Signed-off-by: Dawei Jiang <jiangdawei15@huawei.com>
+---
+ src/qemu/qemu_process.c | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
+index 41e9660ecd..348280d9be 100644
+--- a/src/qemu/qemu_process.c
++++ b/src/qemu/qemu_process.c
+@@ -7929,10 +7929,12 @@ qemuProcessLaunch(virConnectPtr conn,
+         goto cleanup;
+ 
+     /* Autoload hotpatch */
+-    if ((autoLoadStatus = qemuDomainHotpatchAutoload(vm, cfg->hotpatchPath)) == NULL) {
+-        VIR_WARN("Failed to autoload the hotpatch for %s.", vm->def->name);
++    if (cfg->hotpatchPath != NULL) {
++        autoLoadStatus = qemuDomainHotpatchAutoload(vm, cfg->hotpatchPath);
++        if (autoLoadStatus == NULL) {
++            VIR_WARN("Failed to autoload the hotpatch for %s.", vm->def->name);
++        }
+     }
+-
+     ret = 0;
+ 
+  cleanup:
+-- 
+2.27.0
+
diff --git a/hotpatch-implement-hotpatch-virsh-api.patch b/hotpatch-implement-hotpatch-virsh-api.patch
index 552ae2dda8d20bb8266739d61eda1bca9fbb6bac..30b91a373de8342d1d82859b1a721b31ead2d49d 100644
--- a/hotpatch-implement-hotpatch-virsh-api.patch
+++ b/hotpatch-implement-hotpatch-virsh-api.patch
@@ -1,4 +1,4 @@
-From cf380e22898f70f5782bcea8b0d22027ff7d86af Mon Sep 17 00:00:00 2001
+From d56a3df418b90f4a6f303a3830732b5fde8d3a10 Mon Sep 17 00:00:00 2001
 From: AlexChen <alex.chen@huawei.com>
 Date: Wed, 20 Oct 2021 11:07:34 +0800
 Subject: [PATCH] hotpatch: implement hotpatch virsh api
@@ -11,10 +11,10 @@ Signed-off-by: AlexChen <alex.chen@huawei.com>
  1 file changed, 78 insertions(+)
 
 diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
-index f643bd403e..813be4a0db 100644
+index 9d22e219f7..d88ac3cca6 100644
 --- a/tools/virsh-domain.c
 +++ b/tools/virsh-domain.c
-@@ -14326,6 +14326,78 @@ cmdGuestInfo(vshControl *ctl, const vshCmd *cmd)
+@@ -13556,6 +13556,78 @@ cmdGuestInfo(vshControl *ctl, const vshCmd *cmd)
      return ret;
  }
  
@@ -90,11 +90,11 @@ index f643bd403e..813be4a0db 100644
 +    return true;
 +}
 +
- const vshCmdDef domManagementCmds[] = {
-     {.name = "attach-device",
-      .handler = cmdAttachDevice,
-@@ -14953,5 +15025,11 @@ const vshCmdDef domManagementCmds[] = {
-      .info = info_guestinfo,
+ /*
+  * "get-user-sshkeys" command
+  */
+@@ -14456,5 +14528,11 @@ const vshCmdDef domManagementCmds[] = {
+      .info = info_dom_fd_associate,
       .flags = 0
      },
 +    {.name = "hotpatch",
diff --git a/hotpatch-introduce-hotpatch-async-job-flag.patch b/hotpatch-introduce-hotpatch-async-job-flag.patch
index 24f1611410ace86ce95e81c3629b6bc9ec3d4f05..8e3667bd1ed28f01e1b5b0a486705096c0db5a4c 100644
--- a/hotpatch-introduce-hotpatch-async-job-flag.patch
+++ b/hotpatch-introduce-hotpatch-async-job-flag.patch
@@ -1,4 +1,4 @@
-From a83bb0dc19d7c92c200b9a234e120d16878eac19 Mon Sep 17 00:00:00 2001
+From 180e19162083fb74e9e9cbc676ce42611bb2e496 Mon Sep 17 00:00:00 2001
 From: AlexChen <alex.chen@huawei.com>
 Date: Tue, 19 Oct 2021 22:41:24 +0800
 Subject: [PATCH] hotpatch: introduce hotpatch async job flag
@@ -8,93 +8,99 @@ Signed-off-by: Bihong Yu <yubihong@huawei.com>
 Signed-off-by: AlexChen <alex.chen@huawei.com>
 ---
  include/libvirt/libvirt-domain.h |  1 +
- src/qemu/qemu_domain.c           |  3 +++
- src/qemu/qemu_domain.h           |  1 +
- src/qemu/qemu_driver.c           | 13 +++++++++++++
+ src/conf/virdomainjob.c          |  1 +
+ src/conf/virdomainjob.h          |  1 +
+ src/qemu/qemu_domainjob.c        |  2 ++
+ src/qemu/qemu_driver.c           | 14 +++++++++++++-
  src/qemu/qemu_migration.c        |  2 ++
  src/qemu/qemu_process.c          |  1 +
  tools/virsh-domain.c             |  1 +
- 7 files changed, 22 insertions(+)
+ 8 files changed, 22 insertions(+), 1 deletion(-)
 
 diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h
-index f91061724b..2d6432cab2 100644
+index e786ecfab2..96e62deac3 100644
 --- a/include/libvirt/libvirt-domain.h
 +++ b/include/libvirt/libvirt-domain.h
-@@ -3295,6 +3295,7 @@ typedef enum {
-     VIR_DOMAIN_JOB_OPERATION_SNAPSHOT_REVERT = 7,
-     VIR_DOMAIN_JOB_OPERATION_DUMP = 8,
-     VIR_DOMAIN_JOB_OPERATION_BACKUP = 9,
-+    VIR_DOMAIN_JOB_OPERATION_HOTPATCH = 10,
+@@ -4201,6 +4201,7 @@ typedef enum {
+     VIR_DOMAIN_JOB_OPERATION_DUMP = 8, /* (Since: 3.3.0) */
+     VIR_DOMAIN_JOB_OPERATION_BACKUP = 9, /* (Since: 6.0.0) */
+     VIR_DOMAIN_JOB_OPERATION_SNAPSHOT_DELETE = 10, /* (Since: 9.0.0) */
++    VIR_DOMAIN_JOB_OPERATION_HOTPATCH = 11, /* (Since: 6.2.0) */
  
  # ifdef VIR_ENUM_SENTINELS
-     VIR_DOMAIN_JOB_OPERATION_LAST
-diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
-index 5d35d49638..2351cac120 100644
---- a/src/qemu/qemu_domain.c
-+++ b/src/qemu/qemu_domain.c
-@@ -111,6 +111,7 @@ VIR_ENUM_IMPL(qemuDomainAsyncJob,
+     VIR_DOMAIN_JOB_OPERATION_LAST /* (Since: 3.3.0) */
+diff --git a/src/conf/virdomainjob.c b/src/conf/virdomainjob.c
+index 38f08f1d18..d21fc653a0 100644
+--- a/src/conf/virdomainjob.c
++++ b/src/conf/virdomainjob.c
+@@ -51,6 +51,7 @@ VIR_ENUM_IMPL(virDomainAsyncJob,
                "snapshot",
                "start",
                "backup",
 +              "hotpatch",
  );
  
- VIR_ENUM_IMPL(qemuDomainNamespace,
-@@ -217,6 +218,7 @@ qemuDomainAsyncJobPhaseToString(qemuDomainAsyncJob job,
-     case QEMU_ASYNC_JOB_START:
-     case QEMU_ASYNC_JOB_NONE:
-     case QEMU_ASYNC_JOB_BACKUP:
-+    case QEMU_ASYNC_JOB_HOTPATCH:
+ virDomainJobData *
+diff --git a/src/conf/virdomainjob.h b/src/conf/virdomainjob.h
+index 0d62bab287..d0f632edad 100644
+--- a/src/conf/virdomainjob.h
++++ b/src/conf/virdomainjob.h
+@@ -75,6 +75,7 @@ typedef enum {
+     VIR_ASYNC_JOB_SNAPSHOT,
+     VIR_ASYNC_JOB_START,
+     VIR_ASYNC_JOB_BACKUP,
++    VIR_ASYNC_JOB_HOTPATCH,
+ 
+     VIR_ASYNC_JOB_LAST
+ } virDomainAsyncJob;
+diff --git a/src/qemu/qemu_domainjob.c b/src/qemu/qemu_domainjob.c
+index 245e51f14b..c9753c4f2b 100644
+--- a/src/qemu/qemu_domainjob.c
++++ b/src/qemu/qemu_domainjob.c
+@@ -56,6 +56,7 @@ qemuDomainAsyncJobPhaseToString(virDomainAsyncJob job,
+     case VIR_ASYNC_JOB_START:
+     case VIR_ASYNC_JOB_NONE:
+     case VIR_ASYNC_JOB_BACKUP:
++    case VIR_ASYNC_JOB_HOTPATCH:
          G_GNUC_FALLTHROUGH;
-     case QEMU_ASYNC_JOB_LAST:
+     case VIR_ASYNC_JOB_LAST:
          break;
-@@ -243,6 +245,7 @@ qemuDomainAsyncJobPhaseFromString(qemuDomainAsyncJob job,
-     case QEMU_ASYNC_JOB_START:
-     case QEMU_ASYNC_JOB_NONE:
-     case QEMU_ASYNC_JOB_BACKUP:
-+    case QEMU_ASYNC_JOB_HOTPATCH:
+@@ -82,6 +83,7 @@ qemuDomainAsyncJobPhaseFromString(virDomainAsyncJob job,
+     case VIR_ASYNC_JOB_START:
+     case VIR_ASYNC_JOB_NONE:
+     case VIR_ASYNC_JOB_BACKUP:
++    case VIR_ASYNC_JOB_HOTPATCH:
          G_GNUC_FALLTHROUGH;
-     case QEMU_ASYNC_JOB_LAST:
+     case VIR_ASYNC_JOB_LAST:
          break;
-diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h
-index cf19f4d101..678ddab624 100644
---- a/src/qemu/qemu_domain.h
-+++ b/src/qemu/qemu_domain.h
-@@ -107,6 +107,7 @@ typedef enum {
-     QEMU_ASYNC_JOB_SNAPSHOT,
-     QEMU_ASYNC_JOB_START,
-     QEMU_ASYNC_JOB_BACKUP,
-+    QEMU_ASYNC_JOB_HOTPATCH,
- 
-     QEMU_ASYNC_JOB_LAST
- } qemuDomainAsyncJob;
 diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
-index f6d99957a5..d4c5f073bb 100644
+index 3dd82d6f12..31917ef591 100644
 --- a/src/qemu/qemu_driver.c
 +++ b/src/qemu/qemu_driver.c
-@@ -13866,6 +13866,9 @@ static int qemuDomainAbortJob(virDomainPtr dom)
+@@ -12251,6 +12251,8 @@ qemuDomainAbortJobFlags(virDomainPtr dom,
+         qemuBackupJobCancelBlockjobs(vm, priv->backup, true, VIR_ASYNC_JOB_NONE);
          ret = 0;
          break;
- 
-+    case QEMU_ASYNC_JOB_HOTPATCH:
++    case VIR_ASYNC_JOB_HOTPATCH:
 +        break;
-+
-     case QEMU_ASYNC_JOB_LAST:
+ 
+     case VIR_ASYNC_JOB_LAST:
      default:
-         virReportEnumRangeError(qemuDomainAsyncJob, priv->job.asyncJob);
-@@ -23180,6 +23183,7 @@ qemuDomainHotpatchManage(virDomainPtr domain,
+@@ -19942,7 +19944,8 @@ qemuDomainHotpatchManage(virDomainPtr domain,
+                          const char *id,
                           unsigned int flags)
  {
-     virDomainObjPtr vm;
-+    virQEMUDriverPtr driver = domain->conn->privateData;
+-    virDomainObjPtr vm;
++    virDomainObj *vm;
++    virQEMUDriver *driver = domain->conn->privateData;
      char *ret = NULL;
      size_t len;
  
-@@ -23188,6 +23192,12 @@ qemuDomainHotpatchManage(virDomainPtr domain,
+@@ -19951,6 +19954,12 @@ qemuDomainHotpatchManage(virDomainPtr domain,
      if (!(vm = qemuDomainObjFromDomain(domain)))
          goto cleanup;
  
-+    if (qemuDomainObjBeginAsyncJob(driver, vm, QEMU_ASYNC_JOB_HOTPATCH,
++    if (VirDomainObjBeginAsyncJob(driver, vm, QEMU_ASYNC_JOB_HOTPATCH,
 +                                   VIR_DOMAIN_JOB_OPERATION_HOTPATCH, 0) < 0)
 +        goto cleanup;
 +
@@ -103,7 +109,7 @@ index f6d99957a5..d4c5f073bb 100644
      switch (action) {
      case VIR_DOMAIN_HOTPATCH_APPLY:
          ret = qemuDomainHotpatchApply(vm, patch);
-@@ -23214,6 +23224,9 @@ qemuDomainHotpatchManage(virDomainPtr domain,
+@@ -19977,6 +19986,9 @@ qemuDomainHotpatchManage(virDomainPtr domain,
      if (len > 0)
          ret[len - 1] = '\0';
  
@@ -114,38 +120,38 @@ index f6d99957a5..d4c5f073bb 100644
      virDomainObjEndAPI(&vm);
      return ret;
 diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
-index 3f4627bd39..1665071eb3 100644
+index f9c34b72e8..73395ce3b2 100644
 --- a/src/qemu/qemu_migration.c
 +++ b/src/qemu/qemu_migration.c
-@@ -1532,6 +1532,8 @@ qemuMigrationJobName(virDomainObjPtr vm)
-         return _("start job");
-     case QEMU_ASYNC_JOB_BACKUP:
-         return _("backup job");
-+    case QEMU_ASYNC_JOB_HOTPATCH:
+@@ -1846,6 +1846,8 @@ qemuMigrationJobName(virDomainObj *vm)
+         return _("start");
+     case VIR_ASYNC_JOB_BACKUP:
+         return _("backup");
++    case VIR_ASYNC_JOB_HOTPATCH:
 +        return _("hotpatch job");
-     case QEMU_ASYNC_JOB_LAST:
+     case VIR_ASYNC_JOB_NONE:
+     case VIR_ASYNC_JOB_LAST:
      default:
-         return _("job");
 diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
-index 9cf7242f31..818a72d8f9 100644
+index fc05b4b24f..318f9f6182 100644
 --- a/src/qemu/qemu_process.c
 +++ b/src/qemu/qemu_process.c
-@@ -3646,6 +3646,7 @@ qemuProcessRecoverJob(virQEMUDriverPtr driver,
-         priv->job.current->started = now;
+@@ -3758,6 +3758,7 @@ qemuProcessRecoverJob(virQEMUDriver *driver,
+                                       JOB_MASK(VIR_JOB_MODIFY)));
          break;
  
-+    case QEMU_ASYNC_JOB_HOTPATCH:
-     case QEMU_ASYNC_JOB_NONE:
-     case QEMU_ASYNC_JOB_LAST:
++    case VIR_ASYNC_JOB_HOTPATCH:
+     case VIR_ASYNC_JOB_NONE:
+     case VIR_ASYNC_JOB_LAST:
          break;
 diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
-index 65d5c831ec..f643bd403e 100644
+index 66f933dead..9d22e219f7 100644
 --- a/tools/virsh-domain.c
 +++ b/tools/virsh-domain.c
-@@ -6167,6 +6167,7 @@ VIR_ENUM_IMPL(virshDomainJobOperation,
-               N_("Snapshot revert"),
+@@ -6152,6 +6152,7 @@ VIR_ENUM_IMPL(virshDomainJobOperation,
                N_("Dump"),
                N_("Backup"),
+               N_("Snapshot delete"),
 +              N_("Hotpatch"),
  );
  
diff --git a/hotpatch-virsh-support-autoload-mode.patch b/hotpatch-virsh-support-autoload-mode.patch
index 2c95db6e60c039fc6e7911f39ff0e4484d8ab696..b8442884d789bb6f7eddf64d748c7d7f4af2c7d0 100644
--- a/hotpatch-virsh-support-autoload-mode.patch
+++ b/hotpatch-virsh-support-autoload-mode.patch
@@ -1,4 +1,4 @@
-From 3be8bb571d13795c2824dd6d2089035a1be6cf57 Mon Sep 17 00:00:00 2001
+From 48da26004ea0222cc8819e097a004980662ef3eb Mon Sep 17 00:00:00 2001
 From: jiang-dawei15 <jiangdawei15@huawei.com>
 Date: Wed, 26 Jan 2022 15:18:10 +0800
 Subject: [PATCH] hotpatch: virsh support autoload mode
@@ -6,44 +6,44 @@ Subject: [PATCH] hotpatch: virsh support autoload mode
 ---
  include/libvirt/libvirt-domain.h |   1 +
  src/qemu/qemu_conf.c             |   9 +++
- src/qemu/qemu_conf.h             |   1 +
+ src/qemu/qemu_conf.h             |   2 +
  src/qemu/qemu_driver.c           |   5 ++
- src/qemu/qemu_hotpatch.c         | 122 +++++++++++++++++++++++++++++++
+ src/qemu/qemu_hotpatch.c         | 120 +++++++++++++++++++++++++++++++
  src/qemu/qemu_hotpatch.h         |   3 +
- src/qemu/qemu_process.c          |   6 ++
+ src/qemu/qemu_process.c          |   7 ++
  tools/virsh-domain.c             |   5 +-
  8 files changed, 150 insertions(+), 2 deletions(-)
 
 diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h
-index 2d6432cab2..4ab0c9c0b2 100644
+index 96e62deac3..6120c6cea7 100644
 --- a/include/libvirt/libvirt-domain.h
 +++ b/include/libvirt/libvirt-domain.h
-@@ -4997,6 +4997,7 @@ typedef enum {
-     VIR_DOMAIN_HOTPATCH_APPLY,    /* Apply hotpatch */
-     VIR_DOMAIN_HOTPATCH_UNAPPLY,  /* Unapply hotpatch */
-     VIR_DOMAIN_HOTPATCH_QUERY,    /* Query hotpatch */
-+    VIR_DOMAIN_HOTPATCH_AUTOLOAD, /* Autoload hotpatch */
+@@ -6427,6 +6427,7 @@ typedef enum {
+     VIR_DOMAIN_HOTPATCH_APPLY,    /* Apply hotpatch (Since: 6.2.0) */
+     VIR_DOMAIN_HOTPATCH_UNAPPLY,  /* Unapply hotpatch (Since: 6.2.0) */
+     VIR_DOMAIN_HOTPATCH_QUERY,    /* Query hotpatch (Since: 6.2.0) */
++    VIR_DOMAIN_HOTPATCH_AUTOLOAD, /* Autoload hotpatch (Since: 6.2.0) */
  
  # ifdef VIR_ENUM_SENTINELS
-     VIR_DOMAIN_HOTPATCH_LAST
+     VIR_DOMAIN_HOTPATCH_LAST      /* Last index (Since: 6.2.0) */
 diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
-index 809e8fe526..bd96ccb78e 100644
+index 513b5ebb1e..30343d3d12 100644
 --- a/src/qemu/qemu_conf.c
 +++ b/src/qemu/qemu_conf.c
-@@ -1006,6 +1006,12 @@ virQEMUDriverConfigLoadCapsFiltersEntry(virQEMUDriverConfigPtr cfg,
+@@ -1064,6 +1064,12 @@ virQEMUDriverConfigLoadCapsFiltersEntry(virQEMUDriverConfig *cfg,
      return 0;
  }
  
 +static int
-+virQEMUDriverConfigLoadHotpatchPathEntry(virQEMUDriverConfigPtr cfg,
-+                                        virConfPtr conf)
++virQEMUDriverConfigLoadHotpatchPathEntry(virQEMUDriverConfig *cfg,
++                                        virConf *conf)
 +{
 +    return virConfGetValueString(conf, "hotpatch_path", &cfg->hotpatchPath);
 +}
  
- int virQEMUDriverConfigLoadFile(virQEMUDriverConfigPtr cfg,
+ int virQEMUDriverConfigLoadFile(virQEMUDriverConfig *cfg,
                                  const char *filename,
-@@ -1078,6 +1084,9 @@ int virQEMUDriverConfigLoadFile(virQEMUDriverConfigPtr cfg,
+@@ -1136,6 +1142,9 @@ int virQEMUDriverConfigLoadFile(virQEMUDriverConfig *cfg,
      if (virQEMUDriverConfigLoadCapsFiltersEntry(cfg, conf) < 0)
          return -1;
  
@@ -54,30 +54,31 @@ index 809e8fe526..bd96ccb78e 100644
  }
  
 diff --git a/src/qemu/qemu_conf.h b/src/qemu/qemu_conf.h
-index 14f9b9e81e..f0124a0fe2 100644
+index 1a3ba3a0fb..8034ec7885 100644
 --- a/src/qemu/qemu_conf.h
 +++ b/src/qemu/qemu_conf.h
-@@ -220,6 +220,7 @@ struct _virQEMUDriverConfig {
-     gid_t swtpm_group;
+@@ -231,6 +231,8 @@ struct _virQEMUDriverConfig {
+     char *deprecationBehavior;
  
-     char **capabilityfilters;
+     virQEMUSchedCore schedCore;
++
 +    char *hotpatchPath;
  };
  
  G_DEFINE_AUTOPTR_CLEANUP_FUNC(virQEMUDriverConfig, virObjectUnref);
 diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
-index 2b24881f75..37b2c4a2da 100644
+index 05cc0db3ae..6b07bcc8dc 100644
 --- a/src/qemu/qemu_driver.c
 +++ b/src/qemu/qemu_driver.c
-@@ -23186,6 +23186,7 @@ qemuDomainHotpatchManage(virDomainPtr domain,
-     virQEMUDriverPtr driver = domain->conn->privateData;
+@@ -19948,6 +19948,7 @@ qemuDomainHotpatchManage(virDomainPtr domain,
+     virQEMUDriver *driver = domain->conn->privateData;
      char *ret = NULL;
      size_t len;
 +    g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver);
  
      virCheckFlags(0, NULL);
  
-@@ -23214,6 +23215,10 @@ qemuDomainHotpatchManage(virDomainPtr domain,
+@@ -19976,6 +19977,10 @@ qemuDomainHotpatchManage(virDomainPtr domain,
          ret = qemuDomainHotpatchQuery(vm);
          break;
  
@@ -89,7 +90,7 @@ index 2b24881f75..37b2c4a2da 100644
          virReportError(VIR_ERR_OPERATION_INVALID, "%s",
                         _("Unknow hotpatch action"));
 diff --git a/src/qemu/qemu_hotpatch.c b/src/qemu/qemu_hotpatch.c
-index 03e63c1341..02f511cc38 100644
+index 31ef5bb7f2..0259ae76c8 100644
 --- a/src/qemu/qemu_hotpatch.c
 +++ b/src/qemu/qemu_hotpatch.c
 @@ -25,6 +25,8 @@
@@ -109,16 +110,16 @@ index 03e63c1341..02f511cc38 100644
  
  #define VIR_FROM_THIS VIR_FROM_QEMU
  
-@@ -204,3 +207,122 @@ qemuDomainHotpatchUnapply(virDomainObjPtr vm,
+@@ -204,3 +207,120 @@ qemuDomainHotpatchUnapply(virDomainObj *vm,
      VIR_FREE(output);
      return NULL;
  }
 +
 +char *
-+qemuDomainHotpatchAutoload(virDomainObjPtr vm, char *hotpatch_path)
++qemuDomainHotpatchAutoload(virDomainObj *vm, char *hotpatch_path)
 +{
-+    VIR_AUTOSTRINGLIST applied_patches = NULL;
-+    VIR_AUTOSTRINGLIST lines = NULL;
++    g_auto(GStrv) applied_patches = NULL;
++    g_auto(GStrv) lines = NULL;
 +    g_autofree char *applied_patch = NULL;
 +    g_autofree char *libvirtd_conf = NULL;
 +    g_autofree char *patch_conf = NULL;
@@ -142,7 +143,7 @@ index 03e63c1341..02f511cc38 100644
 +    if (len > 0)
 +        buf[len-1] = '\0';
 +
-+    lines = virStringSplit(buf, "\n", 0);
++    lines = g_strsplit(buf, "\n", 0);
 +    if (!lines)
 +        return NULL;
 +
@@ -151,23 +152,23 @@ index 03e63c1341..02f511cc38 100644
 +    if (!applied_patch)
 +        return NULL;
 +
-+    applied_patches = virStringSplit(applied_patch, "\n", 0);
++    applied_patches = g_strsplit(applied_patch, "\n", 0);
 +    if (!applied_patches)
 +        return NULL;
 +
 +    /* load all hotpatch which are listed in Patch.conf one by one */
 +    for (i = 0; lines[i] != NULL; i++) {
-+        VIR_AUTOSTRINGLIST patch_info = NULL;
++        g_auto(GStrv) patch_info = NULL;
 +        g_autofree char *kpatch_dir = NULL;
 +        g_autofree char *file_path = NULL;
 +        struct dirent *de;
-+        DIR *dh;
++        g_autoptr(DIR) dh = NULL;
 +        int direrr;
 +
 +        if (!strstr(lines[i], "QEMU-"))
 +            continue;
 +
-+        patch_info = virStringSplit(lines[i], " ", 0);
++        patch_info = g_strsplit(lines[i], " ", 0);
 +        if (!patch_info)
 +            continue;
 +
@@ -189,11 +190,9 @@ index 03e63c1341..02f511cc38 100644
 +            if (g_lstat(file_path, &sb) < 0) {
 +                virReportSystemError(errno, _("Cannot access '%s'"),
 +                                    file_path);
-+                VIR_DIR_CLOSE(dh);
 +                return NULL;
 +            }
 +        }
-+        VIR_DIR_CLOSE(dh);
 +
 +        if (qemuDomainHotpatchApply(vm, file_path) == NULL) {
 +            virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
@@ -233,52 +232,53 @@ index 03e63c1341..02f511cc38 100644
 +    return ret;
 +}
 diff --git a/src/qemu/qemu_hotpatch.h b/src/qemu/qemu_hotpatch.h
-index 4c84a57950..8e0bfe348a 100644
+index 3cf22f7fc4..7cab4787c6 100644
 --- a/src/qemu/qemu_hotpatch.h
 +++ b/src/qemu/qemu_hotpatch.h
-@@ -34,3 +34,6 @@ qemuDomainHotpatchApply(virDomainObjPtr vm,
+@@ -34,3 +34,6 @@ qemuDomainHotpatchApply(virDomainObj *vm,
  char *
- qemuDomainHotpatchUnapply(virDomainObjPtr vm,
+ qemuDomainHotpatchUnapply(virDomainObj *vm,
                            const char *id);
 +
 +char *
-+qemuDomainHotpatchAutoload(virDomainObjPtr vm, char *path_config);
++qemuDomainHotpatchAutoload(virDomainObj *vm, char *path_config);
 diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
-index 818a72d8f9..24dd9f052c 100644
+index 318f9f6182..41e9660ecd 100644
 --- a/src/qemu/qemu_process.c
 +++ b/src/qemu/qemu_process.c
-@@ -59,6 +59,7 @@
- #include "qemu_firmware.h"
+@@ -61,6 +61,7 @@
  #include "qemu_backup.h"
  #include "qemu_dbus.h"
+ #include "qemu_snapshot.h"
 +#include "qemu_hotpatch.h"
  
  #include "cpu/cpu.h"
  #include "cpu/cpu_x86.h"
-@@ -6684,6 +6685,7 @@ qemuProcessLaunch(virConnectPtr conn,
-     g_autoptr(virQEMUDriverConfig) cfg = NULL;
-     size_t nnicindexes = 0;
+@@ -7595,6 +7596,7 @@ qemuProcessLaunch(virConnectPtr conn,
      g_autofree int *nicindexes = NULL;
+     unsigned long long maxMemLock = 0;
+     bool incomingMigrationExtDevices = false;
 +    g_autofree char *autoLoadStatus = NULL;
-     size_t i;
  
-     VIR_DEBUG("conn=%p driver=%p vm=%p name=%s if=%d asyncJob=%d "
-@@ -6993,6 +6995,10 @@ qemuProcessLaunch(virConnectPtr conn,
-         qemuProcessAutoDestroyAdd(driver, vm, conn) < 0)
+     VIR_DEBUG("conn=%p driver=%p vm=%p name=%s id=%d asyncJob=%d "
+               "incoming.uri=%s "
+@@ -7926,6 +7928,11 @@ qemuProcessLaunch(virConnectPtr conn,
+     if (qemuProcessDeleteThreadContextHelper(vm, asyncJob) < 0)
          goto cleanup;
  
 +    /* Autoload hotpatch */
 +    if ((autoLoadStatus = qemuDomainHotpatchAutoload(vm, cfg->hotpatchPath)) == NULL) {
 +        VIR_WARN("Failed to autoload the hotpatch for %s.", vm->def->name);
 +    }
++
      ret = 0;
  
   cleanup:
 diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
-index 813be4a0db..b5375ebd3e 100644
+index d88ac3cca6..89bd737f19 100644
 --- a/tools/virsh-domain.c
 +++ b/tools/virsh-domain.c
-@@ -14344,7 +14344,7 @@ static const vshCmdOptDef opts_hotpatch[] = {
+@@ -13574,7 +13574,7 @@ static const vshCmdOptDef opts_hotpatch[] = {
      {.name = "action",
       .type = VSH_OT_DATA,
       .flags = VSH_OFLAG_REQ,
@@ -287,7 +287,7 @@ index 813be4a0db..b5375ebd3e 100644
      },
      {.name = "patch",
       .type = VSH_OT_STRING,
-@@ -14363,7 +14363,8 @@ VIR_ENUM_IMPL(virDomainHotpatchAction,
+@@ -13593,7 +13593,8 @@ VIR_ENUM_IMPL(virDomainHotpatchAction,
                "none",
                "apply",
                "unapply",
@@ -298,5 +298,5 @@ index 813be4a0db..b5375ebd3e 100644
  static bool
  cmdHotpatch(vshControl *ctl,
 -- 
-2.30.0
+2.27.0
 
diff --git a/hyperv-fix-the-number-of-threads-per-core.patch b/hyperv-fix-the-number-of-threads-per-core.patch
deleted file mode 100644
index 3f717fe7538451817f02a85023312b97f5b5ecf8..0000000000000000000000000000000000000000
--- a/hyperv-fix-the-number-of-threads-per-core.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From ee9069defba076d94b432662af93a784ea002f5a Mon Sep 17 00:00:00 2001
-From: tangbinzy <tangbin_yewu@cmss.chinamobile.com>
-Date: Tue, 29 Nov 2022 08:57:42 +0000
-Subject: [PATCH 04/24] hyperv: fix the number of threads per core The operands
- were reversed, producing an incorrect result.
-
-Co-authored-by: Sri Ramanujam <sramanujam@datto.com>
-Signed-off-by: Matt Coleman <matt@datto.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-
-Signed-off-by: tangbin <tangbin_yewu@cmss.chinamobile.com>
-(cherry-pick from 1e18d3b833b9daa7bb18b9550a2cf4d140303d86)
----
- src/hyperv/hyperv_driver.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/hyperv/hyperv_driver.c b/src/hyperv/hyperv_driver.c
-index 4677a25ff8..213dd8837b 100644
---- a/src/hyperv/hyperv_driver.c
-+++ b/src/hyperv/hyperv_driver.c
-@@ -310,7 +310,7 @@ hypervNodeGetInfo(virConnectPtr conn, virNodeInfoPtr info)
-     }
- 
-     info->cores = processorList->data.common->NumberOfCores;
--    info->threads = info->cores / processorList->data.common->NumberOfLogicalProcessors;
-+    info->threads = processorList->data.common->NumberOfLogicalProcessors / info->cores;
-     info->cpus = info->sockets * info->cores;
- 
-     result = 0;
--- 
-2.27.0
-
diff --git a/include-Introduce-virDomainDirtyRateCalcFlags.patch b/include-Introduce-virDomainDirtyRateCalcFlags.patch
deleted file mode 100644
index cc700c62eba130da06aeba168357f5d647c73b4b..0000000000000000000000000000000000000000
--- a/include-Introduce-virDomainDirtyRateCalcFlags.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From c4c665b4654280560eafe5782359b71e8ef2b1b5 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Hyman=20Huang=28=E9=BB=84=E5=8B=87=29?=
- <huangy81@chinatelecom.cn>
-Date: Sun, 20 Feb 2022 21:28:11 +0800
-Subject: [PATCH 6/7] include: Introduce virDomainDirtyRateCalcFlags
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Introduce virDomainDirtyRateCalcFlags to get ready for
-adding mode parameter to qemuDomainStartDirtyRateCalc.
-
-Signed-off-by: Hyman Huang(黄勇) <huangy81@chinatelecom.cn>
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
----
- include/libvirt/libvirt-domain.h | 13 +++++++++++++
- src/libvirt-domain.c             | 12 +++++++++++-
- 2 files changed, 24 insertions(+), 1 deletion(-)
-
-diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h
-index e1954ae663..c7956c81d6 100644
---- a/include/libvirt/libvirt-domain.h
-+++ b/include/libvirt/libvirt-domain.h
-@@ -5030,6 +5030,19 @@ typedef enum {
- # endif
- } virDomainDirtyRateStatus;
- 
-+/**
-+ * virDomainDirtyRateCalcFlags:
-+ *
-+ * Flags OR'ed together to provide specific behaviour when calculating dirty page
-+ * rate for a Domain
-+ *
-+ */
-+typedef enum {
-+    VIR_DOMAIN_DIRTYRATE_MODE_PAGE_SAMPLING = 0,        /* default mode - page-sampling */
-+    VIR_DOMAIN_DIRTYRATE_MODE_DIRTY_BITMAP = 1 << 0,    /* dirty-bitmap mode */
-+    VIR_DOMAIN_DIRTYRATE_MODE_DIRTY_RING = 1 << 1,      /* dirty-ring mode */
-+} virDomainDirtyRateCalcFlags;
-+
- int virDomainStartDirtyRateCalc(virDomainPtr domain,
-                                 int seconds,
-                                 unsigned int flags);
-diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c
-index 6a37ea85b7..0ff99c94b6 100644
---- a/src/libvirt-domain.c
-+++ b/src/libvirt-domain.c
-@@ -12821,7 +12821,7 @@ virDomainHotpatchManage(virDomainPtr domain,
-  * virDomainStartDirtyRateCalc:
-  * @domain: a domain object
-  * @seconds: specified calculating time in seconds
-- * @flags: extra flags; not used yet, so callers should always pass 0
-+ * @flags: bitwise-OR of supported virDomainDirtyRateCalcFlags
-  *
-  * Calculate the current domain's memory dirty rate in next @seconds.
-  * The calculated dirty rate information is available by calling
-@@ -12845,6 +12845,16 @@ virDomainStartDirtyRateCalc(virDomainPtr domain,
- 
-     virCheckReadOnlyGoto(conn->flags, error);
- 
-+    VIR_EXCLUSIVE_FLAGS_GOTO(VIR_DOMAIN_DIRTYRATE_MODE_PAGE_SAMPLING,
-+                             VIR_DOMAIN_DIRTYRATE_MODE_DIRTY_BITMAP,
-+                             error);
-+    VIR_EXCLUSIVE_FLAGS_GOTO(VIR_DOMAIN_DIRTYRATE_MODE_PAGE_SAMPLING,
-+                             VIR_DOMAIN_DIRTYRATE_MODE_DIRTY_RING,
-+                             error);
-+    VIR_EXCLUSIVE_FLAGS_GOTO(VIR_DOMAIN_DIRTYRATE_MODE_DIRTY_BITMAP,
-+                             VIR_DOMAIN_DIRTYRATE_MODE_DIRTY_RING,
-+                             error);
-+
-     if (conn->driver->domainStartDirtyRateCalc) {
-         int ret;
-         ret = conn->driver->domainStartDirtyRateCalc(domain, seconds, flags);
--- 
-2.27.0
-
diff --git a/leaseshelper-Report-errors-on-failure.patch b/leaseshelper-Report-errors-on-failure.patch
deleted file mode 100644
index cb4ea48078246f32b8d928f0048cdfbc4138602a..0000000000000000000000000000000000000000
--- a/leaseshelper-Report-errors-on-failure.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 75d4ed800f297532a7b3ac2b8f8a94c049959e3b Mon Sep 17 00:00:00 2001
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Fri, 18 Dec 2020 16:09:08 +0100
-Subject: [PATCH 024/108] leaseshelper: Report errors on failure
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-If leasehelper fails all that we are left with is a simple error
-message produced by dnsmasq:
-
-  lease-init script returned exit code 1
-
-This is because the leasehelper did not write any message to
-stderr. According to dnsmasq's manpage, whenever it's invoking
-leasehelper the stderr is kept open:
-
-  All file descriptors are closed except stdin, which is open to
-  /dev/null, and stdout and stderr which capture output for
-  logging by dnsmasq.
-
-As debugging leasehelper is not trivial (because dnsmasq invokes
-it with plenty of env vars set - that's how data is passed onto
-helper), let's print an error into stderr if exiting with an
-error. And since we are not calling public APIs, we have to call
-virDispatchError() explicitly and since we don't have any
-connection open, we have to pass NULL.
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
-(cherry picked from commit c14bd64f3eba9838af8ab1cac369d51abfeb21b9)
----
- src/network/leaseshelper.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/network/leaseshelper.c b/src/network/leaseshelper.c
-index 2b5fc0f442..fdd7fd3e80 100644
---- a/src/network/leaseshelper.c
-+++ b/src/network/leaseshelper.c
-@@ -253,6 +253,8 @@ main(int argc, char **argv)
-     rv = EXIT_SUCCESS;
- 
-  cleanup:
-+    if (rv != EXIT_SUCCESS)
-+        virDispatchError(NULL);
-     if (pid_file_fd != -1)
-         virPidFileReleasePath(pid_file, pid_file_fd);
- 
--- 
-2.33.0
-
diff --git a/libvirt-6.2.0.tar.xz b/libvirt-6.2.0.tar.xz
deleted file mode 100644
index 4d27d2ffb7b658746540a82edd4aadc8dbe8e401..0000000000000000000000000000000000000000
Binary files a/libvirt-6.2.0.tar.xz and /dev/null differ
diff --git a/libvirt-9.10.0.tar.xz b/libvirt-9.10.0.tar.xz
new file mode 100644
index 0000000000000000000000000000000000000000..43ccea27c3e7cc0b25984e4c777603b39b916c6a
Binary files /dev/null and b/libvirt-9.10.0.tar.xz differ
diff --git a/libvirt-Add-retry-support-for-error-policy.patch b/libvirt-Add-retry-support-for-error-policy.patch
index 3b5d3e326f5c78c8728c96e03ea973db4c9a4cfd..ec8230190b42f9b48f3e1a3011dca4c16708380f 100644
--- a/libvirt-Add-retry-support-for-error-policy.patch
+++ b/libvirt-Add-retry-support-for-error-policy.patch
@@ -1,4 +1,4 @@
-From 9ba3e54d2b33e1105f5879fff3656c093337e60a Mon Sep 17 00:00:00 2001
+From c45717fa823682a04814ca49669116b2f5917671 Mon Sep 17 00:00:00 2001
 From: Jiahui Cen <cenjiahui@huawei.com>
 Date: Thu, 25 Feb 2021 18:55:30 +0800
 Subject: [PATCH] libvirt: Add 'retry' support for error policy
@@ -12,17 +12,17 @@ Add retry_timeout parameter to control the total retry times.
 Signed-off-by: Jiahui Cen <cenjiahui@huawei.com>
 Signed-off-by: Ying Fang <fangying1@huawei.com>
 ---
- src/conf/domain_conf.c  | 25 +++++++++++++++++++++++++
+ src/conf/domain_conf.c  | 26 ++++++++++++++++++++++++++
  src/conf/domain_conf.h  |  3 +++
- src/qemu/qemu_command.c |  8 ++++++++
+ src/qemu/qemu_command.c | 13 +++++++++++++
  src/qemu/qemu_domain.c  |  2 ++
- 4 files changed, 38 insertions(+)
+ 4 files changed, 44 insertions(+)
 
 diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
-index dbc3e103ff..5c469cedd0 100644
+index 22ad43e1d7..f31f06b428 100644
 --- a/src/conf/domain_conf.c
 +++ b/src/conf/domain_conf.c
-@@ -355,6 +355,7 @@ VIR_ENUM_IMPL(virDomainDiskErrorPolicy,
+@@ -385,6 +385,7 @@ VIR_ENUM_IMPL(virDomainDiskErrorPolicy,
                "report",
                "ignore",
                "enospace",
@@ -30,15 +30,24 @@ index dbc3e103ff..5c469cedd0 100644
  );
  
  VIR_ENUM_IMPL(virDomainDiskIo,
-@@ -10213,6 +10214,30 @@ virDomainDiskDefDriverParseXML(virDomainDiskDefPtr def,
+@@ -7773,6 +7774,8 @@ static int
+ virDomainDiskDefDriverParseXML(virDomainDiskDef *def,
+                                xmlNodePtr cur)
+ {
++    g_autofree char *tmp = NULL;
++
+     def->driverName = virXMLPropString(cur, "name");
+ 
+     if (virXMLPropEnum(cur, "cache", virDomainDiskCacheTypeFromString,
+@@ -7796,6 +7799,29 @@ virDomainDiskDefDriverParseXML(virDomainDiskDef *def,
+         return -1;
      }
-     VIR_FREE(tmp);
  
 +    def->retry_interval = -1;
 +    if ((tmp = virXMLPropString(cur, "retry_interval")) &&
 +        ((def->error_policy != VIR_DOMAIN_DISK_ERROR_POLICY_RETRY &&
 +          def->rerror_policy != VIR_DOMAIN_DISK_ERROR_POLICY_RETRY) ||
-+         (virStrToLong_l(tmp, NULL, 10, &def->retry_interval) < 0) ||
++         (virStrToLong_ll(tmp, NULL, 10, &def->retry_interval) < 0) ||
 +         (def->retry_interval < 0))) {
 +        virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
 +                       _("unknown disk retry interval '%s'"), tmp);
@@ -50,22 +59,21 @@ index dbc3e103ff..5c469cedd0 100644
 +    if ((tmp = virXMLPropString(cur, "retry_timeout")) &&
 +        ((def->error_policy != VIR_DOMAIN_DISK_ERROR_POLICY_RETRY &&
 +          def->rerror_policy != VIR_DOMAIN_DISK_ERROR_POLICY_RETRY) ||
-+         (virStrToLong_l(tmp, NULL, 10, &def->retry_timeout) < 0) ||
++         (virStrToLong_ll(tmp, NULL, 10, &def->retry_timeout) < 0) ||
 +         (def->retry_timeout < 0))) {
 +        virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
 +                       _("unknown disk retry interval '%s'"), tmp);
 +        return -1;
 +    }
-+    VIR_FREE(tmp);
 +
-     if ((tmp = virXMLPropString(cur, "io")) &&
-         (def->iomode = virDomainDiskIoTypeFromString(tmp)) <= 0) {
-         virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
+     if (virXMLPropEnum(cur, "io", virDomainDiskIoTypeFromString,
+                        VIR_XML_PROP_NONZERO, &def->iomode) < 0)
+         return -1;
 diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
-index 16e625331c..86a86d3090 100644
+index ed07859bc5..021623cce7 100644
 --- a/src/conf/domain_conf.h
 +++ b/src/conf/domain_conf.h
-@@ -396,6 +396,7 @@ typedef enum {
+@@ -419,6 +419,7 @@ typedef enum {
      VIR_DOMAIN_DISK_ERROR_POLICY_REPORT,
      VIR_DOMAIN_DISK_ERROR_POLICY_IGNORE,
      VIR_DOMAIN_DISK_ERROR_POLICY_ENOSPACE,
@@ -73,39 +81,58 @@ index 16e625331c..86a86d3090 100644
  
      VIR_DOMAIN_DISK_ERROR_POLICY_LAST
  } virDomainDiskErrorPolicy;
-@@ -561,6 +562,8 @@ struct _virDomainDiskDef {
-     int cachemode; /* enum virDomainDiskCache */
-     int error_policy;  /* enum virDomainDiskErrorPolicy */
-     int rerror_policy; /* enum virDomainDiskErrorPolicy */
-+    long retry_interval;
-+    long retry_timeout;
-     int iomode; /* enum virDomainDiskIo */
-     int ioeventfd; /* enum virTristateSwitch */
-     int event_idx; /* enum virTristateSwitch */
+@@ -556,6 +557,8 @@ struct _virDomainDiskDef {
+     virDomainDiskCache cachemode;
+     virDomainDiskErrorPolicy error_policy;
+     virDomainDiskErrorPolicy rerror_policy;
++    long long retry_interval;
++    long long retry_timeout;
+     virDomainDiskIo iomode;
+     virTristateSwitch ioeventfd;
+     virTristateSwitch event_idx;
 diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
-index 315deb5cfd..c3ad041959 100644
+index d54149ed2d..678b84b332 100644
 --- a/src/qemu/qemu_command.c
 +++ b/src/qemu/qemu_command.c
-@@ -1723,6 +1723,14 @@ qemuBuildDiskFrontendAttributeErrorPolicy(virDomainDiskDefPtr disk,
-         virBufferAsprintf(buf, ",werror=%s", wpolicy);
-     if (rpolicy)
-         virBufferAsprintf(buf, ",rerror=%s", rpolicy);
+@@ -1753,6 +1753,8 @@ qemuBuildDiskDeviceProps(const virDomainDef *def,
+     const char *biosCHSTrans = NULL;
+     const char *wpolicy = NULL;
+     const char *rpolicy = NULL;
++    g_autoptr(virJSONValue) retry_interval = NULL;
++    g_autoptr(virJSONValue) retry_timeout = NULL;
+ 
+     switch (disk->bus) {
+     case VIR_DOMAIN_DISK_BUS_IDE:
+@@ -1912,6 +1914,15 @@ qemuBuildDiskDeviceProps(const virDomainDef *def,
+     }
+ 
+     qemuBuildDiskGetErrorPolicy(disk, &wpolicy, &rpolicy);
 +    if ((disk->error_policy == VIR_DOMAIN_DISK_ERROR_POLICY_RETRY ||
 +         disk->rerror_policy == VIR_DOMAIN_DISK_ERROR_POLICY_RETRY) &&
-+        disk->retry_interval >= 0)
-+        virBufferAsprintf(buf, ",retry_interval=%ld", disk->retry_interval);
++         disk->retry_interval >= 0)
++        retry_interval = virJSONValueNewNumberUlong(disk->retry_interval);
 +    if ((disk->error_policy == VIR_DOMAIN_DISK_ERROR_POLICY_RETRY ||
 +         disk->rerror_policy == VIR_DOMAIN_DISK_ERROR_POLICY_RETRY) &&
-+        disk->retry_timeout >= 0)
-+        virBufferAsprintf(buf, ",retry_timeout=%ld", disk->retry_timeout);
- }
++         disk->retry_timeout >= 0)
++        retry_timeout = virJSONValueNewNumberUlong(disk->retry_timeout);
++
  
+     if (virJSONValueObjectAdd(&props,
+                               "S:device_id", scsiVPDDeviceId,
+@@ -1936,6 +1947,8 @@ qemuBuildDiskDeviceProps(const virDomainDef *def,
+                               "S:serial", serial,
+                               "S:werror", wpolicy,
+                               "S:rerror", rpolicy,
++                              "A:retry_interval", &retry_interval,
++                              "A:retry_timeout", &retry_timeout,
+                               NULL) < 0)
+         return NULL;
  
 diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
-index f89ff20a84..58493706a1 100644
+index 953808fcfe..fa6a7fd1c9 100644
 --- a/src/qemu/qemu_domain.c
 +++ b/src/qemu/qemu_domain.c
-@@ -12308,6 +12308,8 @@ qemuDomainDiskChangeSupported(virDomainDiskDefPtr disk,
+@@ -8325,6 +8325,8 @@ qemuDomainDiskChangeSupported(virDomainDiskDef *disk,
      CHECK_EQ(cachemode, "cache", true);
      CHECK_EQ(error_policy, "error_policy", true);
      CHECK_EQ(rerror_policy, "rerror_policy", true);
diff --git a/libvirt-Don-t-require-secdrivers-to-implement-.domainMoveIma.patch b/libvirt-Don-t-require-secdrivers-to-implement-.domainMoveIma.patch
deleted file mode 100644
index 579fbc72fa6e23c58a8f67fa2c7e35bb58d0aab7..0000000000000000000000000000000000000000
--- a/libvirt-Don-t-require-secdrivers-to-implement-.domainMoveIma.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 19845de491a3102df4256a3457c7d5669bccda63 Mon Sep 17 00:00:00 2001
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Mon, 18 May 2020 10:07:30 +0200
-Subject: [PATCH] Don't require secdrivers to implement
- .domainMoveImageMetadata
-
-The AppArmor secdriver does not use labels to grant access to
-resources. Therefore, it doesn't use XATTRs and hence it lacks
-implementation of .domainMoveImageMetadata callback. This leads
-to a harmless but needless error message appearing in the logs:
-
-  virSecurityManagerMoveImageMetadata:476 : this function is not
-  supported by the connection driver: virSecurityManagerMoveImageMetadata
-
-Closes: https://gitlab.com/libvirt/libvirt/-/issues/25
-
-cherry-pick from commit: cc8c297e473afd55e5d8e35e18345d8df176059d
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Erik Skultety <eskultet@redhat.com>
-Signed-off-by: Jin Yan <jinyan12@huawei.com>
----
- src/security/security_manager.c | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/src/security/security_manager.c b/src/security/security_manager.c
-index fe03274..1445291 100644
---- a/src/security/security_manager.c
-+++ b/src/security/security_manager.c
-@@ -473,8 +473,7 @@ virSecurityManagerMoveImageMetadata(virSecurityManagerPtr mgr,
-         return ret;
-     }
- 
--    virReportUnsupportedError();
--    return -1;
-+    return 0;
- }
- 
- 
--- 
-1.8.3.1
-
diff --git a/libvirt-Fix-some-wrong-usage-of-ATTRIBUTE_NONNULL.patch b/libvirt-Fix-some-wrong-usage-of-ATTRIBUTE_NONNULL.patch
deleted file mode 100644
index 240f77e1af2ced57bd99827764296dd3be2ae26c..0000000000000000000000000000000000000000
--- a/libvirt-Fix-some-wrong-usage-of-ATTRIBUTE_NONNULL.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 42e4b74e1bbd08aad3afa46d741e46c40a8af73d Mon Sep 17 00:00:00 2001
-From: Bihong Yu <yubihong@huawei.com>
-Date: Sat, 6 Jun 2020 18:52:35 +0800
-Subject: [PATCH] Fix some wrong usage of ATTRIBUTE_NONNULL()
-
-The virStateInitialize() function has ATTRIBUTE_NONNULL()
-referring to @root argument (incorrectly anyway) but in
-daemonRunStateInit() NULL is passed in anyway.
-
-Then there is virCommandAddArgPair() which also has
-ATTRIBUTE_NONNULL() for one of its arguments and then checks the
-argument for being NULL anyways.
-
-cherry-pick from commit: 2a372a5ad5fab3bf26fb9bea019d38fa04ba8b34
-
-Signed-off-by:Bihong Yu <yubihong@huawei.com>
-Reviewed-by:Chuan Zheng <zhengchuan@huawei.com>
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-Signed-off-by: Jin Yan <jinyan12@huawei.com>
----
- src/libvirt_internal.h | 3 +--
- src/util/vircommand.h  | 3 +--
- 2 files changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/src/libvirt_internal.h b/src/libvirt_internal.h
-index 00ef7aa..72c6127 100644
---- a/src/libvirt_internal.h
-+++ b/src/libvirt_internal.h
-@@ -33,8 +33,7 @@ int virStateInitialize(bool privileged,
-                        bool mandatory,
-                        const char *root,
-                        virStateInhibitCallback inhibit,
--                       void *opaque)
--    ATTRIBUTE_NONNULL(2);
-+                       void *opaque);
- int virStateCleanup(void);
- int virStateReload(void);
- int virStateStop(void);
-diff --git a/src/util/vircommand.h b/src/util/vircommand.h
-index 9086f9a..4e6cb0a 100644
---- a/src/util/vircommand.h
-+++ b/src/util/vircommand.h
-@@ -128,8 +128,7 @@ void virCommandAddArgFormat(virCommandPtr cmd,
- 
- void virCommandAddArgPair(virCommandPtr cmd,
-                           const char *name,
--                          const char *val)
--    ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3);
-+                          const char *val);
- 
- void virCommandAddArgSet(virCommandPtr cmd,
-                          const char *const*vals) ATTRIBUTE_NONNULL(2);
--- 
-1.8.3.1
-
diff --git a/libvirt-Substitute-security_context_t-with-char.patch b/libvirt-Substitute-security_context_t-with-char.patch
deleted file mode 100644
index 93ebe82b1c9a54d3c03a163ce5a39e55bb940990..0000000000000000000000000000000000000000
--- a/libvirt-Substitute-security_context_t-with-char.patch
+++ /dev/null
@@ -1,320 +0,0 @@
-From 0ca4dd0cd279448ff28beb4c88e52107531783a3 Mon Sep 17 00:00:00 2001
-From: Xu Yandong <xuyandong2@huawei.com>
-Date: Tue, 4 Aug 2020 01:44:48 +0000
-Subject: [PATCH] Substitute security_context_t with char *
-
-Historically, we've used security_context_t for variables passed
-to libselinux APIs. But almost 7 years ago, libselinux developers
-admitted in their API that in fact, it's just a 'char *' type
-[1]. Ever since then the APIs accept 'char *' instead, but they
-kept the old alias just for API stability. Well, not anymore [2].
-
-1: https://github.com/SELinuxProject/selinux/commit/9eb9c9327563014ad6a807814e7975424642d5b9
-2: https://github.com/SELinuxProject/selinux/commit/7a124ca2758136f49cc38efc26fb1a2d385ecfd9
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Andrea Bolognani <abologna@redhat.com>
-(cherry-picked from commit e71e13488dc1aa65456e54a4b41bc925821b4263)
-Signed-off-by: Xu Yandong <xuyandong2@huawei.com>
----
- src/libvirt-lxc.c                |  2 +-
- src/rpc/virnetsocket.c           |  2 +-
- src/security/security_selinux.c  | 26 +++++++++++++-------------
- src/storage/storage_util.c       |  2 +-
- src/util/viridentity.c           |  2 +-
- tests/securityselinuxhelper.c    | 16 ++++++++--------
- tests/securityselinuxlabeltest.c |  4 ++--
- tests/securityselinuxtest.c      |  2 +-
- tests/viridentitytest.c          |  2 +-
- 9 files changed, 29 insertions(+), 29 deletions(-)
-
-diff --git a/src/libvirt-lxc.c b/src/libvirt-lxc.c
-index 47a06a3..25f1cfc 100644
---- a/src/libvirt-lxc.c
-+++ b/src/libvirt-lxc.c
-@@ -204,7 +204,7 @@ virDomainLxcEnterSecurityLabel(virSecurityModelPtr model,
-     if (STREQ(model->model, "selinux")) {
- #ifdef WITH_SELINUX
-         if (oldlabel) {
--            security_context_t ctx;
-+            char *ctx;
- 
-             if (getcon(&ctx) < 0) {
-                 virReportSystemError(errno,
-diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c
-index 6c790cb..5537289 100644
---- a/src/rpc/virnetsocket.c
-+++ b/src/rpc/virnetsocket.c
-@@ -1595,7 +1595,7 @@ int virNetSocketGetUNIXIdentity(virNetSocketPtr sock G_GNUC_UNUSED,
- int virNetSocketGetSELinuxContext(virNetSocketPtr sock,
-                                   char **context)
- {
--    security_context_t seccon = NULL;
-+    char *seccon = NULL;
-     int ret = -1;
- 
-     *context = NULL;
-diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c
-index 8aeb6e4..72d1658 100644
---- a/src/security/security_selinux.c
-+++ b/src/security/security_selinux.c
-@@ -198,7 +198,7 @@ virSecuritySELinuxTransactionAppend(const char *path,
- 
- static int
- virSecuritySELinuxRememberLabel(const char *path,
--                                const security_context_t con)
-+                                const char *con)
- {
-     return virSecuritySetRememberedLabel(SECURITY_SELINUX_NAME,
-                                          path, con);
-@@ -207,7 +207,7 @@ virSecuritySELinuxRememberLabel(const char *path,
- 
- static int
- virSecuritySELinuxRecallLabel(const char *path,
--                              security_context_t *con)
-+                              char **con)
- {
-     int rv;
- 
-@@ -431,7 +431,7 @@ virSecuritySELinuxMCSGetProcessRange(char **sens,
-                                      int *catMin,
-                                      int *catMax)
- {
--    security_context_t ourSecContext = NULL;
-+    char *ourSecContext = NULL;
-     context_t ourContext = NULL;
-     char *cat = NULL;
-     char *tmp;
-@@ -530,8 +530,8 @@ virSecuritySELinuxMCSGetProcessRange(char **sens,
- }
- 
- static char *
--virSecuritySELinuxContextAddRange(security_context_t src,
--                                  security_context_t dst)
-+virSecuritySELinuxContextAddRange(char *src,
-+                                  char *dst)
- {
-     char *str = NULL;
-     char *ret = NULL;
-@@ -575,7 +575,7 @@ virSecuritySELinuxGenNewContext(const char *basecontext,
-     context_t context = NULL;
-     char *ret = NULL;
-     char *str;
--    security_context_t ourSecContext = NULL;
-+    char *ourSecContext = NULL;
-     context_t ourContext = NULL;
- 
-     VIR_DEBUG("basecontext=%s mcs=%s isObjectContext=%d",
-@@ -967,7 +967,7 @@ virSecuritySELinuxReserveLabel(virSecurityManagerPtr mgr,
-                                virDomainDefPtr def,
-                                pid_t pid)
- {
--    security_context_t pctx;
-+    char *pctx;
-     context_t ctx = NULL;
-     const char *mcs;
-     int rv;
-@@ -1217,7 +1217,7 @@ virSecuritySELinuxGetProcessLabel(virSecurityManagerPtr mgr G_GNUC_UNUSED,
-                                   pid_t pid,
-                                   virSecurityLabelPtr sec)
- {
--    security_context_t ctx;
-+    char *ctx;
- 
-     if (getpidcon_raw(pid, &ctx) == -1) {
-         virReportSystemError(errno,
-@@ -1330,7 +1330,7 @@ virSecuritySELinuxSetFilecon(virSecurityManagerPtr mgr,
-                              bool remember)
- {
-     bool privileged = virSecurityManagerGetPrivileged(mgr);
--    security_context_t econ = NULL;
-+    char *econ = NULL;
-     int refcount;
-     int rc;
-     bool rollback = false;
-@@ -1440,7 +1440,7 @@ virSecuritySELinuxFSetFilecon(int fd, char *tcon)
- /* Set fcon to the appropriate label for path and mode, or return -1.  */
- static int
- getContext(virSecurityManagerPtr mgr G_GNUC_UNUSED,
--           const char *newpath, mode_t mode, security_context_t *fcon)
-+           const char *newpath, mode_t mode, char **fcon)
- {
-     virSecuritySELinuxDataPtr data = virSecurityManagerGetPrivateData(mgr);
- 
-@@ -1457,7 +1457,7 @@ virSecuritySELinuxRestoreFileLabel(virSecurityManagerPtr mgr,
- {
-     bool privileged = virSecurityManagerGetPrivileged(mgr);
-     struct stat buf;
--    security_context_t fcon = NULL;
-+    char *fcon = NULL;
-     char *newpath = NULL;
-     int rc;
-     int ret = -1;
-@@ -2972,7 +2972,7 @@ virSecuritySELinuxSetDaemonSocketLabel(virSecurityManagerPtr mgr G_GNUC_UNUSED,
- {
-     /* TODO: verify DOI */
-     virSecurityLabelDefPtr secdef;
--    security_context_t scon = NULL;
-+    char *scon = NULL;
-     char *str = NULL;
-     int rc = -1;
- 
-@@ -3259,7 +3259,7 @@ virSecuritySELinuxSetTapFDLabel(virSecurityManagerPtr mgr,
-                                 int fd)
- {
-     struct stat buf;
--    security_context_t fcon = NULL;
-+    char *fcon = NULL;
-     virSecurityLabelDefPtr secdef;
-     char *str = NULL, *proc = NULL, *fd_path = NULL;
-     int rc = -1;
-diff --git a/src/storage/storage_util.c b/src/storage/storage_util.c
-index 1ec1d13..4c67d3a 100644
---- a/src/storage/storage_util.c
-+++ b/src/storage/storage_util.c
-@@ -1818,7 +1818,7 @@ virStorageBackendUpdateVolTargetInfoFD(virStorageSourcePtr target,
-                                        struct stat *sb)
- {
- #if WITH_SELINUX
--    security_context_t filecon = NULL;
-+    char *filecon = NULL;
- #endif
- 
-     if (virStorageSourceUpdateBackingSizes(target, fd, sb) < 0)
-diff --git a/src/util/viridentity.c b/src/util/viridentity.c
-index 8cc2db2..2cb9042 100644
---- a/src/util/viridentity.c
-+++ b/src/util/viridentity.c
-@@ -157,7 +157,7 @@ virIdentityPtr virIdentityGetSystem(void)
-     unsigned long long startTime;
-     g_autoptr(virIdentity) ret = NULL;
- #if WITH_SELINUX
--    security_context_t con;
-+    char *con;
- #endif
- 
-     if (!(ret = virIdentityNew()))
-diff --git a/tests/securityselinuxhelper.c b/tests/securityselinuxhelper.c
-index f89224c..63b5726 100644
---- a/tests/securityselinuxhelper.c
-+++ b/tests/securityselinuxhelper.c
-@@ -58,7 +58,7 @@ static struct selabel_handle *(*real_selabel_open)(unsigned int backend,
-                                                   unsigned nopts);
- static void (*real_selabel_close)(struct selabel_handle *handle);
- static int (*real_selabel_lookup_raw)(struct selabel_handle *handle,
--                                     security_context_t *con,
-+                                     char **con,
-                                      const char *key,
-                                      int type);
- 
-@@ -94,7 +94,7 @@ static void init_syms(void)
-  * the virt_use_nfs bool is set.
-  */
- 
--int getcon_raw(security_context_t *context)
-+int getcon_raw(char **context)
- {
-     if (!is_selinux_enabled()) {
-         errno = EINVAL;
-@@ -109,12 +109,12 @@ int getcon_raw(security_context_t *context)
-     return 0;
- }
- 
--int getcon(security_context_t *context)
-+int getcon(char **context)
- {
-     return getcon_raw(context);
- }
- 
--int getpidcon_raw(pid_t pid, security_context_t *context)
-+int getpidcon_raw(pid_t pid, char **context)
- {
-     if (!is_selinux_enabled()) {
-         errno = EINVAL;
-@@ -134,7 +134,7 @@ int getpidcon_raw(pid_t pid, security_context_t *context)
-     return 0;
- }
- 
--int getpidcon(pid_t pid, security_context_t *context)
-+int getpidcon(pid_t pid, char **context)
- {
-     return getpidcon_raw(pid, context);
- }
-@@ -170,7 +170,7 @@ int setfilecon(const char *path, const char *con)
-     return setfilecon_raw(path, con);
- }
- 
--int getfilecon_raw(const char *path, security_context_t *con)
-+int getfilecon_raw(const char *path, char **con)
- {
-     char *constr = NULL;
-     ssize_t len = getxattr(path, "user.libvirt.selinux",
-@@ -194,7 +194,7 @@ int getfilecon_raw(const char *path, security_context_t *con)
- }
- 
- 
--int getfilecon(const char *path, security_context_t *con)
-+int getfilecon(const char *path, char **con)
- {
-     return getfilecon_raw(path, con);
- }
-@@ -315,7 +315,7 @@ void selabel_close(struct selabel_handle *handle)
- }
- 
- int selabel_lookup_raw(struct selabel_handle *handle,
--                       security_context_t *con,
-+                       char **con,
-                        const char *key,
-                        int type)
- {
-diff --git a/tests/securityselinuxlabeltest.c b/tests/securityselinuxlabeltest.c
-index 3040a36..50b447c 100644
---- a/tests/securityselinuxlabeltest.c
-+++ b/tests/securityselinuxlabeltest.c
-@@ -252,7 +252,7 @@ static int
- testSELinuxCheckLabels(testSELinuxFile *files, size_t nfiles)
- {
-     size_t i;
--    security_context_t ctx;
-+    char *ctx;
- 
-     for (i = 0; i < nfiles; i++) {
-         ctx = NULL;
-@@ -360,7 +360,7 @@ mymain(void)
-     if (virTestRun("Labelling " # name, testSELinuxLabeling, name) < 0) \
-         ret = -1;
- 
--    setcon((security_context_t)"system_r:system_u:libvirtd_t:s0:c0.c1023");
-+    setcon("system_r:system_u:libvirtd_t:s0:c0.c1023");
- 
-     DO_TEST_LABELING("disks");
-     DO_TEST_LABELING("kernel");
-diff --git a/tests/securityselinuxtest.c b/tests/securityselinuxtest.c
-index 6c8314d..3f069c2 100644
---- a/tests/securityselinuxtest.c
-+++ b/tests/securityselinuxtest.c
-@@ -217,7 +217,7 @@ testSELinuxGenLabel(const void *opaque)
-     context_t con = NULL;
-     context_t imgcon = NULL;
- 
--    if (setcon_raw((security_context_t)data->pidcon) < 0) {
-+    if (setcon_raw(data->pidcon) < 0) {
-         perror("Cannot set process security context");
-         return -1;
-     }
-diff --git a/tests/viridentitytest.c b/tests/viridentitytest.c
-index 3f87af1..9a8c891 100644
---- a/tests/viridentitytest.c
-+++ b/tests/viridentitytest.c
-@@ -120,7 +120,7 @@ static int testIdentityGetSystem(const void *data)
- static int testSetFakeSELinuxContext(const void *data G_GNUC_UNUSED)
- {
- #if WITH_SELINUX
--    return setcon_raw((security_context_t)data);
-+    return setcon_raw(data);
- #else
-     VIR_DEBUG("libvirt not compiled with SELinux, skipping this test");
-     return EXIT_AM_SKIP;
--- 
-2.25.4
-
diff --git a/libvirt-cgroup-cleanup-eventParams-when-virTypedParamsAddULL.patch b/libvirt-cgroup-cleanup-eventParams-when-virTypedParamsAddULL.patch
deleted file mode 100644
index c9f2a2eda2594d3cd3ced1535edcc832ce26a5b8..0000000000000000000000000000000000000000
--- a/libvirt-cgroup-cleanup-eventParams-when-virTypedParamsAddULL.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 432afe3f14418ea5d2d69e62d678ef5bb08caaa1 Mon Sep 17 00:00:00 2001
-From: Xu Yandong <xuyandong2@huawei.com>
-Date: Wed, 15 Apr 2020 11:55:43 +0800
-Subject: cgroup: cleanup eventParams when virTypedParamsAddULLong failed
-
-Function virTypedParamsAddULLong use realloc to gain memory,
-and doesn't free it when failed. so we need free eventParams to
-prevent a memory leak.
-
-Signed-off-by: Xu Yandong <xuyandong2@huawei.com>
----
- src/qemu/qemu_cgroup.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c
-index c0e30f6..057f871 100644
---- a/src/qemu/qemu_cgroup.c
-+++ b/src/qemu/qemu_cgroup.c
-@@ -904,8 +904,11 @@ qemuSetupCpuCgroup(virDomainObjPtr vm)
-             if (virTypedParamsAddULLong(&eventParams, &eventNparams,
-                                         &eventMaxparams,
-                                         VIR_DOMAIN_TUNABLE_CPU_CPU_SHARES,
--                                        val) < 0)
-+                                        val) < 0) {
-+                if (eventParams)
-+                    virTypedParamsFree(eventParams, eventNparams);
-                 return -1;
-+            }
- 
-             event = virDomainEventTunableNewFromObj(vm, eventParams, eventNparams);
-         }
--- 
-2.23.0
-
diff --git a/libvirt-conf-Don-t-format-http-cookies-unless-VIR_DOMAIN_DEF.patch b/libvirt-conf-Don-t-format-http-cookies-unless-VIR_DOMAIN_DEF.patch
deleted file mode 100644
index bb035030aa5b8315d52e37f90a76f02b66d1d604..0000000000000000000000000000000000000000
--- a/libvirt-conf-Don-t-format-http-cookies-unless-VIR_DOMAIN_DEF.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From cec735e6f4001caa0395eddc9d8a0fe18e97f9eb Mon Sep 17 00:00:00 2001
-From: Xu Yandong <xuyandong2@huawei.com>
-Date: Tue, 4 Aug 2020 08:40:36 +0000
-Subject: [PATCH] conf: Don't format http cookies unless
- VIR_DOMAIN_DEF_FORMAT_SECURE is used
-
-Starting with 3b076391befc3fe72deb0c244ac6c2b4c100b410
-(v6.1.0-122-g3b076391be) we support http cookies. Since they may contain
-somewhat sensitive information we should not format them into the XML
-unless VIR_DOMAIN_DEF_FORMAT_SECURE is asserted.
-
-Reported-by: Han Han <hhan@redhat.com>
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Erik Skultety <eskultet@redhat.com>
-(cherry-picked from commit a5b064bf4b17a9884d7d361733737fb614ad8979)
-Signed-off-by: Xu Yandong <xuyandong2@huawei.com>
----
- src/conf/domain_conf.c | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
-index 914e03c..cf93a59 100644
---- a/src/conf/domain_conf.c
-+++ b/src/conf/domain_conf.c
-@@ -24565,11 +24565,15 @@ virDomainSourceDefFormatSeclabel(virBufferPtr buf,
- 
- static void
- virDomainDiskSourceFormatNetworkCookies(virBufferPtr buf,
--                                        virStorageSourcePtr src)
-+                                        virStorageSourcePtr src,
-+                                        unsigned int flags)
- {
-     g_auto(virBuffer) childBuf = VIR_BUFFER_INIT_CHILD(buf);
-     size_t i;
- 
-+    if (!(flags & VIR_DOMAIN_DEF_FORMAT_SECURE))
-+        return;
-+
-     for (i = 0; i < src->ncookies; i++) {
-         virBufferEscapeString(&childBuf, "<cookie name='%s'>", src->cookies[i]->name);
-         virBufferEscapeString(&childBuf, "%s</cookie>\n", src->cookies[i]->value);
-@@ -24630,7 +24634,7 @@ virDomainDiskSourceFormatNetwork(virBufferPtr attrBuf,
-                           virTristateBoolTypeToString(src->sslverify));
-     }
- 
--    virDomainDiskSourceFormatNetworkCookies(childBuf, src);
-+    virDomainDiskSourceFormatNetworkCookies(childBuf, src, flags);
- 
-     if (src->readahead)
-         virBufferAsprintf(childBuf, "<readahead size='%llu'/>\n", src->readahead);
--- 
-2.25.4
-
diff --git a/libvirt-conf-Increase-cpuset-length-limit-for-CPU-pinning.patch b/libvirt-conf-Increase-cpuset-length-limit-for-CPU-pinning.patch
deleted file mode 100644
index 7c09892a7c438355f68f21dc3364060fdec39916..0000000000000000000000000000000000000000
--- a/libvirt-conf-Increase-cpuset-length-limit-for-CPU-pinning.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From fc8c41dbb52eb9ce3ee36680ecb53a41f4146610 Mon Sep 17 00:00:00 2001
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Thu, 11 Jun 2020 13:53:27 +0200
-Subject: [PATCH] conf: Increase cpuset length limit for CPU pinning
-
-Domains are now allowed to be pinned to host CPUs with IDs up to 16383.
-The new limit is as arbitrary as the old one. It's just bigger.
-
-cherry-pick from commit: e728ffba5119cfb1488aa7363fef596940449f50
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-Signed-off-by: Jin Yan <jinyan12@huawei.com>
----
- src/conf/domain_conf.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
-index a40773a..16e6253 100644
---- a/src/conf/domain_conf.h
-+++ b/src/conf/domain_conf.h
-@@ -2241,7 +2241,7 @@ struct _virDomainHugePage {
-     unsigned long long size;    /* hugepage size in KiB */
- };
- 
--#define VIR_DOMAIN_CPUMASK_LEN 1024
-+#define VIR_DOMAIN_CPUMASK_LEN 16384
- 
- struct _virDomainIOThreadIDDef {
-     bool autofill;
--- 
-1.8.3.1
-
diff --git a/libvirt-conf-Set-default-values-of-retry-fileds.patch b/libvirt-conf-Set-default-values-of-retry-fileds.patch
index 457305cd1cb8b0b68ed50fcb459e769c24138888..a600ead4e6853544758ef6b5eb28359faae00137 100644
--- a/libvirt-conf-Set-default-values-of-retry-fileds.patch
+++ b/libvirt-conf-Set-default-values-of-retry-fileds.patch
@@ -1,4 +1,4 @@
-From 04292a5ad4cb9741fa8f9687befd1e1c644043a6 Mon Sep 17 00:00:00 2001
+From 2b79389fe60dc8fc0bf8788a346a35d63ae6883d Mon Sep 17 00:00:00 2001
 From: Jiahui Cen <cenjiahui@huawei.com>
 Date: Thu, 18 Mar 2021 15:14:20 +0800
 Subject: [PATCH] libvirt/conf: Set default values of retry fileds
@@ -13,14 +13,14 @@ retry policy is not enabled.
 Signed-off-by: Jiahui Cen <cenjiahui@huawei.com>
 ---
  src/conf/domain_conf.c | 18 ++++++++++++------
- src/conf/domain_conf.h |  3 +++
- 2 files changed, 15 insertions(+), 6 deletions(-)
+ src/conf/domain_conf.h |  2 ++
+ 2 files changed, 14 insertions(+), 6 deletions(-)
 
 diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
-index 5c469cedd0..a4e9b3290c 100644
+index f31f06b428..0aa514bda3 100644
 --- a/src/conf/domain_conf.c
 +++ b/src/conf/domain_conf.c
-@@ -10186,6 +10186,7 @@ virDomainDiskDefDriverParseXML(virDomainDiskDefPtr def,
+@@ -7775,6 +7775,7 @@ virDomainDiskDefDriverParseXML(virDomainDiskDef *def,
                                 xmlNodePtr cur)
  {
      g_autofree char *tmp = NULL;
@@ -28,9 +28,9 @@ index 5c469cedd0..a4e9b3290c 100644
  
      def->driverName = virXMLPropString(cur, "name");
  
-@@ -10214,28 +10215,33 @@ virDomainDiskDefDriverParseXML(virDomainDiskDefPtr def,
+@@ -7799,28 +7800,33 @@ virDomainDiskDefDriverParseXML(virDomainDiskDef *def,
+         return -1;
      }
-     VIR_FREE(tmp);
  
 -    def->retry_interval = -1;
 +    retry_enabled = (def->error_policy == VIR_DOMAIN_DISK_ERROR_POLICY_RETRY) ||
@@ -40,7 +40,7 @@ index 5c469cedd0..a4e9b3290c 100644
 -        ((def->error_policy != VIR_DOMAIN_DISK_ERROR_POLICY_RETRY &&
 -          def->rerror_policy != VIR_DOMAIN_DISK_ERROR_POLICY_RETRY) ||
 +        (!retry_enabled ||
-          (virStrToLong_l(tmp, NULL, 10, &def->retry_interval) < 0) ||
+          (virStrToLong_ll(tmp, NULL, 10, &def->retry_interval) < 0) ||
           (def->retry_interval < 0))) {
          virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
                         _("unknown disk retry interval '%s'"), tmp);
@@ -56,7 +56,7 @@ index 5c469cedd0..a4e9b3290c 100644
 -        ((def->error_policy != VIR_DOMAIN_DISK_ERROR_POLICY_RETRY &&
 -          def->rerror_policy != VIR_DOMAIN_DISK_ERROR_POLICY_RETRY) ||
 +        (!retry_enabled ||
-          (virStrToLong_l(tmp, NULL, 10, &def->retry_timeout) < 0) ||
+          (virStrToLong_ll(tmp, NULL, 10, &def->retry_timeout) < 0) ||
           (def->retry_timeout < 0))) {
          virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
                         _("unknown disk retry interval '%s'"), tmp);
@@ -65,23 +65,22 @@ index 5c469cedd0..a4e9b3290c 100644
 +    if (retry_enabled && !tmp) {
 +        def->retry_timeout = VIR_DOMAIN_DISK_DEFAULT_RETRY_TIMEOUT;
 +    }
-     VIR_FREE(tmp);
  
-     if ((tmp = virXMLPropString(cur, "io")) &&
+     if (virXMLPropEnum(cur, "io", virDomainDiskIoTypeFromString,
+                        VIR_XML_PROP_NONZERO, &def->iomode) < 0)
 diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
-index 86a86d3090..ccee986849 100644
+index 021623cce7..c810721d5b 100644
 --- a/src/conf/domain_conf.h
 +++ b/src/conf/domain_conf.h
-@@ -523,6 +523,9 @@ typedef enum {
- } virDomainMemoryAllocation;
+@@ -515,6 +515,8 @@ typedef enum {
  
+ VIR_ENUM_DECL(virDomainSnapshotLocation);
  
 +#define VIR_DOMAIN_DISK_DEFAULT_RETRY_INTERVAL    1000
 +#define VIR_DOMAIN_DISK_DEFAULT_RETRY_TIMEOUT     0
-+
+ 
  /* Stores the virtual disk configuration */
  struct _virDomainDiskDef {
-     virStorageSourcePtr src; /* non-NULL.  XXX Allow NULL for empty cdrom? */
 -- 
 2.27.0
 
diff --git a/libvirt-conf-vmx-check-for-OOM-after-calling-xmlBufferCreate.patch b/libvirt-conf-vmx-check-for-OOM-after-calling-xmlBufferCreate.patch
deleted file mode 100644
index e822e9ddb78451b755d26f67e4e7e877c78791d3..0000000000000000000000000000000000000000
--- a/libvirt-conf-vmx-check-for-OOM-after-calling-xmlBufferCreate.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-From 657c7f5d79fe43823ffb4d46e244bea15a65baf6 Mon Sep 17 00:00:00 2001
-From: Laine Stump <laine@redhat.com>
-Date: Thu, 18 Jun 2020 12:49:09 -0400
-Subject: [PATCH 1/6] conf, vmx: check for OOM after calling xmlBufferCreate()
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Although libvirt itself uses g_malloc0() and friends, which exit when
-there isn't enouogh memory, libxml2 uses standard malloc(), which just
-returns NULL on OOM - this means we must check for NULL on return from
-any libxml2 functions that allocate memory.
-
-xmlBufferCreate(), for example, might return NULL, and we don't always
-check for it. This patch adds checks where it isn't already done.
-
-(NB: Although libxml2 has a provision for changing behavior on OOM (by
-calling xmlMemSetup() to change what functions are used to
-allocating/freeing memory), we can't use that, since parts of libvirt
-code end up in libvirt.so, which is linked and called directly by
-applications that may themselves use libxml2 (and may have already set
-their own alternate malloc()), e.g. drivers like esx which live totally
-in the library rather than a separate process.)
-
-cherry pick from: b7a92bce070fd57844a59bf8b1c30cb4ef4f3acd
-
-Signed-off-by: Laine Stump <laine@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/conf/domain_conf.c  |  6 +++++-
- src/conf/network_conf.c |  6 +++++-
- src/vmx/vmx.c           | 11 +++++++----
- 3 files changed, 17 insertions(+), 6 deletions(-)
-
-diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
-index 914e03c..37c785a 100644
---- a/src/conf/domain_conf.c
-+++ b/src/conf/domain_conf.c
-@@ -29022,7 +29022,11 @@ virDomainDefFormatInternalSetRootName(virDomainDefPtr def,
-          * Thankfully, libxml maps what looks like globals into
-          * thread-local uses, so we are thread-safe.  */
-         xmlIndentTreeOutput = 1;
--        xmlbuf = xmlBufferCreate();
-+        if (!(xmlbuf = xmlBufferCreate())) {
-+            virReportOOMError();
-+            goto error;
-+        }
-+
-         if (xmlNodeDump(xmlbuf, def->metadata->doc, def->metadata,
-                         virBufferGetIndent(buf) / 2, 1) < 0) {
-             xmlBufferFree(xmlbuf);
-diff --git a/src/conf/network_conf.c b/src/conf/network_conf.c
-index 819b645..c379042 100644
---- a/src/conf/network_conf.c
-+++ b/src/conf/network_conf.c
-@@ -2478,7 +2478,11 @@ virNetworkDefFormatBuf(virBufferPtr buf,
-          * Thankfully, libxml maps what looks like globals into
-          * thread-local uses, so we are thread-safe.  */
-         xmlIndentTreeOutput = 1;
--        xmlbuf = xmlBufferCreate();
-+        if (!(xmlbuf = xmlBufferCreate())) {
-+            virReportOOMError();
-+            return -1;
-+        }
-+
-         if (xmlNodeDump(xmlbuf, def->metadata->doc, def->metadata,
-                         virBufferGetIndent(buf) / 2, 1) < 0) {
-             xmlBufferFree(xmlbuf);
-diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c
-index b1fd118..fbc8366 100644
---- a/src/vmx/vmx.c
-+++ b/src/vmx/vmx.c
-@@ -697,8 +697,8 @@ virVMXConvertToUTF8(const char *encoding, const char *string)
- {
-     char *result = NULL;
-     xmlCharEncodingHandlerPtr handler;
--    xmlBufferPtr input;
--    xmlBufferPtr utf8;
-+    xmlBufferPtr input = NULL;
-+    xmlBufferPtr utf8 = NULL;
- 
-     handler = xmlFindCharEncodingHandler(encoding);
- 
-@@ -708,8 +708,11 @@ virVMXConvertToUTF8(const char *encoding, const char *string)
-         return NULL;
-     }
- 
--    input = xmlBufferCreateStatic((char *)string, strlen(string));
--    utf8 = xmlBufferCreate();
-+    if (!(input = xmlBufferCreateStatic((char *)string, strlen(string))) ||
-+        !(utf8 = xmlBufferCreate())) {
-+        virReportOOMError();
-+        goto cleanup;
-+    }
- 
-     if (xmlCharEncInFunc(handler, utf8, input) < 0) {
-         virReportError(VIR_ERR_INTERNAL_ERROR,
--- 
-1.8.3.1
-
diff --git a/libvirt-cpu-arm-add-cpu-data-free-function-to-virCPUarmDataF.patch b/libvirt-cpu-arm-add-cpu-data-free-function-to-virCPUarmDataF.patch
deleted file mode 100644
index 2adbb48e448e89dc59a00ac728ae9235ccd677f9..0000000000000000000000000000000000000000
--- a/libvirt-cpu-arm-add-cpu-data-free-function-to-virCPUarmDataF.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From efde450d2d0648475cde04f04f5e26c1a006c226 Mon Sep 17 00:00:00 2001
-From: Xu Yandong <xuyandong2@huawei.com>
-Date: Fri, 17 Apr 2020 14:40:27 +0800
-Subject: cpu/arm: add cpu data free function to virCPUarmDataFree
-
-Signed-off-by: Xu Yandong <xuyandong2@huawei.com>
----
- src/cpu/cpu_arm.c | 20 ++++++++++++++++++++
- 1 file changed, 20 insertions(+)
-
-diff --git a/src/cpu/cpu_arm.c b/src/cpu/cpu_arm.c
-index ee58021..230cd27 100644
---- a/src/cpu/cpu_arm.c
-+++ b/src/cpu/cpu_arm.c
-@@ -61,6 +61,25 @@ virCPUarmFeatureFree(virCPUarmFeaturePtr feature)
- 
- G_DEFINE_AUTOPTR_CLEANUP_FUNC(virCPUarmFeature, virCPUarmFeatureFree);
- 
-+static void
-+virCPUarmDataClear(virCPUarmData *data)
-+{
-+    if (!data)
-+        return;
-+
-+    VIR_FREE(data->features);
-+}
-+
-+static void
-+virCPUarmDataFree(virCPUDataPtr cpuData)
-+{
-+    if (!cpuData)
-+        return;
-+
-+    virCPUarmDataClear(&cpuData->data.arm);
-+    VIR_FREE(cpuData);
-+}
-+
- typedef struct _virCPUarmMap virCPUarmMap;
- typedef virCPUarmMap *virCPUarmMapPtr;
- struct _virCPUarmMap {
-@@ -259,6 +278,7 @@ struct cpuArchDriver cpuDriverArm = {
-     .compare = virCPUarmCompare,
-     .decode = NULL,
-     .encode = NULL,
-+    .dataFree = virCPUarmDataFree,
-     .baseline = virCPUarmBaseline,
-     .update = virCPUarmUpdate,
-     .validateFeatures = virCPUarmValidateFeatures,
--- 
-2.23.0
-
diff --git a/libvirt-cpu-arm-add-decode-function.patch b/libvirt-cpu-arm-add-decode-function.patch
deleted file mode 100644
index 6b43380d85c240367877b932dfac13cd4aeb012c..0000000000000000000000000000000000000000
--- a/libvirt-cpu-arm-add-decode-function.patch
+++ /dev/null
@@ -1,275 +0,0 @@
-From c69a629367b0e9bfa1a034301a4c3f88ad080586 Mon Sep 17 00:00:00 2001
-From: Xu Yandong <xuyandong2@huawei.com>
-Date: Sat, 18 Apr 2020 11:16:13 +0800
-Subject: cpu/arm: add decode function
-
-Signed-off-by: Xu Yandong <xuyandong2@huawei.com>
----
- src/cpu/cpu_arm.c     | 150 ++++++++++++++++++++++++++++++++++--------
- src/cpu_map/index.xml |   3 -
- 2 files changed, 122 insertions(+), 31 deletions(-)
-
-diff --git a/src/cpu/cpu_arm.c b/src/cpu/cpu_arm.c
-index d85f111..eb9b1c9 100644
---- a/src/cpu/cpu_arm.c
-+++ b/src/cpu/cpu_arm.c
-@@ -55,7 +55,6 @@ virCPUarmFeatureFree(virCPUarmFeaturePtr feature)
-         return;
- 
-     g_free(feature->name);
--
-     g_free(feature);
- }
- 
-@@ -80,6 +79,8 @@ virCPUarmDataFree(virCPUDataPtr cpuData)
-     g_free(cpuData);
- }
- 
-+G_DEFINE_AUTOPTR_CLEANUP_FUNC(virCPUData, virCPUarmDataFree);
-+
- typedef struct _virCPUarmVendor virCPUarmVendor;
- typedef virCPUarmVendor *virCPUarmVendorPtr;
- struct _virCPUarmVendor {
-@@ -103,6 +104,8 @@ virCPUarmVendorFree(virCPUarmVendorPtr vendor)
-     VIR_FREE(vendor);
- }
- 
-+G_DEFINE_AUTOPTR_CLEANUP_FUNC(virCPUarmVendor, virCPUarmVendorFree);
-+
- typedef struct _virCPUarmModel virCPUarmModel;
- typedef virCPUarmModel *virCPUarmModelPtr;
- struct _virCPUarmModel {
-@@ -175,6 +178,38 @@ virCPUarmMapFree(virCPUarmMapPtr map)
- 
- G_DEFINE_AUTOPTR_CLEANUP_FUNC(virCPUarmMap, virCPUarmMapFree);
- 
-+static virCPUarmVendorPtr
-+virCPUarmVendorFindByID(virCPUarmMapPtr map,
-+                        unsigned long vendor_id)
-+{
-+    size_t i;
-+
-+    for (i = 0; i < map->vendors->len; i++) {
-+        virCPUarmVendorPtr vendor = g_ptr_array_index(map->vendors, i);
-+
-+        if (vendor->value == vendor_id)
-+            return vendor;
-+    }
-+
-+    return NULL;
-+}
-+
-+static virCPUarmVendorPtr
-+virCPUarmVendorFindByName(virCPUarmMapPtr map,
-+                          const char *name)
-+{
-+    size_t i;
-+
-+    for (i = 0; i < map->vendors->len; i++) {
-+        virCPUarmVendorPtr vendor = g_ptr_array_index(map->vendors, i);
-+
-+        if (STREQ(vendor->name, name))
-+            return vendor;
-+    }
-+
-+    return NULL;
-+}
-+
- static virCPUarmFeaturePtr
- virCPUarmMapFeatureFind(virCPUarmMapPtr map,
-                         const char *name)
-@@ -213,36 +248,43 @@ virCPUarmMapFeatureParse(xmlXPathContextPtr ctxt G_GNUC_UNUSED,
-     return 0;
- }
- 
--static virCPUarmVendorPtr
--virCPUarmVendorFindByID(virCPUarmMapPtr map,
--                        unsigned long vendor_id)
-+static int
-+armCpuDataParseFeatures(virCPUDefPtr cpu,
-+                        const virCPUarmData *cpuData)
- {
-+    int ret = -1;
-     size_t i;
-+    char **features;
- 
--    for (i = 0; i < map->vendors->len; i++) {
--        virCPUarmVendorPtr vendor = g_ptr_array_index(map->vendors, i);
-+    if (!cpu || !cpuData)
-+        return ret;
- 
--        if (vendor->value == vendor_id)
--            return vendor;
--    }
-+    if (!(features = virStringSplitCount(cpuData->features, " ",
-+                                         0, &cpu->nfeatures)))
-+        return ret;
- 
--    return NULL;
--}
-+    if (cpu->nfeatures) {
-+        if (VIR_ALLOC_N(cpu->features, cpu->nfeatures) < 0)
-+            goto error;
- 
--static virCPUarmVendorPtr
--virCPUarmVendorFindByName(virCPUarmMapPtr map,
--                          const char *name)
--{
--    size_t i;
-+        for (i = 0; i < cpu->nfeatures; i++) {
-+            cpu->features[i].policy = VIR_CPU_FEATURE_REQUIRE;
-+            cpu->features[i].name = g_strdup(features[i]);
-+        }
-+    }
- 
--    for (i = 0; i < map->vendors->len; i++) {
--        virCPUarmVendorPtr vendor = g_ptr_array_index(map->vendors, i);
-+    ret = 0;
- 
--        if (STREQ(vendor->name, name))
--            return vendor;
--    }
-+cleanup:
-+    virStringListFree(features);
-+    return ret;
- 
--    return NULL;
-+error:
-+    for (i = 0; i < cpu->nfeatures; i++)
-+        VIR_FREE(cpu->features[i].name);
-+    VIR_FREE(cpu->features);
-+    cpu->nfeatures = 0;
-+    goto cleanup;
- }
- 
- static int
-@@ -252,7 +294,6 @@ virCPUarmVendorParse(xmlXPathContextPtr ctxt,
- {
-     virCPUarmMapPtr map = (virCPUarmMapPtr)data;
-     g_autoptr(virCPUarmVendor) vendor = NULL;
--    int ret = -1;
- 
-     if (virCPUarmVendorFindByName(map, name)) {
-         virReportError(VIR_ERR_INTERNAL_ERROR,
-@@ -289,7 +330,7 @@ virCPUarmModelFindByPVR(virCPUarmMapPtr map,
-     for (i = 0; i < map->models->len; i++) {
-         virCPUarmModelPtr model = g_ptr_array_index(map->models, i);
- 
--        if (STREQ(model->pvr, pvr))
-+        if (model->data.pvr == pvr)
-             return model;
-     }
- 
-@@ -299,7 +340,7 @@ virCPUarmModelFindByPVR(virCPUarmMapPtr map,
- 
- static virCPUarmModelPtr
- virCPUarmModelFindByName(virCPUarmMapPtr map,
--                   const char *name)
-+                         const char *name)
- {
-     size_t i;
- 
-@@ -321,7 +362,6 @@ virCPUarmModelParse(xmlXPathContextPtr ctxt,
-     virCPUarmMapPtr map = (virCPUarmMapPtr)data;
-     g_autoptr(virCPUarmModel) model = NULL;
-     char *vendor = NULL;
--    int ret = -1;
- 
-     if (virCPUarmModelFindByName(map, name)) {
-         virReportError(VIR_ERR_INTERNAL_ERROR,
-@@ -404,6 +444,60 @@ virCPUarmGetMap(void)
-     return cpuMap;
- }
- 
-+static int
-+virCPUarmDecode(virCPUDefPtr cpu,
-+                const virCPUarmData *cpuData,
-+                virDomainCapsCPUModelsPtr models)
-+{
-+    virCPUarmMapPtr map;
-+    virCPUarmModelPtr model;
-+    virCPUarmVendorPtr vendor = NULL;
-+
-+    if (!cpuData || !(map = virCPUarmGetMap()))
-+        return -1;
-+
-+    if (!(model = virCPUarmModelFindByPVR(map, cpuData->pvr))) {
-+        virReportError(VIR_ERR_OPERATION_FAILED,
-+                       _("Cannot find CPU model with PVR 0x%03lx"),
-+                       cpuData->pvr);
-+        return -1;
-+    }
-+
-+    if (!virCPUModelIsAllowed(model->name, models)) {
-+        virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-+                       _("CPU model %s is not supported by hypervisor"),
-+                       model->name);
-+        return -1;
-+    }
-+
-+    cpu->model = g_strdup(model->name);
-+
-+    if (cpuData->vendor_id &&
-+        !(vendor = virCPUarmVendorFindByID(map, cpuData->vendor_id))) {
-+        virReportError(VIR_ERR_OPERATION_FAILED,
-+                       _("Cannot find CPU vendor with vendor id 0x%02lx"),
-+                       cpuData->vendor_id);
-+        return -1;
-+    }
-+
-+    if (vendor)
-+        cpu->vendor = g_strdup(vendor->name);
-+
-+    if (cpuData->features &&
-+        armCpuDataParseFeatures(cpu, cpuData) < 0)
-+        return -1;
-+
-+    return 0;
-+}
-+
-+static int
-+virCPUarmDecodeCPUData(virCPUDefPtr cpu,
-+                       const virCPUData *data,
-+                       virDomainCapsCPUModelsPtr models)
-+{
-+    return virCPUarmDecode(cpu, &data->data.arm, models);
-+}
-+
- static int
- virCPUarmUpdate(virCPUDefPtr guest,
-                 const virCPUDef *host)
-@@ -432,7 +526,7 @@ virCPUarmUpdate(virCPUDefPtr guest,
-     guest->match = VIR_CPU_MATCH_EXACT;
-     ret = 0;
- 
-- cleanup:
-+cleanup:
-     virCPUDefFree(updated);
-     return ret;
- }
-@@ -493,7 +587,7 @@ struct cpuArchDriver cpuDriverArm = {
-     .arch = archs,
-     .narch = G_N_ELEMENTS(archs),
-     .compare = virCPUarmCompare,
--    .decode = NULL,
-+    .decode = virCPUarmDecodeCPUData,
-     .encode = NULL,
-     .dataFree = virCPUarmDataFree,
-     .baseline = virCPUarmBaseline,
-diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml
-index 2e78834..985af86 100644
---- a/src/cpu_map/index.xml
-+++ b/src/cpu_map/index.xml
-@@ -86,9 +86,6 @@
- 
-   <arch name='arm'>
-     <include filename='arm_features.xml'/>
--  </arch>
--
--  <arch name='arm'>
-     <include filename="arm_vendors.xml"/>
- 
-     <!-- ARM-based CPU models -->
--- 
-2.23.0
-
diff --git a/libvirt-cpu-arm-add-load-cpu-map-parse-function.patch b/libvirt-cpu-arm-add-load-cpu-map-parse-function.patch
deleted file mode 100644
index cf59ab29790f6d4669a1d1dc458ca8e18b817b7a..0000000000000000000000000000000000000000
--- a/libvirt-cpu-arm-add-load-cpu-map-parse-function.patch
+++ /dev/null
@@ -1,287 +0,0 @@
-From a0574d45603010761d3f3034f97457fda94d2266 Mon Sep 17 00:00:00 2001
-From: Xu Yandong <xuyandong2@huawei.com>
-Date: Fri, 17 Apr 2020 18:13:32 +0800
-Subject: cpu/arm: add load cpu map parse function
-
-Signed-off-by: Xu Yandong <xuyandong2@huawei.com>
----
- src/cpu/cpu_arm.c | 223 +++++++++++++++++++++++++++++++++++++++++++++-
- 1 file changed, 220 insertions(+), 3 deletions(-)
-
-diff --git a/src/cpu/cpu_arm.c b/src/cpu/cpu_arm.c
-index 230cd27..d85f111 100644
---- a/src/cpu/cpu_arm.c
-+++ b/src/cpu/cpu_arm.c
-@@ -67,7 +67,7 @@ virCPUarmDataClear(virCPUarmData *data)
-     if (!data)
-         return;
- 
--    VIR_FREE(data->features);
-+    g_free(data->features);
- }
- 
- static void
-@@ -77,12 +77,64 @@ virCPUarmDataFree(virCPUDataPtr cpuData)
-         return;
- 
-     virCPUarmDataClear(&cpuData->data.arm);
--    VIR_FREE(cpuData);
-+    g_free(cpuData);
- }
- 
-+typedef struct _virCPUarmVendor virCPUarmVendor;
-+typedef virCPUarmVendor *virCPUarmVendorPtr;
-+struct _virCPUarmVendor {
-+    char *name;
-+    unsigned long value;
-+};
-+
-+static virCPUarmVendorPtr
-+virCPUarmVendorNew(void)
-+{
-+    return g_new0(virCPUarmVendor, 1);
-+}
-+
-+static void
-+virCPUarmVendorFree(virCPUarmVendorPtr vendor)
-+{
-+    if (!vendor)
-+        return;
-+
-+    g_free(vendor->name);
-+    VIR_FREE(vendor);
-+}
-+
-+typedef struct _virCPUarmModel virCPUarmModel;
-+typedef virCPUarmModel *virCPUarmModelPtr;
-+struct _virCPUarmModel {
-+    char *name;
-+    virCPUarmVendorPtr vendor;
-+    virCPUarmData data;
-+};
-+
-+static virCPUarmModelPtr
-+virCPUarmModelNew(void)
-+{
-+    return g_new0(virCPUarmModel, 1);
-+}
-+
-+static void
-+virCPUarmModelFree(virCPUarmModelPtr model)
-+{
-+    if (!model)
-+        return;
-+
-+    virCPUarmDataClear(&model->data);
-+    g_free(model->name);
-+    g_free(model);
-+}
-+
-+G_DEFINE_AUTOPTR_CLEANUP_FUNC(virCPUarmModel, virCPUarmModelFree);
-+
- typedef struct _virCPUarmMap virCPUarmMap;
- typedef virCPUarmMap *virCPUarmMapPtr;
- struct _virCPUarmMap {
-+    GPtrArray *vendors;
-+    GPtrArray *models;
-     GPtrArray *features;
- };
- 
-@@ -93,6 +145,14 @@ virCPUarmMapNew(void)
- 
-     map = g_new0(virCPUarmMap, 1);
- 
-+    map->vendors = g_ptr_array_new();
-+    g_ptr_array_set_free_func(map->vendors,
-+                              (GDestroyNotify) virCPUarmVendorFree);
-+
-+    map->models = g_ptr_array_new();
-+    g_ptr_array_set_free_func(map->models,
-+                              (GDestroyNotify) virCPUarmModelFree);
-+
-     map->features = g_ptr_array_new();
-     g_ptr_array_set_free_func(map->features,
-                               (GDestroyNotify) virCPUarmFeatureFree);
-@@ -106,6 +166,8 @@ virCPUarmMapFree(virCPUarmMapPtr map)
-     if (!map)
-         return;
- 
-+    g_ptr_array_free(map->vendors, TRUE);
-+    g_ptr_array_free(map->models, TRUE);
-     g_ptr_array_free(map->features, TRUE);
- 
-     g_free(map);
-@@ -151,6 +213,161 @@ virCPUarmMapFeatureParse(xmlXPathContextPtr ctxt G_GNUC_UNUSED,
-     return 0;
- }
- 
-+static virCPUarmVendorPtr
-+virCPUarmVendorFindByID(virCPUarmMapPtr map,
-+                        unsigned long vendor_id)
-+{
-+    size_t i;
-+
-+    for (i = 0; i < map->vendors->len; i++) {
-+        virCPUarmVendorPtr vendor = g_ptr_array_index(map->vendors, i);
-+
-+        if (vendor->value == vendor_id)
-+            return vendor;
-+    }
-+
-+    return NULL;
-+}
-+
-+static virCPUarmVendorPtr
-+virCPUarmVendorFindByName(virCPUarmMapPtr map,
-+                          const char *name)
-+{
-+    size_t i;
-+
-+    for (i = 0; i < map->vendors->len; i++) {
-+        virCPUarmVendorPtr vendor = g_ptr_array_index(map->vendors, i);
-+
-+        if (STREQ(vendor->name, name))
-+            return vendor;
-+    }
-+
-+    return NULL;
-+}
-+
-+static int
-+virCPUarmVendorParse(xmlXPathContextPtr ctxt,
-+                     const char *name,
-+                     void *data)
-+{
-+    virCPUarmMapPtr map = (virCPUarmMapPtr)data;
-+    g_autoptr(virCPUarmVendor) vendor = NULL;
-+    int ret = -1;
-+
-+    if (virCPUarmVendorFindByName(map, name)) {
-+        virReportError(VIR_ERR_INTERNAL_ERROR,
-+                       _("CPU vendor %s already defined"), name);
-+        return -1;
-+    }
-+
-+    vendor = virCPUarmVendorNew();
-+    vendor->name = g_strdup(name);
-+
-+    if (virXPathULongHex("string(@value)", ctxt, &vendor->value) < 0) {
-+        virReportError(VIR_ERR_INTERNAL_ERROR,
-+                       "%s", _("Missing CPU vendor value"));
-+        return -1;
-+    }
-+
-+    if (virCPUarmVendorFindByID(map, vendor->value)) {
-+        virReportError(VIR_ERR_INTERNAL_ERROR,
-+                       _("CPU vendor value 0x%2lx already defined"), vendor->value);
-+        return -1;
-+    }
-+
-+    g_ptr_array_add(map->vendors, g_steal_pointer(&vendor));
-+
-+    return 0;
-+}
-+
-+static virCPUarmModelPtr
-+virCPUarmModelFindByPVR(virCPUarmMapPtr map,
-+                        unsigned long pvr)
-+{
-+    size_t i;
-+
-+    for (i = 0; i < map->models->len; i++) {
-+        virCPUarmModelPtr model = g_ptr_array_index(map->models, i);
-+
-+        if (STREQ(model->pvr, pvr))
-+            return model;
-+    }
-+
-+    return NULL;
-+
-+}
-+
-+static virCPUarmModelPtr
-+virCPUarmModelFindByName(virCPUarmMapPtr map,
-+                   const char *name)
-+{
-+    size_t i;
-+
-+    for (i = 0; i < map->models->len; i++) {
-+        virCPUarmModelPtr model = g_ptr_array_index(map->models, i);
-+
-+        if (STREQ(model->name, name))
-+            return model;
-+    }
-+
-+    return NULL;
-+}
-+
-+static int
-+virCPUarmModelParse(xmlXPathContextPtr ctxt,
-+                    const char *name,
-+                    void *data)
-+{
-+    virCPUarmMapPtr map = (virCPUarmMapPtr)data;
-+    g_autoptr(virCPUarmModel) model = NULL;
-+    char *vendor = NULL;
-+    int ret = -1;
-+
-+    if (virCPUarmModelFindByName(map, name)) {
-+        virReportError(VIR_ERR_INTERNAL_ERROR,
-+                       _("CPU model %s already defined"), name);
-+        return -1;
-+    }
-+
-+    model = virCPUarmModelNew();
-+    model->name = g_strdup(name);
-+
-+    if (virXPathBoolean("boolean(./vendor)", ctxt)) {
-+        vendor = virXPathString("string(./vendor/@name)", ctxt);
-+        if (!vendor) {
-+            virReportError(VIR_ERR_INTERNAL_ERROR,
-+                           _("Invalid vendor element in CPU model %s"),
-+                           name);
-+            return -1;
-+        }
-+
-+        if (!(model->vendor = virCPUarmVendorFindByName(map, vendor))) {
-+            virReportError(VIR_ERR_INTERNAL_ERROR,
-+                           _("Unknown vendor %s referenced by CPU model %s"),
-+                           vendor, model->name);
-+            return -1;
-+        }
-+    }
-+
-+    if (!virXPathBoolean("boolean(./pvr)", ctxt)) {
-+        virReportError(VIR_ERR_INTERNAL_ERROR,
-+                       _("Missing PVR information for CPU model %s"),
-+                       model->name);
-+        return -1;
-+    }
-+
-+    if (virXPathULongHex("string(./pvr/@value)", ctxt, &model->data.pvr) < 0) {
-+        virReportError(VIR_ERR_INTERNAL_ERROR,
-+                       _("Missing or invalid PVR value in CPU model %s"),
-+                       model->name);
-+        return -1;
-+    }
-+
-+    g_ptr_array_add(map->models, g_steal_pointer(&model));
-+
-+    return 0;
-+}
-+
- static virCPUarmMapPtr
- virCPUarmLoadMap(void)
- {
-@@ -158,7 +375,7 @@ virCPUarmLoadMap(void)
- 
-     map = virCPUarmMapNew();
- 
--    if (cpuMapLoad("arm", NULL, virCPUarmMapFeatureParse, NULL, map) < 0)
-+    if (cpuMapLoad("arm", virCPUarmVendorParse, virCPUarmMapFeatureParse, virCPUarmModelParse, map) < 0)
-         return NULL;
- 
-     return g_steal_pointer(&map);
--- 
-2.23.0
-
diff --git a/libvirt-cpu-arm-add-virCPUarmGetHost-implment.patch b/libvirt-cpu-arm-add-virCPUarmGetHost-implment.patch
deleted file mode 100644
index 981204257ef8a4c82c2a1f2b445903c5d328193e..0000000000000000000000000000000000000000
--- a/libvirt-cpu-arm-add-virCPUarmGetHost-implment.patch
+++ /dev/null
@@ -1,127 +0,0 @@
-From 208c9f1eb9a06d2550b7b3cfe0172840925255d4 Mon Sep 17 00:00:00 2001
-From: Xu Yandong <xuyandong2@huawei.com>
-Date: Mon, 20 Apr 2020 17:29:17 +0800
-Subject: cpu/arm: add virCPUarmGetHost implment
-
-Signed-off-by: Xu Yandong <xuyandong2@huawei.com>
----
- src/cpu/cpu_arm.c | 86 +++++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 86 insertions(+)
-
-diff --git a/src/cpu/cpu_arm.c b/src/cpu/cpu_arm.c
-index eb9b1c9..78e604c 100644
---- a/src/cpu/cpu_arm.c
-+++ b/src/cpu/cpu_arm.c
-@@ -26,9 +26,15 @@
- #include "cpu_map.h"
- #include "virstring.h"
- #include "virxml.h"
-+#include "virfile.h"
- 
- #define VIR_FROM_THIS VIR_FROM_CPU
- 
-+static const char *sysinfoCpuinfo = "/proc/cpuinfo";
-+
-+#define CPUINFO sysinfoCpuinfo
-+#define CPUINFO_FILE_LEN (1024*1024)   /* 1MB limit for /proc/cpuinfo file */
-+
- static const virArch archs[] = {
-     VIR_ARCH_ARMV6L,
-     VIR_ARCH_ARMV7B,
-@@ -531,6 +537,85 @@ cleanup:
-     return ret;
- }
- 
-+static int
-+armCpuDataFromCpuInfo(virCPUarmData *data)
-+{
-+    g_autofree char *str_vendor = NULL;
-+    g_autofree char *str_pvr = NULL;
-+    g_autofree char *outbuf = NULL;
-+    char *eol = NULL;
-+    const char *cur;
-+
-+    if (!data)
-+        return -1;
-+
-+    if (virFileReadAll(CPUINFO, CPUINFO_FILE_LEN, &outbuf) < 0) {
-+        virReportError(VIR_ERR_INTERNAL_ERROR,
-+                       _("Failed to open %s"), CPUINFO);
-+        return -1;
-+    }
-+
-+    /* Account for format 'CPU implementer : XXXX' */
-+    if ((cur = strstr(outbuf, "CPU implementer")) == NULL) {
-+        virReportError(VIR_ERR_INTERNAL_ERROR,
-+                       _("there is no \"CPU implementer\" info in %s"), CPUINFO);
-+        return -1;
-+    }
-+
-+    cur = strchr(cur, ':') + 1;
-+    eol = strchr(cur, '\n');
-+    virSkipSpaces(&cur);
-+    if (!eol || !(str_vendor = g_strndup(cur, eol - cur)) ||
-+        virStrToLong_ul(str_vendor, NULL, 16, &data->vendor_id) < 0)
-+        return -1;
-+
-+    /* Account for format 'CPU part : XXXX' */
-+    if ((cur = strstr(outbuf, "CPU part")) == NULL) {
-+        virReportError(VIR_ERR_INTERNAL_ERROR,
-+                       _("there is no \"CPU part\" info in %s"), CPUINFO);
-+        return -1;
-+    }
-+
-+    cur = strchr(cur, ':') + 1;
-+    eol = strchr(cur, '\n');
-+    virSkipSpaces(&cur);
-+    if (!eol || !(str_pvr = g_strndup(cur, eol - cur)) ||
-+        virStrToLong_ul(str_pvr, NULL, 16, &data->pvr) < 0)
-+        return -1;
-+
-+    /* Account for format 'CPU Features : XXXX' */
-+    if ((cur = strstr(outbuf, "Features")) == NULL) {
-+        virReportError(VIR_ERR_INTERNAL_ERROR,
-+                       _("there is no \"Features\" info in %s"), CPUINFO);
-+        return -1;
-+    }
-+    cur = strchr(cur, ':') + 1;
-+    eol = strchr(cur, '\n');
-+    virSkipSpaces(&cur);
-+    if (eol && !(data->features = g_strndup(cur, eol - cur)))
-+        return -1;
-+
-+    return 0;
-+}
-+
-+static int
-+virCPUarmGetHost(virCPUDefPtr cpu,
-+                 virDomainCapsCPUModelsPtr models)
-+{
-+    g_autoptr(virCPUData) cpuData = NULL;
-+
-+    if (virCPUarmDriverInitialize() < 0)
-+        return -1;
-+
-+    if (!(cpuData = virCPUDataNew(archs[0])))
-+        return -1;
-+
-+    if (armCpuDataFromCpuInfo(&cpuData->data.arm) < 0)
-+        return -1;
-+
-+    return virCPUarmDecodeCPUData(cpu, cpuData, models);
-+}
-+
- 
- static virCPUDefPtr
- virCPUarmBaseline(virCPUDefPtr *cpus,
-@@ -590,6 +675,7 @@ struct cpuArchDriver cpuDriverArm = {
-     .decode = virCPUarmDecodeCPUData,
-     .encode = NULL,
-     .dataFree = virCPUarmDataFree,
-+    .getHost = virCPUarmGetHost,
-     .baseline = virCPUarmBaseline,
-     .update = virCPUarmUpdate,
-     .validateFeatures = virCPUarmValidateFeatures,
--- 
-2.23.0
-
diff --git a/libvirt-cpu-arm-implment-cpu-baseline-function.patch b/libvirt-cpu-arm-implment-cpu-baseline-function.patch
deleted file mode 100644
index d9dc344d55139a248f0b1c59fc979bf106739159..0000000000000000000000000000000000000000
--- a/libvirt-cpu-arm-implment-cpu-baseline-function.patch
+++ /dev/null
@@ -1,216 +0,0 @@
-From 4606782bde2a6e75e88d782fc58e5db5365502c2 Mon Sep 17 00:00:00 2001
-From: Xu Yandong <xuyandong2@huawei.com>
-Date: Mon, 20 Apr 2020 19:17:56 +0800
-Subject: cpu/arm: implment cpu baseline function
-
-Signed-off-by: Xu Yandong <xuyandong2@huawei.com>
----
- src/cpu/cpu_arm.c | 178 ++++++++++++++++++++++++++++++++++++++++++++--
- 1 file changed, 174 insertions(+), 4 deletions(-)
-
-diff --git a/src/cpu/cpu_arm.c b/src/cpu/cpu_arm.c
-index 78e604c..a7c9523 100644
---- a/src/cpu/cpu_arm.c
-+++ b/src/cpu/cpu_arm.c
-@@ -616,24 +616,194 @@ virCPUarmGetHost(virCPUDefPtr cpu,
-     return virCPUarmDecodeCPUData(cpu, cpuData, models);
- }
- 
-+static void
-+virCPUarmDataIntersect(virCPUarmData *data1,
-+                       const virCPUarmData *data2)
-+{
-+    char **features = NULL;
-+    char **features1 = NULL;
-+    char **features2 = NULL;
-+    size_t count = 0;
-+    size_t i;
-+
-+    if (!data1 || !data2)
-+        return;
-+
-+    data1->pvr = MIN(data1->pvr, data2->pvr);
-+
-+    if (virStringIsEmpty(data1->features) ||
-+        virStringIsEmpty(data2->features)) {
-+        VIR_FREE(data1->features);
-+        return;
-+    }
-+
-+    if (STREQ_NULLABLE(data1->features, data2->features))
-+        return;
-+
-+    if (!(features = virStringSplitCount(data1->features, " ", 0, &count)) ||
-+        !(features1 = virStringSplitCount(data1->features, " ", 0, &count)) ||
-+        !(features2 = virStringSplit(data2->features, " ", 0)))
-+        goto cleanup;
-+
-+    for (i = 0; i < count; i++) {
-+        if (!virStringListHasString((const char**)features2, features1[i]))
-+            virStringListRemove(&features, features1[i]);
-+    }
-+
-+    VIR_FREE(data1->features);
-+    if (features)
-+        data1->features = virStringListJoin((const char**)features, " ");
-+
-+cleanup:
-+    virStringListFree(features);
-+    virStringListFree(features1);
-+    virStringListFree(features2);
-+    return;
-+}
-+
-+static void
-+virCPUarmDataCopy(virCPUarmData *dst, const virCPUarmData *src)
-+{
-+    dst->features = g_strdup(src->features);
-+    dst->vendor_id = src->vendor_id;
-+    dst->pvr = src->pvr;
-+}
-+
-+static virCPUarmModelPtr
-+virCPUarmModelCopy(virCPUarmModelPtr model)
-+{
-+    g_autoptr(virCPUarmModel) copy = NULL;
-+
-+    copy = virCPUarmModelNew();
-+
-+    virCPUarmDataCopy(&copy->data, &model->data);
-+    copy->name = g_strdup(model->name);
-+    copy->vendor = model->vendor;
-+
-+    return g_steal_pointer(&copy);
-+}
-+
-+static virCPUarmModelPtr
-+virCPUarmModelFromCPU(const virCPUDef *cpu,
-+                      virCPUarmMapPtr map)
-+{
-+    g_autoptr(virCPUarmModel) model = NULL;
-+    virCPUarmVendorPtr vendor = NULL;
-+    char **features = NULL;
-+    size_t i;
-+
-+    if (!cpu->model) {
-+        virReportError(VIR_ERR_INVALID_ARG, "%s",
-+                       _("no CPU model specified"));
-+        return NULL;
-+    }
-+
-+    if (!(model = virCPUarmModelFindByName(map, cpu->model))) {
-+        virReportError(VIR_ERR_INTERNAL_ERROR,
-+                       _("Unknown CPU model %s"), cpu->model);
-+        return NULL;
-+    }
-+
-+    if (!(model = virCPUarmModelCopy(model)))
-+        return NULL;
-+
-+    if (cpu->vendor) {
-+        if (!(vendor = virCPUarmVendorFindByName(map, cpu->vendor))) {
-+            virReportError(VIR_ERR_INTERNAL_ERROR,
-+                           _("Unknown CPU vendor %s"), cpu->vendor);
-+            return NULL;
-+        }
-+        model->data.vendor_id = vendor->value;
-+    }
-+
-+    if (cpu->nfeatures) {
-+        if (VIR_REALLOC_N(features, cpu->nfeatures + 1) < 0)
-+            return model;
-+
-+        features[cpu->nfeatures] = NULL;
-+        for (i = 0; i < cpu->nfeatures; i++)
-+            features[i] = g_strdup(cpu->features[i].name);
-+        VIR_FREE(model->data.features);
-+        model->data.features = virStringListJoin((const char **)features, " ");
-+    }
-+
-+    virStringListFree(features);
-+    return g_steal_pointer(&model);
-+}
- 
- static virCPUDefPtr
- virCPUarmBaseline(virCPUDefPtr *cpus,
--                  unsigned int ncpus G_GNUC_UNUSED,
--                  virDomainCapsCPUModelsPtr models G_GNUC_UNUSED,
-+                  unsigned int ncpus,
-+                  virDomainCapsCPUModelsPtr models,
-                   const char **features G_GNUC_UNUSED,
-                   bool migratable G_GNUC_UNUSED)
- {
--    virCPUDefPtr cpu = NULL;
-+    virCPUarmMapPtr map = NULL;
-+    g_autoptr(virCPUDef) cpu = NULL;
-+    g_autoptr(virCPUarmModel) model = NULL;
-+    g_autoptr(virCPUarmModel) baseModel = NULL;
-+    virCPUarmVendorPtr vendor = NULL;
-+    bool outputVendor = true;
-+    size_t i;
- 
-     cpu = virCPUDefNew();
- 
-     cpu->model = g_strdup(cpus[0]->model);
- 
-+    cpu->arch = cpus[0]->arch;
-     cpu->type = VIR_CPU_TYPE_GUEST;
-     cpu->match = VIR_CPU_MATCH_EXACT;
-+    cpu->fallback = VIR_CPU_FALLBACK_FORBID;
-+
-+    if (!(map = virCPUarmGetMap()))
-+        return NULL;
-+
-+    if (!(baseModel = virCPUarmModelFromCPU(cpus[0], map)))
-+        return NULL;
-+
-+    if (!cpus[0]->vendor) {
-+        outputVendor = false;
-+    } else if (!(vendor = virCPUarmVendorFindByName(map, cpus[0]->vendor))) {
-+        virReportError(VIR_ERR_OPERATION_FAILED,
-+                       _("Unknown CPU vendor %s"), cpus[0]->vendor);
-+        return NULL;
-+    }
-+
-+    for (i = 0; i < ncpus; i++) {
-+        const char *vn = NULL;
-+        if (!(model = virCPUarmModelFromCPU(cpus[i], map)))
-+            return NULL;
-+
-+        if (cpus[i]->vendor) {
-+            vn = cpus[i]->vendor;
-+        } else {
-+            outputVendor = false;
-+        }
-+
-+        if (vn) {
-+            if (!vendor) {
-+                if (!(vendor = virCPUarmVendorFindByName(map, vn))) {
-+                    virReportError(VIR_ERR_OPERATION_FAILED,
-+                                   _("Unknown CPU vendor %s"), vn);
-+                    return NULL;
-+                }
-+            } else if (STRNEQ(vendor->name, vn)) {
-+                virReportError(VIR_ERR_OPERATION_FAILED,
-+                               "%s", _("CPU vendors do not match"));
-+                return NULL;
-+            }
-+
-+            virCPUarmDataIntersect(&baseModel->data, &model->data);
-+        }
-+    }
-+
-+    if (virCPUarmDecode(cpu, &baseModel->data, models) < 0)
-+        return NULL;
-+
-+    if (!outputVendor)
-+        g_free(cpu->vendor);
- 
--    return cpu;
-+    return g_steal_pointer(&cpu);
- }
- 
- static virCPUCompareResult
--- 
-2.23.0
-
diff --git a/libvirt-cpu-arm-implment-cpu-compare-function.patch b/libvirt-cpu-arm-implment-cpu-compare-function.patch
deleted file mode 100644
index c08e4bb3fcb216586e78f1f7ef6fc5d55ec49c44..0000000000000000000000000000000000000000
--- a/libvirt-cpu-arm-implment-cpu-compare-function.patch
+++ /dev/null
@@ -1,239 +0,0 @@
-From 1a70b1e3bdbd8d0dcf9281341bc23b4ff2ffaa3a Mon Sep 17 00:00:00 2001
-From: Xu Yandong <xuyandong2@huawei.com>
-Date: Mon, 20 Apr 2020 19:33:49 +0800
-Subject: cpu/arm: implment cpu compare function
-
-Signed-off-by: Xu Yandong <xuyandong2@huawei.com>
----
- src/cpu/cpu_arm.c | 196 +++++++++++++++++++++++++++++++++++++++++++++-
- 1 file changed, 193 insertions(+), 3 deletions(-)
-
-diff --git a/src/cpu/cpu_arm.c b/src/cpu/cpu_arm.c
-index a7c9523..3ef54b9 100644
---- a/src/cpu/cpu_arm.c
-+++ b/src/cpu/cpu_arm.c
-@@ -21,6 +21,7 @@
- 
- #include <config.h>
- 
-+#include "virlog.h"
- #include "viralloc.h"
- #include "cpu.h"
- #include "cpu_map.h"
-@@ -30,6 +31,8 @@
- 
- #define VIR_FROM_THIS VIR_FROM_CPU
- 
-+VIR_LOG_INIT("cpu.cpu_arm");
-+
- static const char *sysinfoCpuinfo = "/proc/cpuinfo";
- 
- #define CPUINFO sysinfoCpuinfo
-@@ -806,14 +809,201 @@ virCPUarmBaseline(virCPUDefPtr *cpus,
-     return g_steal_pointer(&cpu);
- }
- 
-+static bool
-+virCPUarmFeaturesIsSub(char *subFeatures,
-+                       char *fullFeatures)
-+{
-+    bool ret = false;
-+    char **sub = NULL;
-+    char **full = NULL;
-+    size_t subCount = 0;
-+    size_t fullCount = 0;
-+    size_t i;
-+
-+    if (virStringIsEmpty(subFeatures))
-+        return true;
-+
-+    if (virStringIsEmpty(fullFeatures))
-+        return ret;
-+
-+    if (STREQ(subFeatures, fullFeatures))
-+        return true;
-+
-+    if (!(sub = virStringSplitCount(subFeatures, " ", 0, &subCount)) ||
-+        !(full = virStringSplitCount(fullFeatures, " ", 0, &fullCount)) ||
-+        subCount > fullCount)
-+        goto cleanup;
-+
-+    for (i = 0; i < subCount; i++) {
-+        if (!virStringListHasString((const char**)full, sub[i]))
-+            goto cleanup;
-+    }
-+
-+    ret = true;
-+
-+ cleanup:
-+    virStringListFree(sub);
-+    virStringListFree(full);
-+    return ret;
-+}
-+
-+static virCPUDataPtr
-+armMakeCPUData(virArch arch,
-+               virCPUarmData *data)
-+{
-+    virCPUDataPtr cpuData;
-+
-+    if (!(cpuData = virCPUDataNew(arch)))
-+        return NULL;
-+
-+    virCPUarmDataCopy(&cpuData->data.arm, data);
-+
-+    return cpuData;
-+}
-+
- static virCPUCompareResult
--virCPUarmCompare(virCPUDefPtr host G_GNUC_UNUSED,
--                 virCPUDefPtr cpu G_GNUC_UNUSED,
--                 bool failMessages G_GNUC_UNUSED)
-+armCompute(virCPUDefPtr host,
-+           virCPUDefPtr cpu,
-+           virCPUDataPtr *guestData,
-+           char **message)
- {
-+    virCPUarmMapPtr map = NULL;
-+    g_autoptr(virCPUarmModel) hostModel = NULL;
-+    g_autoptr(virCPUarmModel) guestModel = NULL;
-+    virArch arch;
-+    size_t i;
-+
-+    if (cpu->arch != VIR_ARCH_NONE) {
-+        bool found = false;
-+
-+        for (i = 0; i < G_N_ELEMENTS(archs); i++) {
-+            if (archs[i] == cpu->arch) {
-+                found = true;
-+                break;
-+            }
-+        }
-+
-+        if (!found) {
-+            VIR_DEBUG("CPU arch %s does not match host arch",
-+                      virArchToString(cpu->arch));
-+            if (message)
-+                *message = g_strdup_printf(_("CPU arch %s does not match host arch"),
-+                                           virArchToString(cpu->arch));
-+
-+            return VIR_CPU_COMPARE_INCOMPATIBLE;
-+        }
-+        arch = cpu->arch;
-+    } else {
-+        arch = host->arch;
-+    }
-+
-+    if (cpu->vendor &&
-+        (!host->vendor || STRNEQ(cpu->vendor, host->vendor))) {
-+        VIR_DEBUG("host CPU vendor does not match required CPU vendor %s",
-+                  cpu->vendor);
-+        if (message)
-+            *message = g_strdup_printf(_("host CPU vendor does not match required "
-+                                       "CPU vendor %s"),
-+                        cpu->vendor);
-+
-+        return VIR_CPU_COMPARE_INCOMPATIBLE;
-+    }
-+
-+    if (!(map = virCPUarmGetMap()))
-+        return VIR_CPU_COMPARE_ERROR;
-+
-+    /* Host CPU information */
-+    if (!(hostModel = virCPUarmModelFromCPU(host, map)))
-+        return VIR_CPU_COMPARE_ERROR;
-+
-+    if (cpu->type == VIR_CPU_TYPE_GUEST) {
-+        /* Guest CPU information */
-+        switch (cpu->mode) {
-+            case VIR_CPU_MODE_HOST_MODEL:
-+            case VIR_CPU_MODE_HOST_PASSTHROUGH:
-+                /* host-model and host-passthrough:
-+                 * the guest CPU is the same as the host */
-+                guestModel = virCPUarmModelCopy(hostModel);
-+                break;
-+
-+            case VIR_CPU_MODE_CUSTOM:
-+                /* custom:
-+                 * look up guest CPU information */
-+                guestModel = virCPUarmModelFromCPU(cpu, map);
-+                break;
-+        }
-+    } else {
-+        /* Other host CPU information */
-+        guestModel = virCPUarmModelFromCPU(cpu, map);
-+    }
-+
-+    if (!guestModel)
-+        return VIR_CPU_COMPARE_ERROR;
-+
-+    if (STRNEQ(guestModel->name, hostModel->name)) {
-+        VIR_DEBUG("host CPU model %s does not match required CPU model %s",
-+                  hostModel->name, guestModel->name);
-+        if (message)
-+            *message = g_strdup_printf(_("host CPU model %s does not match required "
-+                                       "CPU model %s"),
-+                                       hostModel->name, guestModel->name);
-+
-+        return VIR_CPU_COMPARE_INCOMPATIBLE;
-+    }
-+
-+    if (!virCPUarmFeaturesIsSub(guestModel->data.features, hostModel->data.features)) {
-+        VIR_DEBUG("guest CPU features '%s' is not subset of "
-+                  "host CPU features '%s'",
-+                  guestModel->data.features, hostModel->data.features);
-+        if (message)
-+            *message = g_strdup_printf(_("guest CPU features '%s' is not subset of "
-+                                       "host CPU features '%s'"),
-+                                       guestModel->data.features,
-+                                       hostModel->data.features);
-+
-+        return VIR_CPU_COMPARE_INCOMPATIBLE;
-+    }
-+
-+    if (guestData &&
-+        !(*guestData = armMakeCPUData(arch, &guestModel->data)))
-+        return VIR_CPU_COMPARE_ERROR;
-+
-     return VIR_CPU_COMPARE_IDENTICAL;
- }
- 
-+static virCPUCompareResult
-+virCPUarmCompare(virCPUDefPtr host,
-+                 virCPUDefPtr cpu,
-+                 bool failMessages)
-+{
-+    virCPUCompareResult ret = VIR_CPU_COMPARE_ERROR;
-+    g_autofree char *message = NULL;
-+
-+    if (!host || !host->model) {
-+        if (failMessages) {
-+            virReportError(VIR_ERR_CPU_INCOMPATIBLE, "%s",
-+                           _("unknown host CPU"));
-+        } else {
-+            VIR_WARN("unknown host CPU");
-+            return VIR_CPU_COMPARE_INCOMPATIBLE;
-+        }
-+        return VIR_CPU_COMPARE_ERROR;
-+    }
-+
-+    ret = armCompute(host, cpu, NULL, &message);
-+
-+    if (failMessages && ret == VIR_CPU_COMPARE_INCOMPATIBLE) {
-+        if (message) {
-+            virReportError(VIR_ERR_CPU_INCOMPATIBLE, "%s", message);
-+        } else {
-+            virReportError(VIR_ERR_CPU_INCOMPATIBLE, NULL);
-+        }
-+        return VIR_CPU_COMPARE_ERROR;
-+    }
-+
-+    return ret;
-+}
-+
- static int
- virCPUarmValidateFeatures(virCPUDefPtr cpu)
- {
--- 
-2.23.0
-
diff --git a/libvirt-cpu-introduce-virCPUarmData-to-virCPUData.patch b/libvirt-cpu-introduce-virCPUarmData-to-virCPUData.patch
deleted file mode 100644
index 51afaa10fcc7dfcfc4968b0bd9d469b1ef28558c..0000000000000000000000000000000000000000
--- a/libvirt-cpu-introduce-virCPUarmData-to-virCPUData.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 43ebd81b60121ce002a58ebc046b19f31bb23cb6 Mon Sep 17 00:00:00 2001
-From: Xu Yandong <xuyandong2@huawei.com>
-Date: Thu, 16 Apr 2020 11:00:49 +0800
-Subject: cpu: introduce virCPUarmData to virCPUData
-
-introduce virCPUarmData to virCPUData union, CPUarmData include
-vendor id, pvr and cpu features.
-
-Signed-off-by: Xu Yandong <xuyandong2@huawei.com>
----
- src/cpu/cpu.h          |  2 ++
- src/cpu/cpu_arm_data.h | 32 ++++++++++++++++++++++++++++++++
- 2 files changed, 34 insertions(+)
- create mode 100644 src/cpu/cpu_arm_data.h
-
-diff --git a/src/cpu/cpu.h b/src/cpu/cpu.h
-index f779d2b..ec22a18 100644
---- a/src/cpu/cpu.h
-+++ b/src/cpu/cpu.h
-@@ -27,6 +27,7 @@
- #include "cpu_conf.h"
- #include "cpu_x86_data.h"
- #include "cpu_ppc64_data.h"
-+#include "cpu_arm_data.h"
- 
- 
- typedef struct _virCPUData virCPUData;
-@@ -36,6 +37,7 @@ struct _virCPUData {
-     union {
-         virCPUx86Data x86;
-         virCPUppc64Data ppc64;
-+        virCPUarmData arm;
-         /* generic driver needs no data */
-     } data;
- };
-diff --git a/src/cpu/cpu_arm_data.h b/src/cpu/cpu_arm_data.h
-new file mode 100644
-index 0000000..72b3a29
---- /dev/null
-+++ b/src/cpu/cpu_arm_data.h
-@@ -0,0 +1,32 @@
-+/*
-+ * cpu_arm_data.h: 64-bit arm CPU specific data
-+ *
-+ * Copyright (C) 2019. Huawei Technologies Co., Ltd. All rights reserved.
-+ *
-+ * 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
-+
-+
-+#define VIR_CPU_ARM_DATA_INIT { 0 }
-+
-+typedef struct _virCPUarmData virCPUarmData;
-+struct _virCPUarmData {
-+    unsigned long vendor_id;
-+    unsigned long pvr;
-+    char *features;
-+};
--- 
-2.23.0
-
diff --git a/libvirt-cpu_map-Introduce-arm-CPU-models.patch b/libvirt-cpu_map-Introduce-arm-CPU-models.patch
deleted file mode 100644
index b47a7c5445a071f84276b7c5bf43df6b304aba6a..0000000000000000000000000000000000000000
--- a/libvirt-cpu_map-Introduce-arm-CPU-models.patch
+++ /dev/null
@@ -1,150 +0,0 @@
-From b305f4c05d22277ba6092bc0c2a15b752959bdec Mon Sep 17 00:00:00 2001
-From: Xu Yandong <xuyandong2@huawei.com>
-Date: Thu, 16 Apr 2020 10:57:11 +0800
-Subject: cpu_map: Introduce arm CPU models
-
-Support vendor and model for virConnectGetCapabilities in ARM,
-add arm cpu info to cpu map.
-
-Signed-off-by: Xu Yandong <xuyandong2@huawei.com>
----
- src/cpu_map/Makefile.inc.am     |  5 +++++
- src/cpu_map/arm_Kunpeng-920.xml | 24 ++++++++++++++++++++++++
- src/cpu_map/arm_cortex-a53.xml  |  6 ++++++
- src/cpu_map/arm_cortex-a57.xml  |  6 ++++++
- src/cpu_map/arm_cortex-a72.xml  |  6 ++++++
- src/cpu_map/arm_vendors.xml     | 14 ++++++++++++++
- src/cpu_map/index.xml           | 12 ++++++++++++
- 7 files changed, 73 insertions(+)
- create mode 100644 src/cpu_map/arm_Kunpeng-920.xml
- create mode 100644 src/cpu_map/arm_cortex-a53.xml
- create mode 100644 src/cpu_map/arm_cortex-a57.xml
- create mode 100644 src/cpu_map/arm_cortex-a72.xml
- create mode 100644 src/cpu_map/arm_vendors.xml
-
-diff --git a/src/cpu_map/Makefile.inc.am b/src/cpu_map/Makefile.inc.am
-index be64c9a..8663877 100644
---- a/src/cpu_map/Makefile.inc.am
-+++ b/src/cpu_map/Makefile.inc.am
-@@ -67,6 +67,11 @@ cpumap_DATA = \
- 	cpu_map/x86_Skylake-Server-noTSX-IBRS.xml \
- 	cpu_map/x86_Westmere.xml \
- 	cpu_map/x86_Westmere-IBRS.xml \
-+	cpu_map/arm_vendors.xml \
-+	cpu_map/arm_cortex-a53.xml \
-+	cpu_map/arm_cortex-a57.xml \
-+	cpu_map/arm_cortex-a72.xml \
-+	cpu_map/arm_Kunpeng-920.xml \
- 	$(NULL)
- 
- EXTRA_DIST += $(cpumap_DATA)
-diff --git a/src/cpu_map/arm_Kunpeng-920.xml b/src/cpu_map/arm_Kunpeng-920.xml
-new file mode 100644
-index 0000000..b681546
---- /dev/null
-+++ b/src/cpu_map/arm_Kunpeng-920.xml
-@@ -0,0 +1,24 @@
-+<cpus>
-+  <model name='Kunpeng-920'>
-+    <vendor name='Hisilicon'/>
-+    <pvr value='0xd01'/>
-+    <feature name="fp"/>
-+      <feature name="asimd"/>
-+      <feature name="evtstrm"/>
-+      <feature name="aes"/>
-+      <feature name="pmull"/>
-+      <feature name="sha1"/>
-+      <feature name="sha2"/>
-+      <feature name="crc32"/>
-+      <feature name="atomics"/>
-+      <feature name="fphp"/>
-+      <feature name="asimdhp"/>
-+      <feature name="cpuid"/>
-+      <feature name="asimdrdm"/>
-+      <feature name="jscvt"/>
-+      <feature name="fcma"/>
-+      <feature name="dcpop"/>
-+      <feature name="asimddp"/>
-+      <feature name="asimdfhm"/>
-+  </model>
-+</cpus>
-diff --git a/src/cpu_map/arm_cortex-a53.xml b/src/cpu_map/arm_cortex-a53.xml
-new file mode 100644
-index 0000000..3580236
---- /dev/null
-+++ b/src/cpu_map/arm_cortex-a53.xml
-@@ -0,0 +1,6 @@
-+<cpus>
-+  <model name='cortex-a53'>
-+    <vendor name='ARM'/>
-+    <pvr value='0xd03'/>
-+  </model>
-+</cpus>
-diff --git a/src/cpu_map/arm_cortex-a57.xml b/src/cpu_map/arm_cortex-a57.xml
-new file mode 100644
-index 0000000..3bc4324
---- /dev/null
-+++ b/src/cpu_map/arm_cortex-a57.xml
-@@ -0,0 +1,6 @@
-+<cpus>
-+  <model name='cortex-a57'>
-+    <vendor name='ARM'/>
-+    <pvr value='0xd07'/>
-+  </model>
-+</cpus>
-diff --git a/src/cpu_map/arm_cortex-a72.xml b/src/cpu_map/arm_cortex-a72.xml
-new file mode 100644
-index 0000000..c509a40
---- /dev/null
-+++ b/src/cpu_map/arm_cortex-a72.xml
-@@ -0,0 +1,6 @@
-+<cpus>
-+  <model name='cortex-a72'>
-+    <vendor name='ARM'/>
-+    <pvr value='0xd08'/>
-+  </model>
-+</cpus>
-diff --git a/src/cpu_map/arm_vendors.xml b/src/cpu_map/arm_vendors.xml
-new file mode 100644
-index 0000000..840bf9a
---- /dev/null
-+++ b/src/cpu_map/arm_vendors.xml
-@@ -0,0 +1,14 @@
-+<cpus>
-+  <vendor name="ARM" value="0x41"/>
-+  <vendor name="Broadcom" value="0x42"/>
-+  <vendor name="Cavium" value="0x43"/>
-+  <vendor name="DigitalEquipment" value="0x44"/>
-+  <vendor name="Hisilicon" value="0x48"/>
-+  <vendor name="Infineon" value="0x49"/>
-+  <vendor name="Freescale" value="0x4D"/>
-+  <vendor name="NVIDIA" value="0x4E"/>
-+  <vendor name="APM" value="0x50"/>
-+  <vendor name="Qualcomm" value="0x51"/>
-+  <vendor name="Marvell" value="0x56"/>
-+  <vendor name="Intel" value="0x69"/>
-+</cpus>
-diff --git a/src/cpu_map/index.xml b/src/cpu_map/index.xml
-index 50b030d..2e78834 100644
---- a/src/cpu_map/index.xml
-+++ b/src/cpu_map/index.xml
-@@ -87,4 +87,16 @@
-   <arch name='arm'>
-     <include filename='arm_features.xml'/>
-   </arch>
-+
-+  <arch name='arm'>
-+    <include filename="arm_vendors.xml"/>
-+
-+    <!-- ARM-based CPU models -->
-+    <include filename="arm_cortex-a53.xml"/>
-+    <include filename="arm_cortex-a57.xml"/>
-+    <include filename="arm_cortex-a72.xml"/>
-+
-+    <!-- Hisilicon-based CPU models -->
-+    <include filename="arm_Kunpeng-920.xml"/>
-+  </arch>
- </cpus>
--- 
-2.23.0
-
diff --git a/libvirt-ensure-defresult-is-used-in-virConnectAuthCa.patch b/libvirt-ensure-defresult-is-used-in-virConnectAuthCa.patch
deleted file mode 100644
index 68964c3c8d92eecd15e78b96596c0977c8b0b78e..0000000000000000000000000000000000000000
--- a/libvirt-ensure-defresult-is-used-in-virConnectAuthCa.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From fe9f75a69b6dac1dec4f77d8b17ec2406415d89d Mon Sep 17 00:00:00 2001
-From: Matt Coleman <mcoleman@datto.com>
-Date: Mon, 21 Sep 2020 22:01:46 -0400
-Subject: [PATCH 037/108] libvirt: ensure defresult is used in
- virConnectAuthCallbackDefault
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-A previous change to this function's password handling broke the use of
-default values for credential types other than VIR_CRED_PASSPHRASE and
-VIR_CRED_NOECHOPROMPT.
-
-Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
-Reviewed-by: Neal Gompa <ngompa13@gmail.com>
-Signed-off-by: Matt Coleman <matt@datto.com>
-(cherry picked from commit 1bb9f872a02f8be50c8f98b0ad13de62d2986fa9)
----
- src/libvirt.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/libvirt.c b/src/libvirt.c
-index 76bf1fa677..b11a15d7fe 100644
---- a/src/libvirt.c
-+++ b/src/libvirt.c
-@@ -146,7 +146,9 @@ virConnectAuthCallbackDefault(virConnectCredentialPtr cred,
-             len = strlen(buf);
-             if (len != 0 && buf[len-1] == '\n')
-                 buf[len-1] = '\0';
--            bufptr = g_strdup(buf);
-+
-+            if (strlen(buf) > 0)
-+                bufptr = g_strdup(buf);
-             break;
- 
-         case VIR_CRED_PASSPHRASE:
--- 
-2.33.0
-
diff --git a/libvirt-guests-Sync-time-for-autostarted-guests.patch b/libvirt-guests-Sync-time-for-autostarted-guests.patch
deleted file mode 100644
index 16a14d4e2844b3dd15a9a857116f4217364b16cd..0000000000000000000000000000000000000000
--- a/libvirt-guests-Sync-time-for-autostarted-guests.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From bad0bdbee1225d4d5831bc7ea7d4113df4de743d Mon Sep 17 00:00:00 2001
-From: tangbinzy <tangbin_yewu@cmss.chinamobile.com>
-Date: Tue, 29 Nov 2022 10:01:51 +0000
-Subject: [PATCH 08/24] libvirt-guests: Sync time for autostarted guests
- Setting SYNC_TIME=1 does not work on autostarted guests.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-See https://bugzilla.redhat.com/show_bug.cgi?id=1555398.
-
-Signed-off-by: Tim Wiederhake <twiederh@redhat.com>
-Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
-
-Signed-off-by: tangbin <tangbin_yewu@cmss.chinamobile.com>
-(cherry-pick from a501fa7cae2b93807496295945e6d3b51e5ccb3f)
----
- tools/libvirt-guests.sh.in | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/tools/libvirt-guests.sh.in b/tools/libvirt-guests.sh.in
-index a881f6266e..74286a12c4 100644
---- a/tools/libvirt-guests.sh.in
-+++ b/tools/libvirt-guests.sh.in
-@@ -200,9 +200,9 @@ start() {
-                     retval run_virsh "$uri" start $bypass "$name" \
-                         >/dev/null && \
-                     gettext "done"; echo
--                    if "$sync_time"; then
--                        run_virsh "$uri" domtime --sync "$name" >/dev/null
--                    fi
-+                fi
-+                if "$sync_time"; then
-+                    run_virsh "$uri" domtime --sync "$name" >/dev/null
-                 fi
-             fi
-         done
--- 
-2.27.0
-
diff --git a/libvirt-leaseshelper-Report-more-errors.patch b/libvirt-leaseshelper-Report-more-errors.patch
deleted file mode 100644
index b6dce6f73d1c0a520009e87c2fe0b2a5cd55e674..0000000000000000000000000000000000000000
--- a/libvirt-leaseshelper-Report-more-errors.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From cc842aa3030697b1a454e15ccfb2a201e57d5602 Mon Sep 17 00:00:00 2001
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Mon, 15 Jun 2020 12:53:48 +0200
-Subject: [PATCH 3/6] leaseshelper: Report more errors
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Some functions or code paths that may fail don't report error
-(e.g. when acquiring PID file fails) leading to a silent quit
-of the leaseshelper. This makes it super hard for us and users
-to debug what is happening. Fortunately, dnsmasq captures both
-stdout and stderr so we can write an error message there.
-
-cherry pick from: 9ed345ac1a035c8cf1de37431de638f4bac41de3
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
----
- src/network/leaseshelper.c | 18 ++++++++++++++----
- 1 file changed, 14 insertions(+), 4 deletions(-)
-
-diff --git a/src/network/leaseshelper.c b/src/network/leaseshelper.c
-index 86c847d..2b5fc0f 100644
---- a/src/network/leaseshelper.c
-+++ b/src/network/leaseshelper.c
-@@ -131,8 +131,10 @@ main(int argc, char **argv)
-      * events for expired leases. So, libvirtd sets another env var for this
-      * purpose */
-     if (!interface &&
--        !(interface = getenv("VIR_BRIDGE_NAME")))
--        goto cleanup;
-+        !(interface = getenv("VIR_BRIDGE_NAME"))) {
-+        fprintf(stderr, _("interface not set\n"));
-+        exit(EXIT_FAILURE);
-+    }
- 
-     ip = argv[3];
-     mac = argv[2];
-@@ -160,13 +162,21 @@ main(int argc, char **argv)
-     pid_file = g_strdup(RUNSTATEDIR "/leaseshelper.pid");
- 
-     /* Try to claim the pidfile, exiting if we can't */
--    if ((pid_file_fd = virPidFileAcquirePath(pid_file, true, getpid())) < 0)
-+    if ((pid_file_fd = virPidFileAcquirePath(pid_file, true, getpid())) < 0) {
-+        fprintf(stderr,
-+                _("Unable to acquire PID file: %s\n errno=%d"),
-+                pid_file, errno);
-         goto cleanup;
-+    }
- 
-     /* Since interfaces can be hot plugged, we need to make sure that the
-      * corresponding custom lease file exists. If not, 'touch' it */
--    if (virFileTouch(custom_lease_file, 0644) < 0)
-+    if (virFileTouch(custom_lease_file, 0644) < 0) {
-+        fprintf(stderr,
-+                _("Unable to create: %s\n errno=%d"),
-+                custom_lease_file, errno);
-         goto cleanup;
-+    }
- 
-     switch ((enum virLeaseActionFlags) action) {
-     case VIR_LEASE_ACTION_ADD:
--- 
-1.8.3.1
-
diff --git a/libvirt-leaseshelper-Wait-to-acquire-PID-file.patch b/libvirt-leaseshelper-Wait-to-acquire-PID-file.patch
deleted file mode 100644
index 4cbdd02a1d08b4eebd0f836b2d2413ded35d9868..0000000000000000000000000000000000000000
--- a/libvirt-leaseshelper-Wait-to-acquire-PID-file.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 173b80e8f8103f26438d344e9b97335d4e5036b4 Mon Sep 17 00:00:00 2001
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Thu, 11 Jun 2020 16:43:22 +0200
-Subject: [PATCH 2/6] leaseshelper: Wait to acquire PID file
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-On a DHCP transaction, dnsmasq runs our leases helper which
-updates corresponding JSON files. While one dnsmasq won't run the
-leaseshelper in parallel, two dnsmasqs (from two distinct
-networks) might. To avoid corrupting JSON file, the leaseshelper
-acquires PID file first. Well, the way it's acquiring it is not
-ideal - it calls virPidFileAcquirePath(wait = false); which
-means, that either it acquires the PID file instantly or returns
-an error and does not touch the JSON at all. This in turn means
-that there might be a leases record missing. With wait = true,
-this won't happen.
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1840307
-
-cherry pick from: 876211ef4a192df1603b45715044ec14567d7e9f
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
----
- src/network/leaseshelper.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/network/leaseshelper.c b/src/network/leaseshelper.c
-index a1780ca..86c847d 100644
---- a/src/network/leaseshelper.c
-+++ b/src/network/leaseshelper.c
-@@ -160,7 +160,7 @@ main(int argc, char **argv)
-     pid_file = g_strdup(RUNSTATEDIR "/leaseshelper.pid");
- 
-     /* Try to claim the pidfile, exiting if we can't */
--    if ((pid_file_fd = virPidFileAcquirePath(pid_file, false, getpid())) < 0)
-+    if ((pid_file_fd = virPidFileAcquirePath(pid_file, true, getpid())) < 0)
-         goto cleanup;
- 
-     /* Since interfaces can be hot plugged, we need to make sure that the
--- 
-1.8.3.1
-
diff --git a/libvirt-libxl-fix-crash-when-initializing-driver.patch b/libvirt-libxl-fix-crash-when-initializing-driver.patch
deleted file mode 100644
index 4d295c0435c4896aeda3057a0ec96123d11f745a..0000000000000000000000000000000000000000
--- a/libvirt-libxl-fix-crash-when-initializing-driver.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 0e95f7b912055cf254b71b0b02dcb0acf7da3870 Mon Sep 17 00:00:00 2001
-From: Jim Fehlig <jfehlig@suse.com>
-Date: Fri, 3 Apr 2020 15:51:48 -0600
-Subject: [PATCH 1/8] libxl: fix crash when initializing driver
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Commit 54a401af478 split out DriverConfigInit from DriverConfigNew, but
-then called it a bit late from libxlStateInitialize. The cfg is used in
-libxlDriverConfigLoadFile and when uninitialized results in a crash.
-Calling DriverConfigInit immediately after DriverConfigNew fixes the
-crash.
-
-Signed-off-by: Jim Fehlig <jfehlig@suse.com>
-Reviewed-by: Erik Skultety <eskultet@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry-picked from commit 88011ed2)
-Signed-off-by: AlexChen <alex.chen@huawei.com>
----
- src/libxl/libxl_driver.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c
-index 7ec4fcc3d1..980984b199 100644
---- a/src/libxl/libxl_driver.c
-+++ b/src/libxl/libxl_driver.c
-@@ -702,14 +702,14 @@ libxlStateInitialize(bool privileged,
-     if (!(cfg = libxlDriverConfigNew()))
-         goto error;
- 
-+    if (libxlDriverConfigInit(cfg) < 0)
-+        goto error;
-+
-     driverConf = g_strdup_printf("%s/libxl.conf", cfg->configBaseDir);
- 
-     if (libxlDriverConfigLoadFile(cfg, driverConf) < 0)
-         goto error;
- 
--    if (libxlDriverConfigInit(cfg) < 0)
--        goto error;
--
-     /* Register the callbacks providing access to libvirt's event loop */
-     libxl_osevent_register_hooks(cfg->ctx, &libxl_osevent_callbacks, cfg->ctx);
- 
--- 
-2.23.0
-
diff --git a/libvirt-po-Refresh-translation-for-running-state.patch b/libvirt-po-Refresh-translation-for-running-state.patch
deleted file mode 100644
index 146ef476699e1c177d141936f11990b76f12b78c..0000000000000000000000000000000000000000
--- a/libvirt-po-Refresh-translation-for-running-state.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 26c64d58383d391add464b7f640fd6111f0d82d3 Mon Sep 17 00:00:00 2001
-From: Xu Yandong <xuyandong2@huawei.com>
-Date: Wed, 15 Apr 2020 14:17:32 +0800
-Subject: po: Refresh translation for running state
-
-Signed-off-by: Xu Yandong <xuyandong2@huawei.com>
----
- po/zh_CN.mini.po | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/po/zh_CN.mini.po b/po/zh_CN.mini.po
-index 94920d1..3d588ab 100644
---- a/po/zh_CN.mini.po
-+++ b/po/zh_CN.mini.po
-@@ -19075,7 +19075,7 @@ msgid "rule node requires direction attribute"
- msgstr "rule 节点需要 direction 属性"
- 
- msgid "running"
--msgstr "running"
-+msgstr "运行中"
- 
- msgid "sanlock is too old to support lock failure action"
- msgstr "sanlock 太旧不支持锁失败动作"
--- 
-2.23.0
-
diff --git a/libvirt-qemu-Revoke-access-to-mirror-on-failed-blockcopy.patch b/libvirt-qemu-Revoke-access-to-mirror-on-failed-blockcopy.patch
deleted file mode 100644
index 2fadfadfc941a2478530240e7f49c876d8025efe..0000000000000000000000000000000000000000
--- a/libvirt-qemu-Revoke-access-to-mirror-on-failed-blockcopy.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 19d06bcb3c64662d5c131a035146d2caa8c5a437 Mon Sep 17 00:00:00 2001
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Tue, 14 Apr 2020 11:18:02 +0200
-Subject: [PATCH 4/8] qemu: Revoke access to mirror on failed blockcopy
-
-When preparing to do a blockcopy, the mirror image is modified so
-that QEMU can access it. For instance, the mirror has seclabels
-set, if it is a NVMe disk it is detached from the host and so on.
-And usually, the restore is done upon successful finish of the
-blockcopy operation. But, if something fails then we need to
-explicitly revoke the access to the mirror image (and thus
-reattach NVMe disk back to the host).
-
-Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1822538
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Pavel Mores <pmores@redhat.com>
-(cherry-picked from commit 67e19fc9)
-Signed-off-by: AlexChen <alex.chen@huawei.com>
----
- src/qemu/qemu_driver.c | 21 +++++++++++++--------
- 1 file changed, 13 insertions(+), 8 deletions(-)
-
-diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
-index 8bc5368b2f..7162875492 100644
---- a/src/qemu/qemu_driver.c
-+++ b/src/qemu/qemu_driver.c
-@@ -17972,6 +17972,7 @@ qemuDomainBlockCopyCommon(virDomainObjPtr vm,
-     virDomainDiskDefPtr disk = NULL;
-     int ret = -1;
-     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);
-@@ -18146,6 +18147,7 @@ qemuDomainBlockCopyCommon(virDomainObjPtr vm,
- 
-     if (qemuDomainStorageSourceChainAccessAllow(driver, vm, mirror) < 0)
-         goto endjob;
-+    need_revoke = true;
- 
-     if (blockdev) {
-         if (mirror_reuse) {
-@@ -18254,14 +18256,17 @@ qemuDomainBlockCopyCommon(virDomainObjPtr vm,
- 
-  endjob:
-     if (ret < 0 &&
--        virDomainObjIsActive(vm) &&
--        (data || crdata)) {
--        qemuDomainObjEnterMonitor(driver, vm);
--        if (data)
--            qemuBlockStorageSourceChainDetach(priv->mon, data);
--        if (crdata)
--            qemuBlockStorageSourceAttachRollback(priv->mon, crdata->srcdata[0]);
--        ignore_value(qemuDomainObjExitMonitor(driver, vm));
-+        virDomainObjIsActive(vm)) {
-+        if (data || crdata) {
-+            qemuDomainObjEnterMonitor(driver, vm);
-+            if (data)
-+                qemuBlockStorageSourceChainDetach(priv->mon, data);
-+            if (crdata)
-+                qemuBlockStorageSourceAttachRollback(priv->mon, crdata->srcdata[0]);
-+            ignore_value(qemuDomainObjExitMonitor(driver, vm));
-+        }
-+        if (need_revoke)
-+            qemuDomainStorageSourceChainAccessRevoke(driver, vm, mirror);
-     }
-     if (need_unlink && virStorageFileUnlink(mirror) < 0)
-         VIR_WARN("%s", _("unable to remove just-created copy target"));
--- 
-2.23.0
-
diff --git a/libvirt-qemu-Skip-pre-creation-of-NVMe-disks.patch b/libvirt-qemu-Skip-pre-creation-of-NVMe-disks.patch
deleted file mode 100644
index d1c07be670ee1ba74f9a4429d4fcbf92dbdd5074..0000000000000000000000000000000000000000
--- a/libvirt-qemu-Skip-pre-creation-of-NVMe-disks.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From a7f7d8f7513af2b98d01259480f63167cf44cced Mon Sep 17 00:00:00 2001
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Tue, 26 May 2020 16:26:25 +0200
-Subject: [PATCH] qemu: Skip pre-creation of NVMe disks
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Upon migration with disks, libvirt determines if each disk exists
-on the destination and tries to pre-create missing ones. Well,
-NVMe disks can't be pre-created, but they can be checked for
-presence.
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1823639
-
-cherry-pick from commit: a5a297f387fee9e9aa4cbc2df6788c330fd33ad1
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Signed-off-by: Jin Yan <jinyan12@huawei.com>
----
- src/qemu/qemu_migration.c | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
-index 65b47ec..3f4627b 100644
---- a/src/qemu/qemu_migration.c
-+++ b/src/qemu/qemu_migration.c
-@@ -315,6 +315,7 @@ qemuMigrationDstPrecreateStorage(virDomainObjPtr vm,
-     for (i = 0; i < nbd->ndisks; i++) {
-         virDomainDiskDefPtr disk;
-         const char *diskSrcPath;
-+        g_autofree char *nvmePath = NULL;
- 
-         VIR_DEBUG("Looking up disk target '%s' (capacity=%llu)",
-                   nbd->disks[i].target, nbd->disks[i].capacity);
-@@ -326,7 +327,12 @@ qemuMigrationDstPrecreateStorage(virDomainObjPtr vm,
-             goto cleanup;
-         }
- 
--        diskSrcPath = virDomainDiskGetSource(disk);
-+        if (disk->src->type == VIR_STORAGE_TYPE_NVME) {
-+            virPCIDeviceAddressGetSysfsFile(&disk->src->nvme->pciAddr, &nvmePath);
-+            diskSrcPath = nvmePath;
-+        } else {
-+            diskSrcPath = virDomainDiskGetSource(disk);
-+        }
- 
-         /* Skip disks we don't want to migrate and already existing disks. */
-         if (!qemuMigrationAnyCopyDisk(disk, nmigrate_disks, migrate_disks) ||
--- 
-1.8.3.1
-
diff --git a/libvirt-qemu-do-not-add-model-when-actual-iface-type-is-host.patch b/libvirt-qemu-do-not-add-model-when-actual-iface-type-is-host.patch
deleted file mode 100644
index c3b82555cceaaba775c32c44cd4d49afd634949e..0000000000000000000000000000000000000000
--- a/libvirt-qemu-do-not-add-model-when-actual-iface-type-is-host.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From c8a043dcdf4f04288bcfc34c25054dcef571a6a7 Mon Sep 17 00:00:00 2001
-From: Paulo de Rezende Pinatti <ppinatti@linux.ibm.com>
-Date: Tue, 16 Jun 2020 16:32:10 +0200
-Subject: [PATCH] qemu: do not add model when actual iface type is hostdev
-
-No default model should be added to the interface
-entry at post parse when its actual network type is hostdev
-as doing so might cause a mismatch between the interface
-definition and its actual device type.
-
-cherry-pick from commit: bdb8f2e41867ae5dbcc040909b1b8c20fd864a40
-
-Signed-off-by: Paulo de Rezende Pinatti <ppinatti@linux.ibm.com>
-Reviewed-by: Laine Stump <laine@redhat.com>
-Signed-off-by: Jin Yan <jinyan12@huawei.com>
----
- src/qemu/qemu_domain.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
-index 91c1a49..cfada81 100644
---- a/src/qemu/qemu_domain.c
-+++ b/src/qemu/qemu_domain.c
-@@ -9334,6 +9334,7 @@ qemuDomainDeviceNetDefPostParse(virDomainNetDefPtr net,
-                                 virQEMUCapsPtr qemuCaps)
- {
-     if (net->type != VIR_DOMAIN_NET_TYPE_HOSTDEV &&
-+        virDomainNetResolveActualType(net) != VIR_DOMAIN_NET_TYPE_HOSTDEV &&
-         !virDomainNetGetModelString(net))
-         net->model = qemuDomainDefaultNetModel(def, qemuCaps);
- 
--- 
-1.8.3.1
-
diff --git a/libvirt-qemu-fix-hang-in-p2p-xbzrle-compression-parallel-mig.patch b/libvirt-qemu-fix-hang-in-p2p-xbzrle-compression-parallel-mig.patch
deleted file mode 100644
index 5905cf7e4b592b275230d86aa2f05fe23d90eeca..0000000000000000000000000000000000000000
--- a/libvirt-qemu-fix-hang-in-p2p-xbzrle-compression-parallel-mig.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From f15935ea3b510bf0633dc2219a132412a7a8e96c Mon Sep 17 00:00:00 2001
-From: Lin Ma <lma@suse.com>
-Date: Thu, 16 Apr 2020 12:44:51 +0800
-Subject: [PATCH 3/8] qemu: fix hang in p2p + xbzrle compression + parallel
- migration
-
-When we do parallel migration, The multifd-channels migration parameter
-needs to be set on the destination side as well before incoming migration
-URI, unless we accept the default number of connections(2).
-
-Usually, This can be correctly handled by libvirtd. But in this case if
-we use p2p + xbzrle compression without parameter '--comp-xbzrle-cache',
-qemuMigrationParamsDump returns too early, The corresponding migration
-parameter will not be set on the destination side, It results QEMU hangs.
-
-Reproducer:
-virsh migrate --live --p2p --comp-methods xbzrle \
---parallel --parallel-connections 3 GUEST qemu+ssh://dsthost/system
-
-or
-
-virsh migrate --live --p2p --compressed \
---parallel --parallel-connections 3 GUEST qemu+ssh://dsthost/system
-
-Signed-off-by: Lin Ma <lma@suse.com>
-Message-Id: <20200416044451.21134-1-lma@suse.com>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
-(cherry-picked from commit 93b15ba0)
-Signed-off-by: AlexChen <alex.chen@huawei.com>
----
- src/qemu/qemu_migration_params.c | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/src/qemu/qemu_migration_params.c b/src/qemu/qemu_migration_params.c
-index dd5e2ce1b6..810199370f 100644
---- a/src/qemu/qemu_migration_params.c
-+++ b/src/qemu/qemu_migration_params.c
-@@ -630,7 +630,6 @@ qemuMigrationParamsDump(qemuMigrationParamsPtr migParams,
-     if (migParams->compMethods == 1ULL << QEMU_MIGRATION_COMPRESS_XBZRLE &&
-         !migParams->params[QEMU_MIGRATION_PARAM_XBZRLE_CACHE_SIZE].set) {
-         *flags |= VIR_MIGRATE_COMPRESSED;
--        return 0;
-     }
- 
-     for (i = 0; i < QEMU_MIGRATION_COMPRESS_LAST; ++i) {
--- 
-2.23.0
-
diff --git a/libvirt-qemu-fix-potential-memory-leak.patch b/libvirt-qemu-fix-potential-memory-leak.patch
deleted file mode 100644
index 40d03c59550032e2e823f1909d0ddd654d7a8907..0000000000000000000000000000000000000000
--- a/libvirt-qemu-fix-potential-memory-leak.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 4f4ebf64009e402db79bf53db1226966bf5c0a99 Mon Sep 17 00:00:00 2001
-From: Feng Ni <fengni@huawei.com>
-Date: Wed, 15 Apr 2020 11:11:16 +0800
-Subject: qemu: fix potential memory leak
-
-function virTypedParamsAddString may return -1 but alloc params,
-so invoker should free it.
-
-Signed-off-by: Feng Ni <fengni@huawei.com>
-Signed-off-by: Xu Yandong <xuyandong2@huawei.com>
----
- src/qemu/qemu_driver.c | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
-diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
-index ff97f10..8bc5368 100644
---- a/src/qemu/qemu_driver.c
-+++ b/src/qemu/qemu_driver.c
-@@ -5175,6 +5175,8 @@ qemuDomainPinVcpuLive(virDomainObjPtr vm,
-         goto cleanup;
- 
-     event = virDomainEventTunableNewFromObj(vm, eventParams, eventNparams);
-+    eventParams = NULL;
-+    eventNparams = 0;
- 
-     ret = 0;
- 
-@@ -5182,6 +5184,8 @@ qemuDomainPinVcpuLive(virDomainObjPtr vm,
-     virBitmapFree(tmpmap);
-     virCgroupFree(&cgroup_vcpu);
-     virObjectEventStateQueue(driver->domainEventState, event);
-+    if (eventParams)
-+        virTypedParamsFree(eventParams, eventNparams);
-     return ret;
- }
- 
-@@ -5388,6 +5392,8 @@ qemuDomainPinEmulator(virDomainPtr dom,
-             goto endjob;
- 
-         event = virDomainEventTunableNewFromDom(dom, eventParams, eventNparams);
-+        eventParams = NULL;
-+        eventNparams = 0;
-     }
- 
-     if (persistentDef) {
-@@ -5409,6 +5415,8 @@ qemuDomainPinEmulator(virDomainPtr dom,
-  cleanup:
-     if (cgroup_emulator)
-         virCgroupFree(&cgroup_emulator);
-+    if (eventParams)
-+        virTypedParamsFree(eventParams, eventNparams);
-     virObjectEventStateQueue(driver->domainEventState, event);
-     virBitmapFree(pcpumap);
-     virDomainObjEndAPI(&vm);
-@@ -5871,6 +5879,8 @@ qemuDomainPinIOThread(virDomainPtr dom,
-             goto endjob;
- 
-         event = virDomainEventTunableNewFromDom(dom, eventParams, eventNparams);
-+        eventParams = NULL;
-+        eventNparams = 0;
-     }
- 
-     if (persistentDef) {
-@@ -5902,6 +5912,8 @@ qemuDomainPinIOThread(virDomainPtr dom,
-  cleanup:
-     if (cgroup_iothread)
-         virCgroupFree(&cgroup_iothread);
-+    if (eventParams)
-+        virTypedParamsFree(eventParams, eventNparams);
-     virObjectEventStateQueue(driver->domainEventState, event);
-     virBitmapFree(pcpumap);
-     virDomainObjEndAPI(&vm);
--- 
-2.23.0
-
diff --git a/libvirt-qemu-format-ramfb-attribute-for-mediated-devices.patch b/libvirt-qemu-format-ramfb-attribute-for-mediated-devices.patch
deleted file mode 100644
index 0cbf3a46ebf2259adaf92c51d4ceaaa545fba683..0000000000000000000000000000000000000000
--- a/libvirt-qemu-format-ramfb-attribute-for-mediated-devices.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-From e017f95c7d833c0e9a463a1613d01fe93020606b Mon Sep 17 00:00:00 2001
-From: Jonathon Jongsma <jjongsma@redhat.com>
-Date: Tue, 23 Jun 2020 13:29:56 -0500
-Subject: [PATCH 5/6] qemu: format 'ramfb' attribute for mediated devices
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-It's possible to use ramfb as the boot display of an assigned vgpu
-device. This was introduced in 4b95738c, but unfortunately the attribute
-was not formatted into the xml output for such a device. This patch
-fixes that oversight and adds a xml2xml test to verify proper behavior.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1847791
-
-cherry pick from: c5815b31976f3982d18c7f6c1367ab6e403eb7eb
-
-Signed-off-by: Jonathon Jongsma <jjongsma@redhat.com>
-Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
-Signed-off-by: Ján Tomko <jtomko@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/conf/domain_conf.c                             |  3 ++
- .../hostdev-mdev-display-ramfb.x86_64-latest.xml   | 44 ++++++++++++++++++++++
- tests/qemuxml2xmltest.c                            |  1 +
- 3 files changed, 48 insertions(+)
- create mode 100644 tests/qemuxml2xmloutdata/hostdev-mdev-display-ramfb.x86_64-latest.xml
-
-diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
-index 37c785a..93e78a0 100644
---- a/src/conf/domain_conf.c
-+++ b/src/conf/domain_conf.c
-@@ -27849,6 +27849,9 @@ virDomainHostdevDefFormat(virBufferPtr buf,
-             if (mdevsrc->display != VIR_TRISTATE_SWITCH_ABSENT)
-                 virBufferAsprintf(buf, " display='%s'",
-                                   virTristateSwitchTypeToString(mdevsrc->display));
-+            if (mdevsrc->ramfb != VIR_TRISTATE_SWITCH_ABSENT)
-+                virBufferAsprintf(buf, " ramfb='%s'",
-+                                  virTristateSwitchTypeToString(mdevsrc->ramfb));
-         }
- 
-     }
-diff --git a/tests/qemuxml2xmloutdata/hostdev-mdev-display-ramfb.x86_64-latest.xml b/tests/qemuxml2xmloutdata/hostdev-mdev-display-ramfb.x86_64-latest.xml
-new file mode 100644
-index 0000000..c134400
---- /dev/null
-+++ b/tests/qemuxml2xmloutdata/hostdev-mdev-display-ramfb.x86_64-latest.xml
-@@ -0,0 +1,44 @@
-+<domain type='qemu'>
-+  <name>QEMUGuest2</name>
-+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
-+  <memory unit='KiB'>219136</memory>
-+  <currentMemory unit='KiB'>219136</currentMemory>
-+  <vcpu placement='static'>1</vcpu>
-+  <os>
-+    <type arch='i686' machine='pc'>hvm</type>
-+    <boot dev='hd'/>
-+  </os>
-+  <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>
-+    <controller type='usb' index='0' model='piix3-uhci'>
-+      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x2'/>
-+    </controller>
-+    <controller type='pci' index='0' model='pci-root'/>
-+    <controller type='ide' index='0'>
-+      <address type='pci' domain='0x0000' bus='0x00' slot='0x01' function='0x1'/>
-+    </controller>
-+    <input type='mouse' bus='ps2'/>
-+    <input type='keyboard' bus='ps2'/>
-+    <graphics type='vnc' port='-1' autoport='yes'>
-+      <listen type='address'/>
-+    </graphics>
-+    <video>
-+      <model type='qxl' ram='65536' vram='65536' vgamem='16384' heads='1' primary='yes'/>
-+      <address type='pci' domain='0x0000' bus='0x00' slot='0x02' function='0x0'/>
-+    </video>
-+    <hostdev mode='subsystem' type='mdev' managed='no' model='vfio-pci' display='on' ramfb='on'>
-+      <source>
-+        <address uuid='53764d0e-85a0-42b4-af5c-2046b460b1dc'/>
-+      </source>
-+      <address type='pci' domain='0x0000' bus='0x00' slot='0x03' function='0x0'/>
-+    </hostdev>
-+    <memballoon model='none'/>
-+  </devices>
-+</domain>
-diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
-index a0d27fd..3a25395 100644
---- a/tests/qemuxml2xmltest.c
-+++ b/tests/qemuxml2xmltest.c
-@@ -529,6 +529,7 @@ mymain(void)
-             QEMU_CAPS_VFIO_PCI_DISPLAY,
-             QEMU_CAPS_DEVICE_VFIO_PCI,
-             QEMU_CAPS_VNC);
-+    DO_TEST_CAPS_LATEST("hostdev-mdev-display-ramfb");
-     DO_TEST("pci-rom", NONE);
-     DO_TEST("pci-rom-disabled", NONE);
-     DO_TEST("pci-rom-disabled-invalid", NONE);
--- 
-1.8.3.1
-
diff --git a/libvirt-qemu-only-stop-external-devices-after-the-domain.patch b/libvirt-qemu-only-stop-external-devices-after-the-domain.patch
deleted file mode 100644
index 80a50ecf64b1c511c1f4e026a33df466888416f2..0000000000000000000000000000000000000000
--- a/libvirt-qemu-only-stop-external-devices-after-the-domain.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 7dd15a340179598dece5546c9e4fec9b8e47aca7 Mon Sep 17 00:00:00 2001
-From: Ján Tomko <jtomko@redhat.com>
-Date: Tue, 12 May 2020 12:59:07 +0200
-Subject: [PATCH] qemu: only stop external devices after the domain
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-A failure in qemuProcessLaunch would lead to qemuExtDevicesStop
-being called twice - once in the cleanup section and then again
-in qemuProcessStop.
-
-However, the first one is called while the QEMU process is
-still running, which is too soon for the swtpm process, because
-the swtmp_ioctl command can lock up:
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1822523
-
-Remove the first call and only leave the one in qemuProcessStop,
-which is called after the QEMU process is killed.
-
-cherry-pick from commit: 006782a8bc5a27125211946fcb12a40f7d4ed12a
-
-Signed-off-by: Ján Tomko <jtomko@redhat.com>
-Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
-Reviewed-by: Erik Skultety <eskultet@redhat.com>
-Signed-off-by: Jin Yan <jinyan12@huawei.com>
----
- src/qemu/qemu_process.c | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
-index 6b9f6fb..6fbe0c1 100644
---- a/src/qemu/qemu_process.c
-+++ b/src/qemu/qemu_process.c
-@@ -6998,8 +6998,6 @@ qemuProcessLaunch(virConnectPtr conn,
-     ret = 0;
- 
-  cleanup:
--    if (ret < 0)
--        qemuExtDevicesStop(driver, vm);
-     qemuDomainSecretDestroy(vm);
-     return ret;
- }
--- 
-1.8.3.1
-
diff --git a/libvirt-qemu-pre-create-the-dbus-directory-in-qemuStateIniti.patch b/libvirt-qemu-pre-create-the-dbus-directory-in-qemuStateIniti.patch
deleted file mode 100644
index 7c2dae6a4b937a3e4073c3e573ee8308c3dc3e92..0000000000000000000000000000000000000000
--- a/libvirt-qemu-pre-create-the-dbus-directory-in-qemuStateIniti.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-From 3ee423c363b69588e82e522ad1634193284c09a7 Mon Sep 17 00:00:00 2001
-From: Bihong Yu <yubihong@huawei.com>
-Date: Tue, 14 Jul 2020 15:44:05 +0800
-Subject: [PATCH] qemu: pre-create the dbus directory in qemuStateInitialize
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-There are races condiction to make '/run/libvirt/qemu/dbus' directory in
-virDirCreateNoFork() while concurrent start VMs, and get "failed to create
-directory '/run/libvirt/qemu/dbus': File exists" error message. pre-create the
-dbus directory in qemuStateInitialize.
-
-Signed-off-by: Bihong Yu <yubihong@huawei.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Signed-off-by: Ján Tomko <jtomko@redhat.com>
----
- src/qemu/qemu_dbus.c    | 10 ----------
- src/qemu/qemu_dbus.h    |  2 --
- src/qemu/qemu_driver.c  |  7 +++++++
- src/qemu/qemu_process.c |  3 ---
- 4 files changed, 7 insertions(+), 15 deletions(-)
-
-diff --git a/src/qemu/qemu_dbus.c b/src/qemu/qemu_dbus.c
-index 51f6c94e3e..81042876fe 100644
---- a/src/qemu/qemu_dbus.c
-+++ b/src/qemu/qemu_dbus.c
-@@ -33,16 +33,6 @@
- VIR_LOG_INIT("qemu.dbus");
- 
- 
--int
--qemuDBusPrepareHost(virQEMUDriverPtr driver)
--{
--    g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver);
--
--    return virDirCreate(cfg->dbusStateDir, 0770, cfg->user, cfg->group,
--                        VIR_DIR_CREATE_ALLOW_EXIST);
--}
--
--
- static char *
- qemuDBusCreatePidFilename(virQEMUDriverConfigPtr cfg,
-                           const char *shortName)
-diff --git a/src/qemu/qemu_dbus.h b/src/qemu/qemu_dbus.h
-index 474eb1058b..3c2145a223 100644
---- a/src/qemu/qemu_dbus.h
-+++ b/src/qemu/qemu_dbus.h
-@@ -21,8 +21,6 @@
- #include "qemu_conf.h"
- #include "qemu_domain.h"
- 
--int qemuDBusPrepareHost(virQEMUDriverPtr driver);
--
- char *qemuDBusGetAddress(virQEMUDriverPtr driver,
-                          virDomainObjPtr vm);
- 
-diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
-index 8e81c30a93..53980d4d78 100644
---- a/src/qemu/qemu_driver.c
-+++ b/src/qemu/qemu_driver.c
-@@ -743,6 +743,13 @@ qemuStateInitialize(bool privileged,
-         goto error;
-     }
- 
-+    if (virDirCreate(cfg->dbusStateDir, 0770, cfg->user, cfg->group,
-+                     VIR_DIR_CREATE_ALLOW_EXIST) < 0) {
-+        virReportSystemError(errno, _("Failed to create dbus state dir %s"),
-+                             cfg->dbusStateDir);
-+        goto error;
-+    }
-+
-     if ((qemu_driver->lockFD =
-          virPidFileAcquire(cfg->stateDir, "driver", false, getpid())) < 0)
-         goto error;
-diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
-index e8b15ee3ca..1006f41614 100644
---- a/src/qemu/qemu_process.c
-+++ b/src/qemu/qemu_process.c
-@@ -6466,9 +6466,6 @@ qemuProcessPrepareHost(virQEMUDriverPtr driver,
-     qemuDomainObjPrivatePtr priv = vm->privateData;
-     g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver);
- 
--    if (qemuDBusPrepareHost(driver) < 0)
--        return -1;
--
-     if (qemuPrepareNVRAM(cfg, vm) < 0)
-         return -1;
- 
--- 
-2.25.0.windows.1
-
diff --git a/libvirt-qemuBuildMemoryBackendProps-Use-boolean-type-for-pme.patch b/libvirt-qemuBuildMemoryBackendProps-Use-boolean-type-for-pme.patch
deleted file mode 100644
index 1fc48ad5c50e85b1e216350c333c2adcb6f86ed6..0000000000000000000000000000000000000000
--- a/libvirt-qemuBuildMemoryBackendProps-Use-boolean-type-for-pme.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From f63d6889b34af9b0b7808566945d6e1720d7c1fd Mon Sep 17 00:00:00 2001
-From: Peter Krempa <pkrempa@redhat.com>
-Date: Wed, 8 Jul 2020 09:13:42 +0200
-Subject: [PATCH 4/6] qemuBuildMemoryBackendProps: Use boolean type for 'pmem'
- property
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Commit 82576d8f35e used a string "on" to enable the 'pmem' property.
-This is okay for the command line visitor, but the property is declared
-as boolean in qemu and thus it will not work when using QMP.
-
-Modify the type to boolean. This changes the command line, but
-fortunately the command line visitor in qemu parses both 'yes' and 'on'
-as true for the property.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1854684
-
-cherry pick from: e95da4e5bf53ff977f440903df9f7343f2fb6f0e
-
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/qemu/qemu_command.c                                              | 2 +-
- tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-latest.args | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
-index 2f0e919..014a0e4 100644
---- a/src/qemu/qemu_command.c
-+++ b/src/qemu/qemu_command.c
-@@ -3523,7 +3523,7 @@ qemuBuildMemoryBackendProps(virJSONValuePtr *backendProps,
-                              "with this QEMU binary"));
-             return -1;
-         }
--        if (virJSONValueObjectAdd(props, "s:pmem", "on", NULL) < 0)
-+        if (virJSONValueObjectAdd(props, "b:pmem", true, NULL) < 0)
-             return -1;
-     }
- 
-diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-latest.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-latest.args
-index 5dfba9b..00a78ba 100644
---- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-latest.args
-+++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-latest.args
-@@ -19,7 +19,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
- -smp 2,sockets=2,dies=1,cores=1,threads=1 \
- -numa node,nodeid=0,cpus=0-1,mem=214 \
- -object memory-backend-file,id=memnvdimm0,prealloc=yes,mem-path=/tmp/nvdimm,\
--share=no,size=536870912,pmem=on \
-+share=no,size=536870912,pmem=yes \
- -device nvdimm,node=0,memdev=memnvdimm0,id=nvdimm0,slot=0 \
- -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
- -display none \
--- 
-1.8.3.1
-
diff --git a/libvirt-qemuDomainCleanupRun-Actually-run-cleanup-callbacks-.patch b/libvirt-qemuDomainCleanupRun-Actually-run-cleanup-callbacks-.patch
deleted file mode 100644
index 98170db011e113d2f827df8eb7db72c6c6b031f6..0000000000000000000000000000000000000000
--- a/libvirt-qemuDomainCleanupRun-Actually-run-cleanup-callbacks-.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 517d69d6c3935adf59fcf9ed11cb05e1dfa8a6f3 Mon Sep 17 00:00:00 2001
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Tue, 5 May 2020 13:45:44 +0200
-Subject: [PATCH] qemuDomainCleanupRun: Actually run cleanup callbacks in
- reverse order
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-We have a framework to register cleanup callbacks that are run
-when a domain is shut down. The idea is to run callbacks in
-reverse order than they were registered. However, looking at the
-code this is not the case. Fortunately, this framework is used to
-register a single callback and a single callback only -
-qemuMigrationDstPrepareCleanup() - therefore there was no problem
-just yet.
-
-cherry-pick from commit: 06fc99b6ceb846b07e1cae3d82916ef50ca5f60e
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Signed-off-by: Jin Yan <jinyan12@huawei.com>
----
- src/qemu/qemu_domain.c | 8 ++------
- 1 file changed, 2 insertions(+), 6 deletions(-)
-
-diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
-index b1a4647..36bef67 100644
---- a/src/qemu/qemu_domain.c
-+++ b/src/qemu/qemu_domain.c
-@@ -11561,18 +11561,14 @@ qemuDomainCleanupRun(virQEMUDriverPtr driver,
-                      virDomainObjPtr vm)
- {
-     qemuDomainObjPrivatePtr priv = vm->privateData;
--    size_t i;
- 
-     VIR_DEBUG("driver=%p, vm=%s", driver, vm->def->name);
- 
-     /* run cleanup callbacks in reverse order */
--    for (i = 0; i < priv->ncleanupCallbacks; i++) {
--        if (priv->cleanupCallbacks[priv->ncleanupCallbacks - (i + 1)])
--            priv->cleanupCallbacks[i](driver, vm);
--    }
-+    while (priv->ncleanupCallbacks)
-+        priv->cleanupCallbacks[--priv->ncleanupCallbacks](driver, vm);
- 
-     VIR_FREE(priv->cleanupCallbacks);
--    priv->ncleanupCallbacks = 0;
-     priv->ncleanupCallbacks_max = 0;
- }
- 
--- 
-1.8.3.1
-
diff --git a/libvirt-qemuDomainDefPostParse-Fail-if-unable-to-fill-machin.patch b/libvirt-qemuDomainDefPostParse-Fail-if-unable-to-fill-machin.patch
deleted file mode 100644
index 9a94a86f1092c3ca24779d27ebe8f80eb7a5beaf..0000000000000000000000000000000000000000
--- a/libvirt-qemuDomainDefPostParse-Fail-if-unable-to-fill-machin.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From d9190851ed9a28e86d5baa3a9872eb6246270cd1 Mon Sep 17 00:00:00 2001
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Thu, 16 Apr 2020 14:18:28 +0200
-Subject: [PATCH 5/8] qemuDomainDefPostParse: Fail if unable to fill machine
- type
-
-Previously, we used virCapabilitiesDomainDataLookup() to fill
-machine type in post parse callback if none was provided in the
-domain XML. If machine type couldn't be filled in an error was
-reported. After 4a4132b4625 we've changed it to
-virQEMUCapsGetPreferredMachine() which returns NULL, but we no
-longer report an error and proceed with the post parse callbacks
-processing. This may lead to a crash because the code later on
-assumes def->os.machine is not NULL.
-
-Fixes: 4a4132b4625
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Pavel Mores <pmores@redhat.com>
-(cherry-picked from commit 67b973b5)
-Signed-off-by: AlexChen <alex.chen@huawei.com>
----
- src/qemu/qemu_domain.c | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
-index b1a46478ed..36e6343995 100644
---- a/src/qemu/qemu_domain.c
-+++ b/src/qemu/qemu_domain.c
-@@ -4971,6 +4971,14 @@ qemuDomainDefPostParse(virDomainDefPtr def,
-     if (!def->os.machine) {
-         const char *machine = virQEMUCapsGetPreferredMachine(qemuCaps,
-                                                              def->virtType);
-+        if (!machine) {
-+            virReportError(VIR_ERR_INVALID_ARG,
-+                           _("could not get preferred machine for %s type=%s"),
-+                           def->emulator,
-+                           virDomainVirtTypeToString(def->virtType));
-+            return -1;
-+        }
-+
-         def->os.machine = g_strdup(machine);
-     }
- 
--- 
-2.23.0
-
diff --git a/libvirt-qemuDomainGetUnplugTimeout-Add-G_GNUC_NO_INLINE.patch b/libvirt-qemuDomainGetUnplugTimeout-Add-G_GNUC_NO_INLINE.patch
deleted file mode 100644
index bb6fc8040e69cd5ebcffd1d8099c87caa5ad6527..0000000000000000000000000000000000000000
--- a/libvirt-qemuDomainGetUnplugTimeout-Add-G_GNUC_NO_INLINE.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 9494102bc1560c1870c8ba603e936fa81beaa28c Mon Sep 17 00:00:00 2001
-From: Peter Krempa <pkrempa@redhat.com>
-Date: Thu, 23 Apr 2020 10:30:13 +0200
-Subject: [PATCH 8/8] qemuDomainGetUnplugTimeout: Add G_GNUC_NO_INLINE
-
-The function is mocked in qemuhotplugmock.so. Recent clang versions
-decided to inline it so the mock stopped working resulting in
-qemuhotplugtest wasting 15 seconds waiting for timeouts.
-
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-(cherry-picked from commit 2ab8dba5)
-Signed-off-by: AlexChen <alex.chen@huawei.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 14654a17d7..60d0729f1e 100644
---- a/src/qemu/qemu_hotplug.c
-+++ b/src/qemu/qemu_hotplug.c
-@@ -5122,7 +5122,7 @@ qemuDomainResetDeviceRemoval(virDomainObjPtr vm)
- }
- 
- 
--unsigned long long
-+unsigned long long G_GNUC_NO_INLINE
- qemuDomainGetUnplugTimeout(virDomainObjPtr vm)
- {
-     if (qemuDomainIsPSeries(vm->def))
--- 
-2.23.0
-
diff --git a/libvirt-qemuDomainSetNumaParamsLive-set-nodeset-for-root-cgr.patch b/libvirt-qemuDomainSetNumaParamsLive-set-nodeset-for-root-cgr.patch
deleted file mode 100644
index 9718f24195b7e0b3c48c2530cfe52ed8b8fc12f8..0000000000000000000000000000000000000000
--- a/libvirt-qemuDomainSetNumaParamsLive-set-nodeset-for-root-cgr.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 222d16af976dc08ee3ea2008d1dc68b00a1ccc9f Mon Sep 17 00:00:00 2001
-From: Daniel Henrique Barboza <danielhb413@gmail.com>
-Date: Thu, 11 Jun 2020 15:54:57 -0300
-Subject: [PATCH] qemuDomainSetNumaParamsLive: set nodeset for root cgroup
-
-This function handles the change of NUMA nodeset for a given
-guest, setting CpusetMems for the emulator, vcpus and IOThread
-sub-groups. It doesn't set the same  nodeset to the root cgroup
-though. This means that cpuset.mems of the root cgroup ends up
-holding the new nodeset and the old nodeset as well. For
-a guest with placement=strict, nodeset='0', doing
-
-virsh numatune <vm> 0 8 --live
-
-Will make cpuset.mems of emulator, vcpus and iothread to be
-"8", but cpuset.mems of the root cgroup will be "0,8".
-
-This means that any new tasks that ends up landing in the
-root cgroup, aside from the emulator/vcpus/iothread sub-groups,
-will be split between the old nodeset and the new nodeset,
-which is not what we want.
-
-cherry-pick from commit: 1b22dd6dd44202094e0f78f887cbe790c00e9ebc
-
-Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-Signed-off-by: Jin Yan <jinyan12@huawei.com>
----
- src/qemu/qemu_driver.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
-index 8bc5368..cb049fe 100644
---- a/src/qemu/qemu_driver.c
-+++ b/src/qemu/qemu_driver.c
-@@ -9728,6 +9728,10 @@ qemuDomainSetNumaParamsLive(virDomainObjPtr vm,
-         virCgroupFree(&cgroup_temp);
-     }
- 
-+    /* set nodeset for root cgroup */
-+    if (virCgroupSetCpusetMems(priv->cgroup, nodeset_str) < 0)
-+        goto cleanup;
-+
-     ret = 0;
-  cleanup:
-     virCgroupFree(&cgroup_temp);
--- 
-1.8.3.1
-
diff --git a/libvirt-qemuDomainStorageSourcePrivateDispose-Free-httpcooki.patch b/libvirt-qemuDomainStorageSourcePrivateDispose-Free-httpcooki.patch
deleted file mode 100644
index 9fc391e78f4892d0dc1ef21bd32f5a2735293e7c..0000000000000000000000000000000000000000
--- a/libvirt-qemuDomainStorageSourcePrivateDispose-Free-httpcooki.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 8263665d2003446a9b08181fdcc13b89397aae7d Mon Sep 17 00:00:00 2001
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Thu, 14 May 2020 10:47:42 +0200
-Subject: [PATCH] qemuDomainStorageSourcePrivateDispose: Free httpcookie
-
-==156803== 58 (40 direct, 18 indirect) bytes in 1 blocks are definitely lost in loss record 306 of 463
-==156803==    at 0x4839EC6: calloc (vg_replace_malloc.c:762)
-==156803==    by 0x5791AC0: g_malloc0 (in /usr/lib64/libglib-2.0.so.0.6400.1)
-==156803==    by 0x48F60DC: virAlloc (viralloc.c:48)
-==156803==    by 0x18DD74: qemuStorageSourcePrivateDataAssignSecinfo (qemu_domain.c:2384)
-==156803==    by 0x18DFD5: qemuStorageSourcePrivateDataParse (qemu_domain.c:2433)
-==156803==    by 0x49EC884: virDomainStorageSourceParse (domain_conf.c:9857)
-==156803==    by 0x49ECBA3: virDomainDiskBackingStoreParse (domain_conf.c:9909)
-==156803==    by 0x49F129D: virDomainDiskDefParseXML (domain_conf.c:10785)
-==156803==    by 0x4A1804E: virDomainDefParseXML (domain_conf.c:21543)
-==156803==    by 0x4A1B60C: virDomainObjParseXML (domain_conf.c:22254)
-==156803==    by 0x4A1BFE9: virDomainObjParseNode (domain_conf.c:22429)
-==156803==    by 0x4A1C0B4: virDomainObjParseFile (domain_conf.c:22443
-
-cherry-pick from commit: 42a415d5a548d828c4b6bd42ad59dfc44b113fa9
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Peter Krempa <pkrempa@redhat.com>
-Signed-off-by: Jin Yan <jinyan12@huawei.com>
----
- src/qemu/qemu_domain.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
-index 36bef67..91c1a49 100644
---- a/src/qemu/qemu_domain.c
-+++ b/src/qemu/qemu_domain.c
-@@ -1203,6 +1203,7 @@ qemuDomainStorageSourcePrivateDispose(void *obj)
- 
-     g_clear_pointer(&priv->secinfo, qemuDomainSecretInfoFree);
-     g_clear_pointer(&priv->encinfo, qemuDomainSecretInfoFree);
-+    g_clear_pointer(&priv->httpcookie, qemuDomainSecretInfoFree);
- }
- 
- 
--- 
-1.8.3.1
-
diff --git a/libvirt-qemuProcessStop-Reattach-NVMe-disks-a-domain-is-mirr.patch b/libvirt-qemuProcessStop-Reattach-NVMe-disks-a-domain-is-mirr.patch
deleted file mode 100644
index 510f073d735ddce37e37e7c8c7979852fa231c83..0000000000000000000000000000000000000000
--- a/libvirt-qemuProcessStop-Reattach-NVMe-disks-a-domain-is-mirr.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 2358e2dd4971793f4c8cc530251ed0b01536e603 Mon Sep 17 00:00:00 2001
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Mon, 18 May 2020 15:11:49 +0200
-Subject: [PATCH] qemuProcessStop: Reattach NVMe disks a domain is mirroring
- into
-
-If the mirror destination is not a file but a NVMe disk, then
-call qemuHostdevReAttachOneNVMeDisk() to reattach the NVMe back
-to the host.
-
-This would be done by blockjob code when the job finishes, but in
-this case the job won't finish - QEMU is killed meanwhile.
-
-Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1825785
-
-cherry-pick from commit: 8fd2749b2df99f3ac27215e9e4ab8be191c39460
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Peter Krempa <pkrempa@redhat.com>
-Signed-off-by: Jin Yan <jinyan12@huawei.com>
----
- src/qemu/qemu_process.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
-index 9285ace..280fed9 100644
---- a/src/qemu/qemu_process.c
-+++ b/src/qemu/qemu_process.c
-@@ -7606,6 +7606,9 @@ void qemuProcessStop(virQEMUDriverPtr driver,
-             if (disk->mirror) {
-                 if (qemuSecurityRestoreImageLabel(driver, vm, disk->mirror, false) < 0)
-                     VIR_WARN("Unable to restore security label on %s", disk->dst);
-+
-+                if (virStorageSourceChainHasNVMe(disk->mirror))
-+                    qemuHostdevReAttachOneNVMeDisk(driver, vm->def->name, disk->mirror);
-             }
- 
-             qemuBlockRemoveImageMetadata(driver, vm, disk->dst, disk->src);
--- 
-1.8.3.1
-
diff --git a/libvirt-qemuProcessStop-Use-XATTRs-to-restore-seclabels-on-d.patch b/libvirt-qemuProcessStop-Use-XATTRs-to-restore-seclabels-on-d.patch
deleted file mode 100644
index 679d7bdfb01ef6b05490888010c023bb8c045f70..0000000000000000000000000000000000000000
--- a/libvirt-qemuProcessStop-Use-XATTRs-to-restore-seclabels-on-d.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 63846560cf12789ff592374dfc6211d83e693e9d Mon Sep 17 00:00:00 2001
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Mon, 18 May 2020 15:07:46 +0200
-Subject: [PATCH] qemuProcessStop: Use XATTRs to restore seclabels on disks a
- domain is mirroring into
-
-In v5.10.0-rc1~42 (which was later fixed in v6.0.0-rc1~487) I am
-removing XATTRs for a file that QEMU is mirroring a disk into but
-it is killed meanwhile. Well, we can call
-qemuSecurityRestoreImageLabel() which will not only remove XATTRs
-but also use them to restore the original owner of the file.
-
-This would be done by blockjob code when the job finishes, but in
-this case the job won't finish - QEMU is killed meanwhile
-
-cherry-pick from commit: 0230e3838402624756d6cd913b7d92639fafc7d0
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Peter Krempa <pkrempa@redhat.com>
-Signed-off-by: Jin Yan <jinyan12@huawei.com>
----
- src/qemu/qemu_process.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
-index 6fbe0c1..9285ace 100644
---- a/src/qemu/qemu_process.c
-+++ b/src/qemu/qemu_process.c
-@@ -7603,8 +7603,10 @@ void qemuProcessStop(virQEMUDriverPtr driver,
-         for (i = 0; i < def->ndisks; i++) {
-             virDomainDiskDefPtr disk = def->disks[i];
- 
--            if (disk->mirror)
--                qemuBlockRemoveImageMetadata(driver, vm, disk->dst, disk->mirror);
-+            if (disk->mirror) {
-+                if (qemuSecurityRestoreImageLabel(driver, vm, disk->mirror, false) < 0)
-+                    VIR_WARN("Unable to restore security label on %s", disk->dst);
-+            }
- 
-             qemuBlockRemoveImageMetadata(driver, vm, disk->dst, disk->src);
-         }
--- 
-1.8.3.1
-
diff --git a/libvirt-remote-fix-driver-name-check-for-libxl-driver.patch b/libvirt-remote-fix-driver-name-check-for-libxl-driver.patch
deleted file mode 100644
index 916a2b76f12b65dd661322bbdc5f9849b5d2a0e0..0000000000000000000000000000000000000000
--- a/libvirt-remote-fix-driver-name-check-for-libxl-driver.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 1285a266c106ebac3fc6d1a7d5bf839a7623a5a0 Mon Sep 17 00:00:00 2001
-From: Daniel P. Berrangé <berrange@redhat.com>
-Date: Mon, 4 May 2020 17:41:46 +0100
-Subject: [PATCH] remote: fix driver name check for libxl driver
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The virConnectGetType() returns "Xen" for libxl, not "LIBXL".
-
-This prevents users opening a connection to the libxl driver when using
-the modular daemons.
-
-cherry-pick from commit: d677de9d567e3e87be295b91723457b461345caa
-
-Reviewed-by: Jim Fehlig <jfehlig@suse.com>
-Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
-Signed-off-by: Jin Yan <jinyan12@huawei.com>
----
- src/remote/remote_daemon_dispatch.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/remote/remote_daemon_dispatch.c b/src/remote/remote_daemon_dispatch.c
-index c5506c2..d2652e3 100644
---- a/src/remote/remote_daemon_dispatch.c
-+++ b/src/remote/remote_daemon_dispatch.c
-@@ -2111,7 +2111,7 @@ remoteDispatchConnectOpen(virNetServerPtr server G_GNUC_UNUSED,
- 
-     VIR_DEBUG("Primary driver type is '%s'", type);
-     if (STREQ(type, "QEMU") ||
--        STREQ(type, "LIBXL") ||
-+        STREQ(type, "Xen") ||
-         STREQ(type, "LXC") ||
-         STREQ(type, "VBOX") ||
-         STREQ(type, "bhyve") ||
--- 
-1.8.3.1
-
diff --git a/libvirt-resctrl-Do-not-open-directory-for-writing.patch b/libvirt-resctrl-Do-not-open-directory-for-writing.patch
deleted file mode 100644
index 7bbfaab78766303c2f9b3314cc111d880376d1db..0000000000000000000000000000000000000000
--- a/libvirt-resctrl-Do-not-open-directory-for-writing.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 6c4265c15abd446e050f955cccb41d22f8456969 Mon Sep 17 00:00:00 2001
-From: Martin Kletzander <mkletzan@redhat.com>
-Date: Thu, 9 Jul 2020 09:27:41 +0200
-Subject: [PATCH 6/6] resctrl: Do not open directory for writing
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-When preparing for the removal of GNULIB commit 18dca21a32e9 removed the
-unneeded O_DIRECTORY, but unfortunately started opening the directory for
-writing which fails every time for a directory.  There is also no need for that
-as flock() works on O_RDONLY file descriptor as well, even for LOCK_EX.
-
-https://bugzilla.redhat.com/1852741
-
-cherry pick from: 9d832813820b948eb508508fb3cbd86c90698119
-
-Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Reviewed-by: Andrea Bolognani <abologna@redhat.com>
----
- src/util/virresctrl.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/util/virresctrl.c b/src/util/virresctrl.c
-index c537d60..937a053 100644
---- a/src/util/virresctrl.c
-+++ b/src/util/virresctrl.c
-@@ -456,7 +456,7 @@ VIR_ONCE_GLOBAL_INIT(virResctrl);
- static int
- virResctrlLockWrite(void)
- {
--    int fd = open(SYSFS_RESCTRL_PATH, O_RDWR | O_CLOEXEC);
-+    int fd = open(SYSFS_RESCTRL_PATH, O_RDONLY | O_CLOEXEC);
- 
-     if (fd < 0) {
-         virReportSystemError(errno, "%s", _("Cannot open resctrl"));
--- 
-1.8.3.1
-
diff --git a/libvirt-security-don-t-fail-if-built-without-attr-support.patch b/libvirt-security-don-t-fail-if-built-without-attr-support.patch
deleted file mode 100644
index e4314980fe1430d4f3003481e777029b1135c678..0000000000000000000000000000000000000000
--- a/libvirt-security-don-t-fail-if-built-without-attr-support.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From ba950b814f7a2037829d54e3d1e0522c42c104a4 Mon Sep 17 00:00:00 2001
-From: Christian Ehrhardt <christian.ehrhardt@canonical.com>
-Date: Tue, 26 May 2020 09:33:38 +0200
-Subject: [PATCH] security: don't fail if built without attr support
-
-If built without attr support removing any image will trigger
- qemuBlockRemoveImageMetadata (the one that emits the warning)
-   -> qemuSecurityMoveImageMetadata
-     -> virSecurityManagerMoveImageMetadata
-       -> virSecurityDACMoveImageMetadata
-         -> virSecurityDACMoveImageMetadataHelper
-           -> virProcessRunInFork (spawns subprocess)
-             -> virSecurityMoveRememberedLabel
-
-In there due to !HAVE_LIBATTR virFileGetXAttrQuiet will return
-ENOSYS and from there the chain will error out.
-
-That is wrong and looks like:
-  libvirtd[6320]: internal error: child reported (status=125):
-  libvirtd[6320]: Unable to remove disk metadata on vm testguest from
-  /var/lib/uvtool/libvirt/images/testguest.qcow (disk target vda)
-
-This change makes virSecurityDACMoveImageMetadataHelper and
-virSecuritySELinuxMoveImageMetadataHelper accept that
-error code gracefully and in that sense it is an extension of:
-5214b2f1a3f "security: Don't skip label restore on file systems lacking XATTRs"
-which does the same for other call chains into the virFile*XAttr functions.
-
-cherry-pick from commit: 55029d93150e33d70b02b6de2b899c05054c5d3a
-
-Signed-off-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-Signed-off-by: Jin Yan <jinyan12@huawei.com>
----
- src/security/security_dac.c     | 6 ++++++
- src/security/security_selinux.c | 6 ++++++
- 2 files changed, 12 insertions(+)
-
-diff --git a/src/security/security_dac.c b/src/security/security_dac.c
-index 11fff63..51cabf1 100644
---- a/src/security/security_dac.c
-+++ b/src/security/security_dac.c
-@@ -1132,6 +1132,12 @@ virSecurityDACMoveImageMetadataHelper(pid_t pid G_GNUC_UNUSED,
- 
-     ret = virSecurityMoveRememberedLabel(SECURITY_DAC_NAME, data->src, data->dst);
-     virSecurityManagerMetadataUnlock(data->mgr, &state);
-+
-+    if (ret == -2) {
-+        /* Libvirt built without XATTRS */
-+        ret = 0;
-+    }
-+
-     return ret;
- }
- 
-diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c
-index 72d1658..78ea618 100644
---- a/src/security/security_selinux.c
-+++ b/src/security/security_selinux.c
-@@ -1990,6 +1990,12 @@ virSecuritySELinuxMoveImageMetadataHelper(pid_t pid G_GNUC_UNUSED,
- 
-     ret = virSecurityMoveRememberedLabel(SECURITY_SELINUX_NAME, data->src, data->dst);
-     virSecurityManagerMetadataUnlock(data->mgr, &state);
-+
-+    if (ret == -2) {
-+        /* Libvirt built without XATTRS */
-+        ret = 0;
-+    }
-+
-     return ret;
- }
- 
--- 
-1.8.3.1
-
diff --git a/libvirt-support-aarch64-vtpm-with-parameter-tpm-tis-.patch b/libvirt-support-aarch64-vtpm-with-parameter-tpm-tis-.patch
deleted file mode 100644
index 34488d6138cb0a3dc0f792120a991c7969d654bd..0000000000000000000000000000000000000000
--- a/libvirt-support-aarch64-vtpm-with-parameter-tpm-tis-.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-From 959bbbafc3ba59e2aa00b83c88fa84a32d500def Mon Sep 17 00:00:00 2001
-From: jiangfangjie <jiangfangjie@huawei.com>
-Date: Wed, 5 Aug 2020 12:54:43 +0800
-Subject: [PATCH] libvirt: support aarch64 vtpm with parameter tpm-tis-device
-
-Signed-off-by: jiangfangjie <jiangfangjie@huawei.com>
----
- src/conf/domain_conf.c       | 1 +
- src/conf/domain_conf.h       | 1 +
- src/qemu/qemu_capabilities.c | 8 ++++++++
- src/qemu/qemu_capabilities.h | 3 +++
- src/qemu/qemu_domain.c       | 3 +++
- 5 files changed, 16 insertions(+)
-
-diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
-index cf93a59..6192c08 100644
---- a/src/conf/domain_conf.c
-+++ b/src/conf/domain_conf.c
-@@ -1140,6 +1140,7 @@ VIR_ENUM_IMPL(virDomainTPMModel,
-               "tpm-tis",
-               "tpm-crb",
-               "tpm-spapr",
-+              "tpm-tis-device",
- );
- 
- VIR_ENUM_IMPL(virDomainTPMBackend,
-diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
-index 33875d9..a40773a 100644
---- a/src/conf/domain_conf.h
-+++ b/src/conf/domain_conf.h
-@@ -1274,6 +1274,7 @@ typedef enum {
-     VIR_DOMAIN_TPM_MODEL_TIS,
-     VIR_DOMAIN_TPM_MODEL_CRB,
-     VIR_DOMAIN_TPM_MODEL_SPAPR,
-+    VIR_DOMAIN_TPM_MODEL_TIS_DEVICE,
- 
-     VIR_DOMAIN_TPM_MODEL_LAST
- } virDomainTPMModel;
-diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
-index 73a8856..18bf37b 100644
---- a/src/qemu/qemu_capabilities.c
-+++ b/src/qemu/qemu_capabilities.c
-@@ -568,6 +568,9 @@ VIR_ENUM_IMPL(virQEMUCaps,
-               "blockdev-snapshot.allow-write-only-overlay",
-               "blockdev-reopen",
-               "storage.werror",
-+	      
-+              /* 360 */
-+              "tpm-tis-device",
-     );
- 
- 
-@@ -1285,6 +1288,7 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = {
-     { "rng-builtin", QEMU_CAPS_OBJECT_RNG_BUILTIN },
-     { "tpm-spapr", QEMU_CAPS_DEVICE_TPM_SPAPR },
-     { "vhost-user-fs-device", QEMU_CAPS_DEVICE_VHOST_USER_FS },
-+    { "tpm-tis-device", QEMU_CAPS_DEVICE_TPM_TIS_DEVICE },
- };
- 
- static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsVirtioBalloon[] = {
-@@ -3065,6 +3069,10 @@ const struct tpmTypeToCaps virQEMUCapsTPMModelsToCaps[] = {
-         .type = VIR_DOMAIN_TPM_MODEL_SPAPR,
-         .caps = QEMU_CAPS_DEVICE_TPM_SPAPR,
-     },
-+    {
-+	.type = VIR_DOMAIN_TPM_MODEL_TIS_DEVICE,
-+	.caps = QEMU_CAPS_DEVICE_TPM_TIS_DEVICE,
-+    },
- };
- 
- static int
-diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
-index 51ec1a5..8e16fc0 100644
---- a/src/qemu/qemu_capabilities.h
-+++ b/src/qemu/qemu_capabilities.h
-@@ -549,6 +549,9 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
-     QEMU_CAPS_BLOCKDEV_SNAPSHOT_ALLOW_WRITE_ONLY, /* blockdev-snapshot has the 'allow-write-only-overlay' feature */
-     QEMU_CAPS_BLOCKDEV_REOPEN, /* 'blockdev-reopen' qmp command is supported */
-     QEMU_CAPS_STORAGE_WERROR, /* virtio-blk,scsi-hd.werror */
-+    
-+    /* 360 */
-+    QEMU_CAPS_DEVICE_TPM_TIS_DEVICE, /* -device tpm-tis-device */
- 
-     QEMU_CAPS_LAST /* this must always be the last item */
- } virQEMUCapsFlags;
-diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
-index dd48b6f..b1a4647 100644
---- a/src/qemu/qemu_domain.c
-+++ b/src/qemu/qemu_domain.c
-@@ -8118,6 +8118,9 @@ qemuDomainDeviceDefValidateTPM(virDomainTPMDef *tpm,
-     case VIR_DOMAIN_TPM_MODEL_SPAPR:
-         flag = QEMU_CAPS_DEVICE_TPM_SPAPR;
-         break;
-+    case VIR_DOMAIN_TPM_MODEL_TIS_DEVICE:
-+        flag = QEMU_CAPS_DEVICE_TPM_TIS_DEVICE;
-+        break;
-     case VIR_DOMAIN_TPM_MODEL_LAST:
-     default:
-         virReportEnumRangeError(virDomainTPMModel, tpm->model);
--- 
-2.23.0
-
diff --git a/libvirt-systemd-start-libvirtd-after-firewalld-iptables-serv.patch b/libvirt-systemd-start-libvirtd-after-firewalld-iptables-serv.patch
deleted file mode 100644
index 8d359641157e30532f36020c63ba092cd27ef777..0000000000000000000000000000000000000000
--- a/libvirt-systemd-start-libvirtd-after-firewalld-iptables-serv.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-From 1ed313f35a4ac27ed29395ed30ec6e7966b798fd Mon Sep 17 00:00:00 2001
-From: Laine Stump <laine@redhat.com>
-Date: Fri, 1 May 2020 00:05:50 -0400
-Subject: [PATCH] systemd: start libvirtd after firewalld/iptables services
-
-When a system has enabled the iptables/ip6tables services rather than
-firewalld, there is no explicit ordering of the start of those
-services vs. libvirtd. This creates a problem when libvirtd.service is
-started before ip[6]tables, as the latter, when it finally is started,
-will remove all of the iptables rules that had previously been added
-by libvirt, including the custom chains where libvirt's rules are
-kept. This results in an error message similar to the following when a
-user subsequently tries to start a new libvirt network:
-
- "Error while activating network: Call to virNetworkCreate failed:
- internal error: Failed to apply firewall rules
- /usr/sbin/ip6tables -w --table filter --insert LIBVIRT_FWO \
-   --in-interface virbr2 --jump REJECT:
- ip6tables: No chain/target/match by that name."
-
-(Prior to logging this error, it also would have caused failure to
-forward (or block) traffic in some cases, e.g. for guests on a NATed
-network, since libvirt's rules to forward/block had all been deleted
-and libvirt didn't know about it, so it couldn't fix the problem)
-
-When this happens, the problem can be remedied by simply restarting
-libvirtd.service (which has the side-effect of reloading all
-libvirt-generated firewall rules)
-
-Instead, we can just explicitly stating in the libvirtd.service file
-that libvirtd.service should start after ip6tables.service and
-ip6tables.service, eliminating the race condition that leads to the
-error.
-
-There is also nothing (that I can see) in the systemd .service files
-to guarantee that firewalld.service will be started (if enabled) prior
-to libvirtd.service. The same error scenario given above would occur
-if libvirtd.service started before firewalld.service.  Even before
-that, though libvirtd would have detected that firewalld.service was
-disabled, and then turn off all firewalld support. So, for example,
-firewalld's libvirt zone wouldn't be used, and most likely traffic
-from guests would therefore be blocked (all with no external
-indication of the source of the problem other than a debug-level log
-when libvirtd was started saying that firewalld wasn't in use); also
-libvirtd wouldn't notice when firewalld reloaded its rules (which also
-simultaneously deletes all of libvirt's rules).
-
-I'm not aware of any reports that have been traced back to
-libvirtd.service starting before firewalld.service, but have seen that
-error reported multiple times, and also don't see an existing
-dependency that would guarantee firewalld.service starts before
-libvirtd.service, so it's possible it's been happening and we just
-haven't gotten to the bottom of it.
-
-This patch adds an After= line to the libvirtd.service file for each
-of iptables.service, ip6tables.service, and firewalld.servicee, which
-should guarantee that libvirtd.service isn't started until systemd has
-started whichever of the others is enabled.
-
-This race was diagnosed, and patch proposed, by Jason Montleon in
-https://bugzilla.redhat.com/1723698 . At the time (April 2019) danpb
-agreed with him that this change to libvirtd.service was a reasonable
-thing to do, but I guess everyone thought someone else was going to
-post a patch, so in the end nobody did.
-
-cherry-pick from commit: 0756415f147dda15a417bd79eef9a62027d176e6
-
-Signed-off-by: Laine Stump <laine@redhat.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-Signed-off-by: Jin Yan <jinyan12@huawei.com>
----
- src/network/virtnetworkd.service.in | 3 +++
- src/remote/libvirtd.service.in      | 3 +++
- 2 files changed, 6 insertions(+)
-
-diff --git a/src/network/virtnetworkd.service.in b/src/network/virtnetworkd.service.in
-index 656e8b4..56182e1 100644
---- a/src/network/virtnetworkd.service.in
-+++ b/src/network/virtnetworkd.service.in
-@@ -5,6 +5,9 @@ Requires=virtnetworkd.socket
- Requires=virtnetworkd-ro.socket
- Requires=virtnetworkd-admin.socket
- After=network.target
-+After=firewalld.service
-+After=iptables.service
-+After=ip6tables.service
- After=dbus.service
- After=apparmor.service
- After=local-fs.target
-diff --git a/src/remote/libvirtd.service.in b/src/remote/libvirtd.service.in
-index 90b2cad..cc0d4e3 100644
---- a/src/remote/libvirtd.service.in
-+++ b/src/remote/libvirtd.service.in
-@@ -11,6 +11,9 @@ Wants=libvirtd-admin.socket
- Wants=systemd-machined.service
- Before=libvirt-guests.service
- After=network.target
-+After=firewalld.service
-+After=iptables.service
-+After=ip6tables.service
- After=dbus.service
- After=iscsid.service
- After=apparmor.service
--- 
-1.8.3.1
-
diff --git a/libvirt-tests-add-baseline-test-cases-for-arm-CPU.patch b/libvirt-tests-add-baseline-test-cases-for-arm-CPU.patch
deleted file mode 100644
index 719a6a796b1dbf8a813338889554d029a91de367..0000000000000000000000000000000000000000
--- a/libvirt-tests-add-baseline-test-cases-for-arm-CPU.patch
+++ /dev/null
@@ -1,263 +0,0 @@
-From 89b60f0cefe533a5fda021fae303e7662c141d02 Mon Sep 17 00:00:00 2001
-From: Xu Yandong <xuyandong2@huawei.com>
-Date: Mon, 16 Oct 2017 17:45:48 +0800
-Subject: [PATCH 11/11] tests: add baseline test cases for arm CPU
-
-add baseline test cases for aarch64
-
-Signed-off-by: Xu Yandong <xuyandong2@huawei.com>
----
- tests/cputest.c                               |  7 +++++
- .../aarch64-baseline-incompatible-vendors.xml | 26 +++++++++++++++++++
- ...-baseline-no-compatible-feature-result.xml |  4 +++
- ...aarch64-baseline-no-compatible-feature.xml | 19 ++++++++++++++
- .../aarch64-baseline-no-feature-result.xml    |  4 +++
- .../aarch64-baseline-no-feature.xml           |  7 +++++
- .../cputestdata/aarch64-baseline-no-model.xml | 13 ++++++++++
- .../aarch64-baseline-no-vendor-result.xml     | 10 +++++++
- .../aarch64-baseline-no-vendor.xml            | 13 ++++++++++
- ...baseline-one-compatible-feature-result.xml |  5 ++++
- ...arch64-baseline-one-compatible-feature.xml | 20 ++++++++++++++
- .../aarch64-baseline-one-feature-result.xml   |  5 ++++
- .../aarch64-baseline-one-feature.xml          |  8 ++++++
- 13 files changed, 141 insertions(+)
- create mode 100644 tests/cputestdata/aarch64-baseline-incompatible-vendors.xml
- create mode 100644 tests/cputestdata/aarch64-baseline-no-compatible-feature-result.xml
- create mode 100644 tests/cputestdata/aarch64-baseline-no-compatible-feature.xml
- create mode 100644 tests/cputestdata/aarch64-baseline-no-feature-result.xml
- create mode 100644 tests/cputestdata/aarch64-baseline-no-feature.xml
- create mode 100644 tests/cputestdata/aarch64-baseline-no-model.xml
- create mode 100644 tests/cputestdata/aarch64-baseline-no-vendor-result.xml
- create mode 100644 tests/cputestdata/aarch64-baseline-no-vendor.xml
- create mode 100644 tests/cputestdata/aarch64-baseline-one-compatible-feature-result.xml
- create mode 100644 tests/cputestdata/aarch64-baseline-one-compatible-feature.xml
- create mode 100644 tests/cputestdata/aarch64-baseline-one-feature-result.xml
- create mode 100644 tests/cputestdata/aarch64-baseline-one-feature.xml
-
-diff --git a/tests/cputest.c b/tests/cputest.c
-index e4b4531..3657fa4 100644
---- a/tests/cputest.c
-+++ b/tests/cputest.c
-@@ -1194,6 +1194,13 @@ mymain(void)
-     DO_TEST_BASELINE(VIR_ARCH_PPC64, "same-model", 0, 0);
-     DO_TEST_BASELINE(VIR_ARCH_PPC64, "legacy", 0, -1);
- 
-+    DO_TEST_BASELINE(VIR_ARCH_AARCH64, "incompatible-vendors", 0, -1);
-+    DO_TEST_BASELINE(VIR_ARCH_AARCH64, "no-vendor", 0, 0);
-+    DO_TEST_BASELINE(VIR_ARCH_AARCH64, "no-feature", 0, 0);
-+    DO_TEST_BASELINE(VIR_ARCH_AARCH64, "one-feature", 0, 0);
-+    DO_TEST_BASELINE(VIR_ARCH_AARCH64, "no-compatible-feature", 0, 0);
-+    DO_TEST_BASELINE(VIR_ARCH_AARCH64, "one-compatible-feature", 0, 0);
-+
-     /* CPU features */
-     DO_TEST_HASFEATURE(VIR_ARCH_X86_64, "host", "vmx", YES);
-     DO_TEST_HASFEATURE(VIR_ARCH_X86_64, "host", "lm", YES);
-diff --git a/tests/cputestdata/aarch64-baseline-incompatible-vendors.xml b/tests/cputestdata/aarch64-baseline-incompatible-vendors.xml
-new file mode 100644
-index 0000000..f2c71a1
---- /dev/null
-+++ b/tests/cputestdata/aarch64-baseline-incompatible-vendors.xml
-@@ -0,0 +1,26 @@
-+<cpuTest>
-+<cpu>
-+  <arch>aarch64</arch>
-+  <model>cortex-a57</model>
-+  <vendor>ARM</vendor>
-+  <feature name='fp'/>
-+  <feature name='asimd'/>
-+  <feature name='aes'/>
-+  <feature name='pmull'/>
-+  <feature name='sha1'/>
-+  <feature name='sha2'/>
-+  <feature name='crc32'/>
-+</cpu>
-+<cpu>
-+  <arch>aarch64</arch>
-+  <model>cortex-a72</model>
-+  <vendor>Hisilicon</vendor>
-+  <feature name='fp'/>
-+  <feature name='asimd'/>
-+  <feature name='aes'/>
-+  <feature name='pmull'/>
-+  <feature name='sha1'/>
-+  <feature name='sha2'/>
-+  <feature name='crc32'/>
-+</cpu>
-+</cpuTest>
-diff --git a/tests/cputestdata/aarch64-baseline-no-compatible-feature-result.xml b/tests/cputestdata/aarch64-baseline-no-compatible-feature-result.xml
-new file mode 100644
-index 0000000..6db66aa
---- /dev/null
-+++ b/tests/cputestdata/aarch64-baseline-no-compatible-feature-result.xml
-@@ -0,0 +1,4 @@
-+<cpu mode='custom' match='exact'>
-+  <model fallback='forbid'>cortex-a57</model>
-+  <vendor>ARM</vendor>
-+</cpu>
-diff --git a/tests/cputestdata/aarch64-baseline-no-compatible-feature.xml b/tests/cputestdata/aarch64-baseline-no-compatible-feature.xml
-new file mode 100644
-index 0000000..5fd3228
---- /dev/null
-+++ b/tests/cputestdata/aarch64-baseline-no-compatible-feature.xml
-@@ -0,0 +1,19 @@
-+<cpuTest>
-+<cpu>
-+  <arch>aarch64</arch>
-+  <model>cortex-a57</model>
-+  <vendor>ARM</vendor>
-+  <feature name='fp'/>
-+  <feature name='asimd'/>
-+  <feature name='pmull'/>
-+  <feature name='sha2'/>
-+  <feature name='crc32'/>
-+</cpu>
-+<cpu>
-+  <arch>aarch64</arch>
-+  <model>cortex-a57</model>
-+  <vendor>ARM</vendor>
-+  <feature name='aes'/>
-+  <feature name='sha1'/>
-+</cpu>
-+</cpuTest>
-diff --git a/tests/cputestdata/aarch64-baseline-no-feature-result.xml b/tests/cputestdata/aarch64-baseline-no-feature-result.xml
-new file mode 100644
-index 0000000..6db66aa
---- /dev/null
-+++ b/tests/cputestdata/aarch64-baseline-no-feature-result.xml
-@@ -0,0 +1,4 @@
-+<cpu mode='custom' match='exact'>
-+  <model fallback='forbid'>cortex-a57</model>
-+  <vendor>ARM</vendor>
-+</cpu>
-diff --git a/tests/cputestdata/aarch64-baseline-no-feature.xml b/tests/cputestdata/aarch64-baseline-no-feature.xml
-new file mode 100644
-index 0000000..0d6af96
---- /dev/null
-+++ b/tests/cputestdata/aarch64-baseline-no-feature.xml
-@@ -0,0 +1,7 @@
-+<cpuTest>
-+<cpu>
-+  <arch>aarch64</arch>
-+  <model>cortex-a57</model>
-+  <vendor>ARM</vendor>
-+</cpu>
-+</cpuTest>
-diff --git a/tests/cputestdata/aarch64-baseline-no-model.xml b/tests/cputestdata/aarch64-baseline-no-model.xml
-new file mode 100644
-index 0000000..6033e4c
---- /dev/null
-+++ b/tests/cputestdata/aarch64-baseline-no-model.xml
-@@ -0,0 +1,13 @@
-+<cpuTest>
-+<cpu>
-+  <arch>aarch64</arch>
-+  <vendor>ARM</vendor>
-+  <feature name='fp'/>
-+  <feature name='asimd'/>
-+  <feature name='aes'/>
-+  <feature name='pmull'/>
-+  <feature name='sha1'/>
-+  <feature name='sha2'/>
-+  <feature name='crc32'/>
-+</cpu>
-+</cpuTest>
-diff --git a/tests/cputestdata/aarch64-baseline-no-vendor-result.xml b/tests/cputestdata/aarch64-baseline-no-vendor-result.xml
-new file mode 100644
-index 0000000..c1d74c2
---- /dev/null
-+++ b/tests/cputestdata/aarch64-baseline-no-vendor-result.xml
-@@ -0,0 +1,10 @@
-+<cpu mode='custom' match='exact'>
-+  <model fallback='forbid'>cortex-a57</model>
-+  <feature policy='require' name='fp'/>
-+  <feature policy='require' name='asimd'/>
-+  <feature policy='require' name='aes'/>
-+  <feature policy='require' name='pmull'/>
-+  <feature policy='require' name='sha1'/>
-+  <feature policy='require' name='sha2'/>
-+  <feature policy='require' name='crc32'/>
-+</cpu>
-diff --git a/tests/cputestdata/aarch64-baseline-no-vendor.xml b/tests/cputestdata/aarch64-baseline-no-vendor.xml
-new file mode 100644
-index 0000000..8aacb3e
---- /dev/null
-+++ b/tests/cputestdata/aarch64-baseline-no-vendor.xml
-@@ -0,0 +1,13 @@
-+<cpuTest>
-+<cpu>
-+  <arch>aarch64</arch>
-+  <model>cortex-a57</model>
-+  <feature name='fp'/>
-+  <feature name='asimd'/>
-+  <feature name='aes'/>
-+  <feature name='pmull'/>
-+  <feature name='sha1'/>
-+  <feature name='sha2'/>
-+  <feature name='crc32'/>
-+</cpu>
-+</cpuTest>
-diff --git a/tests/cputestdata/aarch64-baseline-one-compatible-feature-result.xml b/tests/cputestdata/aarch64-baseline-one-compatible-feature-result.xml
-new file mode 100644
-index 0000000..84c559d
---- /dev/null
-+++ b/tests/cputestdata/aarch64-baseline-one-compatible-feature-result.xml
-@@ -0,0 +1,5 @@
-+<cpu mode='custom' match='exact'>
-+  <model fallback='forbid'>cortex-a57</model>
-+  <vendor>ARM</vendor>
-+  <feature policy='require' name='sha1'/>
-+</cpu>
-diff --git a/tests/cputestdata/aarch64-baseline-one-compatible-feature.xml b/tests/cputestdata/aarch64-baseline-one-compatible-feature.xml
-new file mode 100644
-index 0000000..c85059b
---- /dev/null
-+++ b/tests/cputestdata/aarch64-baseline-one-compatible-feature.xml
-@@ -0,0 +1,20 @@
-+<cpuTest>
-+<cpu>
-+  <arch>aarch64</arch>
-+  <model>cortex-a57</model>
-+  <vendor>ARM</vendor>
-+  <feature name='fp'/>
-+  <feature name='asimd'/>
-+  <feature name='aes'/>
-+  <feature name='pmull'/>
-+  <feature name='sha1'/>
-+  <feature name='sha2'/>
-+  <feature name='crc32'/>
-+</cpu>
-+<cpu>
-+  <arch>aarch64</arch>
-+  <model>cortex-a57</model>
-+  <vendor>ARM</vendor>
-+  <feature name='sha1'/>
-+</cpu>
-+</cpuTest>
-diff --git a/tests/cputestdata/aarch64-baseline-one-feature-result.xml b/tests/cputestdata/aarch64-baseline-one-feature-result.xml
-new file mode 100644
-index 0000000..0fcea51
---- /dev/null
-+++ b/tests/cputestdata/aarch64-baseline-one-feature-result.xml
-@@ -0,0 +1,5 @@
-+<cpu mode='custom' match='exact'>
-+  <model fallback='forbid'>cortex-a57</model>
-+  <vendor>ARM</vendor>
-+  <feature policy='require' name='fp'/>
-+</cpu>
-diff --git a/tests/cputestdata/aarch64-baseline-one-feature.xml b/tests/cputestdata/aarch64-baseline-one-feature.xml
-new file mode 100644
-index 0000000..e0ae15f
---- /dev/null
-+++ b/tests/cputestdata/aarch64-baseline-one-feature.xml
-@@ -0,0 +1,8 @@
-+<cpuTest>
-+<cpu>
-+  <arch>aarch64</arch>
-+  <model>cortex-a57</model>
-+  <vendor>ARM</vendor>
-+  <feature name='fp'/>
-+</cpu>
-+</cpuTest>
--- 
-2.23.0
-
diff --git a/libvirt-tests-add-cpu-compare-test-cases-for-arm-CPU.patch b/libvirt-tests-add-cpu-compare-test-cases-for-arm-CPU.patch
deleted file mode 100644
index 9ed2f82c97cf38054b9ad84b2c837a2dd781d0ea..0000000000000000000000000000000000000000
--- a/libvirt-tests-add-cpu-compare-test-cases-for-arm-CPU.patch
+++ /dev/null
@@ -1,171 +0,0 @@
-From 8c57ff0e9b940eb1e29a4aa3e8a9d04b03424989 Mon Sep 17 00:00:00 2001
-From: Xu Yandong <xuyandong2@huawei.com>
-Date: Mon, 16 Oct 2017 17:55:48 +0800
-Subject: tests: add cpu compare test cases for arm CPU
-
-add cpu compare test cases for arm CPU
-
-Signed-off-by: Xu Yandong <xuyandong2@huawei.com>
----
- tests/cputest.c                                      | 10 ++++++++++
- .../aarch64-guest-compat-incompatible.xml            |  4 ++++
- tests/cputestdata/aarch64-guest-compat-none.xml      |  1 +
- tests/cputestdata/aarch64-guest-compat-valid.xml     |  3 +++
- tests/cputestdata/aarch64-guest-exact.xml            |  4 ++++
- tests/cputestdata/aarch64-guest-features-invalid.xml | 12 ++++++++++++
- tests/cputestdata/aarch64-guest-features-valid.xml   |  7 +++++++
- .../aarch64-guest-legacy-incompatible.xml            |  4 ++++
- tests/cputestdata/aarch64-guest-legacy.xml           |  4 ++++
- tests/cputestdata/aarch64-guest-strict.xml           |  4 ++++
- tests/cputestdata/aarch64-host.xml                   | 12 ++++++++++++
- 11 files changed, 65 insertions(+)
- create mode 100644 tests/cputestdata/aarch64-guest-compat-incompatible.xml
- create mode 100644 tests/cputestdata/aarch64-guest-compat-none.xml
- create mode 100644 tests/cputestdata/aarch64-guest-compat-valid.xml
- create mode 100644 tests/cputestdata/aarch64-guest-exact.xml
- create mode 100644 tests/cputestdata/aarch64-guest-features-invalid.xml
- create mode 100644 tests/cputestdata/aarch64-guest-features-valid.xml
- create mode 100644 tests/cputestdata/aarch64-guest-legacy-incompatible.xml
- create mode 100644 tests/cputestdata/aarch64-guest-legacy.xml
- create mode 100644 tests/cputestdata/aarch64-guest-strict.xml
- create mode 100644 tests/cputestdata/aarch64-host.xml
-
-diff --git a/tests/cputest.c b/tests/cputest.c
-index 1f59f0d..e4b4531 100644
---- a/tests/cputest.c
-+++ b/tests/cputest.c
-@@ -1140,6 +1140,16 @@ mymain(void)
-     DO_TEST_COMPARE(VIR_ARCH_PPC64, "host", "guest-compat-invalid", VIR_CPU_COMPARE_ERROR);
-     DO_TEST_COMPARE(VIR_ARCH_PPC64, "host", "guest-compat-incompatible", VIR_CPU_COMPARE_INCOMPATIBLE);
- 
-+    DO_TEST_COMPARE(VIR_ARCH_AARCH64, "host", "guest-strict", VIR_CPU_COMPARE_IDENTICAL);
-+    DO_TEST_COMPARE(VIR_ARCH_AARCH64, "host", "guest-exact", VIR_CPU_COMPARE_INCOMPATIBLE);
-+    DO_TEST_COMPARE(VIR_ARCH_AARCH64, "host", "guest-legacy", VIR_CPU_COMPARE_IDENTICAL);
-+    DO_TEST_COMPARE(VIR_ARCH_AARCH64, "host", "guest-legacy-incompatible", VIR_CPU_COMPARE_INCOMPATIBLE);
-+    DO_TEST_COMPARE(VIR_ARCH_AARCH64, "host", "guest-compat-none", VIR_CPU_COMPARE_IDENTICAL);
-+    DO_TEST_COMPARE(VIR_ARCH_AARCH64, "host", "guest-compat-valid", VIR_CPU_COMPARE_IDENTICAL);
-+    DO_TEST_COMPARE(VIR_ARCH_AARCH64, "host", "guest-compat-incompatible", VIR_CPU_COMPARE_INCOMPATIBLE);
-+    DO_TEST_COMPARE(VIR_ARCH_AARCH64, "host", "guest-features-valid", VIR_CPU_COMPARE_IDENTICAL);
-+    DO_TEST_COMPARE(VIR_ARCH_AARCH64, "host", "guest-features-invalid", VIR_CPU_COMPARE_INCOMPATIBLE);
-+
-     /* guest updates for migration
-      * automatically compares host CPU with the result */
-     DO_TEST_UPDATE(VIR_ARCH_X86_64, "host", "min", VIR_CPU_COMPARE_IDENTICAL);
-diff --git a/tests/cputestdata/aarch64-guest-compat-incompatible.xml b/tests/cputestdata/aarch64-guest-compat-incompatible.xml
-new file mode 100644
-index 0000000..f68ead5
---- /dev/null
-+++ b/tests/cputestdata/aarch64-guest-compat-incompatible.xml
-@@ -0,0 +1,4 @@
-+<cpu mode='custom'>
-+  <model>cortex-a72</model>
-+  <vendor>ARM</vendor>
-+</cpu>
-diff --git a/tests/cputestdata/aarch64-guest-compat-none.xml b/tests/cputestdata/aarch64-guest-compat-none.xml
-new file mode 100644
-index 0000000..fd50c03
---- /dev/null
-+++ b/tests/cputestdata/aarch64-guest-compat-none.xml
-@@ -0,0 +1 @@
-+<cpu mode='host-model'/>
-diff --git a/tests/cputestdata/aarch64-guest-compat-valid.xml b/tests/cputestdata/aarch64-guest-compat-valid.xml
-new file mode 100644
-index 0000000..0206d6e
---- /dev/null
-+++ b/tests/cputestdata/aarch64-guest-compat-valid.xml
-@@ -0,0 +1,3 @@
-+<cpu mode='host-model'>
-+  <model>cortex-a57</model>
-+</cpu>
-diff --git a/tests/cputestdata/aarch64-guest-exact.xml b/tests/cputestdata/aarch64-guest-exact.xml
-new file mode 100644
-index 0000000..bbbe65f
---- /dev/null
-+++ b/tests/cputestdata/aarch64-guest-exact.xml
-@@ -0,0 +1,4 @@
-+<cpu match='exact'>
-+  <model>cortex-a72</model>
-+  <vendor>ARM</vendor>
-+</cpu>
-diff --git a/tests/cputestdata/aarch64-guest-features-invalid.xml b/tests/cputestdata/aarch64-guest-features-invalid.xml
-new file mode 100644
-index 0000000..afbb402
---- /dev/null
-+++ b/tests/cputestdata/aarch64-guest-features-invalid.xml
-@@ -0,0 +1,12 @@
-+<cpu>
-+  <model>cortex-a57</model>
-+  <vendor>ARM</vendor>
-+  <feature name='fp'/>
-+  <feature name='asimd'/>
-+  <feature name='aes'/>
-+  <feature name='pmull'/>
-+  <feature name='sha1'/>
-+  <feature name='sha2'/>
-+  <feature name='crc32'/>
-+  <feature name='sha3'/>
-+</cpu>
-diff --git a/tests/cputestdata/aarch64-guest-features-valid.xml b/tests/cputestdata/aarch64-guest-features-valid.xml
-new file mode 100644
-index 0000000..0858f76
---- /dev/null
-+++ b/tests/cputestdata/aarch64-guest-features-valid.xml
-@@ -0,0 +1,7 @@
-+<cpu>
-+  <model>cortex-a57</model>
-+  <vendor>ARM</vendor>
-+  <feature name='asimd'/>
-+  <feature name='aes'/>
-+  <feature name='crc32'/>
-+</cpu>
-diff --git a/tests/cputestdata/aarch64-guest-legacy-incompatible.xml b/tests/cputestdata/aarch64-guest-legacy-incompatible.xml
-new file mode 100644
-index 0000000..2f1941d
---- /dev/null
-+++ b/tests/cputestdata/aarch64-guest-legacy-incompatible.xml
-@@ -0,0 +1,4 @@
-+<cpu mode='custom' match='exact'>
-+  <model fallback='allow'>cortex-a72</model>
-+  <vendor>ARM</vendor>
-+</cpu>
-diff --git a/tests/cputestdata/aarch64-guest-legacy.xml b/tests/cputestdata/aarch64-guest-legacy.xml
-new file mode 100644
-index 0000000..64a05e4
---- /dev/null
-+++ b/tests/cputestdata/aarch64-guest-legacy.xml
-@@ -0,0 +1,4 @@
-+<cpu mode='custom' match='exact'>
-+  <model fallback='allow'>cortex-a57</model>
-+  <vendor>ARM</vendor>
-+</cpu>
-diff --git a/tests/cputestdata/aarch64-guest-strict.xml b/tests/cputestdata/aarch64-guest-strict.xml
-new file mode 100644
-index 0000000..a057ebd
---- /dev/null
-+++ b/tests/cputestdata/aarch64-guest-strict.xml
-@@ -0,0 +1,4 @@
-+<cpu match='strict'>
-+  <model>cortex-a57</model>
-+  <vendor>ARM</vendor>
-+</cpu>
-diff --git a/tests/cputestdata/aarch64-host.xml b/tests/cputestdata/aarch64-host.xml
-new file mode 100644
-index 0000000..60c20f2
---- /dev/null
-+++ b/tests/cputestdata/aarch64-host.xml
-@@ -0,0 +1,12 @@
-+<cpu>
-+  <arch>aarch64</arch>
-+  <model>cortex-a57</model>
-+  <vendor>ARM</vendor>
-+  <feature name='fp'/>
-+  <feature name='asimd'/>
-+  <feature name='aes'/>
-+  <feature name='pmull'/>
-+  <feature name='sha1'/>
-+  <feature name='sha2'/>
-+  <feature name='crc32'/>
-+</cpu>
--- 
-2.23.0
-
diff --git a/libvirt-util-fix-iteration-in-virSocketAddrResolveService.patch b/libvirt-util-fix-iteration-in-virSocketAddrResolveService.patch
deleted file mode 100644
index f60a90519af2d4578b8a0bd2144289593fbd672e..0000000000000000000000000000000000000000
--- a/libvirt-util-fix-iteration-in-virSocketAddrResolveService.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 9056229f9dff923406d97f0ac295bd502eaa5265 Mon Sep 17 00:00:00 2001
-From: Nikolay Shirokovskiy <nshirokovskiy@virtuozzo.com>
-Date: Mon, 13 Apr 2020 16:48:43 +0300
-Subject: [PATCH 2/8] util: fix iteration in virSocketAddrResolveService
-
-getaddrinfo returns linked list. Fix iteration accordingly.
-
-Signed-off-by: Nikolay Shirokovskiy <nshirokovskiy@virtuozzo.com>
-Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
-(cherry-picked from commit a13ac587)
-Signed-off-by: AlexChen <alex.chen@huawei.com>
----
- src/util/virsocketaddr.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/util/virsocketaddr.c b/src/util/virsocketaddr.c
-index 4cad329d15..4c9f124e88 100644
---- a/src/util/virsocketaddr.c
-+++ b/src/util/virsocketaddr.c
-@@ -271,7 +271,7 @@ int virSocketAddrResolveService(const char *service)
-             port = ntohs(in.sin6_port);
-             goto cleanup;
-         }
--        tmp++;
-+        tmp = tmp->ai_next;
-     }
- 
-     virReportError(VIR_ERR_SYSTEM_ERROR,
--- 
-2.23.0
-
diff --git a/libvirt-util-virdaemon-fix-waiting-for-child-processes.patch b/libvirt-util-virdaemon-fix-waiting-for-child-processes.patch
deleted file mode 100644
index b397b89cad79e22f3922aaeca8a7f850e81cdc32..0000000000000000000000000000000000000000
--- a/libvirt-util-virdaemon-fix-waiting-for-child-processes.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 66ee42dc1a3a1445fed97c000f949ae0455bf948 Mon Sep 17 00:00:00 2001
-From: Rafael Fonseca <r4f4rfs@gmail.com>
-Date: Tue, 21 Apr 2020 15:55:46 +0800
-Subject: util: virdaemon: fix waiting for child processes
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Unlike `waitpid`, `virProcessWait` only returns -1 (error) or 0
-(success), so comparing that to `pid` will always be false and the
-parent will report failure with:
-
-error : main:851 : Failed to fork as daemon: No such file or directory
-
-even though the grandchild process is succesfully running. Note that the
-errno message is misleading: it was last set when trying to find a
-restart state file.
-
-Signed-off-by: Rafael Fonseca <r4f4rfs@gmail.com>
-Reported-by: Marcin Krol <hawk@tld-linux.org>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Signed-off-by: Ján Tomko <jtomko@redhat.com>
-(cherry-picked from commit a87e4788d2ee3d74cef5679d2961689d4e4a96a3)
-Signed-off-by: Xu Yandong <xuyandong2@huawei.com>
----
- src/util/virdaemon.c | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/src/util/virdaemon.c b/src/util/virdaemon.c
-index 5d92c7d..99530fd 100644
---- a/src/util/virdaemon.c
-+++ b/src/util/virdaemon.c
-@@ -97,15 +97,14 @@ virDaemonForkIntoBackground(const char *argv0)
-     default:
-         {
-             /* parent */
--            int got, exitstatus = 0;
-+            int exitstatus = 0;
-             int ret;
-             char status;
- 
-             VIR_FORCE_CLOSE(statuspipe[1]);
- 
-             /* We wait to make sure the first child forked successfully */
--            if ((got = virProcessWait(pid, &exitstatus, 0)) < 0 ||
--                got != pid ||
-+            if (virProcessWait(pid, &exitstatus, 0) < 0 ||
-                 exitstatus != 0) {
-                 goto error;
-             }
--- 
-2.23.0
-
diff --git a/libvirt-virDevMapperGetTargetsImpl-quit-early-if-device-is-n.patch b/libvirt-virDevMapperGetTargetsImpl-quit-early-if-device-is-n.patch
deleted file mode 100644
index b5b5268c9588ed62ba656047e249576ff487fde1..0000000000000000000000000000000000000000
--- a/libvirt-virDevMapperGetTargetsImpl-quit-early-if-device-is-n.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From c279162d6d335d4302a74c1e19dbce8eaff75679 Mon Sep 17 00:00:00 2001
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Fri, 24 Apr 2020 13:17:51 +0200
-Subject: [PATCH] virDevMapperGetTargetsImpl: quit early if device is not a
- devmapper target
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-As suggested in the linked bug, libvirt should firstly check
-whether the major number of the device is device mapper major.
-Because if it isn't subsequent DM_DEVICE_DEPS task may not only
-fail, but also yield different results. In the bugzilla this is
-demonstrated by creating a devmapper target named 'loop0' and
-then creating loop target /dev/loop0. When the latter is then
-passed to a domain, our virDevMapperGetTargetsImpl() function
-blindly asks devmapper to provide target dependencies for
-/dev/loop0 and because of the way devmapper APIs work, it will
-'sanitize' the input by using the last component only which is
-'loop0' and thus return different results than expected.
-
-Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1823976
-
-cherry-pick from commit: 01626c668ecfbe465d18799ac4628e6127ea1d47
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Signed-off-by: Jin Yan <jinyan12@huawei.com>
----
- src/util/virdevmapper.c | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/src/util/virdevmapper.c b/src/util/virdevmapper.c
-index feb5982..79dbc3d 100644
---- a/src/util/virdevmapper.c
-+++ b/src/util/virdevmapper.c
-@@ -64,6 +64,7 @@ virDevMapperGetTargetsImpl(const char *path,
-                            char ***devPaths_ret,
-                            unsigned int ttl)
- {
-+    struct stat sb;
-     struct dm_task *dmt = NULL;
-     struct dm_deps *deps;
-     struct dm_info info;
-@@ -82,6 +83,15 @@ virDevMapperGetTargetsImpl(const char *path,
-         return ret;
-     }
- 
-+    if (stat(path, &sb) < 0) {
-+        if (errno == ENOENT)
-+            return 0;
-+        return -1;
-+    }
-+
-+    if (!dm_is_dm_major(major(sb.st_dev)))
-+        return 0;
-+
-     if (!(dmt = dm_task_create(DM_DEVICE_DEPS))) {
-         if (errno == ENOENT || errno == ENODEV) {
-             /* It's okay. Kernel is probably built without
--- 
-1.8.3.1
-
diff --git a/libvirt-virNetDevGetFamilyId-Change-signature.patch b/libvirt-virNetDevGetFamilyId-Change-signature.patch
deleted file mode 100644
index 2a0330c880189139b252cea34a169eef09d3dbba..0000000000000000000000000000000000000000
--- a/libvirt-virNetDevGetFamilyId-Change-signature.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-From 56635fe00f44f8c83ba059432d42c093be4e9ed8 Mon Sep 17 00:00:00 2001
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Sun, 19 Apr 2020 08:26:04 +0200
-Subject: [PATCH 6/8] virNetDevGetFamilyId: Change signature
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Introduced in v3.8.0-rc1~96, the virNetDevGetFamilyId() gets
-netlink family ID for passed family name (even though it's used
-only for getting "devlink" ID). Nevertheless, the function
-returns 0 on an error or if no family ID was found. This makes it
-harder for a caller to distinguish these two. Change the retval
-so that a negative value is returned upon error, zero is no ID
-found (but no error encountered) and a positive value is returned
-on successful translation.
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry-picked from commit ca616274)
-Signed-off-by: AlexChen <alex.chen@huawei.com>
----
- src/util/virnetdev.c | 23 +++++++++++++++--------
- 1 file changed, 15 insertions(+), 8 deletions(-)
-
-diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c
-index b465bdac2e..3431aaf6a9 100644
---- a/src/util/virnetdev.c
-+++ b/src/util/virnetdev.c
-@@ -3057,11 +3057,15 @@ virNetDevGetEthtoolFeatures(virBitmapPtr bitmap,
-  * This function supplies the devlink family id
-  *
-  * @family_name: the name of the family to query
-+ * @family_id: family ID
-  *
-- * Returns family id or 0 on failure.
-+ * Returns: 0 if no family was found,
-+ *          1 if family was found (@family_id is set),
-+ *         -1 otherwise
-  */
--static uint32_t
--virNetDevGetFamilyId(const char *family_name)
-+static int
-+virNetDevGetFamilyId(const char *family_name,
-+                     uint32_t *family_id)
- {
-     struct nl_msg *nl_msg = NULL;
-     struct nlmsghdr *resp = NULL;
-@@ -3072,7 +3076,7 @@ virNetDevGetFamilyId(const char *family_name)
-     };
-     struct nlattr *tb[CTRL_ATTR_MAX + 1] = {NULL, };
-     unsigned int recvbuflen;
--    uint32_t family_id = 0;
-+    int ret = -1;
- 
-     if (!(nl_msg = nlmsg_alloc_simple(GENL_ID_CTRL,
-                                       NLM_F_REQUEST | NLM_F_ACK))) {
-@@ -3098,15 +3102,18 @@ virNetDevGetFamilyId(const char *family_name)
-         goto cleanup;
-     }
- 
--    if (tb[CTRL_ATTR_FAMILY_ID] == NULL)
-+    if (tb[CTRL_ATTR_FAMILY_ID] == NULL) {
-+        ret = 0;
-         goto cleanup;
-+    }
- 
--    family_id = *(uint32_t *)RTA_DATA(tb[CTRL_ATTR_FAMILY_ID]);
-+    *family_id = *(uint32_t *)RTA_DATA(tb[CTRL_ATTR_FAMILY_ID]);
-+    ret = 1;
- 
-  cleanup:
-     nlmsg_free(nl_msg);
-     VIR_FREE(resp);
--    return family_id;
-+    return ret;
- }
- 
- 
-@@ -3140,7 +3147,7 @@ virNetDevSwitchdevFeature(const char *ifname,
-     int ret = -1;
-     uint32_t family_id;
- 
--    if ((family_id = virNetDevGetFamilyId(DEVLINK_GENL_NAME)) <= 0)
-+    if (virNetDevGetFamilyId(DEVLINK_GENL_NAME, &family_id) <= 0)
-         return ret;
- 
-     if ((is_vf = virNetDevIsVirtualFunction(ifname)) < 0)
--- 
-2.23.0
-
diff --git a/libvirt-virNetDevSwitchdevFeature-Make-failure-to-get-family.patch b/libvirt-virNetDevSwitchdevFeature-Make-failure-to-get-family.patch
deleted file mode 100644
index 2934d73cdb45cdd3e9a14cedc96e047900d41bd9..0000000000000000000000000000000000000000
--- a/libvirt-virNetDevSwitchdevFeature-Make-failure-to-get-family.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 7581a0bbd552d63d654a88f0ad2a68e99fa8b54a Mon Sep 17 00:00:00 2001
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Sun, 19 Apr 2020 07:25:34 +0200
-Subject: [PATCH 7/8] virNetDevSwitchdevFeature: Make failure to get
- 'family_id' non-fatal
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-I've just got a new machine and I'm still converging on the
-kernel config. Anyway, since I don't have enabled any of SRIO-V
-drivers, my kernel doesn't have NET_DEVLINK enabled (i.e.
-virNetDevGetFamilyId() returns 0). But this makes nodedev driver
-ignore all interfaces, because when enumerating all devices via
-udev, the control reaches virNetDevSwitchdevFeature() eventually
-and subsequently virNetDevGetFamilyId() which 'fails'. Well, it's
-not really a failure - the virNetDevSwitchdevFeature() stub
-simply returns 0.
-
-Also, move the call a few lines below, just around the place
-where it's needed.
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry-picked from commit 423664a6)
-Signed-off-by: AlexChen <alex.chen@huawei.com>
----
- src/util/virnetdev.c | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c
-index 3431aaf6a9..ff86aa1fc9 100644
---- a/src/util/virnetdev.c
-+++ b/src/util/virnetdev.c
-@@ -3146,9 +3146,7 @@ virNetDevSwitchdevFeature(const char *ifname,
-     int is_vf = -1;
-     int ret = -1;
-     uint32_t family_id;
--
--    if (virNetDevGetFamilyId(DEVLINK_GENL_NAME, &family_id) <= 0)
--        return ret;
-+    int rv;
- 
-     if ((is_vf = virNetDevIsVirtualFunction(ifname)) < 0)
-         return ret;
-@@ -3168,6 +3166,9 @@ virNetDevSwitchdevFeature(const char *ifname,
-         goto cleanup;
-     }
- 
-+    if ((rv = virNetDevGetFamilyId(DEVLINK_GENL_NAME, &family_id)) <= 0)
-+        return rv;
-+
-     if (!(nl_msg = nlmsg_alloc_simple(family_id,
-                                       NLM_F_REQUEST | NLM_F_ACK))) {
-         virReportOOMError();
--- 
-2.23.0
-
diff --git a/libvirt-virQEMUDriverConfigNew-Add-slash-to-cfg-defaultTLSx5.patch b/libvirt-virQEMUDriverConfigNew-Add-slash-to-cfg-defaultTLSx5.patch
deleted file mode 100644
index bb1ba2938a65e672a0c1b4481db6a715901edf43..0000000000000000000000000000000000000000
--- a/libvirt-virQEMUDriverConfigNew-Add-slash-to-cfg-defaultTLSx5.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From a34f1d6623f3fb1ec03982ef776e31a4b450158d Mon Sep 17 00:00:00 2001
-From: Peter Krempa <pkrempa@redhat.com>
-Date: Tue, 16 Jun 2020 12:36:55 +0200
-Subject: [PATCH] virQEMUDriverConfigNew: Add slash to
- cfg->defaultTLSx509certdir for non-embedded driver
-
-Commit 068efae5b1a9ef accidentally removed the slash.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1847234
-
-cherry-pick from commit: 8f58a4003532d5fffdadf2adc659c94eba3fa21a
-
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Andrea Bolognani <abologna@redhat.com>
-Signed-off-by: Jin Yan <jinyan12@huawei.com>
----
- src/qemu/qemu_conf.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
-index 15837ce..809e8fe 100644
---- a/src/qemu/qemu_conf.c
-+++ b/src/qemu/qemu_conf.c
-@@ -234,7 +234,7 @@ virQEMUDriverConfigPtr virQEMUDriverConfigNew(bool privileged,
-      * directory doesn't exist (although we don't check if this exists).
-      */
-     if (root == NULL) {
--        cfg->defaultTLSx509certdir = g_strdup(SYSCONFDIR "pki/qemu");
-+        cfg->defaultTLSx509certdir = g_strdup(SYSCONFDIR "/pki/qemu");
-     } else {
-         cfg->defaultTLSx509certdir = g_strdup_printf("%s/etc/pki/qemu", root);
-     }
--- 
-1.8.3.1
-
diff --git a/libvirt-virsh-Fix-return-code-for-dump-and-migrate.patch b/libvirt-virsh-Fix-return-code-for-dump-and-migrate.patch
deleted file mode 100644
index 96400a9d4e5e40d33fbefd12b5ac2cfc6fb95943..0000000000000000000000000000000000000000
--- a/libvirt-virsh-Fix-return-code-for-dump-and-migrate.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From 0009ad3497c09ecf45412511edf765f695a506dd Mon Sep 17 00:00:00 2001
-From: Andrea Bolognani <abologna@redhat.com>
-Date: Tue, 21 Apr 2020 19:06:16 +0200
-Subject: virsh: Fix return code for dump and migrate
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-When the job monitoring logic was refactored, these two commands
-were not converted properly and the result is that a successful
-dump or migration (char '0') would be reported as a failed one
-(int 48) instead.
-
-Fixes: dc0771cfa2e78ffecd7c8234538ee548748d7bef
-Reported-by: Brian Rak <brak@gameservers.com>
-Signed-off-by: Andrea Bolognani <abologna@redhat.com>
-Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
-(cherry-picked from commit 3169e06a2080bf3335d947de4d4f6235bf2f440d)
-Signed-off-by: Xu Yandong <xuyandong2@huawei.com>
----
- tools/virsh-domain.c | 10 +++-------
- 1 file changed, 3 insertions(+), 7 deletions(-)
-
-diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
-index 2dc7c38..afe360c 100644
---- a/tools/virsh-domain.c
-+++ b/tools/virsh-domain.c
-@@ -5436,7 +5436,6 @@ static const vshCmdOptDef opts_dump[] = {
- static void
- doDump(void *opaque)
- {
--    char ret = '1';
-     virshCtrlData *data = opaque;
-     vshControl *ctl = data->ctl;
-     const vshCmd *cmd = data->cmd;
-@@ -5508,7 +5507,7 @@ doDump(void *opaque)
-         }
-     }
- 
--    ret = '0';
-+    data->ret = 0;
-  out:
- #ifndef WIN32
-     pthread_sigmask(SIG_SETMASK, &oldsigmask, NULL);
-@@ -5516,7 +5515,6 @@ doDump(void *opaque)
- #endif /* !WIN32 */
-     if (dom)
-         virshDomainFree(dom);
--    data->ret = ret;
-     g_main_loop_quit(data->eventLoop);
- }
- 
-@@ -10722,7 +10720,6 @@ static const vshCmdOptDef opts_migrate[] = {
- static void
- doMigrate(void *opaque)
- {
--    char ret = '1';
-     virDomainPtr dom = NULL;
-     const char *desturi = NULL;
-     const char *opt = NULL;
-@@ -11001,14 +10998,14 @@ doMigrate(void *opaque)
- 
-     if (flags & VIR_MIGRATE_PEER2PEER || vshCommandOptBool(cmd, "direct")) {
-         if (virDomainMigrateToURI3(dom, desturi, params, nparams, flags) == 0)
--            ret = '0';
-+            data->ret = 0;
-     } else {
-         /* For traditional live migration, connect to the destination host directly. */
-         virDomainPtr ddom = NULL;
- 
-         if ((ddom = virDomainMigrate3(dom, dconn, params, nparams, flags))) {
-             virshDomainFree(ddom);
--            ret = '0';
-+            data->ret = 0;
-         }
-     }
- 
-@@ -11019,7 +11016,6 @@ doMigrate(void *opaque)
- #endif /* !WIN32 */
-     virTypedParamsFree(params, nparams);
-     virshDomainFree(dom);
--    data->ret = ret;
-     g_main_loop_quit(data->eventLoop);
-     return;
- 
--- 
-2.23.0
-
diff --git a/libvirt-virsh-Fix-return-code-for-dump.patch b/libvirt-virsh-Fix-return-code-for-dump.patch
deleted file mode 100644
index a30711b18047e9c9d22531cb25be31b91943745c..0000000000000000000000000000000000000000
--- a/libvirt-virsh-Fix-return-code-for-dump.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 3e4b15eb78b5815ad4101644efc37bd2bab6608e Mon Sep 17 00:00:00 2001
-From: Xu Yandong <xuyandong2@huawei.com>
-Date: Mon, 4 May 2020 16:36:19 +0800
-Subject: [PATCH] virsh: Fix return code for dump
-
-After the commit dc0771c, ret variable no longer
-represents the status of the return code, use
-data->ret replace it.
-
-Signed-off-by: Xu Yandong <xuyandong2@huawei.com>
----
- tools/virsh-domain.c | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
-index afe360c..0a62308 100644
---- a/tools/virsh-domain.c
-+++ b/tools/virsh-domain.c
-@@ -5522,7 +5522,6 @@ static bool
- cmdDump(vshControl *ctl, const vshCmd *cmd)
- {
-     virDomainPtr dom;
--    bool ret = false;
-     bool verbose = false;
-     const char *name = NULL;
-     const char *to = NULL;
-@@ -5556,12 +5555,12 @@ cmdDump(vshControl *ctl, const vshCmd *cmd)
- 
-     virThreadJoin(&workerThread);
- 
--    if (!ret)
-+    if (!data.ret)
-         vshPrintExtra(ctl, _("\nDomain %s dumped to %s\n"), name, to);
- 
-  cleanup:
-     virshDomainFree(dom);
--    return !ret;
-+    return !data.ret;
- }
- 
- static const vshCmdInfo info_screenshot[] = {
--- 
-2.23.0
-
diff --git a/libvirt-virstoragetest-testBackingParse-Use-VIR_DOMAIN_DEF_F.patch b/libvirt-virstoragetest-testBackingParse-Use-VIR_DOMAIN_DEF_F.patch
deleted file mode 100644
index 53b8078dad5d24a9bce06036c5f04142a9300499..0000000000000000000000000000000000000000
--- a/libvirt-virstoragetest-testBackingParse-Use-VIR_DOMAIN_DEF_F.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 18c86b74537561ab926f1b5b71a1eea7ae5d0bcb Mon Sep 17 00:00:00 2001
-From: rpm-build <rpm-build>
-Date: Tue, 4 Aug 2020 09:09:04 +0000
-Subject: [PATCH] virstoragetest: testBackingParse: Use
- VIR_DOMAIN_DEF_FORMAT_SECURE when formatting xml
-
-We want to format even the secure information in tests.
-
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Erik Skultety <eskultet@redhat.com>
-(cherry-picked from commit 524de6cc35d3b222f0e940bb0fd027f5482572c5)
-Signed-off-by: Xu Yandong <xuyandong2@huawei.com>
----
- tests/virstoragetest.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/tests/virstoragetest.c b/tests/virstoragetest.c
-index 6e8ebeb..6d2b21c 100644
---- a/tests/virstoragetest.c
-+++ b/tests/virstoragetest.c
-@@ -594,6 +594,7 @@ testBackingParse(const void *args)
-     g_autoptr(virStorageSource) src = NULL;
-     int rc;
-     int erc = data->rv;
-+    unsigned int xmlformatflags = VIR_DOMAIN_DEF_FORMAT_SECURE;
- 
-     /* expect failure return code with NULL expected data */
-     if (!data->expect)
-@@ -613,7 +614,7 @@ testBackingParse(const void *args)
-         return -1;
-     }
- 
--    if (virDomainDiskSourceFormat(&buf, src, "source", 0, false, 0, true, NULL) < 0 ||
-+    if (virDomainDiskSourceFormat(&buf, src, "source", 0, false, xmlformatflags, true, NULL) < 0 ||
-         !(xml = virBufferContentAndReset(&buf))) {
-         fprintf(stderr, "failed to format disk source xml\n");
-         return -1;
--- 
-2.25.4
-
diff --git a/libvirt.spec b/libvirt.spec
index c681a93d031b456f5b5664465d0526f70d42de85..99a74e830139ba7fab250cec238791fbca7c7b53 100644
--- a/libvirt.spec
+++ b/libvirt.spec
@@ -1,26 +1,55 @@
 # -*- rpm-spec -*-
 
-# Default to skipping autoreconf.  Distros can change just this one line
-# (or provide a command-line override) if they backport any patches that
-# touch configure.ac or Makefile.am.
-%{!?enable_autotools:%global enable_autotools 1}
+# This spec file assumes you are building on a Fedora or RHEL version
+# that's still supported by the vendor. It may work on other distros
+# or versions, but no effort will be made to ensure that going forward.
+%define min_rhel 8
+%define min_fedora 37
+
+%define arches_qemu_kvm         %{ix86} x86_64 %{power64} %{arm} aarch64 s390x
+%if 0%{?rhel}
+    %if 0%{?rhel} > 8
+        %define arches_qemu_kvm     x86_64 aarch64 s390x
+    %else
+        %define arches_qemu_kvm     x86_64 %{power64} aarch64 s390x
+    %endif
+%endif
+
+%define arches_64bit            x86_64 %{power64} aarch64 s390x riscv64
+%define arches_x86              %{ix86} x86_64
+
+%define arches_systemtap_64bit  %{arches_64bit}
+%define arches_dmidecode        %{arches_x86}
+%define arches_xen              %{arches_x86} aarch64
+%if 0%{?fedora}
+    %define arches_xen          x86_64 aarch64
+%endif
+%define arches_vbox             %{arches_x86}
+%define arches_ceph             %{arches_64bit}
+%define arches_zfs              %{arches_x86} %{power64} %{arm}
+%define arches_numactl          %{arches_x86} %{power64} aarch64 s390x
+%define arches_numad            %{arches_x86} %{power64} aarch64
 
 # The hypervisor drivers that run in libvirtd
 %define with_qemu          0%{!?_without_qemu:1}
 %define with_lxc           0%{!?_without_lxc:0}
 %define with_libxl         0%{!?_without_libxl:0}
 %define with_vbox          0%{!?_without_vbox:0}
+%define with_client_qemu   0%{!?_without_client_qemu:0}
 
-%define with_qemu_tcg      %{with_qemu}
-
-%define qemu_kvm_arches %{ix86} x86_64 aarch64 loongarch64 riscv64
-
-%ifarch %{qemu_kvm_arches}
+%ifarch %{arches_qemu_kvm}
     %define with_qemu_kvm      %{with_qemu}
 %else
     %define with_qemu_kvm      0
 %endif
 
+%define with_qemu_tcg      %{with_qemu}
+
+# RHEL disables TCG on all architectures
+%if 0%{?rhel}
+    %define with_qemu_tcg 0
+%endif
+
 %if ! %{with_qemu_tcg} && ! %{with_qemu_kvm}
     %define with_qemu 0
 %endif
@@ -33,477 +62,259 @@
 
 # Then the secondary host drivers, which run inside libvirtd
 %define with_storage_rbd      0%{!?_without_storage_rbd:1}
-%define with_storage_sheepdog 0%{!?_without_storage_sheepdog:0}
-%define with_storage_gluster 0%{!?_without_storage_gluster:1}
-
-%define with_numactl          0%{!?_without_numactl:1}
 
-# Numactl is not available on many non-x86 archs
-%ifarch %{arm} riscv64
-    %define with_numactl 0
+%define with_storage_gluster 0%{!?_without_storage_gluster:1}
+%if 0%{?rhel}
+    # Glusterfs has been dropped in RHEL-9, and before that
+    # was only enabled on arches where KVM exists
+    %if 0%{?rhel} > 8
+        %define with_storage_gluster 0
+    %else
+        %ifnarch %{arches_qemu_kvm}
+            %define with_storage_gluster 0
+        %endif
+    %endif
 %endif
 
-%define with_storage_zfs      0%{!?_without_storage_zfs:1}
-%ifarch aarch64 x86_64 loongarch64 riscv64
-    %define with_storage_zfs 0
+# Fedora has zfs-fuse
+%if 0%{?fedora}
+    %define with_storage_zfs      0%{!?_without_storage_zfs:1}
+%else
+    %define with_storage_zfs      0
 %endif
 
-%define arg_dtrace --without-dtrace
-
-# We need a recent enough libiscsi (>= 1.18.0)
 %define with_storage_iscsi_direct 0%{!?_without_storage_iscsi_direct:1}
+# libiscsi has been dropped in RHEL-9
+%if 0%{?rhel} > 8
+    %define with_storage_iscsi_direct 0
+%endif
+
+# Other optional features
+%define with_numactl          0%{!?_without_numactl:1}
 
 # A few optional bits off by default, we enable later
-%define with_fuse          0%{!?_without_fuse:0}
-%define with_sanlock       0%{!?_without_sanlock:1}
-%define with_numad         0%{!?_without_numad:0}
-%define with_firewalld     0%{!?_without_firewalld:1}
-%define with_firewalld_zone 0%{!?_without_firewalld_zone:1}
-%define with_libssh2       0%{!?_without_libssh2:1}
-%define with_wireshark     0%{!?_without_wireshark:1}
-%define with_libssh        0%{!?_without_libssh:1}
-%define with_bash_completion  0%{!?_without_bash_completion:1}
+%define with_fuse             0
+%define with_sanlock          1
+%define with_numad            0
+%define with_nbdkit           0
+%define with_firewalld_zone   1
+%define with_netcf            0
+%define with_libssh2          1
+%define with_wireshark        1
+%define with_libssh           1
+%define with_dmidecode        0
 
 # Finally set the OS / architecture specific special cases
 
-# Xen is available only on i386 x86_64 ia64
-%ifnarch %{ix86} x86_64 ia64
+# Architecture-dependent features
+%ifnarch %{arches_xen}
     %define with_libxl 0
 %endif
+%ifnarch %{arches_vbox}
+    %define with_vbox 0
+%endif
+%ifnarch %{arches_numactl}
+    %define with_numactl 0
+%endif
+%ifnarch %{arches_zfs}
+    %define with_storage_zfs 0
+%endif
+%ifnarch %{arches_ceph}
+    %define with_storage_rbd 0
+%endif
 
-# vbox is available only on i386 x86_64
-%ifnarch %{ix86} x86_64
+# RHEL doesn't ship many hypervisor drivers
+%if 0%{?rhel}
+    %define with_openvz 0
     %define with_vbox 0
+    %define with_vmware 0
+    %define with_libxl 0
+    %define with_hyperv 0
+    %define with_lxc 0
+%endif
+
+%define with_firewalld_zone 0%{!?_without_firewalld_zone:1}
+
+%if 0%{?rhel} && 0%{?rhel} < 9
+    %define with_netcf 0%{!?_without_netcf:1}
+%endif
+
+# fuse is used to provide virtualized /proc for LXC
+%if %{with_lxc}
+    %define with_fuse      0%{!?_without_fuse:0}
 %endif
 
-%define with_bash_completion  0%{!?_without_bash_completion:1}
+# Enable sanlock library for lock management with QEMU
+# Sanlock is available only on arches where kvm is available for RHEL
+%if 0%{?fedora}
+    %define with_sanlock 0%{!?_without_sanlock:1}
+%endif
+%if 0%{?rhel}
+    %ifarch %{arches_qemu_kvm}
+        %define with_sanlock 0%{!?_without_sanlock:1}
+    %endif
+%endif
+
+# Enable libssh2 transport for new enough distros
+%if 0%{?fedora}
+    %define with_libssh2 0%{!?_without_libssh2:1}
+%endif
 
-# Enable wireshark plugins for all distros shipping libvirt 1.2.2 or newer
+# Enable wireshark plugins for all distros
+%define with_wireshark 0%{!?_without_wireshark:1}
 %define wireshark_plugindir %(pkg-config --variable plugindir wireshark)/epan
 
+# Enable libssh transport for all distros
+%define with_libssh 0%{!?_without_libssh:1}
+
 %if %{with_qemu} || %{with_lxc}
 # numad is used to manage the CPU and memory placement dynamically,
 # it's not available on many non-x86 architectures.
-    %ifnarch s390 s390x %{arm} riscv64
+    %ifarch %{arches_numad}
         %define with_numad    0%{!?_without_numad:1}
     %endif
 %endif
 
+# We should only enable nbdkit support if the OS ships a SELinux policy that
+# allows libvirt to launch it. Right now that's not the case anywhere, but
+# things should be fine by the time Fedora 40 is released.
+#
+# TODO: add RHEL 9 once a minor release that contains the necessary SELinux
+#       bits exists (we only support the most recent minor release)
+%if %{with_qemu}
+    %if 0%{?fedora} >= 40
+        %define with_nbdkit 0%{!?_without_nbdkit:1}
+    %endif
+%endif
+
+%ifarch %{arches_dmidecode}
+    %define with_dmidecode 0%{!?_without_dmidecode:1}
+%endif
+
+%define with_modular_daemons 0
+%if 0%{?fedora} || 0%{?rhel} >= 9
+    %define with_modular_daemons 1
+%endif
+
 # Force QEMU to run as non-root
 %define qemu_user  qemu
 %define qemu_group  qemu
 
-%define enable_werror --enable-werror
+# Locations for QEMU data
+%define qemu_moddir %{_libdir}/qemu
+%define qemu_datadir %{_datadir}/qemu
+
+# Native / MinGW builds
+%define with_native 0%{!?_without_native:1}
+
+%define with_mingw32 0
+%define with_mingw64 0
+
+%if 0%{?fedora}
+    %if 0%{!?_without_mingw:1}
+        %define with_mingw32 0%{!?_without_mingw32:1}
+        %define with_mingw64 0%{!?_without_mingw64:1}
+    %endif
+
+    # These tell the other mingw macros whether to perform or
+    # skip the 32-bit and 64-bit specific steps respectively
+    %define mingw_build_win32 %{with_mingw32}
+    %define mingw_build_win64 %{with_mingw64}
+%endif
+
+%if !%{with_native}
+    # Building the debugsource package apparently only works if the
+    # native build is enabled. debuginfo packages don't have this
+    # problem and setting this doesn't disable them
+    %global debug_package %{nil}
+%endif
+
+# RHEL releases provide stable tool chains and so it is safe to turn
+# compiler warning into errors without being worried about frequent
+# changes in reported warnings
+%if 0%{?rhel}
+    %define enable_werror -Dwerror=true
+%else
+    %define enable_werror -Dwerror=false -Dgit_werror=disabled
+%endif
 
 %define tls_priority "@LIBVIRT,SYSTEM"
 
+# libvirt 8.1.0 stops distributing any sysconfig files.
+# If the user has customized their sysconfig file,
+# the RPM upgrade path will rename it to .rpmsave
+# because the file is no longer managed by RPM.
+# To prevent a regression we rename it back after the
+# transaction to preserve the user's modifications
+%define libvirt_sysconfig_pre() \
+    for sc in %{?*} ; do \
+        test -f "%{_sysconfdir}/sysconfig/${sc}.rpmsave" || continue ; \
+        mv -v "%{_sysconfdir}/sysconfig/${sc}.rpmsave" "%{_sysconfdir}/sysconfig/${sc}.rpmsave.old" ; \
+    done \
+    %{nil}
+%define libvirt_sysconfig_posttrans() \
+    for sc in %{?*} ; do \
+        test -f "%{_sysconfdir}/sysconfig/${sc}.rpmsave" || continue ; \
+        mv -v "%{_sysconfdir}/sysconfig/${sc}.rpmsave" "%{_sysconfdir}/sysconfig/${sc}" ; \
+    done \
+    %{nil}
 
 Summary: Library providing a simple virtualization API
 Name: libvirt
-Version: 6.2.0
-Release: 60
+Version: 9.10.0
+Release: 8
 License: LGPLv2+
 URL: https://libvirt.org/
 
 %if %(echo %{version} | grep -q "\.0$"; echo $?) == 1
     %define mainturl stable_updates/
 %endif
-Source: https://libvirt.org/sources/%{?mainturl}libvirt-%{version}.tar.xz
-Patch0000: libvirt-qemu-fix-potential-memory-leak.patch
-Patch0001: libvirt-qemu-add-pointer-check-in-qemuMonitorLastError.patch
-Patch0002: libvirt-qemu-fix-a-concurrent-operation-situation.patch
-Patch0003: libvirt-cgroup-cleanup-eventParams-when-virTypedParamsAddULL.patch
-Patch0004: libvirt-nodedev-fix-potential-heap-use-after-free.patch
-Patch0005: libvirt-po-Refresh-translation-for-running-state.patch
-Patch0006: libvirt-cpu_map-Introduce-arm-CPU-models.patch
-Patch0007: libvirt-cpu-introduce-virCPUarmData-to-virCPUData.patch
-Patch0008: libvirt-cpu-arm-add-cpu-data-free-function-to-virCPUarmDataF.patch
-Patch0009: libvirt-cpu-arm-add-load-cpu-map-parse-function.patch
-Patch0010: libvirt-cpu-arm-add-decode-function.patch
-Patch0011: libvirt-cpu-arm-add-virCPUarmGetHost-implment.patch
-Patch0012: libvirt-cpu-arm-implment-cpu-baseline-function.patch
-Patch0013: libvirt-cpu-arm-implment-cpu-compare-function.patch
-Patch0014: libvirt-tests-add-cpu-compare-test-cases-for-arm-CPU.patch
-Patch0015: libvirt-tests-add-baseline-test-cases-for-arm-CPU.patch
-Patch0016: libvirt-util-virdaemon-fix-waiting-for-child-processes.patch
-Patch0017: libvirt-virsh-Fix-return-code-for-dump-and-migrate.patch
-Patch0018: libvirt-virsh-Fix-return-code-for-dump.patch
-Patch0019: libvirt-cpu-aarch64-enable-host-model-cpu-for-AArch64-archit.patch
-Patch0020: libvirt-cpu_map-add-kunpeng-920-features-as-known-features.patch
-Patch0021: libvirt-Substitute-security_context_t-with-char.patch
-Patch0022: libvirt-conf-Don-t-format-http-cookies-unless-VIR_DOMAIN_DEF.patch
-Patch0023: libvirt-virstoragetest-testBackingParse-Use-VIR_DOMAIN_DEF_F.patch
-Patch0024: libvirt-support-aarch64-vtpm-with-parameter-tpm-tis-.patch
-Patch0025: libvirt-tests-commandtest-skip-the-test4-if-the-testcase-is-.patch
-Patch0026: libvirt-remote-fix-driver-name-check-for-libxl-driver.patch
-Patch0027: libvirt-systemd-start-libvirtd-after-firewalld-iptables-serv.patch
-Patch0028: libvirt-qemuDomainCleanupRun-Actually-run-cleanup-callbacks-.patch
-Patch0029: libvirt-virDevMapperGetTargetsImpl-quit-early-if-device-is-n.patch
-Patch0030: libvirt-qemu-only-stop-external-devices-after-the-domain.patch
-Patch0031: libvirt-qemuDomainStorageSourcePrivateDispose-Free-httpcooki.patch
-Patch0032: libvirt-Don-t-require-secdrivers-to-implement-.domainMoveIma.patch
-Patch0033: libvirt-qemuProcessStop-Use-XATTRs-to-restore-seclabels-on-d.patch
-Patch0034: libvirt-qemuProcessStop-Reattach-NVMe-disks-a-domain-is-mirr.patch
-Patch0035: libvirt-security-don-t-fail-if-built-without-attr-support.patch
-Patch0036: libvirt-qemu-Skip-pre-creation-of-NVMe-disks.patch
-Patch0037: libvirt-Fix-some-wrong-usage-of-ATTRIBUTE_NONNULL.patch
-Patch0038: libvirt-conf-Increase-cpuset-length-limit-for-CPU-pinning.patch
-Patch0039: libvirt-virQEMUDriverConfigNew-Add-slash-to-cfg-defaultTLSx5.patch
-Patch0040: libvirt-qemuDomainSetNumaParamsLive-set-nodeset-for-root-cgr.patch
-Patch0041: libvirt-qemu-do-not-add-model-when-actual-iface-type-is-host.patch
-Patch0042: libvirt-qemu-pre-create-the-dbus-directory-in-qemuStateIniti.patch
-Patch0043: libvirt-conf-vmx-check-for-OOM-after-calling-xmlBufferCreate.patch
-Patch0044: libvirt-leaseshelper-Wait-to-acquire-PID-file.patch
-Patch0045: libvirt-leaseshelper-Report-more-errors.patch
-Patch0046: libvirt-qemuBuildMemoryBackendProps-Use-boolean-type-for-pme.patch
-Patch0047: libvirt-qemu-format-ramfb-attribute-for-mediated-devices.patch
-Patch0048: libvirt-resctrl-Do-not-open-directory-for-writing.patch
-Patch0049: libvirt-libxl-fix-crash-when-initializing-driver.patch
-Patch0050: libvirt-util-fix-iteration-in-virSocketAddrResolveService.patch
-Patch0051: libvirt-qemu-fix-hang-in-p2p-xbzrle-compression-parallel-mig.patch
-Patch0052: libvirt-qemu-Revoke-access-to-mirror-on-failed-blockcopy.patch
-Patch0053: libvirt-qemuDomainDefPostParse-Fail-if-unable-to-fill-machin.patch
-Patch0054: libvirt-virNetDevGetFamilyId-Change-signature.patch
-Patch0055: libvirt-virNetDevSwitchdevFeature-Make-failure-to-get-family.patch
-Patch0056: libvirt-qemuDomainGetUnplugTimeout-Add-G_GNUC_NO_INLINE.patch
-Patch0057: rpc-gendispatch-handle-empty-flags.patch
-Patch0058: rpc-add-support-for-filtering-acls-by-uint-params.patch
-Patch0059: rpc-require-write-acl-for-guest-agent-in-virDomainIn.patch
-Patch0060: qemu-agent-set-ifname-to-NULL-after-freeing.patch
-Patch0061: util-Move-virIsDevMapperDevice-to-virdevmapper.c.patch
-Patch0062: virdevmapper-Don-t-use-libdevmapper-to-obtain-depend.patch
-Patch0063: libvirt-Add-retry-support-for-error-policy.patch
-Patch0064: qemu-Support-retry-BLOCK_IO_ERROR-event.patch
-Patch0065: add-phytium-2000plus-and-s2500-support-on-arm-archit.patch
-Patch0066: libvirt-conf-Set-default-values-of-retry-fileds.patch
-Patch0067: tests-fix-stat-mocking-with-Fedora-rawhide.patch
-Patch0068: cpu_map-Add-Cooperlake-x86-CPU-model.patch
-Patch0069: cpu_map-Add-pschange-mc-no-bit-in-IA32_ARCH_CAPABILI.patch
-Patch0070: cpu_map-Distribute-x86_Cooperlake.xml.patch
-Patch0071: Don-t-cache-device-mapper-major.patch
-Patch0072: virdevmapper-Handle-kernel-without-device-mapper-sup.patch
-Patch0073: virDevMapperGetTargets-Don-t-ignore-EBADF.patch
-Patch0074: conf-domain_conf-pin-the-retry_interval-and-retry_ti.patch
-Patch0075: storage_driver-Unlock-object-on-ACL-fail-in-storageP.patch
-Patch0076: security-fix-SELinux-label-generation-logic.patch
-Patch0077: Hotpatch-introduce-DomainHotpatchManage-API.patch
-Patch0078: hotpatch-Implement-qemuDomainHotpatchManage.patch
-Patch0079: hotpatch-introduce-hotpatch-async-job-flag.patch
-Patch0080: hotpatch-implement-hotpatch-virsh-api.patch
-Patch0081: hotpatch-check-vm-id-and-pid-before-using-hotpatch-a.patch
-Patch0082: domain-add-logs-for-virDomainHotpatchManage.patch
-Patch0083: docs-build-Don-t-include-stylesheet-in-intermediate-.patch
-Patch0084: tests-Replace-deprecated-ASN1-code.patch
-Patch0085: tests-disabale-storage-tests.patch
-Patch0086: Revert-tests-disabale-storage-tests.patch
-Patch0087: hotpatch-virsh-support-autoload-mode.patch
-Patch0088: virQEMUBuildCommandLineJSON-Allow-skipping-certain-k.patch
-Patch0089: virQEMUBuildCommandLineJSON-Add-possibility-for-usin.patch
-Patch0090: util-virqemu-Introduce-virQEMUBuildNetdevCommandline.patch
-Patch0091: util-json-Introduce-virJSONValueObjectAppendStringPr.patch
-Patch0092: qemuBuildChannelsCommandLine-Use-typecasted-switch-f.patch
-Patch0093: qemuBuildChannelsCommandLine-Extract-common-formatti.patch
-Patch0094: qemuBuildChannelChrDeviceStr-Remove-formatting-of-pr.patch
-Patch0095: qemuMonitorJSON-Add-Remove-Netdev-Refactor-cleanup.patch
-Patch0096: qemuBuildHostNetStr-Stop-using-ipv6-net-convenience-.patch
-Patch0097: qemu-command-Generate-netdev-command-line-via-JSON-c.patch
-Patch0098: qemuBuildChannelGuestfwdNetdevProps-Convert-to-gener.patch
-Patch0099: qemuMonitorAddNetdev-Convert-to-the-native-JSON-prop.patch
-Patch0100: virCommand-Introduce-virCommandGetArgList.patch
-Patch0101: testutilsqemuschema-Introduce-testQEMUSchemaValidate.patch
-Patch0102: testCompareXMLToArgv-Split-out-preparation-and-comma.patch
-Patch0103: virQEMUBuildNetdevCommandlineFromJSON-Prepare-for-qu.patch
-Patch0104: qemu-Prepare-for-testing-of-netdev_add-props-via-qem.patch
-Patch0105: qemuxml2argvtest-Add-QAPI-QMP-schema-validation-for-.patch
-Patch0106: qemu-Probe-for-a-few-params-supported-by-migrate-set.patch
-Patch0107: qemu-Avoid-deprecated-migrate_set_speed-QMP-command.patch
-Patch0108: qemu-Avoid-deprecated-migrate_set_downtime-QMP-comma.patch
-Patch0109: qemu-Avoid-deprecated-query-migrate-cache-size-QMP-c.patch
-Patch0110: qemu-Avoid-deprecated-migrate-set-cache-size-QMP-com.patch
-Patch0111: qemu-Track-numa-mem-supported-machine-attribute.patch
-Patch0112: qemuBuildNumaArgStr-Switch-order-of-if-and-for.patch
-Patch0113: qemuBuildNumaArgStr-Use-modern-numa-memdev-if-old-nu.patch
-Patch0114: Revert-libvirt-support-aarch64-vtpm-with-parameter-t.patch
-Patch0115: qemu-Fix-swtpm-device-with-aarch64.patch
-Patch0116: qemu-Fix-libvirt-hang-due-to-early-TPM-device-stop.patch
-Patch0117: qemu_tpm-Move-logfile-path-generation-into-a-separat.patch
-Patch0118: qemu_tpm-Generate-log-file-path-among-with-storage-p.patch
-Patch0119: virtpm-Fix-path-handling-in-virTPMEmulatorInit.patch
-Patch0120: qemuMonitorJSONSetMigrationParams-Take-double-pointe.patch
-Patch0121: qemuMonitorJSONAddObject-Take-double-pointer-for-pro.patch
-Patch0122: qemuMonitorJSONMakeCommandInternal-Clear-arguments-w.patch
-Patch0123: qemuMonitorAddObject-Fix-semantics-of-alias.patch
-Patch0124: qemuMonitorAddObject-Refactor-cleanup.patch
-Patch0125: util-json-Replace-virJSONValueObjectSteal-by-virJSON.patch
-Patch0126: qemu-command-Generate-commandline-of-masterKey0-secr.patch
-Patch0127: qemu-command-Generate-commandline-of-sev0-sev-guest-.patch
-Patch0128: qemu-command-Generate-commandline-of-iothread-object.patch
-Patch0129: qemu-capabilities-Introduce-QEMU_CAPS_OBJECT_QAPIFIE.patch
-Patch0130: qemu-monitor-Make-wrapping-of-props-of-object-add-op.patch
-Patch0131: qemuMonitorCreateObjectPropsWrap-Open-code-in-qemuBu.patch
-Patch0132: qemu-monitor-Don-t-add-props-wrapper-if-qemu-has-QEM.patch
-Patch0133: qemu-command-Use-JSON-for-QAPIfied-object-directly.patch
-Patch0134: tests-qemuxml2argv-Validate-generation-of-JSON-props.patch
-Patch0135: qemu-capabilities-Enable-detection-of-QEMU_CAPS_OBJE.patch
-Patch0136: apparmor-Permit-new-capabilities-required-by-libvirt.patch
-Patch0137: virsh-Display-vhostuser-socket-path-in-domblklist.patch
-Patch0138: sw_64-Add-sw64-architecture-support.patch
-Patch0139: src-workaround-warning-triggered-in-glib-2.69.patch
-Patch0140: nwfilter-fix-crash-when-counting-number-of-network-f.patch
-Patch0141: apibuild-Fix-self.waring-method-call.patch
-Patch0142: qemu-Add-missing-lock-in-qemuProcessHandleMonitorEOF.patch
-Patch0143: util-avoid-race-in-releasing-the-GSource-in-event-th.patch
-Patch0144: test-Fix-memory-leak-in-testParseXMLDocFromFile.patch
-Patch0145: lxc-Fix-memory-leak-in-virLXCControllerPopulateDevic.patch
-Patch0146: util-Fix-memory-leak-in-virAuthConfigLookup.patch
-Patch0147: util-Fix-memory-leak-in-virAuthGetCredential.patch
-Patch0148: qemu_security-Complete-renaming-of-virSecurityManage.patch
-Patch0149: virSecurityManagerMetadataLock-Ignore-RO-filesystem.patch
-Patch0150: virSecurityManagerMetadataLock-Clarify-directory-loc.patch
-Patch0151: qemu-Use-qemuSecurityDomainSetPathLabel-to-set-secla.patch
-Patch0152: qemu-Drop-unused-qemuSecuritySetSavedStateLabel.patch
-Patch0153: qemu-don-t-shutdown-event-thread-in-monitor-EOF-call.patch
-Patch0154: cpu_map-Fix-Icelake-Server-model-number.patch
-Patch0155: rpc-avoid-crash-when-system-time-jump-back.patch
-Patch0156: check-for-NULL-before-calling-g_regex_unref.patch
-Patch0157: qemu_monitor-Document-qemuMonitorUnregister.patch
-Patch0158: storageBackendProbeTarget-Don-t-fail-if-backing-stor.patch
-Patch0159: virPipeImpl-Don-t-overwrite-error.patch
-Patch0160: virBufferAdd-Ensure-that-the-buffer-is-initialized-a.patch
-Patch0161: qemuMigrationSrcRun-Don-t-jump-to-exit_monitor-from-.patch
-Patch0162: util-Fix-error-reporting-in-virnetlink.patch
-Patch0163: locking-Resolve-mem-leak-in-virLockDaemonPreExecRest.patch
-Patch0164: qemu_conf-Fix-double-free-problem-for-cfg-firmwares.patch
-Patch0165: qemuDomainCheckpointLoad-Don-t-align-disks-when-rest.patch
-Patch0166: leaseshelper-Report-errors-on-failure.patch
-Patch0167: networkGetDHCPLeases-Use-VIR_APPEND_ELEMENT-instead-.patch
-Patch0168: qemuFirmwareFillDomain-Fill-NVRAM-template-on-migrat.patch
-Patch0169: disk-storage-fix-allocation-size-for-pool-format-dos.patch
-Patch0170: qemu-qemuDomainPMSuspendAgent-Don-t-assign-to-ret-in.patch
-Patch0171: tests-avoid-close-of-bad-file-handle-in-commandtest.patch
-Patch0172: util-event-check-return-value-of-virInitialize.patch
-Patch0173: rpc-socket-properly-call-virSetCloseExec.patch
-Patch0174: virsh-do-not-return-bool-in-virshNetworkPortUUIDComp.patch
-Patch0175: logging-fix-endless-loop-on-EOF.patch
-Patch0176: vircommand.c-write-child-pidfile-before-process-tuni.patch
-Patch0177: virsocketaddr-Zero-netmask-in-virSocketAddrPrefixToN.patch
-Patch0178: logging-read-all-bytes-on-EOF-in-event-handler.patch
-Patch0179: libvirt-ensure-defresult-is-used-in-virConnectAuthCa.patch
-Patch0180: qemu-firmware-check-virJSONValueObjectGet-return-val.patch
-Patch0181: qemu-qemuDomainPMSuspendForDuration-Check-availabili.patch
-Patch0182: virNodeDevPCICapSRIOVVirtualParseXML-fix-memleak-of-.patch
-Patch0183: qemu-snapshot-Collect-query-named-block-nodes-prior-.patch
-Patch0184: virsh-completer-use-signed-variable-for-XPathNodeSet.patch
-Patch0185: virt-login-shell-correctly-calculate-string-length.patch
-Patch0186: qemu-avoid-maybe-uninitialized-warning-by-GCC-10.patch
-Patch0187: tools-avoid-potential-null-pointer-dereference-by-GC.patch
-Patch0188: storage-avoid-maybe-uninitialized-warning-by-GCC-10.patch
-Patch0189: virnuma-Don-t-work-around-numa_node_to_cpus-for-non-.patch
-Patch0190: virsh-guest-agent-timeout-set-default-value-for-opti.patch
-Patch0191: conf-properly-clear-out-autogenerated-macvtap-names-.patch
-Patch0192: storage_util-fix-qemu-img-sparse-allocation.patch
-Patch0193: vahDeinit-Fix-memory-leak.patch
-Patch0194: virnetdevbridge-Ignore-EEXIST-when-adding-an-entry-t.patch
-Patch0195: securityselinuxhelper-Fix-retval-of-setcon_raw-and-s.patch
-Patch0196: virCapabilitiesHostNUMAInitReal-Free-cpus-properly.patch
-Patch0197: vsh-fix-memory-leak-in-vshCommandParse.patch
-Patch0198: qemu_interface-Fix-cfg-refcounting-in-qemuInterfaceP.patch
-Patch0199: qemuBlockJobProcessEventCompletedPull-Avoid-dangling.patch
-Patch0200: qemuBlockJobProcessEventCompletedPull-Add-backingSto.patch
-Patch0201: nodedev-Signal-initCond-with-driver-locked.patch
-Patch0202: nodedev-Mark-device-initialization-complete-even-in-.patch
-Patch0203: cmdCheckpointList-Fix-memory-leak.patch
-Patch0204: cmdSnapshotList-Fix-memory-leak.patch
-Patch0205: virshCheckpointListCollect-Do-not-pass-NULL-to-qsort.patch
-Patch0206: qemu-blockjob-Transition-into-ready-state-only-from-.patch
-Patch0207: qemu-fix-crash-in-qemuDomainSetBlkioParameters-witho.patch
-Patch0208: domain_capabilities-Assert-enums-fit-into-unsigned-i.patch
-Patch0209: domain_conf.c-do-not-leak-video-in-virDomainDefParse.patch
-Patch0210: conf-Use-unsigned-long-long-for-timer-frequency.patch
-Patch0211: parthelper-Don-t-leak-canonical_path.patch
-Patch0212: parthelper-Initialize-error-object.patch
-Patch0213: qemu-fix-qemuMigrationSrcCleanup-to-use-qemuMigratio.patch
-Patch0214: util-Avoid-double-free-in-virProcessSetAffinity.patch
-Patch0215: util-fix-very-old-bug-typo-in-virNetDevParseVfInfo.patch
-Patch0216: domain_conf-fix-NULL-dereference-on-error-in-virDoma.patch
-Patch0217: testutils-call-va_end-before-return.patch
-Patch0218: qemu-Don-t-cache-domCaps-in-virQEMUDriverGetDomainCa.patch
-Patch0219: network-Introduce-mutex-for-bridge-name-generation.patch
-Patch0220: hostdev-Update-mdev-pointer-reference-after-checking.patch
-Patch0221: hostdev-mdev-Lookup-mdevs-by-sysfs-path-rather-than-.patch
-Patch0222: util-new-function-virSkipToDigit.patch
-Patch0223: util-Skip-over-any-extra-verbiage-preceding-version-.patch
-Patch0224: qemuMigrationSrcNBDStorageCopyReady-Use-ready-state-.patch
-Patch0225: qemuBlockJobEventProcess-Always-clear-mirrorState-wh.patch
-Patch0226: qemu-Fix-memstat-for-non-transitional-memballoon.patch
-Patch0227: virsh-Fix-XPATH-in-virshDomainDeviceAliasCompleter.patch
-Patch0228: virsh-domain-Fix-error-handling-of-pthread_sigmask.patch
-Patch0229: qemu_driver-increase-recorded-counter-for-disk-block.patch
-Patch0230: qemu_capabilities-Don-t-leak-str-in-virQEMUCapsLoadM.patch
-Patch0231: qemu_process-Release-domain-seclabel-later-in-qemuPr.patch
-Patch0232: nodedev-Don-t-crash-when-exiting-before-init-is-done.patch
-Patch0233: domain_cgroup.c-update-domain-after-setting-blkio.we.patch
-Patch0234: virCPUDefFindFeature-Make-first-argument-const-ptr.patch
-Patch0235: qemuOpenFileAs-Move-into-util-virqemu.c.patch
-Patch0236: Don-t-call-qsort-over-NULL.patch
-Patch0237: virFileReadLimFD-Cast-maxlen-to-size_t-before-adding.patch
-Patch0238: virnuma-Use-numa_nodes_ptr-when-checking-available-N.patch
-Patch0239: testutils-Don-t-leak-testBitmap-and-failedTests.patch
-Patch0240: tests-Don-t-leak-cpu-defs.patch
-Patch0241: virsh-snapshot-Don-t-leak-then-in-cmdSnapshotList.patch
-Patch0242: util-virIdentitySetCurrent-only-unref-the-old-identi.patch
-Patch0243: vireventglib-Remove-handles-with-the-highest-priorit.patch
-Patch0244: qemu-Do-not-pass-negative-ncpus-to-virCapabilitiesCl.patch
-Patch0245: qemu_agent-Rework-domain-object-locking-when-opening.patch
-Patch0246: util-virExec-may-blocked-by-reading-pipe-if-grandchi.patch
-Patch0247: util-fix-cache-invalidation-of-swtpm-capabilities.patch
-Patch0248: virnettlscontext-Drop-gnutls_dh_set_prime_bits.patch
-Patch0249: virnettlscontext-Don-t-pass-static-key-length-to-gnu.patch
-Patch0250: rpc-Fix-memory-leak-of-fds.patch
-Patch0251: migration-dirtyrate-Introduce-virDomainStartDirtyRat.patch
-Patch0252: migration-dirtyrate-Implement-qemuDomainStartDirtyRa.patch
-Patch0253: migration-dirtyrate-Introduce-domdirtyrate-calc-virs.patch
-Patch0254: migration-dirtyrate-Introduce-virDomainDirtyRateStat.patch
-Patch0255: migration-dirtyrate-Implement-qemuMonitorQueryDirtyR.patch
-Patch0256: migration-dirtyrate-Extend-dirtyrate-statistics-for-.patch
-Patch0257: migration-dirtyrate-Introduce-command-virsh-domstats.patch
-Patch0258: docs-Fix-template-matching-in-page.xsl.patch
-Patch0259: vircgroupv1-fix-null-string-specifier-argument-in-vi.patch
-Patch0260: qemu-fix-null-string-specifier-argument-in-qemuDomai.patch
-Patch0261: qemu-fix-domain-start-with-corrupted-save-file.patch
-Patch0262: qemu-fix-bad-indentation-for-qemuDomainNVRAMPathForm.patch
-Patch0263: util-fix-syslog-facility-value.patch
-Patch0264: util-set-facility-when-opening-syslog-channel.patch
-Patch0265: qemu-fix-memleak-in-qemuDomainAttachDeviceLive.patch
-Patch0266: mdev-Fix-daemon-crash-when-reattaching-mdevs-on-assi.patch
-Patch0267: Fix-allocation-of-virDomainFSDef.patch
-Patch0268: virsh-Fix-typo-of-metadata.patch
-Patch0269: virsh-cmdBlock-Remove-error-prefix-for-an-empty-line.patch
-Patch0270: vshtabletest-Fix-potential-memleak.patch
-Patch0271: vircgroupv2devices-fix-counting-entries-in-BPF-map.patch
-Patch0272: node_device_udev.h-Drop-unused-macro.patch
-Patch0273: qemu-fix-conversion-specifier-in-qemuBuildVsockDevPr.patch
-Patch0274: checkpoint-Fix-a-typo-of-comments.patch
-Patch0275: qemu_driver-Fix-indentation-in-qemuDomainGetStatsVcp.patch
-Patch0276: vmx-Require-networkName-for-bridged-and-custom-NICs.patch
-Patch0277: nodedev-wait-a-bit-longer-for-new-node-devices.patch
-Patch0278: bash-completion-fix-variable-leaks-of-word.patch
-Patch0279: util-Drop-pointless-NUL_TERMINATE-macro.patch
-Patch0280: virDomainCheckpointCreateXML-Don-t-use-HTML-in-funct.patch
-Patch0281: qemuMigrationSrcWaitForSpice-Remove-return-value.patch
-Patch0282: virsh-cmdScreenshot-fix-cbdata-passing-to-virshStrea.patch
-Patch0283: client-fix-memory-leak-in-client-msg.patch
-Patch0284: tests-Fix-false-positive-in-testConfRoundTrip.patch
-Patch0285: hyperv-fix-the-number-of-threads-per-core.patch
-Patch0286: virCgroupKillRecursive-Return-1-on-failure-condition.patch
-Patch0287: tests-Fix-lstat-mock-initialization-on-macOS.patch
-Patch0288: storagepoolxml2argvtest-Reorder-gluster-arguments.patch
-Patch0289: libvirt-guests-Sync-time-for-autostarted-guests.patch
-Patch0290: cpu_ppc64-compare-CPU-function-is-ignoring-return-va.patch
-Patch0291: security_util-Don-t-error-on-macOS-when-getting-sett.patch
-Patch0292: vsh-Fix-completion-error-in-case-of-multiple-mac-add.patch
-Patch0293: qemu-Do-not-require-TSC-frequency-to-strictly-match-.patch
-Patch0294: qemu_alias-introduce-qemuDomainGetVhostUserAlias-hel.patch
-Patch0295: docs-introduces-new-vhostuser-disk-type.patch
-Patch0296: conf-implement-support-for-vhostuser-disk.patch
-Patch0297: qemu_capabilities-introduce-vhost-user-blk-capabilit.patch
-Patch0298: qemu-implement-vhost-user-blk-support.patch
-Patch0299: qemu_command-remove-redundant-scsi-option-in-vhost-u.patch
-Patch0300: lxc-fix-error-value-of-lxcNodeGetSecurityModel.patch
-Patch0301: examples-hellolibvirt-fix-argc-check.patch
-Patch0302: virsh-domain-fix-mistake-in-cmdMigrateSetMaxDowntime.patch
-Patch0303: vbox_network-fix-possible-memory-leak-in-vboxNetwork.patch
-Patch0304: lxc-Fix-syntax-error-in-lxcNodeGetSecurityModel.patch
-Patch0305: qemu_command-Don-t-validate-accelerator-when-buildin.patch
-Patch0306: qemu-Switch-to-accel.patch
-Patch0307: tests-qemuxml2argvdata-qtests-switch-to-accel.patch
-Patch0308: tests-Fix-vhostuser-args-file.patch
-Patch0309: qemu_capabilities-Fix-incorrect-alignment.patch
-Patch0310: qemu_driver-Acquire-MODIFY-job-in-qemuDomainStartDir.patch
-Patch0311: qemu_capabilities-Introduce-QEMU_CAPS_CALC_DIRTY_RAT.patch
-Patch0312: qemu_driver-Probe-capability-before-calculating-dirt.patch
-Patch0313: qemu_capabilities-Introduce-QEMU_CAPS_DIRTYRATE_MODE.patch
-Patch0314: include-Introduce-virDomainDirtyRateCalcFlags.patch
-Patch0315: qemu_driver-Add-mode-parameter-to-qemuDomainStartDir.patch
-Patch0316: update-the-Chinese-translation-of-nwfilter.patch
-Patch0317: migration-migration-pin-add-some-migration-multiFd-p.patch
-Patch0318: migration-migration-pin-add-qemu-monitor-callback-fu.patch
-Patch0319: migration-migration-pin-add-migrationpin-for-migrati.patch
-Patch0320: migration-migration-pin-add-domainMigrationPid-for-q.patch
-Patch0321: migration-multifd-pin-add-qemu-monitor-callback-func.patch
-Patch0322: migration-multifd-pin-support-migration-multifd-thre.patch
-Patch0323: virInterfaceDefDevFormat-Add-missing-error-handling.patch
-Patch0324: tests-Report-expected-monitor-command-for-simulated-.patch
-Patch0325: testutils-Terminate-usage-string-with-a-new-line.patch
-Patch0326: qemuxml2-argv-xml-data-x86-kvm-32-on-64-Add-machine-.patch
-Patch0327: qemuDomainPinIOThread-Update-live-definition-after-p.patch
-Patch0328: qemu-Log-which-API-is-trying-to-acquire-a-job.patch
-Patch0329: qemuxml2argvtest-disk-vhostuser-Add-invocation-for-q.patch
-Patch0330: qemuDomainAttachHostPCIDevice-Fix-coding-style.patch
-Patch0331: test_driver-Don-t-leak-group_name.patch
-Patch0332: virnwfilterbindingobj-Fix-virNWFilterBindingObjNew.patch
-Patch0333: conf-validate-serial-port-model-in-ABI-checks.patch
-Patch0334: qemu-Validate-domain-definition-even-on-migration.patch
-Patch0335: enum-Add-helpers-for-converting-virTristate-to-a-pla.patch
-Patch0336: qemu-fix-formatting-of-pflash-readonly-attribute.patch
-Patch0337: qemu-do-crash-safe-creation-of-NVRAM-file.patch
-Patch0338: virNetDevOpenvswitchUpdateVlan-fix-vlan-tag-update-e.patch
-Patch0339: virNetDevOpenvswitchUpdateVlan-Use-space-for-indenta.patch
-Patch0340: virbuftest-Increase-coverage.patch
-Patch0341: tests-add-test-case-for-NVRAM-with-template.patch
-Patch0342: tests-add-explicit-test-case-for-pflash-loader-lacki.patch
-Patch0343: tests-Update-IPv4-in-IPv6-addresses.patch
-Patch0344: sockettest-Check-for-IPv4-in-IPv6-parsing-and-format.patch
-Patch0345: vircgroupmock-Be-wiser-about-detecting-fakerootdir-c.patch
-Patch0346: tests-Allow-expansion-of-mocked-stat-symbols.patch
-Patch0347: virsh-fflush-stdout-after-fputs.patch
-Patch0348: qemu_cgroup-Drop-ENOENT-special-case-for-RNG-devices.patch
-Patch0349: virConnectDomainEventRegisterAny-correct-docs.patch
-Patch0350: virsh-Fix-integer-overflow-in-allocpages.patch
-Patch0351: virNWFilterObjListFree-Prevent-null-pointer-derefern.patch
-Patch0352: qemu-fix-one-more-race-on-undefining-and-create.patch
-Patch0353: remote_daemon-Don-t-run-virStateCleanup-if-virStateR.patch
-Patch0354: virDomainInputDefValidate-Validate-model.patch
-Patch0355: virsh-Check-whether-enough-arguments-was-passed-to-i.patch
-Patch0356: virNetDevSaveNetConfig-Pass-mode-to-virFileWriteStr.patch
-Patch0357: live_migrate-virsh-migrate-command-supports-the-zstd.patch
-Patch0358: glibcompat-Provide-implementation-for-G_GNUC_NO_INLI.patch
-Patch0359: bugfix-move-the-check-function-qemuDomainDiskBlockIo.patch
-Patch0360: Add-loongarch-cpu-support.patch
-Patch0361: Add-loongarch-cpu-model-and-vendor-info.patch
-Patch0362: Config-some-capabilities-for-loongarch-virt-machine.patch
-Patch0363: Implement-the-method-of-getting-host-info-for-loonga.patch
-Patch0364: backport-virhostcpu-Fix-build-with-clang-and-newest-kernel-he.patch
-Patch0365: backport-meson-drop-debug_logs-configure-argument.patch
-Patch0366: backport-vshCommandStringGetArg-Drop-sz.patch
-Patch0367: bugfix-fix-warnings-found-by-clang.patch
-Patch0368: Fix-potential-crash-during-driver-cleanup.patch
-Patch0369: nodedev-ignore-EINVAL-from-libudev-in-udevEventHandl.patch
-Patch0370: qemu-tpm-Pass-logfile-to-swtpm_setup-for-incoming-mi.patch
-Patch0371: cpu_topo-support-for-cpu_topo-clusters-in-conf.patch
-Patch0372: cpu_topo-support-for-specifying-clusters-in-qemu-com.patch
-Patch0373: cpu_topo-support-for-reporting-cluster_id-in-NUMA-to.patch
-Patch0374: cpu_topo-fix-detection-of-vCPU-pids-when-multiple-cl.patch
-Patch0375: fix-error-in-printf-format-string.patch
-Patch0376: selinux-adapt-to-libselinux.patch
-Patch0377: Revert-selinux-adapt-to-libselinux.patch
-Patch0378: selinux-Reflect-context_str-type-change.patch
-Patch0379: virnetsshsession-Adapt-to-change-libssh2-API.patch
-Patch0380: qemu-Fix-incorrect-command-name-in-error-messages.patch
-Patch0381: esx-call-freeaddrinfo-earlier-in-esxUtil_ResolveHost.patch
-Patch0382: admin-fix-leak-of-typed-parameters-on-error.patch
-Patch0383: Use-un-signed-printf-specifiers-correctly.patch
-Patch0384: fix-the-issue-of-errors-when-saving-after-virsh-edit.patch
-Patch0385: virrandom-Fix-printf-format-string-in-virRandomGener.patch
-Patch0386: qemu_migration_cookie-Rename-ret-in-qemuDomainExtrac.patch
-Patch0387: tests-upstream-Fixing-compiler-warning-in-cputest.patch
-Patch0388: qemu-Return-perf-status-that-affect-next-boot-for-sh.patch
-Patch0389: lxc-fix-lxcContainerMountAllFS-DEREF_BEFORE_CHECK.patch
-Patch0390: Include-vdpa-devices-in-node-device-list.patch
-Patch0391: node_device-fix-leak-of-DIR.patch
-Patch0392: vdpa-Introduce-the-new-device-type-vdpa-to-hostdev.patch
-Patch0393: vdpa-support-vdpa-device-hot-plug-unplug.patch
-Patch0394: vdpa-support-vdpa-device-migrate.patch
+Source: https://download.libvirt.org/%{?mainturl}libvirt-%{version}.tar.xz
+
+Patch0001: nodedev-delete-mdev.patch
+Patch0002: meson.build-isolate-the-client-qemu-using-macros.patch
+Patch0003: test-commandtest-skip-the-test4-if-the-testcase-is-r.patch
+Patch0004: qemu-fix-a-concurrent-operation-situation.patch
+Patch0005: qemu-add-pointer-check-in-qemuMonitorLastError.patch
+Patch0006: migration-migration-pin-add-some-migration-multiFd-p.patch
+Patch0007: migration-migration-pin-add-qemu-monitor-callback-fu.patch
+Patch0008: migration-migration-pin-add-migrationpin-for-migrati.patch
+Patch0009: migration-migration-pin-add-domainMigrationPid-for-q.patch
+Patch0010: migration-multifd-pin-add-qemu-monitor-callback-func.patch
+Patch0011: migration-multifd-pin-support-migration-multifd-thre.patch
+Patch0012: node_device-fix-leak-of-DIR.patch
+Patch0013: hostdev-Introduce-vDPA-device-to-hostdev-subsystem-a.patch
+Patch0014: vdpa-support-vdpa-device-hot-plug-unplug.patch
+Patch0015: vdpa-support-vdpa-device-migrate.patch
+Patch0016: libvirt-Add-retry-support-for-error-policy.patch
+Patch0017: qemu-Support-retry-BLOCK_IO_ERROR-event.patch
+Patch0018: libvirt-conf-Set-default-values-of-retry-fileds.patch
+Patch0019: nodedev-fix-potential-heap-use-after-free.patch
+Patch0020: conf-domain_conf-pin-the-retry_interval-and-retry_ti.patch
+Patch0021: cpu-aarch64-enable-host-model-cpu-for-AArch64-archit.patch
+Patch0022: cpu_map-add-kunpeng-920-features-to-arm-features.patch
+Patch0023: tests-Add-hostcpudata-for-machine-with-CPU-clusters.patch
+Patch0024: conf-Report-CPU-clusters-in-capabilities-XML.patch
+Patch0025: conf-Allow-specifying-CPU-clusters.patch
+Patch0026: qemu-Introduce-QEMU_CAPS_SMP_CLUSTERS.patch
+Patch0027: qemu-Use-CPU-clusters-for-guests.patch
+Patch0028: qemu-Make-monitor-aware-of-CPU-clusters.patch
+Patch0029: tests-Verify-handling-of-CPU-clusters-in-QMP-data.patch
+Patch0030: docs-Improve-documentation-for-CPU-topology.patch
+Patch0031: docs-Document-CPU-clusters.patch
+Patch0032: Hotpatch-introduce-DomainHotpatchManage-API.patch
+Patch0033: hotpatch-Implement-qemuDomainHotpatchManage.patch
+Patch0034: hotpatch-introduce-hotpatch-async-job-flag.patch
+Patch0035: hotpatch-implement-hotpatch-virsh-api.patch
+Patch0036: hotpatch-check-vm-id-and-pid-before-using-hotpatch-a.patch
+Patch0037: domain-add-logs-for-virDomainHotpatchManage.patch
+Patch0038: hotpatch-virsh-support-autoload-mode.patch
+Patch0039: Fix-warnings-found-by-clang.patch
+Patch0040: Fix-off-by-one-error-in-udevListInterfacesByStatus.patch
+Patch0041: remote-check-for-negative-array-lengths-before-alloc.patch
+Patch0042: hotpatch-if-hotpatch_path-not-in-qemu.conf-the-hotpa.patch
+Patch0043: remote_driver-Restore-special-behavior-of-remoteDoma.patch
+Patch0044: CVE-2024-4418.patch
 
 Requires: libvirt-daemon = %{version}-%{release}
 Requires: libvirt-daemon-config-network = %{version}-%{release}
@@ -516,6 +327,9 @@ Requires: libvirt-daemon-driver-lxc = %{version}-%{release}
 %endif
 %if %{with_qemu}
 Requires: libvirt-daemon-driver-qemu = %{version}-%{release}
+%if %{with_client_qemu}
+Requires: libvirt-client-qemu = %{version}-%{release}
+%endif
 %endif
 # We had UML driver, but we've removed it.
 Obsoletes: libvirt-daemon-driver-uml <= 5.0.0
@@ -524,7 +338,6 @@ Obsoletes: libvirt-daemon-uml <= 5.0.0
 Requires: libvirt-daemon-driver-vbox = %{version}-%{release}
 %endif
 Requires: libvirt-daemon-driver-nwfilter = %{version}-%{release}
-
 Requires: libvirt-daemon-driver-interface = %{version}-%{release}
 Requires: libvirt-daemon-driver-secret = %{version}-%{release}
 Requires: libvirt-daemon-driver-storage = %{version}-%{release}
@@ -535,29 +348,29 @@ Requires: libvirt-libs = %{version}-%{release}
 
 # All build-time requirements. Run-time requirements are
 # listed against each sub-RPM
-%if 0%{?enable_autotools}
-BuildRequires: autoconf
-BuildRequires: automake
-BuildRequires: gettext-devel
-BuildRequires: libtool
-%endif
 BuildRequires: python3-docutils
-BuildRequires: gcc
+BuildRequires: meson >= 0.56.0
+BuildRequires: ninja-build
+BuildRequires: git
 BuildRequires: perl-interpreter
 BuildRequires: python3
+BuildRequires: python3-pytest
+BuildRequires: libgfapi0
+# For xsltproc
+BuildRequires: libxslt
+BuildRequires: gettext
 BuildRequires: systemd-units
 %if %{with_libxl}
 BuildRequires: xen-devel
 %endif
-BuildRequires: glib2-devel >= 2.48
+# Fedora build root suckage
+BuildRequires: gawk
+%if %{with_native}
+BuildRequires: gcc
+BuildRequires: glib2-devel >= 2.56
 BuildRequires: libxml2-devel
-BuildRequires: libxslt
 BuildRequires: readline-devel
-%if %{with_bash_completion}
 BuildRequires: bash-completion >= 2.0
-%endif
-BuildRequires: ncurses-devel
-BuildRequires: gettext
 BuildRequires: libtasn1-devel
 BuildRequires: gnutls-devel
 BuildRequires: libattr-devel
@@ -568,113 +381,128 @@ BuildRequires: augeas
 BuildRequires: systemd-devel >= 185
 BuildRequires: libpciaccess-devel >= 0.10.9
 BuildRequires: yajl-devel
-%if %{with_sanlock}
+    %if %{with_sanlock}
 BuildRequires: sanlock-devel >= 2.4
-%endif
+    %endif
 BuildRequires: libpcap-devel >= 1.5.0
 BuildRequires: libnl3-devel
 BuildRequires: libselinux-devel
-BuildRequires: dnsmasq >= 2.41
 BuildRequires: iptables
-BuildRequires: radvd
 BuildRequires: ebtables
 BuildRequires: module-init-tools
+# For modprobe
+BuildRequires: kmod
 BuildRequires: cyrus-sasl-devel
 BuildRequires: polkit >= 0.112
 # For mount/umount in FS driver
 BuildRequires: util-linux
-%if %{with_qemu}
+    %if %{with_qemu}
 # For managing ACLs
 BuildRequires: libacl-devel
-# From QEMU RPMs
+# From QEMU RPMs, used by virstoragetest
 BuildRequires: /usr/bin/qemu-img
-%endif
+    %endif
+# nbdkit support requires libnbd
+    %if %{with_nbdkit}
+BuildRequires: libnbd-devel
+    %endif
 # For LVM drivers
 BuildRequires: lvm2
 # For pool type=iscsi
 BuildRequires: iscsi-initiator-utils
-%if %{with_storage_iscsi_direct}
+    %if %{with_storage_iscsi_direct}
 # For pool type=iscsi-direct
 BuildRequires: libiscsi-devel
-%endif
+    %endif
 # For disk driver
 BuildRequires: parted-devel
 # For Multipath support
 BuildRequires: device-mapper-devel
-# For XFS reflink clone support
-BuildRequires: xfsprogs-devel
-%if %{with_storage_rbd}
+    %if %{with_storage_rbd}
 BuildRequires: librados-devel
 BuildRequires: librbd-devel
-%endif
-%if %{with_storage_gluster}
-BuildRequires: libgfapi0
+    %endif
+    %if %{with_storage_gluster}
 BuildRequires: glusterfs-api-devel >= 3.4.1
 BuildRequires: glusterfs-devel >= 3.4.1
-%endif
-%if %{with_storage_sheepdog}
-BuildRequires: sheepdog
-%endif
-%if %{with_storage_zfs}
-# Support any conforming implementation of zfs. On stock Fedora
-# this is zfs-fuse, but could be zfsonlinux upstream RPMs
-BuildRequires: /sbin/zfs
-BuildRequires: /sbin/zpool
-%endif
-%if %{with_numactl}
+    %endif
+    %if %{with_numactl}
 # For QEMU/LXC numa info
 BuildRequires: numactl-devel
-%endif
+    %endif
 BuildRequires: libcap-ng-devel >= 0.5.0
-%if %{with_fuse}
+    %if %{with_fuse}
 BuildRequires: fuse-devel >= 2.8.6
-%endif
-%if %{with_libssh2}
+    %endif
+    %if %{with_libssh2}
 BuildRequires: libssh2-devel >= 1.3.0
-%endif
-
+    %endif
+    %if %{with_netcf}
 BuildRequires: netcf-devel >= 0.2.2
-%if %{with_esx}
+    %endif
+    %if 0%{?fedora} || 0%{?rhel} >= 9
+BuildRequires: passt
+    %endif
+    %if %{with_esx}
 BuildRequires: libcurl-devel
-%endif
-%if %{with_hyperv}
-BuildRequires: libwsman-devel >= 2.2.3
-%endif
+    %endif
+    %if %{with_hyperv}
+BuildRequires: libwsman-devel >= 2.6.3
+    %endif
 BuildRequires: audit-libs-devel
 # we need /usr/sbin/dtrace
 BuildRequires: systemtap-sdt-devel
-
 # For mount/umount in FS driver
 BuildRequires: util-linux
 # For showmount in FS driver (netfs discovery)
 BuildRequires: nfs-utils
-
-# Communication with the firewall and polkit daemons use DBus
-BuildRequires: dbus-devel
-
-# Fedora build root suckage
-BuildRequires: gawk
-
 # For storage wiping with different algorithms
 BuildRequires: scrub
-
-%if %{with_numad}
+    %if %{with_numad}
 BuildRequires: numad
-%endif
-
-%if %{with_wireshark}
-BuildRequires: wireshark-devel >= 2.4.0
-%endif
-
-%if %{with_libssh}
-BuildRequires: libssh-devel >= 0.7.0
-%endif
-
-BuildRequires: rpcgen
+    %endif
+    %if %{with_wireshark}
+BuildRequires: wireshark-devel
+    %endif
+    %if %{with_libssh}
+BuildRequires: libssh-devel >= 0.8.1
+    %endif
 BuildRequires: libtirpc-devel
-
-%if %{with_firewalld_zone}
+    %if %{with_firewalld_zone}
+# Needed for the firewalld_reload macro
 BuildRequires: firewalld-filesystem
+    %endif
+%endif
+
+%if %{with_mingw32}
+BuildRequires: mingw32-filesystem
+BuildRequires: mingw32-gcc
+BuildRequires: mingw32-binutils
+BuildRequires: mingw32-glib2 >= 2.48
+BuildRequires: mingw32-libgpg-error
+BuildRequires: mingw32-libgcrypt
+BuildRequires: mingw32-gnutls
+BuildRequires: mingw32-gettext
+BuildRequires: mingw32-libxml2
+BuildRequires: mingw32-portablexdr
+BuildRequires: mingw32-dlfcn
+BuildRequires: mingw32-libssh2
+BuildRequires: mingw32-curl
+%endif
+%if %{with_mingw64}
+BuildRequires: mingw64-filesystem
+BuildRequires: mingw64-gcc
+BuildRequires: mingw64-binutils
+BuildRequires: mingw64-glib2 >= 2.48
+BuildRequires: mingw32-libgpg-error
+BuildRequires: mingw32-libgcrypt
+BuildRequires: mingw64-gnutls
+BuildRequires: mingw64-gettext
+BuildRequires: mingw64-libxml2
+BuildRequires: mingw64-portablexdr
+BuildRequires: mingw64-dlfcn
+BuildRequires: mingw64-libssh2
+BuildRequires: mingw64-curl
 %endif
 
 %description
@@ -682,6 +510,7 @@ Libvirt is a C toolkit to interact with the virtualization capabilities
 of recent versions of Linux (and other OSes). The main package includes
 the libvirtd server exporting the virtualization support.
 
+%if %{with_native}
 %package docs
 Summary: API reference and website documentation
 
@@ -696,46 +525,98 @@ Summary: Server side daemon and supporting files for libvirt library
 # for subpackages are listed later in those subpackages)
 
 # The client side, i.e. shared libs are in a subpackage
-Requires: %{name}-libs = %{version}-%{release}
-
-# (client invokes 'nc' against the UNIX socket on the server)
-Requires: /usr/bin/nc
+Requires: libvirt-libs = %{version}-%{release}
+Requires: libvirt-daemon-common = %{version}-%{release}
+Requires: libvirt-daemon-lock = %{version}-%{release}
+Requires: libvirt-daemon-plugin-lockd = %{version}-%{release}
+Requires: libvirt-daemon-log = %{version}-%{release}
+Requires: libvirt-daemon-proxy = %{version}-%{release}
 
-# for modprobe of pci devices
-Requires: module-init-tools
+%description daemon
+Server side daemon required to manage the virtualization capabilities
+of recent versions of Linux. Requires a hypervisor specific sub-RPM
+for specific drivers.
 
-# for /sbin/ip & /sbin/tc
+%package daemon-common
+Summary: Files and utilities used by daemons
+Requires: libvirt-libs = %{version}-%{release}
+# The libvirt-guests.sh script requires virsh from libvirt-client subpackage,
+# but not every deployment wants to use libvirt-guests service. Using
+# Recommends here will install libvirt-client by default (if available), but
+# RPM won't complain if the package is unavailable, masked, or removed later.
+Recommends: libvirt-client = %{version}-%{release}
+# for /sbin/ip
 Requires: iproute
-# tc is provided by iproute-tc since at least Fedora 26
+# for /sbin/tc
 Requires: iproute-tc
-
 Requires: polkit >= 0.112
-%ifarch %{ix86} x86_64 ia64
+    %if %{with_dmidecode}
 # For virConnectGetSysinfo
 Requires: dmidecode
-%endif
+    %endif
 # For service management
-Requires(post): systemd-units
-Requires(post): systemd-sysv
-Requires(preun): systemd-units
-Requires(postun): systemd-units
-%if %{with_numad}
-Requires: numad
-%endif
+Requires(posttrans): /usr/bin/systemctl
+Requires(preun): /usr/bin/systemctl
 # libvirtd depends on 'messagebus' service
 Requires: dbus
 # For uid creation during pre
 Requires(pre): shadow-utils
+# Needed by /usr/libexec/libvirt-guests.sh script.
+    %if 0%{?fedora}
+Requires: gettext-runtime
+    %else
+Requires: gettext
+    %endif
 
-%description daemon
-Server side daemon required to manage the virtualization capabilities
-of recent versions of Linux. Requires a hypervisor specific sub-RPM
-for specific drivers.
+# Ensure smooth upgrades
+Obsoletes: libvirt-admin < 7.3.0
+Provides: libvirt-admin = %{version}-%{release}
+Obsoletes: libvirt-bash-completion < 7.3.0
+
+%description daemon-common
+Miscellaneous files and utilities used by other libvirt daemons
+
+%package daemon-lock
+Summary: Server side daemon for managing locks
+Requires: libvirt-libs = %{version}-%{release}
+
+%description daemon-lock
+Server side daemon used to manage locks held against virtual machine
+resources
+
+%package daemon-plugin-lockd
+Summary: lockd client plugin for virtlockd
+Requires: libvirt-libs = %{version}-%{release}
+Requires: libvirt-daemon-lock = %{version}-%{release}
+
+%description daemon-plugin-lockd
+A client-side plugin that implements disk locking using POSIX fcntl advisory
+locks via communication with the virtlockd daemon
+
+%package daemon-log
+Summary: Server side daemon for managing logs
+Requires: libvirt-libs = %{version}-%{release}
+
+%description daemon-log
+Server side daemon used to manage logs from virtual machine consoles
+
+%package daemon-proxy
+Summary: Server side daemon providing libvirtd proxy
+Requires: libvirt-libs = %{version}-%{release}
+# netcat is needed on the server side so that clients that have
+# libvirt < 6.9.0 can connect, but newer versions will prefer
+# virt-ssh-helper. Making this a Recommends means that it gets
+# installed by default, but can still be removed if compatibility
+# with old clients is not required
+Recommends: /usr/bin/nc
+
+%description daemon-proxy
+Server side daemon providing functionality previously provided by
+the monolithic libvirtd
 
 %package daemon-config-network
 Summary: Default configuration files for the libvirtd daemon
 
-Requires: libvirt-daemon = %{version}-%{release}
 Requires: libvirt-daemon-driver-network = %{version}-%{release}
 
 %description daemon-config-network
@@ -744,7 +625,6 @@ Default configuration files for setting up NAT based networking
 %package daemon-config-nwfilter
 Summary: Network filter configuration files for the libvirtd daemon
 
-Requires: libvirt-daemon = %{version}-%{release}
 Requires: libvirt-daemon-driver-nwfilter = %{version}-%{release}
 
 %description daemon-config-nwfilter
@@ -752,10 +632,9 @@ Network filter configuration files for cleaning guest traffic
 
 %package daemon-driver-network
 Summary: Network driver plugin for the libvirtd daemon
-Requires: libvirt-daemon = %{version}-%{release}
+Requires: libvirt-daemon-common = %{version}-%{release}
 Requires: libvirt-libs = %{version}-%{release}
 Requires: dnsmasq >= 2.41
-Requires: radvd
 Requires: iptables
 
 %description daemon-driver-network
@@ -763,10 +642,9 @@ The network driver plugin for the libvirtd daemon, providing
 an implementation of the virtual network APIs using the Linux
 bridge capabilities.
 
-
 %package daemon-driver-nwfilter
 Summary: Nwfilter driver plugin for the libvirtd daemon
-Requires: libvirt-daemon = %{version}-%{release}
+Requires: libvirt-daemon-common = %{version}-%{release}
 Requires: libvirt-libs = %{version}-%{release}
 Requires: iptables
 Requires: ebtables
@@ -776,35 +654,37 @@ The nwfilter driver plugin for the libvirtd daemon, providing
 an implementation of the firewall APIs using the ebtables,
 iptables and ip6tables capabilities
 
-
 %package daemon-driver-nodedev
 Summary: Nodedev driver plugin for the libvirtd daemon
-Requires: libvirt-daemon = %{version}-%{release}
+Requires: libvirt-daemon-common = %{version}-%{release}
 Requires: libvirt-libs = %{version}-%{release}
 # needed for device enumeration
 Requires: systemd >= 185
+# For managing persistent mediated devices
+# Requires: mdevctl
+# for modprobe of pci devices
+Requires: module-init-tools
 
 %description daemon-driver-nodedev
 The nodedev driver plugin for the libvirtd daemon, providing
 an implementation of the node device APIs using the udev
 capabilities.
 
-
 %package daemon-driver-interface
 Summary: Interface driver plugin for the libvirtd daemon
-Requires: libvirt-daemon = %{version}-%{release}
+Requires: libvirt-daemon-common = %{version}-%{release}
 Requires: libvirt-libs = %{version}-%{release}
+    %if %{with_netcf}
 Requires: netcf-libs >= 0.2.2
+    %endif
 
 %description daemon-driver-interface
 The interface driver plugin for the libvirtd daemon, providing
-an implementation of the network interface APIs using the
-netcf library
-
+an implementation of the host network interface APIs.
 
 %package daemon-driver-secret
 Summary: Secret driver plugin for the libvirtd daemon
-Requires: libvirt-daemon = %{version}-%{release}
+Requires: libvirt-daemon-common = %{version}-%{release}
 Requires: libvirt-libs = %{version}-%{release}
 
 %description daemon-driver-secret
@@ -813,18 +693,19 @@ an implementation of the secret key APIs.
 
 %package daemon-driver-storage-core
 Summary: Storage driver plugin including base backends for the libvirtd daemon
-Requires: libvirt-daemon = %{version}-%{release}
+Requires: libvirt-daemon-common = %{version}-%{release}
 Requires: libvirt-libs = %{version}-%{release}
 Requires: nfs-utils
 # For mkfs
 Requires: util-linux
-%if %{with_qemu}
+    %if %{with_qemu}
 # From QEMU RPMs
 Requires: /usr/bin/qemu-img
-%endif
-%if !%{with_storage_rbd}
-Obsoletes: libvirt-daemon-driver-storage-rbd < %{version}-%{release}
-%endif
+    %endif
+    %if !%{with_storage_rbd}
+Obsoletes: libvirt-daemon-driver-storage-rbd < 5.2.0
+    %endif
+Obsoletes: libvirt-daemon-driver-storage-sheepdog < 8.8.0
 
 %description daemon-driver-storage-core
 The storage driver plugin for the libvirtd daemon, providing
@@ -841,7 +722,6 @@ Requires: lvm2
 The storage driver backend adding implementation of the storage APIs for block
 volumes using lvm.
 
-
 %package daemon-driver-storage-disk
 Summary: Storage driver plugin for disk
 Requires: libvirt-daemon-driver-storage-core = %{version}-%{release}
@@ -853,7 +733,6 @@ Requires: device-mapper
 The storage driver backend adding implementation of the storage APIs for block
 volumes using the host disks.
 
-
 %package daemon-driver-storage-scsi
 Summary: Storage driver plugin for local scsi devices
 Requires: libvirt-daemon-driver-storage-core = %{version}-%{release}
@@ -863,7 +742,6 @@ Requires: libvirt-libs = %{version}-%{release}
 The storage driver backend adding implementation of the storage APIs for scsi
 host devices.
 
-
 %package daemon-driver-storage-iscsi
 Summary: Storage driver plugin for iscsi
 Requires: libvirt-daemon-driver-storage-core = %{version}-%{release}
@@ -874,19 +752,16 @@ Requires: iscsi-initiator-utils
 The storage driver backend adding implementation of the storage APIs for iscsi
 volumes using the host iscsi stack.
 
-
-%if %{with_storage_iscsi_direct}
+    %if %{with_storage_iscsi_direct}
 %package daemon-driver-storage-iscsi-direct
 Summary: Storage driver plugin for iscsi-direct
 Requires: libvirt-daemon-driver-storage-core = %{version}-%{release}
 Requires: libvirt-libs = %{version}-%{release}
-Requires: libiscsi
 
 %description daemon-driver-storage-iscsi-direct
 The storage driver backend adding implementation of the storage APIs for iscsi
 volumes using libiscsi direct connection.
-%endif
-
+    %endif
 
 %package daemon-driver-storage-mpath
 Summary: Storage driver plugin for multipath volumes
@@ -898,22 +773,24 @@ Requires: device-mapper
 The storage driver backend adding implementation of the storage APIs for
 multipath storage using device mapper.
 
-
-%if %{with_storage_gluster}
+    %if %{with_storage_gluster}
 %package daemon-driver-storage-gluster
 Summary: Storage driver plugin for gluster
 Requires: libvirt-daemon-driver-storage-core = %{version}-%{release}
 Requires: libvirt-libs = %{version}-%{release}
+        %if 0%{?fedora}
 Requires: glusterfs-client >= 2.0.1
+        %endif
+        %if 0%{?fedora} || 0%{?with_storage_gluster}
 Requires: /usr/sbin/gluster
+        %endif
 
 %description daemon-driver-storage-gluster
 The storage driver backend adding implementation of the storage APIs for gluster
 volumes using libgfapi.
-%endif
-
+    %endif
 
-%if %{with_storage_rbd}
+    %if %{with_storage_rbd}
 %package daemon-driver-storage-rbd
 Summary: Storage driver plugin for rbd
 Requires: libvirt-daemon-driver-storage-core = %{version}-%{release}
@@ -922,23 +799,9 @@ Requires: libvirt-libs = %{version}-%{release}
 %description daemon-driver-storage-rbd
 The storage driver backend adding implementation of the storage APIs for rbd
 volumes using the ceph protocol.
-%endif
-
-
-%if %{with_storage_sheepdog}
-%package daemon-driver-storage-sheepdog
-Summary: Storage driver plugin for sheepdog
-Requires: libvirt-daemon-driver-storage-core = %{version}-%{release}
-Requires: libvirt-libs = %{version}-%{release}
-Requires: sheepdog
-
-%description daemon-driver-storage-sheepdog
-The storage driver backend adding implementation of the storage APIs for
-sheepdog volumes using.
-%endif
-
+    %endif
 
-%if %{with_storage_zfs}
+    %if %{with_storage_zfs}
 %package daemon-driver-storage-zfs
 Summary: Storage driver plugin for ZFS
 Requires: libvirt-daemon-driver-storage-core = %{version}-%{release}
@@ -950,8 +813,7 @@ Requires: /sbin/zpool
 %description daemon-driver-storage-zfs
 The storage driver backend adding implementation of the storage APIs for
 ZFS volumes.
-%endif
-
+    %endif
 
 %package daemon-driver-storage
 Summary: Storage driver plugin including all backends for the libvirtd daemon
@@ -961,32 +823,29 @@ Requires: libvirt-daemon-driver-storage-logical = %{version}-%{release}
 Requires: libvirt-daemon-driver-storage-scsi = %{version}-%{release}
 Requires: libvirt-daemon-driver-storage-iscsi = %{version}-%{release}
 Requires: libvirt-daemon-driver-storage-mpath = %{version}-%{release}
-%if %{with_storage_iscsi_direct}
+    %if %{with_storage_iscsi_direct}
 Requires: libvirt-daemon-driver-storage-iscsi-direct = %{version}-%{release}
-%endif
-%if %{with_storage_gluster}
+    %endif
+    %if %{with_storage_gluster}
 Requires: libvirt-daemon-driver-storage-gluster = %{version}-%{release}
-%endif
-%if %{with_storage_rbd}
+    %endif
+    %if %{with_storage_rbd}
 Requires: libvirt-daemon-driver-storage-rbd = %{version}-%{release}
-%endif
-%if %{with_storage_sheepdog}
-Requires: libvirt-daemon-driver-storage-sheepdog = %{version}-%{release}
-%endif
-%if %{with_storage_zfs}
+    %endif
+    %if %{with_storage_zfs}
 Requires: libvirt-daemon-driver-storage-zfs = %{version}-%{release}
-%endif
+    %endif
 
 %description daemon-driver-storage
 The storage driver plugin for the libvirtd daemon, providing
 an implementation of the storage APIs using LVM, iSCSI,
 parted and more.
 
-
-%if %{with_qemu}
+    %if %{with_qemu}
 %package daemon-driver-qemu
 Summary: QEMU driver plugin for the libvirtd daemon
-Requires: libvirt-daemon = %{version}-%{release}
+Requires: libvirt-daemon-common = %{version}-%{release}
+Requires: libvirt-daemon-log = %{version}-%{release}
 Requires: libvirt-libs = %{version}-%{release}
 Requires: /usr/bin/qemu-img
 # For image compression
@@ -995,47 +854,62 @@ Requires: bzip2
 Requires: lzop
 Requires: xz
 Requires: systemd-container
+Requires: swtpm-tools
+        %if %{with_numad}
+Requires: numad
+        %endif
+        %if 0%{?fedora} || 0%{?rhel} >= 9
+Recommends: passt
+Recommends: passt-selinux
+        %endif
+        %if %{with_nbdkit}
+Recommends: nbdkit
+Recommends: nbdkit-curl-plugin
+Recommends: nbdkit-ssh-plugin
+        %endif
 
 %description daemon-driver-qemu
 The qemu driver plugin for the libvirtd daemon, providing
 an implementation of the hypervisor driver APIs using
 QEMU
-%endif
-
+    %endif
 
-%if %{with_lxc}
+    %if %{with_lxc}
 %package daemon-driver-lxc
 Summary: LXC driver plugin for the libvirtd daemon
-Requires: libvirt-daemon = %{version}-%{release}
+Requires: libvirt-daemon-common = %{version}-%{release}
 Requires: libvirt-libs = %{version}-%{release}
 # There really is a hard cross-driver dependency here
 Requires: libvirt-daemon-driver-network = %{version}-%{release}
 Requires: systemd-container
+# for modprobe of nbd driver
+Requires: module-init-tools
+        %if %{with_numad}
+Requires: numad
+        %endif
 
 %description daemon-driver-lxc
 The LXC driver plugin for the libvirtd daemon, providing
 an implementation of the hypervisor driver APIs using
 the Linux kernel
-%endif
-
+    %endif
 
-%if %{with_vbox}
+    %if %{with_vbox}
 %package daemon-driver-vbox
 Summary: VirtualBox driver plugin for the libvirtd daemon
-Requires: libvirt-daemon = %{version}-%{release}
+Requires: libvirt-daemon-common = %{version}-%{release}
 Requires: libvirt-libs = %{version}-%{release}
 
 %description daemon-driver-vbox
 The vbox driver plugin for the libvirtd daemon, providing
 an implementation of the hypervisor driver APIs using
 VirtualBox
-%endif
-
+    %endif
 
-%if %{with_libxl}
+    %if %{with_libxl}
 %package daemon-driver-libxl
 Summary: Libxl driver plugin for the libvirtd daemon
-Requires: libvirt-daemon = %{version}-%{release}
+Requires: libvirt-daemon-common = %{version}-%{release}
 Requires: libvirt-libs = %{version}-%{release}
 Obsoletes: libvirt-daemon-driver-xen < 4.3.0
 
@@ -1043,14 +917,22 @@ Obsoletes: libvirt-daemon-driver-xen < 4.3.0
 The Libxl driver plugin for the libvirtd daemon, providing
 an implementation of the hypervisor driver APIs using
 Libxl
-%endif
-
+    %endif
 
-%if %{with_qemu_tcg}
+    %if %{with_qemu_tcg}
 %package daemon-qemu
 Summary: Server side daemon & driver required to run QEMU guests
 
+        %if %{with_modular_daemons}
+Requires: libvirt-daemon-common = %{version}-%{release}
+Requires: libvirt-daemon-log = %{version}-%{release}
+Requires: libvirt-daemon-lock = %{version}-%{release}
+Requires: libvirt-daemon-plugin-lockd = %{version}-%{release}
+Requires: libvirt-daemon-proxy = %{version}-%{release}
+Recommends: libvirt-daemon = %{version}-%{release}
+        %else
 Requires: libvirt-daemon = %{version}-%{release}
+        %endif
 Requires: libvirt-daemon-driver-qemu = %{version}-%{release}
 Requires: libvirt-daemon-driver-interface = %{version}-%{release}
 Requires: libvirt-daemon-driver-network = %{version}-%{release}
@@ -1063,14 +945,22 @@ Requires: qemu
 %description daemon-qemu
 Server side daemon and driver required to manage the virtualization
 capabilities of the QEMU TCG emulators
-%endif
-
+    %endif
 
-%if %{with_qemu_kvm}
+    %if %{with_qemu_kvm}
 %package daemon-kvm
 Summary: Server side daemon & driver required to run KVM guests
 
+        %if %{with_modular_daemons}
+Requires: libvirt-daemon-common = %{version}-%{release}
+Requires: libvirt-daemon-log = %{version}-%{release}
+Requires: libvirt-daemon-lock = %{version}-%{release}
+Requires: libvirt-daemon-plugin-lockd = %{version}-%{release}
+Requires: libvirt-daemon-proxy = %{version}-%{release}
+Recommends: libvirt-daemon = %{version}-%{release}
+        %else
 Requires: libvirt-daemon = %{version}-%{release}
+        %endif
 Requires: libvirt-daemon-driver-qemu = %{version}-%{release}
 Requires: libvirt-daemon-driver-interface = %{version}-%{release}
 Requires: libvirt-daemon-driver-network = %{version}-%{release}
@@ -1078,19 +968,24 @@ Requires: libvirt-daemon-driver-nodedev = %{version}-%{release}
 Requires: libvirt-daemon-driver-nwfilter = %{version}-%{release}
 Requires: libvirt-daemon-driver-secret = %{version}-%{release}
 Requires: libvirt-daemon-driver-storage = %{version}-%{release}
-Requires: qemu
+Requires: qemu-kvm
 
 %description daemon-kvm
 Server side daemon and driver required to manage the virtualization
 capabilities of the KVM hypervisor
-%endif
-
+    %endif
 
-%if %{with_lxc}
+    %if %{with_lxc}
 %package daemon-lxc
 Summary: Server side daemon & driver required to run LXC guests
 
+        %if %{with_modular_daemons}
+Requires: libvirt-daemon-common = %{version}-%{release}
+Requires: libvirt-daemon-proxy = %{version}-%{release}
+Recommends: libvirt-daemon = %{version}-%{release}
+        %else
 Requires: libvirt-daemon = %{version}-%{release}
+        %endif
 Requires: libvirt-daemon-driver-lxc = %{version}-%{release}
 Requires: libvirt-daemon-driver-interface = %{version}-%{release}
 Requires: libvirt-daemon-driver-network = %{version}-%{release}
@@ -1102,17 +997,22 @@ Requires: libvirt-daemon-driver-storage = %{version}-%{release}
 %description daemon-lxc
 Server side daemon and driver required to manage the virtualization
 capabilities of LXC
-%endif
-
+    %endif
 
-%if %{with_libxl}
+    %if %{with_libxl}
 %package daemon-xen
 Summary: Server side daemon & driver required to run XEN guests
 
+        %if %{with_modular_daemons}
+Requires: libvirt-daemon-common = %{version}-%{release}
+Requires: libvirt-daemon-lock = %{version}-%{release}
+Requires: libvirt-daemon-plugin-lockd = %{version}-%{release}
+Requires: libvirt-daemon-proxy = %{version}-%{release}
+Recommends: libvirt-daemon = %{version}-%{release}
+        %else
 Requires: libvirt-daemon = %{version}-%{release}
-    %if %{with_libxl}
+        %endif
 Requires: libvirt-daemon-driver-libxl = %{version}-%{release}
-    %endif
 Requires: libvirt-daemon-driver-interface = %{version}-%{release}
 Requires: libvirt-daemon-driver-network = %{version}-%{release}
 Requires: libvirt-daemon-driver-nodedev = %{version}-%{release}
@@ -1124,13 +1024,19 @@ Requires: xen
 %description daemon-xen
 Server side daemon and driver required to manage the virtualization
 capabilities of XEN
-%endif
+    %endif
 
-%if %{with_vbox}
+    %if %{with_vbox}
 %package daemon-vbox
 Summary: Server side daemon & driver required to run VirtualBox guests
 
+        %if %{with_modular_daemons}
+Requires: libvirt-daemon-common = %{version}-%{release}
+Requires: libvirt-daemon-proxy = %{version}-%{release}
+Recommends: libvirt-daemon = %{version}-%{release}
+        %else
 Requires: libvirt-daemon = %{version}-%{release}
+        %endif
 Requires: libvirt-daemon-driver-vbox = %{version}-%{release}
 Requires: libvirt-daemon-driver-interface = %{version}-%{release}
 Requires: libvirt-daemon-driver-network = %{version}-%{release}
@@ -1142,25 +1048,34 @@ Requires: libvirt-daemon-driver-storage = %{version}-%{release}
 %description daemon-vbox
 Server side daemon and driver required to manage the virtualization
 capabilities of VirtualBox
-%endif
+    %endif
 
 %package client
 Summary: Client side utilities of the libvirt library
-Requires: %{name}-libs = %{version}-%{release}
-Requires: readline
-Requires: ncurses
-# Needed by /usr/libexec/libvirt-guests.sh script.
-Requires: gettext
+Requires: libvirt-libs = %{version}-%{release}
 # Needed by virt-pki-validate script.
 Requires: gnutls-utils
-%if %{with_bash_completion}
-Requires: %{name}-bash-completion = %{version}-%{release}
-%endif
+
+# Ensure smooth upgrades
+Obsoletes: libvirt-bash-completion < 7.3.0
 
 %description client
 The client binaries needed to access the virtualization
 capabilities of recent versions of Linux (and other OSes).
 
+%if %{with_client_qemu}
+%package client-qemu
+Summary: Additional client side utilities for QEMU
+Requires: libvirt-libs = %{version}-%{release}
+Requires: python3-libvirt >= 3.7.0
+Requires: python3-cryptography
+Requires: python3-lxml
+
+%description client-qemu
+The additional client binaries are used to interact
+with some QEMU specific features of libvirt.
+%endif
+
 %package libs
 Summary: Client side libraries
 # So remote clients can access libvirt over SSH tunnel
@@ -1172,67 +1087,49 @@ Requires: cyrus-sasl-gssapi
 %description libs
 Shared libraries for accessing the libvirt daemon.
 
-%package admin
-Summary: Set of tools to control libvirt daemon
-Requires: %{name}-libs = %{version}-%{release}
-Requires: readline
-%if %{with_bash_completion}
-Requires: %{name}-bash-completion = %{version}-%{release}
-%endif
-
-%description admin
-The client side utilities to control the libvirt daemon.
-
-%if %{with_bash_completion}
-%package bash-completion
-Summary: Bash completion script
-
-%description bash-completion
-Bash completion script stub.
-%endif
-
-%if %{with_wireshark}
+    %if %{with_wireshark}
 %package wireshark
 Summary: Wireshark dissector plugin for libvirt RPC transactions
-Requires: wireshark >= 2.4.0
-Requires: %{name}-libs = %{version}-%{release}
+Requires: wireshark
+Requires: libvirt-libs = %{version}-%{release}
 
 %description wireshark
 Wireshark dissector plugin for better analysis of libvirt RPC traffic.
-%endif
+    %endif
 
-%if %{with_lxc}
+    %if %{with_lxc}
 %package login-shell
 Summary: Login shell for connecting users to an LXC container
-Requires: %{name}-libs = %{version}-%{release}
+Requires: libvirt-libs = %{version}-%{release}
 
 %description login-shell
 Provides the set-uid virt-login-shell binary that is used to
 connect a user to an LXC container when they login, by switching
 namespaces.
-%endif
+    %endif
 
 %package devel
 Summary: Libraries, includes, etc. to compile with the libvirt library
-Requires: %{name}-libs = %{version}-%{release}
+Requires: libvirt-libs = %{version}-%{release}
 Requires: pkgconfig
 
 %description devel
 Include header files & development libraries for the libvirt C library.
 
-%if %{with_sanlock}
-%package lock-sanlock
+    %if %{with_sanlock}
+%package daemon-plugin-sanlock
 Summary: Sanlock lock manager plugin for QEMU driver
 Requires: sanlock >= 2.4
 #for virt-sanlock-cleanup require augeas
 Requires: augeas
-Requires: %{name}-daemon = %{version}-%{release}
-Requires: %{name}-libs = %{version}-%{release}
+Requires: libvirt-libs = %{version}-%{release}
+Obsoletes: libvirt-lock-sanlock < 9.1.0
+Provides: libvirt-lock-sanlock = %{version}-%{release}
 
-%description lock-sanlock
+%description daemon-plugin-sanlock
 Includes the Sanlock lock manager plugin for the QEMU
 driver
-%endif
+    %endif
 
 %package nss
 Summary: Libvirt plugin for Name Service Switch
@@ -1240,266 +1137,358 @@ Requires: libvirt-daemon-driver-network = %{version}-%{release}
 
 %description nss
 Libvirt plugin for NSS for translating domain names into IP addresses.
+%endif
 
+%if %{with_mingw32}
+%package -n mingw32-libvirt
+Summary: %{summary}
+Obsoletes: mingw32-libvirt-static < 7.0.0
+BuildArch: noarch
 
-%prep
+%description -n mingw32-libvirt
+MinGW Windows libvirt virtualization library.
+
+%{?mingw32_debug_package}
+%endif
 
-%autosetup -p1
+%if %{with_mingw64}
+%package -n mingw64-libvirt
+Summary: %{summary}
+Obsoletes: mingw64-libvirt-static < 7.0.0
+BuildArch: noarch
+
+%description -n mingw64-libvirt
+MinGW Windows libvirt virtualization library.
+
+%{?mingw64_debug_package}
+%endif
+
+%prep
+%autosetup -S git_am
 
 %build
+%if 0%{?fedora} >= %{min_fedora} || 0%{?rhel} >= %{min_rhel}
+    %define supported_platform 1
+%else
+    %define supported_platform 0
+%endif
 
 %if %{with_qemu}
-    %define arg_qemu --with-qemu
+    %define arg_qemu -Ddriver_qemu=enabled
 %else
-    %define arg_qemu --without-qemu
+    %define arg_qemu -Ddriver_qemu=disabled
 %endif
 
 %if %{with_openvz}
-    %define arg_openvz --with-openvz
+    %define arg_openvz -Ddriver_openvz=enabled
 %else
-    %define arg_openvz --without-openvz
+    %define arg_openvz -Ddriver_openvz=disabled
 %endif
 
 %if %{with_lxc}
-    %define arg_lxc --with-lxc
-    %define arg_login_shell --with-login-shell
+    %define arg_lxc -Ddriver_lxc=enabled
+    %define arg_login_shell -Dlogin_shell=enabled
 %else
-    %define arg_lxc --without-lxc
-    %define arg_login_shell --without-login-shell
+    %define arg_lxc -Ddriver_lxc=disabled
+    %define arg_login_shell -Dlogin_shell=disabled
 %endif
 
 %if %{with_vbox}
-    %define arg_vbox --with-vbox
+    %define arg_vbox -Ddriver_vbox=enabled
 %else
-    %define arg_vbox --without-vbox
+    %define arg_vbox -Ddriver_vbox=disabled
 %endif
 
 %if %{with_libxl}
-    %define arg_libxl --with-libxl
+    %define arg_libxl -Ddriver_libxl=enabled
 %else
-    %define arg_libxl --without-libxl
+    %define arg_libxl -Ddriver_libxl=disabled
 %endif
 
 %if %{with_esx}
-    %define arg_esx --with-esx
+    %define arg_esx -Ddriver_esx=enabled -Dcurl=enabled
 %else
-    %define arg_esx --without-esx
+    %define arg_esx -Ddriver_esx=disabled -Dcurl=disabled
 %endif
 
 %if %{with_hyperv}
-    %define arg_hyperv --with-hyperv
+    %define arg_hyperv -Ddriver_hyperv=enabled -Dopenwsman=enabled
 %else
-    %define arg_hyperv --without-hyperv
+    %define arg_hyperv -Ddriver_hyperv=disabled -Dopenwsman=disabled
 %endif
 
 %if %{with_vmware}
-    %define arg_vmware --with-vmware
+    %define arg_vmware -Ddriver_vmware=enabled
 %else
-    %define arg_vmware --without-vmware
+    %define arg_vmware -Ddriver_vmware=disabled
 %endif
 
 %if %{with_storage_rbd}
-    %define arg_storage_rbd --with-storage-rbd
+    %define arg_storage_rbd -Dstorage_rbd=enabled
 %else
-    %define arg_storage_rbd --without-storage-rbd
-%endif
-
-%if %{with_storage_sheepdog}
-    %define arg_storage_sheepdog --with-storage-sheepdog
-%else
-    %define arg_storage_sheepdog --without-storage-sheepdog
+    %define arg_storage_rbd -Dstorage_rbd=disabled
 %endif
 
 %if %{with_storage_gluster}
-    %define arg_storage_gluster --with-storage-gluster
+    %define arg_storage_gluster -Dstorage_gluster=enabled -Dglusterfs=enabled
 %else
-    %define arg_storage_gluster --without-storage-gluster
+    %define arg_storage_gluster -Dstorage_gluster=disabled -Dglusterfs=disabled
 %endif
 
 %if %{with_storage_zfs}
-    %define arg_storage_zfs --with-storage-zfs
+    %define arg_storage_zfs -Dstorage_zfs=enabled
 %else
-    %define arg_storage_zfs --without-storage-zfs
+    %define arg_storage_zfs -Dstorage_zfs=disabled
 %endif
 
 %if %{with_numactl}
-    %define arg_numactl --with-numactl
+    %define arg_numactl -Dnumactl=enabled
 %else
-    %define arg_numactl --without-numactl
+    %define arg_numactl -Dnumactl=disabled
 %endif
 
 %if %{with_numad}
-    %define arg_numad --with-numad
+    %define arg_numad -Dnumad=enabled
 %else
-    %define arg_numad --without-numad
+    %define arg_numad -Dnumad=disabled
+%endif
+
+%if %{with_nbdkit}
+    %define arg_nbdkit -Dnbdkit=enabled
+%else
+    %define arg_nbdkit -Dnbdkit=disabled
 %endif
 
 %if %{with_fuse}
-    %define arg_fuse --with-fuse
+    %define arg_fuse -Dfuse=enabled
 %else
-    %define arg_fuse --without-fuse
+    %define arg_fuse -Dfuse=disabled
 %endif
 
 %if %{with_sanlock}
-    %define arg_sanlock --with-sanlock
+    %define arg_sanlock -Dsanlock=enabled
 %else
-    %define arg_sanlock --without-sanlock
+    %define arg_sanlock -Dsanlock=disabled
 %endif
 
-%if %{with_firewalld}
-    %define arg_firewalld --with-firewalld
+%if %{with_firewalld_zone}
+    %define arg_firewalld_zone -Dfirewalld_zone=enabled
 %else
-    %define arg_firewalld --without-firewalld
+    %define arg_firewalld_zone -Dfirewalld_zone=disabled
 %endif
 
-%if %{with_firewalld_zone}
-    %define arg_firewalld_zone --with-firewalld-zone
+%if %{with_netcf}
+    %define arg_netcf -Dnetcf=enabled
 %else
-    %define arg_firewalld_zone --without-firewalld-zone
+    %define arg_netcf -Dnetcf=disabled
 %endif
 
 %if %{with_wireshark}
-    %define arg_wireshark --with-wireshark-dissector
+    %define arg_wireshark -Dwireshark_dissector=enabled
 %else
-    %define arg_wireshark --without-wireshark-dissector
+    %define arg_wireshark -Dwireshark_dissector=disabled
 %endif
 
 %if %{with_storage_iscsi_direct}
-    %define arg_storage_iscsi_direct --with-storage-iscsi-direct
+    %define arg_storage_iscsi_direct -Dstorage_iscsi_direct=enabled -Dlibiscsi=enabled
+%else
+    %define arg_storage_iscsi_direct -Dstorage_iscsi_direct=disabled -Dlibiscsi=disabled
+%endif
+
+%if %{with_libssh}
+    %define arg_libssh -Dlibssh=enabled
 %else
-    %define arg_storage_iscsi_direct --without-storage-iscsi-direct
+    %define arg_libssh -Dlibssh=disabled
+%endif
+
+%if %{with_libssh2}
+    %define arg_libssh2 -Dlibssh2=enabled
+%else
+    %define arg_libssh2 -Dlibssh2=disabled
+%endif
+
+%if %{with_modular_daemons}
+    %define arg_remote_mode -Dremote_default_mode=direct
+%else
+    %define arg_remote_mode -Dremote_default_mode=legacy
 %endif
 
 %define when  %(date +"%%F-%%T")
 %define where %(hostname)
 %define who   %{?packager}%{!?packager:Unknown}
-%define arg_packager --with-packager="%{who}, %{when}, %{where}"
-%define arg_packager_version --with-packager-version="%{release}"
-
-%define arg_selinux_mount --with-selinux-mount="/sys/fs/selinux"
-
-# Nightly edk2.git-ovmf-x64
-LOADERS="/usr/share/edk2.git/ovmf-x64/OVMF_CODE-pure-efi.fd:/usr/share/edk2.git/ovmf-x64/OVMF_VARS-pure-efi.fd"
-# Nightly edk2.git-ovmf-ia32
-LOADERS="$LOADERS:/usr/share/edk2.git/ovmf-ia32/OVMF_CODE-pure-efi.fd:/usr/share/edk2.git/ovmf-ia32/OVMF_VARS-pure-efi.fd"
-# Nightly edk2.git-aarch64
-LOADERS="$LOADERS:/usr/share/edk2.git/aarch64/QEMU_EFI-pflash.raw:/usr/share/edk2.git/aarch64/vars-template-pflash.raw"
-# Nightly edk2.git-arm
-LOADERS="$LOADERS:/usr/share/edk2.git/arm/QEMU_EFI-pflash.raw:/usr/share/edk2.git/arm/vars-template-pflash.raw"
-# Fedora edk2-ovmf
-LOADERS="$LOADERS:/usr/share/edk2/ovmf/OVMF_CODE.fd:/usr/share/edk2/ovmf/OVMF_VARS.fd"
-# Fedora edk2-ovmf-ia32
-LOADERS="$LOADERS:/usr/share/edk2/ovmf-ia32/OVMF_CODE.fd:/usr/share/edk2/ovmf-ia32/OVMF_VARS.fd"
-# Fedora edk2-aarch64
-LOADERS="$LOADERS:/usr/share/edk2/aarch64/QEMU_EFI-pflash.raw:/usr/share/edk2/aarch64/vars-template-pflash.raw"
-# Fedora edk2-arm
-LOADERS="$LOADERS:/usr/share/edk2/arm/QEMU_EFI-pflash.raw:/usr/share/edk2/arm/vars-template-pflash.raw"
-# LoongArch
-LOADERS="$LOADERS:/usr/share/qemu/loongarch_bios.bin:/usr/share/qemu/loongarch_vars.bin"
-%define arg_loader_nvram --with-loader-nvram="$LOADERS"
+%define arg_packager -Dpackager="%{who}, %{when}, %{where}"
+%define arg_packager_version -Dpackager_version="%{release}"
+%define arg_selinux_mount -Dselinux_mount="/sys/fs/selinux"
 
 # place macros above and build commands below this comment
 
-export SOURCE_DATE_EPOCH=$(stat --printf='%Y' %{_specdir}/%{name}.spec)
-
-%if 0%{?enable_autotools}
- autoreconf -if
-%endif
-
-rm -f po/stamp-po
+export SOURCE_DATE_EPOCH=$(stat --printf='%Y' %{_specdir}/libvirt.spec)
 
-%define _configure ../configure
-mkdir %{_vpath_builddir}
-cd %{_vpath_builddir}
-
-%configure --enable-dependency-tracking \
-           --with-runstatedir=%{_rundir} \
+%if %{with_native}
+%meson \
+           -Drunstatedir=%{_rundir} \
+           -Dinitconfdir=%{_sysconfdir}/sysconfig \
            %{?arg_qemu} \
            %{?arg_openvz} \
            %{?arg_lxc} \
            %{?arg_vbox} \
            %{?arg_libxl} \
-           --with-sasl \
-           --with-polkit \
-           --with-libvirtd \
+           -Dsasl=enabled \
+           -Dpolkit=enabled \
+           -Ddriver_libvirtd=enabled \
+           -Ddriver_remote=enabled \
+           -Ddriver_test=enabled \
            %{?arg_esx} \
            %{?arg_hyperv} \
            %{?arg_vmware} \
-           --without-vz \
-           --without-bhyve \
-           --with-remote-default-mode=legacy \
-           --with-interface \
-           --with-network \
-           --with-storage-fs \
-           --with-storage-lvm \
-           --with-storage-iscsi \
+           -Ddriver_vz=disabled \
+           -Ddriver_bhyve=disabled \
+           -Ddriver_ch=disabled \
+           %{?arg_remote_mode} \
+           -Ddriver_interface=enabled \
+           -Ddriver_network=enabled \
+           -Dstorage_fs=enabled \
+           -Dstorage_lvm=enabled \
+           -Dstorage_iscsi=enabled \
            %{?arg_storage_iscsi_direct} \
-           --with-storage-scsi \
-           --with-storage-disk \
-           --with-storage-mpath \
+           -Dstorage_scsi=enabled \
+           -Dstorage_disk=enabled \
+           -Dstorage_mpath=enabled \
            %{?arg_storage_rbd} \
-           %{?arg_storage_sheepdog} \
            %{?arg_storage_gluster} \
            %{?arg_storage_zfs} \
-           --without-storage-vstorage \
+           -Dstorage_vstorage=disabled \
            %{?arg_numactl} \
            %{?arg_numad} \
-           --with-capng \
+           -Dcapng=enabled \
            %{?arg_fuse} \
-           --with-netcf \
-           --with-selinux \
+           %{?arg_netcf} \
+           -Dnls=enabled \
+           -Dselinux=enabled \
            %{?arg_selinux_mount} \
-           --without-apparmor \
-           --without-hal \
-           --with-udev \
-           --with-yajl \
+           -Dapparmor=disabled \
+           -Dapparmor_profiles=disabled \
+           -Dsecdriver_apparmor=disabled \
+           -Dudev=enabled \
+           -Dyajl=enabled \
            %{?arg_sanlock} \
-           --with-libpcap \
-           --with-macvtap \
-           --with-audit \
-           %{?arg_dtrace} \
-           --with-driver-modules \
-           %{?arg_firewalld} \
+           -Dlibpcap=enabled \
+           %{?arg_nbdkit} \
+           -Dlibnl=enabled \
+           -Daudit=enabled \
+           -Ddtrace=enabled \
+           -Dfirewalld=enabled \
            %{?arg_firewalld_zone} \
            %{?arg_wireshark} \
-           --without-pm-utils \
-           --with-nss-plugin \
+           %{?arg_libssh} \
+           %{?arg_libssh2} \
+           -Dpm_utils=disabled \
+           -Dnss=enabled \
            %{arg_packager} \
            %{arg_packager_version} \
-           --with-qemu-user=%{qemu_user} \
-           --with-qemu-group=%{qemu_group} \
-           --with-tls-priority=%{tls_priority} \
-           %{?arg_loader_nvram} \
+           -Dqemu_user=%{qemu_user} \
+           -Dqemu_group=%{qemu_group} \
+           -Dqemu_moddir=%{qemu_moddir} \
+           -Dqemu_datadir=%{qemu_datadir} \
+           -Dtls_priority=%{tls_priority} \
            %{?enable_werror} \
-           --enable-expensive-tests \
-           --with-init-script=systemd \
+           -Dexpensive_tests=enabled \
+           -Dinit_script=systemd \
+           -Ddocs=enabled \
+           -Dtests=enabled \
+           -Drpath=disabled \
            %{?arg_login_shell}
-make %{?_smp_mflags} V=1
+
+%meson_build
+%endif
+
+%if %{with_mingw32} || %{with_mingw64}
+%mingw_meson \
+  --auto-features=enabled \
+  -Ddriver_remote=enabled \
+  -Ddriver_test=enabled \
+  -Ddriver_esx=enabled \
+  -Dcurl=enabled \
+  -Ddocs=enabled \
+  -Dapparmor=disabled \
+  -Dapparmor_profiles=disabled \
+  -Dattr=disabled \
+  -Daudit=disabled \
+  -Dbash_completion=disabled \
+  -Dblkid=disabled \
+  -Dcapng=disabled \
+  -Ddriver_bhyve=disabled \
+  -Ddriver_hyperv=disabled \
+  -Ddriver_interface=disabled \
+  -Ddriver_libvirtd=disabled \
+  -Ddriver_libxl=disabled \
+  -Ddriver_lxc=disabled \
+  -Ddriver_network=disabled \
+  -Ddriver_openvz=disabled \
+  -Ddriver_qemu=disabled \
+  -Ddriver_secrets=disabled \
+  -Ddriver_vbox=disabled \
+  -Ddriver_vmware=disabled \
+  -Ddriver_vz=disabled \
+  -Ddtrace=disabled \
+  -Dexpensive_tests=disabled \
+  -Dfirewalld=disabled \
+  -Dfirewalld_zone=disabled \
+  -Dfuse=disabled \
+  -Dglusterfs=disabled \
+  -Dhost_validate=disabled \
+  -Dlibiscsi=disabled \
+  -Dnbdkit=disabled \
+  -Dlibnl=disabled \
+  -Dlibpcap=disabled \
+  -Dlibssh2=disabled \
+  -Dlibssh=disabled \
+  -Dlogin_shell=disabled \
+  -Dnetcf=disabled \
+  -Dnls=enabled \
+  -Dnss=disabled \
+  -Dnumactl=disabled \
+  -Dnumad=disabled \
+  -Dopenwsman=disabled \
+  -Dpciaccess=disabled \
+  -Dpm_utils=disabled \
+  -Dpolkit=disabled \
+  -Dreadline=disabled \
+  -Drpath=disabled \
+  -Dsanlock=disabled \
+  -Dsasl=disabled \
+  -Dsecdriver_apparmor=disabled \
+  -Dsecdriver_selinux=disabled \
+  -Dselinux=disabled \
+  -Dstorage_dir=disabled \
+  -Dstorage_disk=disabled \
+  -Dstorage_fs=disabled \
+  -Dstorage_gluster=disabled \
+  -Dstorage_iscsi_direct=disabled \
+  -Dstorage_iscsi=disabled \
+  -Dstorage_lvm=disabled \
+  -Dstorage_mpath=disabled \
+  -Dstorage_rbd=disabled \
+  -Dstorage_scsi=disabled \
+  -Dstorage_vstorage=disabled \
+  -Dstorage_zfs=disabled \
+  -Dsysctl_config=disabled \
+  -Dtests=disabled \
+  -Dudev=disabled \
+  -Dwireshark_dissector=disabled \
+  -Dyajl=disabled
+    %mingw_ninja
+%endif
 
 %install
 rm -fr %{buildroot}
 
-export SOURCE_DATE_EPOCH=$(stat --printf='%Y' %{_specdir}/%{name}.spec)
-
-cd %{_vpath_builddir}
-%make_install %{?_smp_mflags} SYSTEMD_UNIT_DIR=%{_unitdir} V=1
-
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.a
-rm -f $RPM_BUILD_ROOT%{_libdir}/libvirt/lock-driver/*.la
-rm -f $RPM_BUILD_ROOT%{_libdir}/libvirt/lock-driver/*.a
-rm -f $RPM_BUILD_ROOT%{_libdir}/libvirt/connection-driver/*.la
-rm -f $RPM_BUILD_ROOT%{_libdir}/libvirt/connection-driver/*.a
-rm -f $RPM_BUILD_ROOT%{_libdir}/libvirt/storage-backend/*.la
-rm -f $RPM_BUILD_ROOT%{_libdir}/libvirt/storage-backend/*.a
-rm -f $RPM_BUILD_ROOT%{_libdir}/libvirt/storage-file/*.la
-rm -f $RPM_BUILD_ROOT%{_libdir}/libvirt/storage-file/*.a
-%if %{with_wireshark}
-rm -f $RPM_BUILD_ROOT%{wireshark_plugindir}/libvirt.la
-%endif
+export SOURCE_DATE_EPOCH=$(stat --printf='%Y' %{_specdir}/libvirt.spec)
 
-install -d -m 0755 $RPM_BUILD_ROOT%{_datadir}/lib/libvirt/dnsmasq/
-# We don't want to install /etc/libvirt/qemu/networks in the main %files list
+%if %{with_native}
+%meson_install
+
+# We don't want to install /etc/libvirt/qemu/networks in the main %%files list
 # because if the admin wants to delete the default network completely, we don't
 # want to end up re-incarnating it on every RPM upgrade.
 install -d -m 0755 $RPM_BUILD_ROOT%{_datadir}/libvirt/networks/
@@ -1508,7 +1497,7 @@ cp $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu/networks/default.xml \
 # libvirt saves this file with mode 0600
 chmod 0600 $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu/networks/default.xml
 
-# nwfilter files are installed in /usr/share/libvirt and copied to /etc in %post
+# nwfilter files are installed in /usr/share/libvirt and copied to /etc in %%post
 # to avoid verification errors on changed files in /etc
 install -d -m 0755 $RPM_BUILD_ROOT%{_datadir}/libvirt/nwfilter/
 cp -a $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/nwfilter/*.xml \
@@ -1516,158 +1505,440 @@ cp -a $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/nwfilter/*.xml \
 # libvirt saves these files with mode 600
 chmod 600 $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/nwfilter/*.xml
 
-# Strip auto-generated UUID - we need it generated per-install
-sed -i -e "/<uuid>/d" $RPM_BUILD_ROOT%{_datadir}/libvirt/networks/default.xml
-%if ! %{with_qemu}
+    %if ! %{with_qemu}
 rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/libvirtd_qemu.aug
 rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/tests/test_libvirtd_qemu.aug
-%endif
+    %endif
 %find_lang %{name}
 
-%if ! %{with_sanlock}
+    %if ! %{with_sanlock}
 rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/libvirt_sanlock.aug
 rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/tests/test_libvirt_sanlock.aug
-%endif
+    %endif
 
-%if ! %{with_lxc}
+    %if ! %{with_lxc}
 rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/libvirtd_lxc.aug
 rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/tests/test_libvirtd_lxc.aug
-%endif
+    %endif
 
-%if ! %{with_qemu}
+    %if ! %{with_client_qemu}
+rm -rf $RPM_BUILD_ROOT%{_mandir}/man1/virt-qemu-qmp-proxy.1*
+rm -rf $RPM_BUILD_ROOT%{_mandir}/man1/virt-qemu-sev-validate.1*
+rm -rf $RPM_BUILD_ROOT%{_bindir}/virt-qemu-qmp-proxy
+rm -rf $RPM_BUILD_ROOT%{_bindir}/virt-qemu-sev-validate
+    %endif
+    %if ! %{with_qemu}
 rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/qemu.conf
 rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/libvirtd.qemu
-%endif
-%if ! %{with_lxc}
+    %endif
+    %if ! %{with_lxc}
 rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/lxc.conf
 rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/libvirtd.lxc
-%endif
-%if ! %{with_libxl}
+    %endif
+    %if ! %{with_libxl}
 rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/libvirt/libxl.conf
 rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/libvirtd.libxl
 rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/libvirtd_libxl.aug
 rm -f $RPM_BUILD_ROOT%{_datadir}/augeas/lenses/tests/test_libvirtd_libxl.aug
-%endif
+    %endif
 
 # Copied into libvirt-docs subpackage eventually
 mv $RPM_BUILD_ROOT%{_datadir}/doc/libvirt libvirt-docs
 
-%ifarch %{power64} s390x ia64 alpha sparc64
+    %ifarch %{arches_systemtap_64bit}
 mv $RPM_BUILD_ROOT%{_datadir}/systemtap/tapset/libvirt_probes.stp \
    $RPM_BUILD_ROOT%{_datadir}/systemtap/tapset/libvirt_probes-64.stp
 
-    %if %{with_qemu}
+        %if %{with_qemu}
 mv $RPM_BUILD_ROOT%{_datadir}/systemtap/tapset/libvirt_qemu_probes.stp \
    $RPM_BUILD_ROOT%{_datadir}/systemtap/tapset/libvirt_qemu_probes-64.stp
+        %endif
     %endif
 %endif
 
-%check
-cd %{_vpath_builddir}
-if ! make %{?_smp_mflags} check VIR_TEST_DEBUG=1
-then
-  cat tests/test-suite.log || true
-  exit 1
-fi
+%if %{with_mingw32} || %{with_mingw64}
+%mingw_ninja_install
+%endif
 
-%post libs
-/usr/sbin/ldconfig
+%if %{with_mingw32}
+rm -rf $RPM_BUILD_ROOT%{mingw32_sysconfdir}/libvirt/nwfilter
+rm -rf $RPM_BUILD_ROOT%{mingw32_datadir}/doc/*
+rm -rf $RPM_BUILD_ROOT%{mingw32_datadir}/gtk-doc/*
+rm -rf $RPM_BUILD_ROOT%{mingw32_libexecdir}/libvirt_iohelper.exe
+rm -rf $RPM_BUILD_ROOT%{mingw32_libexecdir}/libvirt-guests.sh
+%endif
 
-%postun libs
-/usr/sbin/ldconfig
+%if %{with_mingw64}
+rm -rf $RPM_BUILD_ROOT%{mingw64_sysconfdir}/libvirt/nwfilter
+rm -rf $RPM_BUILD_ROOT%{mingw64_datadir}/doc/*
+rm -rf $RPM_BUILD_ROOT%{mingw64_datadir}/gtk-doc/*
+rm -rf $RPM_BUILD_ROOT%{mingw64_libexecdir}/libvirt_iohelper.exe
+rm -rf $RPM_BUILD_ROOT%{mingw64_libexecdir}/libvirt-guests.sh
+%endif
+
+%if %{with_mingw32} || %{with_mingw64}
+%mingw_debug_install_post
+
+%mingw_find_lang %{name}
+
+%endif
+
+%check
 
+%if %{with_native}
+# Building on slow archs, like emulated s390x in Fedora copr, requires
+# raising the test timeout
+VIR_TEST_DEBUG=1 %meson_test --no-suite syntax-check --timeout-multiplier 10
+%endif
+
+%define libvirt_rpmstatedir %{_localstatedir}/lib/rpm-state/libvirt
+
+# Mark units such that presets will later be applied to them. Meant
+# to be called during %pre. Units that already exist on the system
+# will not be marked, with the assumption that presets have already
+# been applied at some point in the past. This makes it safe to call
+# this macro for all units each time %pre runs.
+%define libvirt_systemd_schedule_preset() \
+    mkdir -p %{libvirt_rpmstatedir} || : \
+    for unit in %{?*}; do \
+        if ! test -e %{_unitdir}/$unit; then \
+            touch %{libvirt_rpmstatedir}/preset-$unit || : \
+        fi \
+    done \
+    %{nil}
+
+# Apply presets for units that have previously been marked. Meant to
+# be called during %posttrans. Note that foo.service must be passed
+# as the first argument, before all the various foo*.socket
+# associated with it, for things to work correctly. This is necessary
+# because Also=foo.socket is usually present in foo.service's
+# [Install] section, and we want that configuration to take
+# precedence over foo.socket's own presets.
+%define libvirt_systemd_perform_preset() \
+    %{?7:%{error:Too many arguments}} \
+    for unit in %{?2} %{?3} %{?4} %{?5} %{?6} %1; do \
+        if test -e %{libvirt_rpmstatedir}/preset-$unit; then \
+            /usr/bin/systemctl --no-reload preset $unit || : \
+        fi \
+        rm -f %{libvirt_rpmstatedir}/preset-$unit \
+    done \
+    rmdir %{libvirt_rpmstatedir} 2>/dev/null || : \
+    %{nil}
+
+# Mark a single unit for restart. Meant to be called during %pre.
+%define libvirt_systemd_schedule_restart() \
+    mkdir -p %{libvirt_rpmstatedir} || : \
+    touch %{libvirt_rpmstatedir}/restart-%1 || : \
+    %{nil}
+
+# Restart a unit that was previously marked. Meant to be called
+# during %posttrans. If systemd is not running, no action will be
+# performed.
+%define libvirt_systemd_perform_restart() \
+    if test -d /run/systemd/system && \
+       test -e %{libvirt_rpmstatedir}/restart-%1; then \
+        /usr/bin/systemctl try-restart %1 >/dev/null 2>&1 || : \
+    fi \
+    rm -f %{libvirt_rpmstatedir}/restart-%1 \
+    rmdir %{libvirt_rpmstatedir} 2>/dev/null || : \
+    %{nil}
+
+# Mark a single unit for reload. Meant to be called during %pre.
+%define libvirt_systemd_schedule_reload() \
+    mkdir -p %{libvirt_rpmstatedir} || : \
+    touch %{libvirt_rpmstatedir}/reload-%1 || : \
+    %{nil}
+
+# Reload a unit that was previously marked. Meant to be called during
+# %posttrans. If systemd is not running, no action will be performed.
+%define libvirt_systemd_perform_reload() \
+    if test -d /run/systemd/system && \
+       test -e %{libvirt_rpmstatedir}/reload-%1; then \
+        /usr/bin/systemctl try-reload-or-restart %1 >/dev/null 2>&1 || : \
+    fi \
+    rm -f %{libvirt_rpmstatedir}/reload-%1 \
+    rmdir %{libvirt_rpmstatedir} 2>/dev/null || : \
+    %{nil}
+
+# Disable a single unit, optionally stopping it if systemd is
+# running. Meant to be called during %preun.
+%define libvirt_systemd_disable() \
+    if test -d /run/systemd/system; then \
+        /usr/bin/systemctl --no-reload disable --now %{?*} || : \
+    else \
+        /usr/bin/systemctl --no-reload disable %{?*} || : \
+    fi \
+    %{nil}
+
+# %pre implementation for services that should be restarted on
+# upgrade. Note that foo.service must be passed as the first
+# argument, before all the various foo*.socket associated with it.
+%define libvirt_systemd_restart_pre() \
+    %libvirt_systemd_schedule_preset %{?*} \
+    %libvirt_systemd_schedule_restart %1 \
+    %{nil}
+
+# %pre implementation for services that should be reloaded on
+# upgrade. Note that foo.service must be passed as the first
+# argument, before all the various foo*.socket associated with it.
+%define libvirt_systemd_reload_pre() \
+    %libvirt_systemd_schedule_preset %{?*} \
+    %libvirt_systemd_schedule_reload %1 \
+    %{nil}
+
+# %pre implementation for services that should be neither restarted
+# nor reloaded on upgrade.
+%define libvirt_systemd_noaction_pre() \
+    %libvirt_systemd_schedule_preset %{?*} \
+    %{nil}
+
+# %posttrans implementation for all services. We can use a single
+# macro to cover all scenarios, because each operation will only be
+# performed if it had previously been scheduled. Note that
+# foo.service must be passed as the first argument, before all the
+# various foo*.socket associated with it.
+%define libvirt_systemd_posttrans() \
+    %libvirt_systemd_perform_preset %{?*} \
+    %libvirt_systemd_perform_reload %1 \
+    %libvirt_systemd_perform_restart %1 \
+    %{nil}
+
+# %preun implementation for all services.
+%define libvirt_systemd_preun() \
+    if [ $1 -lt 1 ]; then \
+        %libvirt_systemd_disable %{?*} \
+    fi \
+    %{nil}
+
+# For daemons with only UNIX sockets
+
+%define libvirt_systemd_unix_pre() %libvirt_systemd_restart_pre %1.service %1.socket %1-ro.socket %1-admin.socket
+%define libvirt_systemd_unix_posttrans() %libvirt_systemd_posttrans %1.service %1.socket %1-ro.socket %1-admin.socket
+%define libvirt_systemd_unix_preun() %libvirt_systemd_preun %1.service %1.socket %1-ro.socket %1-admin.socket
+
+# For daemons with UNIX and INET sockets
+%define libvirt_systemd_inet_pre() %libvirt_systemd_restart_pre %1.service %1.socket %1-ro.socket %1-admin.socket %1-tls.socket %1-tcp.socket
+%define libvirt_systemd_inet_posttrans() %libvirt_systemd_posttrans %1.service %1.socket %1-ro.socket %1-admin.socket %1-tls.socket %1-tcp.socket
+%define libvirt_systemd_inet_preun() %libvirt_systemd_preun %1.service %1.socket %1-ro.socket %1-admin.socket %1-tls.socket %1-tcp.socket
+
+# For daemons with only UNIX sockets and no unprivileged read-only access
+%define libvirt_systemd_privileged_pre() %libvirt_systemd_reload_pre %1.service %1.socket %1-admin.socket
+%define libvirt_systemd_privileged_posttrans() %libvirt_systemd_posttrans %1.service %1.socket %1-admin.socket
+%define libvirt_systemd_privileged_preun() %libvirt_systemd_preun %1.service %1.socket %1-admin.socket
+
+# For one-shot daemons that have no associated sockets and should never be restarted
+%define libvirt_systemd_oneshot_pre() %libvirt_systemd_noaction_pre %1.service
+%define libvirt_systemd_oneshot_posttrans() %libvirt_systemd_posttrans %1.service
+%define libvirt_systemd_oneshot_preun() %libvirt_systemd_preun %1.service
+
+# For packages that install configuration for other daemons
+%define libvirt_systemd_config_pre() %libvirt_systemd_schedule_restart %1.service
+%define libvirt_systemd_config_posttrans() %libvirt_systemd_perform_restart %1.service
+
+%if %{with_native}
 %pre daemon
-# 'libvirt' group is just to allow password-less polkit access to
-# libvirtd. The uid number is irrelevant, so we use dynamic allocation
-# described at the above link.
-getent group libvirt >/dev/null || groupadd -r libvirt
+%libvirt_sysconfig_pre libvirtd
+%libvirt_systemd_inet_pre libvirtd
 
+%posttrans daemon
+%libvirt_sysconfig_posttrans libvirtd
+%libvirt_systemd_inet_posttrans libvirtd
+
+%preun daemon
+%libvirt_systemd_inet_preun libvirtd
+
+%pre daemon-common
+%libvirt_sysconfig_pre libvirt-guests
+%libvirt_systemd_oneshot_pre libvirt-guests
+# 'libvirt' group is just to allow password-less polkit access to libvirt
+# daemons. The uid number is irrelevant, so we use dynamic allocation.
+getent group libvirt >/dev/null || groupadd -r libvirt
 exit 0
 
-%post daemon
+%posttrans daemon-common
+%libvirt_sysconfig_posttrans libvirt-guests
+%libvirt_systemd_oneshot_posttrans libvirt-guests
 
-%systemd_post virtlockd.socket virtlockd-admin.socket
-%systemd_post virtlogd.socket virtlogd-admin.socket
-%systemd_post libvirtd.socket libvirtd-ro.socket libvirtd-admin.socket
-%systemd_post libvirtd-tcp.socket libvirtd-tls.socket
-%systemd_post libvirtd.service
+%preun daemon-common
+%libvirt_systemd_oneshot_preun libvirt-guests
 
-# request daemon restart in posttrans
-mkdir -p %{_localstatedir}/lib/rpm-state/libvirt || :
-touch %{_localstatedir}/lib/rpm-state/libvirt/restart || :
+%pre daemon-lock
+%libvirt_sysconfig_pre virtlockd
+%libvirt_systemd_privileged_pre virtlockd
 
-%preun daemon
-%systemd_preun libvirtd.service
-%systemd_preun libvirtd-tcp.socket libvirtd-tls.socket
-%systemd_preun libvirtd.socket libvirtd-ro.socket libvirtd-admin.socket
-%systemd_preun virtlogd.socket virtlogd-admin.socket virtlogd.service
-%systemd_preun virtlockd.socket virtlockd-admin.socket virtlockd.service
-
-%postun daemon
-/bin/systemctl daemon-reload >/dev/null 2>&1 || :
-if [ $1 -ge 1 ] ; then
-    /bin/systemctl reload-or-try-restart virtlockd.service >/dev/null 2>&1 || :
-    /bin/systemctl reload-or-try-restart virtlogd.service >/dev/null 2>&1 || :
-fi
+%posttrans daemon-lock
+%libvirt_sysconfig_posttrans virtlockd
+%libvirt_systemd_privileged_posttrans virtlockd
 
-# In upgrade scenario we must explicitly enable virtlockd/virtlogd
-# sockets, if libvirtd is already enabled and start them if
-# libvirtd is running, otherwise you'll get failures to start
-# guests
-%triggerpostun daemon -- libvirt-daemon < 1.3.0
-if [ $1 -ge 1 ] ; then
-    /bin/systemctl is-enabled libvirtd.service 1>/dev/null 2>&1 &&
-        /bin/systemctl enable virtlogd.socket virtlogd-admin.socket || :
-    /bin/systemctl is-active libvirtd.service 1>/dev/null 2>&1 &&
-        /bin/systemctl start virtlogd.socket virtlogd-admin.socket || :
-fi
+%preun daemon-lock
+%libvirt_systemd_privileged_preun virtlockd
 
-%posttrans daemon
-if [ -f %{_localstatedir}/lib/rpm-state/libvirt/restart ]; then
-    # See if user has previously modified their install to
-    # tell libvirtd to use --listen
-    grep -E '^LIBVIRTD_ARGS=.*--listen' /etc/sysconfig/libvirtd 1>/dev/null 2>&1
-    if test $? = 0
-    then
-        # Then lets keep honouring --listen and *not* use
-        # systemd socket activation, because switching things
-        # might confuse mgmt tool like puppet/ansible that
-        # expect the old style libvirtd
-        /bin/systemctl mask libvirtd.socket >/dev/null 2>&1 || :
-        /bin/systemctl mask libvirtd-ro.socket >/dev/null 2>&1 || :
-        /bin/systemctl mask libvirtd-admin.socket >/dev/null 2>&1 || :
-        /bin/systemctl mask libvirtd-tls.socket >/dev/null 2>&1 || :
-        /bin/systemctl mask libvirtd-tcp.socket >/dev/null 2>&1 || :
-    else
-        # Old libvirtd owns the sockets and will delete them on
-        # shutdown. Can't use a try-restart as libvirtd will simply
-        # own the sockets again when it comes back up. Thus we must
-        # do this particular ordering, so that we get libvirtd
-        # running with socket activation in use
-        /bin/systemctl is-active libvirtd.service 1>/dev/null 2>&1
-        if test $? = 0
-        then
-            /bin/systemctl stop libvirtd.service >/dev/null 2>&1 || :
-
-            /bin/systemctl try-restart libvirtd.socket >/dev/null 2>&1 || :
-            /bin/systemctl try-restart libvirtd-ro.socket >/dev/null 2>&1 || :
-            /bin/systemctl try-restart libvirtd-admin.socket >/dev/null 2>&1 || :
-
-            /bin/systemctl start libvirtd.service >/dev/null 2>&1 || :
-        fi
-    fi
-fi
-rm -rf %{_localstatedir}/lib/rpm-state/libvirt || :
+%pre daemon-log
+%libvirt_sysconfig_pre virtlogd
+%libvirt_systemd_privileged_pre virtlogd
+
+%posttrans daemon-log
+%libvirt_sysconfig_posttrans virtlogd
+%libvirt_systemd_privileged_posttrans virtlogd
+
+%preun daemon-log
+%libvirt_systemd_privileged_preun virtlogd
+
+%pre daemon-proxy
+%libvirt_sysconfig_pre virtproxyd
+%libvirt_systemd_inet_pre virtproxyd
+
+%posttrans daemon-proxy
+%libvirt_sysconfig_posttrans virtproxyd
+%libvirt_systemd_inet_posttrans virtproxyd
+
+%preun daemon-proxy
+%libvirt_systemd_inet_preun virtproxyd
+
+%pre daemon-driver-network
+%libvirt_sysconfig_pre virtnetworkd
+%libvirt_systemd_unix_pre virtnetworkd
 
 %post daemon-driver-network
-%if %{with_firewalld_zone}
+    %if %{with_firewalld_zone}
     %firewalld_reload
-%endif
+    %endif
+
+%posttrans daemon-driver-network
+%libvirt_sysconfig_posttrans virtnetworkd
+%libvirt_systemd_unix_posttrans virtnetworkd
+
+%preun daemon-driver-network
+%libvirt_systemd_unix_preun virtnetworkd
 
 %postun daemon-driver-network
-%if %{with_firewalld_zone}
+    %if %{with_firewalld_zone}
     %firewalld_reload
-%endif
+    %endif
+
+%pre daemon-driver-nwfilter
+%libvirt_sysconfig_pre virtnwfilterd
+%libvirt_systemd_unix_pre virtnwfilterd
+
+%posttrans daemon-driver-nwfilter
+%libvirt_sysconfig_posttrans virtnwfilterd
+%libvirt_systemd_unix_posttrans virtnwfilterd
+
+%preun daemon-driver-nwfilter
+%libvirt_systemd_unix_preun virtnwfilterd
+
+%pre daemon-driver-nodedev
+%libvirt_sysconfig_pre virtnodedevd
+%libvirt_systemd_unix_pre virtnodedevd
+
+%posttrans daemon-driver-nodedev
+%libvirt_sysconfig_posttrans virtnodedevd
+%libvirt_systemd_unix_posttrans virtnodedevd
+
+%preun daemon-driver-nodedev
+%libvirt_systemd_unix_preun virtnodedevd
+
+%pre daemon-driver-interface
+%libvirt_sysconfig_pre virtinterfaced
+%libvirt_systemd_unix_pre virtinterfaced
+
+%posttrans daemon-driver-interface
+%libvirt_sysconfig_posttrans virtinterfaced
+%libvirt_systemd_unix_posttrans virtinterfaced
+
+%preun daemon-driver-interface
+%libvirt_systemd_unix_preun virtinterfaced
+
+%pre daemon-driver-secret
+%libvirt_sysconfig_pre virtsecretd
+%libvirt_systemd_unix_pre virtsecretd
+
+%posttrans daemon-driver-secret
+%libvirt_sysconfig_posttrans virtsecretd
+%libvirt_systemd_unix_posttrans virtsecretd
+
+%preun daemon-driver-secret
+%libvirt_systemd_unix_preun virtsecretd
+
+%pre daemon-driver-storage-core
+%libvirt_sysconfig_pre virtstoraged
+%libvirt_systemd_unix_pre virtstoraged
+
+%posttrans daemon-driver-storage-core
+%libvirt_sysconfig_posttrans virtstoraged
+%libvirt_systemd_unix_posttrans virtstoraged
+
+%preun daemon-driver-storage-core
+%libvirt_systemd_unix_preun virtstoraged
+
+    %if %{with_qemu}
+%pre daemon-driver-qemu
+%libvirt_sysconfig_pre virtqemud
+%libvirt_systemd_unix_pre virtqemud
+# We want soft static allocation of well-known ids, as disk images
+# are commonly shared across NFS mounts by id rather than name; see
+# https://fedoraproject.org/wiki/Packaging:UsersAndGroups
+getent group kvm >/dev/null || groupadd -f -g 36 -r kvm
+getent group qemu >/dev/null || groupadd -f -g 107 -r qemu
+if ! getent passwd qemu >/dev/null; then
+  if ! getent passwd 107 >/dev/null; then
+    useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin -c "qemu user" qemu
+  else
+    useradd -r -g qemu -G kvm -d / -s /sbin/nologin -c "qemu user" qemu
+  fi
+fi
+exit 0
+
+%posttrans daemon-driver-qemu
+%libvirt_sysconfig_posttrans virtqemud
+%libvirt_systemd_unix_posttrans virtqemud
+
+%preun daemon-driver-qemu
+%libvirt_systemd_unix_preun virtqemud
+    %endif
+
+    %if %{with_lxc}
+%pre daemon-driver-lxc
+%libvirt_sysconfig_pre virtlxcd
+%libvirt_systemd_unix_pre virtlxcd
+
+%posttrans daemon-driver-lxc
+%libvirt_sysconfig_posttrans virtlxcd
+%libvirt_systemd_unix_posttrans virtlxcd
+
+%preun daemon-driver-lxc
+%libvirt_systemd_unix_preun virtlxcd
+    %endif
+
+    %if %{with_vbox}
+%pre daemon-driver-vbox
+%libvirt_sysconfig_pre virtvboxd
+%libvirt_systemd_unix_pre virtvboxd
+
+%posttrans daemon-driver-vbox
+%libvirt_sysconfig_posttrans virtvboxd
+%libvirt_systemd_unix_posttrans virtvboxd
+
+%preun daemon-driver-vbox
+%libvirt_systemd_unix_preun virtvboxd
+    %endif
+
+    %if %{with_libxl}
+%pre daemon-driver-libxl
+%libvirt_sysconfig_pre virtxend
+%libvirt_systemd_unix_pre virtxend
+
+%posttrans daemon-driver-libxl
+%libvirt_sysconfig_posttrans virtxend
+%libvirt_systemd_unix_posttrans virtxend
+
+%preun daemon-driver-libxl
+%libvirt_systemd_unix_preun virtxend
+    %endif
+
+%pre daemon-config-network
+%libvirt_systemd_config_pre libvirtd
+%libvirt_systemd_config_pre virtnetworkd
 
 %post daemon-config-network
 if test $1 -eq 1 && test ! -f %{_sysconfdir}/libvirt/qemu/networks/default.xml ; then
@@ -1699,159 +1970,135 @@ if test $1 -eq 1 && test ! -f %{_sysconfdir}/libvirt/qemu/networks/default.xml ;
         ;;
     esac
 
-    UUID=`/usr/bin/uuidgen`
     sed -e "s/${orig_sub}/${sub}/g" \
-        -e "s,</name>,</name>\n  <uuid>$UUID</uuid>," \
          < %{_datadir}/libvirt/networks/default.xml \
          > %{_sysconfdir}/libvirt/qemu/networks/default.xml
     ln -s ../default.xml %{_sysconfdir}/libvirt/qemu/networks/autostart/default.xml
     # libvirt saves this file with mode 0600
     chmod 0600 %{_sysconfdir}/libvirt/qemu/networks/default.xml
-
-    # Make sure libvirt picks up the new network defininiton
-    mkdir -p %{_localstatedir}/lib/rpm-state/libvirt || :
-    touch %{_localstatedir}/lib/rpm-state/libvirt/restart || :
 fi
 
 %posttrans daemon-config-network
-if [ -f %{_localstatedir}/lib/rpm-state/libvirt/restart ]; then
-    /bin/systemctl try-restart libvirtd.service >/dev/null 2>&1 || :
-fi
-rm -rf %{_localstatedir}/lib/rpm-state/libvirt || :
-
-%post daemon-config-nwfilter
-cp %{_datadir}/libvirt/nwfilter/*.xml %{_sysconfdir}/libvirt/nwfilter/
-# libvirt saves these files with mode 600
-chmod 600 %{_sysconfdir}/libvirt/nwfilter/*.xml
-# Make sure libvirt picks up the new nwfilter defininitons
-mkdir -p %{_localstatedir}/lib/rpm-state/libvirt || :
-touch %{_localstatedir}/lib/rpm-state/libvirt/restart || :
+%libvirt_systemd_config_posttrans libvirtd
+%libvirt_systemd_config_posttrans virtnetworkd
 
-%posttrans daemon-config-nwfilter
-if [ -f %{_localstatedir}/lib/rpm-state/libvirt/restart ]; then
-    /bin/systemctl try-restart libvirtd.service >/dev/null 2>&1 || :
-fi
-rm -rf %{_localstatedir}/lib/rpm-state/libvirt || :
+%pre daemon-config-nwfilter
+%libvirt_systemd_config_pre libvirtd
+%libvirt_systemd_config_pre virtnwfilterd
 
-
-%if %{with_qemu}
-%pre daemon-driver-qemu
-# We want soft static allocation of well-known ids, as disk images
-# are commonly shared across NFS mounts by id rather than name; see
-# https://fedoraproject.org/wiki/Packaging:UsersAndGroups
-getent group kvm >/dev/null || groupadd -f -g 36 -r kvm
-getent group qemu >/dev/null || groupadd -f -g 107 -r qemu
-if ! getent passwd qemu >/dev/null; then
-  if ! getent passwd 107 >/dev/null; then
-    useradd -r -u 107 -g qemu -G kvm -d / -s /sbin/nologin -c "qemu user" qemu
-  else
-    useradd -r -g qemu -G kvm -d / -s /sbin/nologin -c "qemu user" qemu
+%post daemon-config-nwfilter
+for datadir_file in %{_datadir}/libvirt/nwfilter/*.xml; do
+  sysconfdir_file=%{_sysconfdir}/libvirt/nwfilter/$(basename "$datadir_file")
+  if [ ! -f "$sysconfdir_file" ]; then
+    # libvirt saves these files with mode 600
+    install -m 0600 "$datadir_file" "$sysconfdir_file"
   fi
-fi
-exit 0
-%endif
-
-%preun client
-
-%systemd_preun libvirt-guests.service
+done
 
-%post client
-%systemd_post libvirt-guests.service
-
-%postun client
-%systemd_postun libvirt-guests.service
+%posttrans daemon-config-nwfilter
+%libvirt_systemd_config_posttrans libvirtd
+%libvirt_systemd_config_posttrans virtnwfilterd
 
-%if %{with_lxc}
+    %if %{with_lxc}
 %pre login-shell
 getent group virtlogin >/dev/null || groupadd -r virtlogin
 exit 0
+    %endif
 %endif
 
+%if %{with_native}
 %files
 
 %files docs
-%doc AUTHORS ChangeLog NEWS README README.md
-%doc %{_vpath_builddir}/libvirt-docs/*
+%doc NEWS.rst README.rst
+%doc libvirt-docs/*
 
 %files daemon
-
-%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/
-
 %{_unitdir}/libvirtd.service
 %{_unitdir}/libvirtd.socket
 %{_unitdir}/libvirtd-ro.socket
 %{_unitdir}/libvirtd-admin.socket
 %{_unitdir}/libvirtd-tcp.socket
 %{_unitdir}/libvirtd-tls.socket
-%{_unitdir}/virtproxyd.service
-%{_unitdir}/virtproxyd.socket
-%{_unitdir}/virtproxyd-ro.socket
-%{_unitdir}/virtproxyd-admin.socket
-%{_unitdir}/virtproxyd-tcp.socket
-%{_unitdir}/virtproxyd-tls.socket
-%{_unitdir}/virt-guest-shutdown.target
-%{_unitdir}/virtlogd.service
-%{_unitdir}/virtlogd.socket
-%{_unitdir}/virtlogd-admin.socket
-%{_unitdir}/virtlockd.service
-%{_unitdir}/virtlockd.socket
-%{_unitdir}/virtlockd-admin.socket
-%config(noreplace) %{_sysconfdir}/sysconfig/libvirtd
-%config(noreplace) %{_sysconfdir}/sysconfig/virtlogd
-%config(noreplace) %{_sysconfdir}/sysconfig/virtlockd
 %config(noreplace) %{_sysconfdir}/libvirt/libvirtd.conf
-%config(noreplace) %{_sysconfdir}/libvirt/virtproxyd.conf
-%config(noreplace) %{_sysconfdir}/libvirt/virtlogd.conf
-%config(noreplace) %{_sysconfdir}/libvirt/virtlockd.conf
-%config(noreplace) %{_sysconfdir}/sasl2/libvirt.conf
 %config(noreplace) %{_prefix}/lib/sysctl.d/60-libvirtd.conf
-
 %config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd
-%dir %{_datadir}/libvirt/
+%{_datadir}/augeas/lenses/libvirtd.aug
+%{_datadir}/augeas/lenses/tests/test_libvirtd.aug
+%attr(0755, root, root) %{_sbindir}/libvirtd
+%{_mandir}/man8/libvirtd.8*
 
+%files daemon-common
+%{_unitdir}/virt-guest-shutdown.target
+%{_unitdir}/libvirt-guests.service
+%config(noreplace) %{_sysconfdir}/sasl2/libvirt.conf
+%dir %{_datadir}/libvirt/
 %ghost %dir %{_rundir}/libvirt/
-
+%ghost %dir %{_rundir}/libvirt/common/
+%dir %attr(0755, root, root) %{_localstatedir}/lib/libvirt/
 %dir %attr(0711, root, root) %{_localstatedir}/lib/libvirt/images/
 %dir %attr(0711, root, root) %{_localstatedir}/lib/libvirt/filesystems/
 %dir %attr(0711, root, root) %{_localstatedir}/lib/libvirt/boot/
 %dir %attr(0711, root, root) %{_localstatedir}/cache/libvirt/
-
-
 %dir %attr(0755, root, root) %{_libdir}/libvirt/
 %dir %attr(0755, root, root) %{_libdir}/libvirt/connection-driver/
-%dir %attr(0755, root, root) %{_libdir}/libvirt/lock-driver
-%attr(0755, root, root) %{_libdir}/libvirt/lock-driver/lockd.so
-
-%{_datadir}/augeas/lenses/libvirtd.aug
-%{_datadir}/augeas/lenses/tests/test_libvirtd.aug
-%{_datadir}/augeas/lenses/virtlogd.aug
-%{_datadir}/augeas/lenses/tests/test_virtlogd.aug
-%{_datadir}/augeas/lenses/virtlockd.aug
-%{_datadir}/augeas/lenses/tests/test_virtlockd.aug
-%{_datadir}/augeas/lenses/virtproxyd.aug
-%{_datadir}/augeas/lenses/tests/test_virtproxyd.aug
-%{_datadir}/augeas/lenses/libvirt_lockd.aug
-%if %{with_qemu}
-%{_datadir}/augeas/lenses/tests/test_libvirt_lockd.aug
-%endif
-
+%dir %attr(0755, root, root) %{_libdir}/libvirt/storage-backend/
+%dir %attr(0755, root, root) %{_libdir}/libvirt/storage-file/
 %{_datadir}/polkit-1/actions/org.libvirt.unix.policy
 %{_datadir}/polkit-1/actions/org.libvirt.api.policy
 %{_datadir}/polkit-1/rules.d/50-libvirt.rules
-
 %dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/
-
 %attr(0755, root, root) %{_libexecdir}/libvirt_iohelper
+%attr(0755, root, root) %{_bindir}/virt-ssh-helper
+%attr(0755, root, root) %{_libexecdir}/libvirt-guests.sh
+%{_mandir}/man1/virt-admin.1*
+%{_mandir}/man1/virt-host-validate.1*
+%{_mandir}/man8/virt-ssh-helper.8*
+%{_mandir}/man8/libvirt-guests.8*
+%{_bindir}/virt-host-validate
+%{_bindir}/virt-admin
+%{_datadir}/bash-completion/completions/virt-admin
 
-%attr(0755, root, root) %{_sbindir}/libvirtd
-%attr(0755, root, root) %{_sbindir}/virtproxyd
-%attr(0755, root, root) %{_sbindir}/virtlogd
+%files daemon-lock
+%{_unitdir}/virtlockd.service
+%{_unitdir}/virtlockd.socket
+%{_unitdir}/virtlockd-admin.socket
+%config(noreplace) %{_sysconfdir}/libvirt/virtlockd.conf
+%{_datadir}/augeas/lenses/virtlockd.aug
+%{_datadir}/augeas/lenses/tests/test_virtlockd.aug
+%{_datadir}/augeas/lenses/libvirt_lockd.aug
+    %if %{with_qemu}
+%{_datadir}/augeas/lenses/tests/test_libvirt_lockd.aug
+    %endif
 %attr(0755, root, root) %{_sbindir}/virtlockd
+%{_mandir}/man8/virtlockd.8*
 
-%{_mandir}/man8/libvirtd.8*
+%files daemon-plugin-lockd
+%dir %attr(0755, root, root) %{_libdir}/libvirt/lock-driver/
+%attr(0755, root, root) %{_libdir}/libvirt/lock-driver/lockd.so
+
+%files daemon-log
+%{_unitdir}/virtlogd.service
+%{_unitdir}/virtlogd.socket
+%{_unitdir}/virtlogd-admin.socket
+%config(noreplace) %{_sysconfdir}/libvirt/virtlogd.conf
+%{_datadir}/augeas/lenses/virtlogd.aug
+%{_datadir}/augeas/lenses/tests/test_virtlogd.aug
+%attr(0755, root, root) %{_sbindir}/virtlogd
 %{_mandir}/man8/virtlogd.8*
-%{_mandir}/man8/virtlockd.8*
-%{_mandir}/man7/virkey*.7*
+
+%files daemon-proxy
+%{_unitdir}/virtproxyd.service
+%{_unitdir}/virtproxyd.socket
+%{_unitdir}/virtproxyd-ro.socket
+%{_unitdir}/virtproxyd-admin.socket
+%{_unitdir}/virtproxyd-tcp.socket
+%{_unitdir}/virtproxyd-tls.socket
+%config(noreplace) %{_sysconfdir}/libvirt/virtproxyd.conf
+%{_datadir}/augeas/lenses/virtproxyd.aug
+%{_datadir}/augeas/lenses/tests/test_virtproxyd.aug
+%attr(0755, root, root) %{_sbindir}/virtproxyd
+%{_mandir}/man8/virtproxyd.8*
 
 %files daemon-config-network
 %dir %{_datadir}/libvirt/networks/
@@ -1873,7 +2120,9 @@ exit 0
 %{_unitdir}/virtinterfaced-ro.socket
 %{_unitdir}/virtinterfaced-admin.socket
 %attr(0755, root, root) %{_sbindir}/virtinterfaced
-%{_libdir}/%{name}/connection-driver/libvirt_driver_interface.so
+%ghost %dir %{_rundir}/libvirt/interface/
+%{_libdir}/libvirt/connection-driver/libvirt_driver_interface.so
+%{_mandir}/man8/virtinterfaced.8*
 
 %files daemon-driver-network
 %config(noreplace) %{_sysconfdir}/libvirt/virtnetworkd.conf
@@ -1891,11 +2140,15 @@ exit 0
 %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/network/
 %dir %attr(0755, root, root) %{_localstatedir}/lib/libvirt/dnsmasq/
 %attr(0755, root, root) %{_libexecdir}/libvirt_leaseshelper
-%{_libdir}/%{name}/connection-driver/libvirt_driver_network.so
-
-%if %{with_firewalld_zone}
+%{_libdir}/libvirt/connection-driver/libvirt_driver_network.so
+%{_mandir}/man8/virtnetworkd.8*
+    %if %{with_firewalld_zone}
 %{_prefix}/lib/firewalld/zones/libvirt.xml
-%endif
+%{_prefix}/lib/firewalld/zones/libvirt-routed.xml
+%{_prefix}/lib/firewalld/policies/libvirt-routed-in.xml
+%{_prefix}/lib/firewalld/policies/libvirt-routed-out.xml
+%{_prefix}/lib/firewalld/policies/libvirt-to-host.xml
+    %endif
 
 %files daemon-driver-nodedev
 %config(noreplace) %{_sysconfdir}/libvirt/virtnodedevd.conf
@@ -1906,7 +2159,9 @@ exit 0
 %{_unitdir}/virtnodedevd-ro.socket
 %{_unitdir}/virtnodedevd-admin.socket
 %attr(0755, root, root) %{_sbindir}/virtnodedevd
-%{_libdir}/%{name}/connection-driver/libvirt_driver_nodedev.so
+%ghost %dir %{_rundir}/libvirt/nodedev/
+%{_libdir}/libvirt/connection-driver/libvirt_driver_nodedev.so
+%{_mandir}/man8/virtnodedevd.8*
 
 %files daemon-driver-nwfilter
 %config(noreplace) %{_sysconfdir}/libvirt/virtnwfilterd.conf
@@ -1919,7 +2174,10 @@ exit 0
 %attr(0755, root, root) %{_sbindir}/virtnwfilterd
 %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/nwfilter/
 %ghost %dir %{_rundir}/libvirt/network/
-%{_libdir}/%{name}/connection-driver/libvirt_driver_nwfilter.so
+%ghost %dir %{_rundir}/libvirt/nwfilter-binding/
+%ghost %dir %{_rundir}/libvirt/nwfilter/
+%{_libdir}/libvirt/connection-driver/libvirt_driver_nwfilter.so
+%{_mandir}/man8/virtnwfilterd.8*
 
 %files daemon-driver-secret
 %config(noreplace) %{_sysconfdir}/libvirt/virtsecretd.conf
@@ -1930,7 +2188,10 @@ exit 0
 %{_unitdir}/virtsecretd-ro.socket
 %{_unitdir}/virtsecretd-admin.socket
 %attr(0755, root, root) %{_sbindir}/virtsecretd
-%{_libdir}/%{name}/connection-driver/libvirt_driver_secret.so
+%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/secrets/
+%ghost %dir %{_rundir}/libvirt/secrets/
+%{_libdir}/libvirt/connection-driver/libvirt_driver_secret.so
+%{_mandir}/man8/virtsecretd.8*
 
 %files daemon-driver-storage
 
@@ -1944,54 +2205,54 @@ exit 0
 %{_unitdir}/virtstoraged-admin.socket
 %attr(0755, root, root) %{_sbindir}/virtstoraged
 %attr(0755, root, root) %{_libexecdir}/libvirt_parthelper
-%{_libdir}/%{name}/connection-driver/libvirt_driver_storage.so
-%{_libdir}/%{name}/storage-backend/libvirt_storage_backend_fs.so
-%{_libdir}/%{name}/storage-file/libvirt_storage_file_fs.so
+%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/storage/
+%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/storage/autostart/
+%ghost %dir %{_rundir}/libvirt/storage/
+%{_libdir}/libvirt/connection-driver/libvirt_driver_storage.so
+%{_libdir}/libvirt/storage-backend/libvirt_storage_backend_fs.so
+%{_libdir}/libvirt/storage-file/libvirt_storage_file_fs.so
+%{_mandir}/man8/virtstoraged.8*
 
 %files daemon-driver-storage-disk
-%{_libdir}/%{name}/storage-backend/libvirt_storage_backend_disk.so
+%{_libdir}/libvirt/storage-backend/libvirt_storage_backend_disk.so
 
 %files daemon-driver-storage-logical
-%{_libdir}/%{name}/storage-backend/libvirt_storage_backend_logical.so
+%{_libdir}/libvirt/storage-backend/libvirt_storage_backend_logical.so
 
 %files daemon-driver-storage-scsi
-%{_libdir}/%{name}/storage-backend/libvirt_storage_backend_scsi.so
+%{_libdir}/libvirt/storage-backend/libvirt_storage_backend_scsi.so
 
 %files daemon-driver-storage-iscsi
-%{_libdir}/%{name}/storage-backend/libvirt_storage_backend_iscsi.so
+%{_libdir}/libvirt/storage-backend/libvirt_storage_backend_iscsi.so
 
-%if %{with_storage_iscsi_direct}
+    %if %{with_storage_iscsi_direct}
 %files daemon-driver-storage-iscsi-direct
-%{_libdir}/%{name}/storage-backend/libvirt_storage_backend_iscsi-direct.so
-%endif
+%{_libdir}/libvirt/storage-backend/libvirt_storage_backend_iscsi-direct.so
+    %endif
 
 %files daemon-driver-storage-mpath
-%{_libdir}/%{name}/storage-backend/libvirt_storage_backend_mpath.so
+%{_libdir}/libvirt/storage-backend/libvirt_storage_backend_mpath.so
 
-%if %{with_storage_gluster}
+    %if %{with_storage_gluster}
 %files daemon-driver-storage-gluster
-%{_libdir}/%{name}/storage-backend/libvirt_storage_backend_gluster.so
-%{_libdir}/%{name}/storage-file/libvirt_storage_file_gluster.so
-%endif
+%{_libdir}/libvirt/storage-backend/libvirt_storage_backend_gluster.so
+%{_libdir}/libvirt/storage-file/libvirt_storage_file_gluster.so
+    %endif
 
-%if %{with_storage_rbd}
+    %if %{with_storage_rbd}
 %files daemon-driver-storage-rbd
-%{_libdir}/%{name}/storage-backend/libvirt_storage_backend_rbd.so
-%endif
-
-%if %{with_storage_sheepdog}
-%files daemon-driver-storage-sheepdog
-%{_libdir}/%{name}/storage-backend/libvirt_storage_backend_sheepdog.so
-%endif
+%{_libdir}/libvirt/storage-backend/libvirt_storage_backend_rbd.so
+    %endif
 
-%if %{with_storage_zfs}
+    %if %{with_storage_zfs}
 %files daemon-driver-storage-zfs
-%{_libdir}/%{name}/storage-backend/libvirt_storage_backend_zfs.so
-%endif
+%{_libdir}/libvirt/storage-backend/libvirt_storage_backend_zfs.so
+    %endif
 
-%if %{with_qemu}
+    %if %{with_qemu}
 %files daemon-driver-qemu
 %config(noreplace) %{_sysconfdir}/libvirt/virtqemud.conf
+%config(noreplace) %{_prefix}/lib/sysctl.d/60-qemu-postcopy-migration.conf
 %{_datadir}/augeas/lenses/virtqemud.aug
 %{_datadir}/augeas/lenses/tests/test_virtqemud.aug
 %{_unitdir}/virtqemud.service
@@ -2000,23 +2261,35 @@ exit 0
 %{_unitdir}/virtqemud-admin.socket
 %attr(0755, root, root) %{_sbindir}/virtqemud
 %dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/
+%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/qemu/autostart/
 %dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/qemu/
 %config(noreplace) %{_sysconfdir}/libvirt/qemu.conf
 %config(noreplace) %{_sysconfdir}/libvirt/qemu-lockd.conf
 %config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd.qemu
 %ghost %dir %{_rundir}/libvirt/qemu/
+%ghost %dir %{_rundir}/libvirt/qemu/dbus/
+%ghost %dir %{_rundir}/libvirt/qemu/passt/
+%ghost %dir %{_rundir}/libvirt/qemu/slirp/
+%ghost %dir %{_rundir}/libvirt/qemu/swtpm/
 %dir %attr(0751, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/
-%dir %attr(0750, %{qemu_user}, %{qemu_group}) %{_localstatedir}/cache/libvirt/qemu/
+%dir %attr(0751, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/checkpoint/
+%dir %attr(0751, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/dump/
+%dir %attr(0751, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/nvram/
+%dir %attr(0751, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/ram/
+%dir %attr(0751, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/save/
+%dir %attr(0751, %{qemu_user}, %{qemu_group}) %{_localstatedir}/lib/libvirt/qemu/snapshot/
+%dir %attr(0750, root, root) %{_localstatedir}/cache/libvirt/qemu/
 %{_datadir}/augeas/lenses/libvirtd_qemu.aug
 %{_datadir}/augeas/lenses/tests/test_libvirtd_qemu.aug
-%{_libdir}/%{name}/connection-driver/libvirt_driver_qemu.so
+%{_libdir}/libvirt/connection-driver/libvirt_driver_qemu.so
 %dir %attr(0711, root, root) %{_localstatedir}/lib/libvirt/swtpm/
-%dir %attr(0711, root, root) %{_localstatedir}/log/swtpm/libvirt/qemu/
+%dir %attr(0730, tss, tss) %{_localstatedir}/log/swtpm/libvirt/qemu/
 %{_bindir}/virt-qemu-run
 %{_mandir}/man1/virt-qemu-run.1*
-%endif
+%{_mandir}/man8/virtqemud.8*
+    %endif
 
-%if %{with_lxc}
+    %if %{with_lxc}
 %files daemon-driver-lxc
 %config(noreplace) %{_sysconfdir}/libvirt/virtlxcd.conf
 %{_datadir}/augeas/lenses/virtlxcd.aug
@@ -2027,6 +2300,8 @@ exit 0
 %{_unitdir}/virtlxcd-admin.socket
 %attr(0755, root, root) %{_sbindir}/virtlxcd
 %dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/lxc/
+%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/lxc/
+%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/lxc/autostart/
 %config(noreplace) %{_sysconfdir}/libvirt/lxc.conf
 %config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd.lxc
 %ghost %dir %{_rundir}/libvirt/lxc/
@@ -2034,10 +2309,11 @@ exit 0
 %{_datadir}/augeas/lenses/libvirtd_lxc.aug
 %{_datadir}/augeas/lenses/tests/test_libvirtd_lxc.aug
 %attr(0755, root, root) %{_libexecdir}/libvirt_lxc
-%{_libdir}/%{name}/connection-driver/libvirt_driver_lxc.so
-%endif
+%{_libdir}/libvirt/connection-driver/libvirt_driver_lxc.so
+%{_mandir}/man8/virtlxcd.8*
+    %endif
 
-%if %{with_libxl}
+    %if %{with_libxl}
 %files daemon-driver-libxl
 %config(noreplace) %{_sysconfdir}/libvirt/virtxend.conf
 %{_datadir}/augeas/lenses/virtxend.aug
@@ -2050,15 +2326,22 @@ exit 0
 %config(noreplace) %{_sysconfdir}/libvirt/libxl.conf
 %config(noreplace) %{_sysconfdir}/logrotate.d/libvirtd.libxl
 %config(noreplace) %{_sysconfdir}/libvirt/libxl-lockd.conf
+%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/libxl/
+%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/libxl/autostart/
 %{_datadir}/augeas/lenses/libvirtd_libxl.aug
 %{_datadir}/augeas/lenses/tests/test_libvirtd_libxl.aug
 %dir %attr(0700, root, root) %{_localstatedir}/log/libvirt/libxl/
 %ghost %dir %{_rundir}/libvirt/libxl/
 %dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/libxl/
-%{_libdir}/%{name}/connection-driver/libvirt_driver_libxl.so
-%endif
+%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/libxl/channel/
+%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/libxl/channel/target/
+%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/libxl/dump/
+%dir %attr(0700, root, root) %{_localstatedir}/lib/libvirt/libxl/save/
+%{_libdir}/libvirt/connection-driver/libvirt_driver_libxl.so
+%{_mandir}/man8/virtxend.8*
+    %endif
 
-%if %{with_vbox}
+    %if %{with_vbox}
 %files daemon-driver-vbox
 %config(noreplace) %{_sysconfdir}/libvirt/virtvboxd.conf
 %{_datadir}/augeas/lenses/virtvboxd.aug
@@ -2068,37 +2351,39 @@ exit 0
 %{_unitdir}/virtvboxd-ro.socket
 %{_unitdir}/virtvboxd-admin.socket
 %attr(0755, root, root) %{_sbindir}/virtvboxd
-%{_libdir}/%{name}/connection-driver/libvirt_driver_vbox.so
-%endif
+%{_libdir}/libvirt/connection-driver/libvirt_driver_vbox.so
+%{_mandir}/man8/virtvboxd.8*
+    %endif
 
-%if %{with_qemu_tcg}
+    %if %{with_qemu_tcg}
 %files daemon-qemu
-%endif
+    %endif
 
-%if %{with_qemu_kvm}
+    %if %{with_qemu_kvm}
 %files daemon-kvm
-%endif
+    %endif
 
-%if %{with_lxc}
+    %if %{with_lxc}
 %files daemon-lxc
-%endif
+    %endif
 
-%if %{with_libxl}
+    %if %{with_libxl}
 %files daemon-xen
-%endif
+    %endif
 
-%if %{with_vbox}
+    %if %{with_vbox}
 %files daemon-vbox
-%endif
+    %endif
 
-%if %{with_sanlock}
-%files lock-sanlock
-    %if %{with_qemu}
+    %if %{with_sanlock}
+%files daemon-plugin-sanlock
+        %if %{with_qemu}
 %config(noreplace) %{_sysconfdir}/libvirt/qemu-sanlock.conf
-    %endif
-    %if %{with_libxl}
+        %endif
+        %if %{with_libxl}
 %config(noreplace) %{_sysconfdir}/libvirt/libxl-sanlock.conf
-    %endif
+        %endif
+%dir %attr(0755, root, root) %{_libdir}/libvirt/lock-driver/
 %attr(0755, root, root) %{_libdir}/libvirt/lock-driver/sanlock.so
 %{_datadir}/augeas/lenses/libvirt_sanlock.aug
 %{_datadir}/augeas/lenses/tests/test_libvirt_sanlock.aug
@@ -2106,37 +2391,33 @@ exit 0
 %{_sbindir}/virt-sanlock-cleanup
 %{_mandir}/man8/virt-sanlock-cleanup.8*
 %attr(0755, root, root) %{_libexecdir}/libvirt_sanlock_helper
-%endif
+    %endif
 
 %files client
 %{_mandir}/man1/virsh.1*
 %{_mandir}/man1/virt-xml-validate.1*
+%{_mandir}/man1/virt-pki-query-dn.1*
 %{_mandir}/man1/virt-pki-validate.1*
-%{_mandir}/man1/virt-host-validate.1*
+%{_mandir}/man7/virkey*.7*
 %{_bindir}/virsh
 %{_bindir}/virt-xml-validate
+%{_bindir}/virt-pki-query-dn
 %{_bindir}/virt-pki-validate
-%{_bindir}/virt-host-validate
+%{_datadir}/bash-completion/completions/virsh
 
-%ifnarch aarch64 x86_64 loongarch64 riscv64
-    %{_datadir}/systemtap/tapset/libvirt_probes*.stp
-    %{_datadir}/systemtap/tapset/libvirt_functions.stp
     %if %{with_qemu}
-    %{_datadir}/systemtap/tapset/libvirt_qemu_probes*.stp
-    %endif
-%endif
-
-%if %{with_bash_completion}
-%{_datadir}/bash-completion/completions/virsh
+%if %{with_client_qemu}
+%files client-qemu
+%{_mandir}/man1/virt-qemu-qmp-proxy.1*
+%{_mandir}/man1/virt-qemu-sev-validate.1*
+%{_bindir}/virt-qemu-qmp-proxy
+%{_bindir}/virt-qemu-sev-validate
 %endif
+    %endif
 
-
-%{_unitdir}/libvirt-guests.service
-%config(noreplace) %{_sysconfdir}/sysconfig/libvirt-guests
-%attr(0755, root, root) %{_libexecdir}/libvirt-guests.sh
-
-%files libs -f %{_vpath_builddir}/%{name}.lang
+%files libs -f %{name}.lang
 %license COPYING COPYING.LESSER
+%dir %attr(0700, root, root) %{_sysconfdir}/libvirt/
 %config(noreplace) %{_sysconfdir}/libvirt/libvirt.conf
 %config(noreplace) %{_sysconfdir}/libvirt/libvirt-admin.conf
 %{_libdir}/libvirt.so.*
@@ -2145,63 +2426,31 @@ exit 0
 %{_libdir}/libvirt-admin.so.*
 %dir %{_datadir}/libvirt/
 %dir %{_datadir}/libvirt/schemas/
-%dir %attr(0755, root, root) %{_localstatedir}/lib/libvirt/
-
-%{_datadir}/libvirt/schemas/basictypes.rng
-%{_datadir}/libvirt/schemas/capability.rng
-%{_datadir}/libvirt/schemas/cputypes.rng
-%{_datadir}/libvirt/schemas/domain.rng
-%{_datadir}/libvirt/schemas/domainbackup.rng
-%{_datadir}/libvirt/schemas/domaincaps.rng
-%{_datadir}/libvirt/schemas/domaincheckpoint.rng
-%{_datadir}/libvirt/schemas/domaincommon.rng
-%{_datadir}/libvirt/schemas/domainsnapshot.rng
-%{_datadir}/libvirt/schemas/interface.rng
-%{_datadir}/libvirt/schemas/network.rng
-%{_datadir}/libvirt/schemas/networkcommon.rng
-%{_datadir}/libvirt/schemas/networkport.rng
-%{_datadir}/libvirt/schemas/nodedev.rng
-%{_datadir}/libvirt/schemas/nwfilter.rng
-%{_datadir}/libvirt/schemas/nwfilter_params.rng
-%{_datadir}/libvirt/schemas/nwfilterbinding.rng
-%{_datadir}/libvirt/schemas/secret.rng
-%{_datadir}/libvirt/schemas/storagecommon.rng
-%{_datadir}/libvirt/schemas/storagepool.rng
-%{_datadir}/libvirt/schemas/storagepoolcaps.rng
-%{_datadir}/libvirt/schemas/storagevol.rng
-
+%{_datadir}/systemtap/tapset/libvirt_probes*.stp
+%{_datadir}/systemtap/tapset/libvirt_functions.stp
+    %if %{with_qemu}
+%{_datadir}/systemtap/tapset/libvirt_qemu_probes*.stp
+    %endif
+%{_datadir}/libvirt/schemas/*.rng
 %{_datadir}/libvirt/cpu_map/*.xml
-
 %{_datadir}/libvirt/test-screenshot.png
 
-%files admin
-%{_mandir}/man1/virt-admin.1*
-%{_bindir}/virt-admin
-%if %{with_bash_completion}
-%{_datadir}/bash-completion/completions/virt-admin
-%endif
-
-%if %{with_bash_completion}
-%files bash-completion
-%{_datadir}/bash-completion/completions/vsh
-%endif
-
-%if %{with_wireshark}
+    %if %{with_wireshark}
 %files wireshark
 %{wireshark_plugindir}/libvirt.so
-%endif
+    %endif
 
 %files nss
 %{_libdir}/libnss_libvirt.so.2
 %{_libdir}/libnss_libvirt_guest.so.2
 
-%if %{with_lxc}
+    %if %{with_lxc}
 %files login-shell
 %attr(4750, root, virtlogin) %{_bindir}/virt-login-shell
 %{_libexecdir}/virt-login-shell-helper
 %config(noreplace) %{_sysconfdir}/libvirt/virt-login-shell.conf
 %{_mandir}/man1/virt-login-shell.1*
-%endif
+    %endif
 
 %files devel
 %{_libdir}/libvirt.so
@@ -2231,286 +2480,192 @@ exit 0
 %{_libdir}/pkgconfig/libvirt-admin.pc
 %{_libdir}/pkgconfig/libvirt-qemu.pc
 %{_libdir}/pkgconfig/libvirt-lxc.pc
-
 %dir %{_datadir}/libvirt/api/
 %{_datadir}/libvirt/api/libvirt-api.xml
 %{_datadir}/libvirt/api/libvirt-admin-api.xml
 %{_datadir}/libvirt/api/libvirt-qemu-api.xml
 %{_datadir}/libvirt/api/libvirt-lxc-api.xml
+%endif
 
+%if %{with_mingw32}
+%files -n mingw32-libvirt -f mingw32-libvirt.lang
+%dir %{mingw32_sysconfdir}/libvirt/
+%config(noreplace) %{mingw32_sysconfdir}/libvirt/libvirt.conf
+%config(noreplace) %{mingw32_sysconfdir}/libvirt/libvirt-admin.conf
+%{mingw32_bindir}/libvirt-0.dll
+%{mingw32_bindir}/virsh.exe
+%{mingw32_bindir}/virt-admin.exe
+%{mingw32_bindir}/virt-xml-validate
+%{mingw32_bindir}/virt-pki-query-dn.exe
+%{mingw32_bindir}/virt-pki-validate
+%{mingw32_bindir}/libvirt-lxc-0.dll
+%{mingw32_bindir}/libvirt-qemu-0.dll
+%{mingw32_bindir}/libvirt-admin-0.dll
+%{mingw32_libdir}/libvirt.dll.a
+%{mingw32_libdir}/pkgconfig/libvirt.pc
+%{mingw32_libdir}/pkgconfig/libvirt-qemu.pc
+%{mingw32_libdir}/pkgconfig/libvirt-lxc.pc
+%{mingw32_libdir}/pkgconfig/libvirt-admin.pc
+%{mingw32_libdir}/libvirt-lxc.dll.a
+%{mingw32_libdir}/libvirt-qemu.dll.a
+%{mingw32_libdir}/libvirt-admin.dll.a
+%dir %{mingw32_datadir}/libvirt/
+%dir %{mingw32_datadir}/libvirt/schemas/
+%{mingw32_datadir}/libvirt/schemas/*.rng
+%dir %{mingw32_datadir}/libvirt/api/
+%{mingw32_datadir}/libvirt/api/libvirt-api.xml
+%{mingw32_datadir}/libvirt/api/libvirt-lxc-api.xml
+%{mingw32_datadir}/libvirt/api/libvirt-qemu-api.xml
+%{mingw32_datadir}/libvirt/api/libvirt-admin-api.xml
+%{mingw32_datadir}/libvirt/cpu_map/*.xml
+%{mingw32_datadir}/libvirt/test-screenshot.png
+%dir %{mingw32_includedir}/libvirt
+%{mingw32_includedir}/libvirt/libvirt.h
+%{mingw32_includedir}/libvirt/libvirt-common.h
+%{mingw32_includedir}/libvirt/libvirt-domain.h
+%{mingw32_includedir}/libvirt/libvirt-domain-checkpoint.h
+%{mingw32_includedir}/libvirt/libvirt-domain-snapshot.h
+%{mingw32_includedir}/libvirt/libvirt-event.h
+%{mingw32_includedir}/libvirt/libvirt-host.h
+%{mingw32_includedir}/libvirt/libvirt-interface.h
+%{mingw32_includedir}/libvirt/libvirt-network.h
+%{mingw32_includedir}/libvirt/libvirt-nodedev.h
+%{mingw32_includedir}/libvirt/libvirt-nwfilter.h
+%{mingw32_includedir}/libvirt/libvirt-secret.h
+%{mingw32_includedir}/libvirt/libvirt-storage.h
+%{mingw32_includedir}/libvirt/libvirt-stream.h
+%{mingw32_includedir}/libvirt/virterror.h
+%{mingw32_includedir}/libvirt/libvirt-lxc.h
+%{mingw32_includedir}/libvirt/libvirt-qemu.h
+%{mingw32_includedir}/libvirt/libvirt-admin.h
+%{mingw32_mandir}/man1/virsh.1*
+%{mingw32_mandir}/man1/virt-admin.1*
+%{mingw32_mandir}/man1/virt-xml-validate.1*
+%{mingw32_mandir}/man1/virt-pki-query-dn.1*
+%{mingw32_mandir}/man1/virt-pki-validate.1*
+%{mingw32_mandir}/man7/virkey*.7*
+%endif
+
+%if %{with_mingw64}
+%files -n mingw64-libvirt -f mingw64-libvirt.lang
+%dir %{mingw64_sysconfdir}/libvirt/
+%config(noreplace) %{mingw64_sysconfdir}/libvirt/libvirt.conf
+%config(noreplace) %{mingw64_sysconfdir}/libvirt/libvirt-admin.conf
+%{mingw64_bindir}/libvirt-0.dll
+%{mingw64_bindir}/virsh.exe
+%{mingw64_bindir}/virt-admin.exe
+%{mingw64_bindir}/virt-xml-validate
+%{mingw64_bindir}/virt-pki-query-dn.exe
+%{mingw64_bindir}/virt-pki-validate
+%{mingw64_bindir}/libvirt-lxc-0.dll
+%{mingw64_bindir}/libvirt-qemu-0.dll
+%{mingw64_bindir}/libvirt-admin-0.dll
+%{mingw64_libdir}/libvirt.dll.a
+%{mingw64_libdir}/pkgconfig/libvirt.pc
+%{mingw64_libdir}/pkgconfig/libvirt-qemu.pc
+%{mingw64_libdir}/pkgconfig/libvirt-lxc.pc
+%{mingw64_libdir}/pkgconfig/libvirt-admin.pc
+%{mingw64_libdir}/libvirt-lxc.dll.a
+%{mingw64_libdir}/libvirt-qemu.dll.a
+%{mingw64_libdir}/libvirt-admin.dll.a
+%dir %{mingw64_datadir}/libvirt/
+%dir %{mingw64_datadir}/libvirt/schemas/
+%{mingw64_datadir}/libvirt/schemas/*.rng
+%dir %{mingw64_datadir}/libvirt/api/
+%{mingw64_datadir}/libvirt/api/libvirt-api.xml
+%{mingw64_datadir}/libvirt/api/libvirt-lxc-api.xml
+%{mingw64_datadir}/libvirt/api/libvirt-qemu-api.xml
+%{mingw64_datadir}/libvirt/api/libvirt-admin-api.xml
+%{mingw64_datadir}/libvirt/cpu_map/*.xml
+%{mingw64_datadir}/libvirt/test-screenshot.png
+%dir %{mingw64_includedir}/libvirt
+%{mingw64_includedir}/libvirt/libvirt.h
+%{mingw64_includedir}/libvirt/libvirt-common.h
+%{mingw64_includedir}/libvirt/libvirt-domain.h
+%{mingw64_includedir}/libvirt/libvirt-domain-checkpoint.h
+%{mingw64_includedir}/libvirt/libvirt-domain-snapshot.h
+%{mingw64_includedir}/libvirt/libvirt-event.h
+%{mingw64_includedir}/libvirt/libvirt-host.h
+%{mingw64_includedir}/libvirt/libvirt-interface.h
+%{mingw64_includedir}/libvirt/libvirt-network.h
+%{mingw64_includedir}/libvirt/libvirt-nodedev.h
+%{mingw64_includedir}/libvirt/libvirt-nwfilter.h
+%{mingw64_includedir}/libvirt/libvirt-secret.h
+%{mingw64_includedir}/libvirt/libvirt-storage.h
+%{mingw64_includedir}/libvirt/libvirt-stream.h
+%{mingw64_includedir}/libvirt/virterror.h
+%{mingw64_includedir}/libvirt/libvirt-lxc.h
+%{mingw64_includedir}/libvirt/libvirt-qemu.h
+%{mingw64_includedir}/libvirt/libvirt-admin.h
+%{mingw64_mandir}/man1/virsh.1*
+%{mingw64_mandir}/man1/virt-admin.1*
+%{mingw64_mandir}/man1/virt-xml-validate.1*
+%{mingw64_mandir}/man1/virt-pki-query-dn.1*
+%{mingw64_mandir}/man1/virt-pki-validate.1*
+%{mingw64_mandir}/man7/virkey*.7*
+%endif
 
 %changelog
-* Wed Nov 29 2023 Jiabo Feng <fengjiabo1@huawei.com> - 6.2.0-60
-- vdpa: support vdpa device migrate
-- vdpa: support vdpa device hot plug/unplug
-- vdpa: Introduce the new device type vdpa to hostdev
-- node_device: fix leak of DIR*
-- Include vdpa devices in node device list
-- lxc: fix lxcContainerMountAllFS() DEREF_BEFORE_CHECK
-- qemu: Return perf status that affect next boot  for shutoff domains While we set up perf events for a shutoff domain and check the settings, All of perf events are reported as 'disabled', unless we add --config, This is redundant for a shutoff domain.
-- tests: upstream Fixing compiler warning in cputest
-- qemu_migration_cookie: Rename ret in qemuDomainExtractTLSSubject
-- virrandom: Fix printf format string in virRandomGenerateWWN()
-- fix the issue of errors when saving after 'virsh edit'
-- Use (un)signed printf specifiers correctly
-- admin: fix leak of typed parameters on error
-- esx: call freeaddrinfo earlier in esxUtil_ResolveHostname Call freeaddrinfo() as soon as @result is not needed anymore, i.e. right after getnameinfo(); this avoids calling freeaddrinfo() in two branches.
-- qemu: Fix incorrect command name in error messages
-
-
-* Wed Aug 9 2023 Jiabo Feng <fengjiabo1@huawei.com> - 6.2.0-59
-- virnetsshsession: Adapt to change libssh2 API
-- selinux: Reflect context_str() type change
-- Revert "selinux: adapt to libselinux"
-- selinux: adapt to libselinux
-- fix error in printf format string
-
-* Tue May 23 2023 laokz <zhangkai@iscas.ac.cn> - 6.2.0-58
-- add riscv64 support
-
-* Mon May 22 2023 zhangxinhao <zhangxinhao1@huawei.com> - 6.2.0-57
-- cpu_topo: support for cpu_topo "clusters” in conf
-- cpu_topo: support for specifying "clusters" in qemu comand
-- cpu_topo: support for reporting cluster_id in NUMA topology
-- cpu_topo: fix detection of vCPU pids when multiple clusters are present
-
-* Sun May 21 2023 XuFei <xufei30@huawei.com> - 6.2.0-56
-- nodedev: ignore EINVAL from libudev in udevEventHandleThread
-- qemu: tpm: Pass --logfile to swtpm_setup for incoming migration
-
-* Tue Apr 25 2023 tianyuan <tianyuan01@chinasoftinc.com> - 6.2.0-55
-- bugfix: Fix potential crash during driver cleanup
-
-* Tue Apr 04 2023 Chenxi Mao <chenxi.mao@suse.com> - 6.2.0-54
-- bugfix: Fix build error if compiler switch to clang.
-
-* Thu Mar 30 2023 zhaotianrui <zhaotianrui@loongson.cn> - 6.2.0-53
-- bugfix: correct the firmware path of loongarch virt machine
-
-* Tue Mar 28 2023 mayunlong <mayunlong6@huawei.com> - 6.2.0-52
-- bugfix: move qemuDomainDiskBlockIoTunelsSupported to currect place
-- libvirt: add loongarch support
-
-* Tue Feb 14 2023 mayunlong <mayunlong6@huawei.com> - 6.2.0-51
-- live_migrate: virsh migrate command supports the zstd compression algorithm
-- glibcompat: Provide implementation for G_GNUC_NO_INLINE
-
-* Wed Jan 04 2023 jiangjiacheng <jiangjiacheng@huawei.com> - 6.2.0-50
-- backport patches from upstream
-
-* Sat Dec 17 2022 zhengchuan <zhengchuan@huawei.com> - 6.2.0-49
-- add function of set migration thread affinity during migration
-
-* Sat Dec 10 2022 yezengruan <yezengruan@huawei.com> - 6.2.0-48
-- update the Chinese translation of nwfilter
-
-* Tue Dec 06 2022 yezengruan <yezengruan@huawei.com> - 6.2.0-47
-- sync some bugfix patches from upstream
-- support vhostuser disk
-- libvirt: support dirtyrate (calc-dirty-rate, dirtyrate-param.mode)
-
-* Fri Nov 25 2022 yezengruan <yezengruan@huawei.com> - 6.2.0-46
-- sync some bugfix patches from upstream
-
-* Fri Nov 11 2022 yezengruan <yezengruan@huawei.com> - 6.2.0-45
-- docs: Fix template matching in page.xsl
-
-* Thu Nov 03 2022 yezengruan <yezengruan@huawei.com> - 6.2.0-44
-- libvirt: support migration dirtyrate
-
-* Tue Oct 11 2022 wengyu <wengyu@isrc.iscas.ac.cn> - 6.2.0-43
-- libvirt: Synchronize upstream patches according to issue I5OLYY
-
-* Thu Aug 25 2022 yezengruan <yezengruan@huawei.com> - 6.2.0-42
-- qemu: Add missing lock in qemuProcessHandleMonitorEOF (CVE-2021-3975)
-
-* Thu Aug 11 2022 yezengruan <yezengruan@huawei.com> - 6.2.0-41
-- apibuild: Fix self.waring method call
-
-* Mon Jun 20 2022 yezengruan <yezengruan@huawei.com> - 6.2.0-40
-- nwfilter: fix crash when counting number of network filters (CVE-2022-0897)
-
-* Mon Jun 13 2022 yezengruan <yezengruan@huawei.com> - 6.2.0-39
-- sw_64: Add sw64 architecture support
-- src: workaround warning triggered in glib 2.69
-
-* Tue May 10 2022 yezengruan <yezengruan@huawei.com> - 6.2.0-38
-- update some inconsistent patches
-- virsh: Display vhostuser socket path in domblklist
-
-* Wed Apr 27 2022 yezengruan <yezengruan@huawei.com> - 6.2.0-37
-- update the format of changelog
-
-* Thu Mar 24 2022 yezengruan <yezengruan@huawei.com> - 6.2.0-36
-- apparmor: Permit new capabilities required by libvirtd
-
-* Thu Mar 24 2022 yezengruan <yezengruan@huawei.com> - 6.2.0-35
-- qemuMonitorJSONSetMigrationParams: Take double pointer for @params
-- qemuMonitorJSONAddObject: Take double pointer for @props
-- :qemuMonitorJSONMakeCommandInternal: Clear @arguments when stolen
-- qemuMonitorAddObject: Fix semantics of @alias
-- qemuMonitorAddObject: Refactor cleanup
-- util: json: Replace virJSONValueObjectSteal by virJSONValueObjectRemoveKey
-- qemu: command: Generate commandline of 'masterKey0' secret via JSON
-- qemu: command: Generate commandline of 'sev0' sev-guest object via JSON
-- qemu: command: Generate commandline of iothread objects JSON
-- qemu: capabilities: Introduce QEMU_CAPS_OBJECT_QAPIFIED
-- qemu: monitor: Make wrapping of 'props' of 'object-add' optional
-- qemuMonitorCreateObjectPropsWrap: Open-code in qemuBuildMemoryBackendProps
-- qemu: monitor: Don't add 'props' wrapper if qemu has QEMU_CAPS_OBJECT_QAPIFIED
-- qemu: command: Use JSON for QAPIfied -object directly
-- tests: qemuxml2argv: Validate generation of JSON props for object-add
-- qemu: capabilities: Enable detection of QEMU_CAPS_OBJECT_QAPIFIED
-
-* Sat Mar 12 2022 yezengruan <yezengruan@huawei.com> - 6.2.0-34
-- Revert libvirt: support aarch64 vtpm with parameter tpm-tis-device
-- qemu: Fix swtpm device with aarch64
-- qemu: Fix libvirt hang due to early TPM device stop
-- qemu_tpm: Move logfile path generation into a separate function
-- qemu_tpm: Generate log file path among with storage path
-- virtpm: Fix @path handling in virTPMEmulatorInit()
-
-* Fri Mar 11 2022 yezengruan <yezengruan@huawei.com> - 6.2.0-33
-- qemu: Probe for a few params supported by migrate-set-parameters
-- qemu: Avoid deprecated migrate_set_speed QMP command
-- qemu: Avoid deprecated migrate_set_downtime QMP command
-- qemu: Avoid deprecated query-migrate-cache-size QMP command
-- qemu: Avoid deprecated migrate-set-cache-size QMP command
-- qemu: Track numa-mem-supported machine attribute
-- qemuBuildNumaArgStr: Switch order of if() and for()
-- qemuBuildNumaArgStr: Use modern -numa memdev= if old -numa mem= is unsupported
-
-* Mon Feb 21 2022 imxcc <xingchaochao@huawei.com> - 6.2.0-32
-- virQEMUBuildCommandLineJSON: Allow skipping certain keys
-- virQEMUBuildCommandLineJSON: Add possibility for using 'on/off' instead of 'yes/no'
-- util: virqemu: Introduce virQEMUBuildNetdevCommandlineFromJSON
-- util: json: Introduce virJSONValueObjectAppendStringPrintf
-- qemuBuildChannelsCommandLine: Use typecasted switch for channel type
-- qemuBuildChannelsCommandLine: Extract common formatting of 'chardev'
-- qemuBuildChannelChrDeviceStr: Remove formatting of properties for -netdev
-- qemuMonitorJSON(Add|Remove)Netdev: Refactor cleanup
-- qemuBuildHostNetStr: Stop using 'ipv6-net' convenience argument
-- qemu: command: Generate -netdev command line via JSON->cmdline conversion
-- qemuBuildChannelGuestfwdNetdevProps: Convert to generating JSON props
-- qemuMonitorAddNetdev: Convert to the native JSON props object
-- virCommand: Introduce virCommandGetArgList
-- testutilsqemuschema: Introduce testQEMUSchemaValidateCommand
-- testCompareXMLToArgv: Split out preparation and command formatting
-- virQEMUBuildNetdevCommandlineFromJSON: Prepare for quirky 'guestfwd'
-- qemu: Prepare for testing of 'netdev_add' props via qemuxml2argvtest
-- qemuxml2argvtest: Add QAPI/QMP schema validation for -blockdev and -netdev
-
-* Sat Feb 12 2022 imxcc <xingchaochao@huawei.com> - 6.2.0-31
-- hotpatch: virsh support autoload mode
-
-* Sat Jan 29 2022 imxcc <xingchaochao@huawei.com> - 6.2.0-30
-- Revert "tests: disabale storage tests"
+* Mon May 06 2024 yinyongkang <yinyongkang@kylinos.cn> - 9.10.0-8
+- fix CVE-2024-4418
 
-* Fri Jan 14 2022 imxcc <xingchaochao@huawei.com> - 6.2.0-29
-- tests: disabale storage tests
+* Mon Apr 29 2024 YageShen <shenyage1@huawei.com> - 9.10.0-7
+- remote_driver: Restore special behavior of remoteDomainGetBlockIoTune()
 
-* Tue Jan 11 2022 imxcc <xingchaochao@huawei.com> - 6.2.0-28
-- docs: build: Don't include stylesheet in intermediate html
-- tests: Replace deprecated ASN1 code
+* Thu Apr 11 2024 JiaboFeng <fengjiabo1@huawei.com> - 9.10.0-6
+- spec: remove libxml2 dependency
 
-* Mon Dec 06 2021 Euler Robot <euler.robot@huawei.com> - 6.2.0-27
-- hotpatch: implement hotpatch virsh api
-- hotpatch: check vm id and pid before using hotpatch api
+* Wed Apr 10 2024 JiaboFeng <fengjiabo1@huawei.com> - 9.10.0-5
+- hotpatch: if hotpatch_path not in qemu.conf,the hotpatch doesn't antoload
+- remote: check for negative array lengths before allocation
+- Fix off-by-one error in udevListInterfacesByStatus
+- Fix warnings found by clang
+- hotpatch: virsh support autoload mode
 - domain: add logs for virDomainHotpatchManage
-
-* Mon Dec 06 2021 Euler Robot <euler.robot@huawei.com> - 6.2.0-26
-- Hotpatch: introduce DomainHotpatchManage API
-- hotpatch: Implement qemuDomainHotpatchManage
+- hotpatch: check vm id and pid before using hotpatch api
+- hotpatch: implement hotpatch virsh api
 - hotpatch: introduce hotpatch async job flag
+- hotpatch: Implement qemuDomainHotpatchManage
+- Hotpatch: introduce DomainHotpatchManage API
 
-* Sun Sep 26 2021 imxcc <xingchaochao@huawei.com> - 6.2.0-26
-- fix cve-2021-3667 cve-2021-3631
-
-* Fri Sep 24 2021 Euler Robot <euler.robot@huawei.com> - 6.2.0-25
+* Tue Apr 2 2024 JiaboFeng <fengjiabo1@huawei.com> - 9.10.0-4
+- docs: Document CPU clusters
+- docs: Improve documentation for CPU topology
+- tests: Verify handling of CPU clusters in QMP data
+- qemu: Make monitor aware of CPU clusters
+- qemu: Use CPU clusters for guests
+- qemu: Introduce QEMU_CAPS_SMP_CLUSTERS
+- conf: Allow specifying CPU clusters
+- conf: Report CPU clusters in capabilities XML
+- tests: Add hostcpudata for machine with CPU clusters
+- cpu_map: add kunpeng-920 features to arm features
+- cpu/aarch64: enable host-model cpu for AArch64 architecture
 - conf/domain_conf: pin the retry_interval and retry_timeout parameters to xml
-
-* Tue Sep 14 2021 imxcc <xingchaochao@huawei.com> - 6.2.0-24
-- virDevMapperGetTargets: Don't ignore EBADF
-
-* Tue Sep 14 2021 imxcc <xingchaochao@huawei.com> - 6.2.0-23
-- Modify some different patch files
-
-* Thu Sep 2 2021 heyitao <heyitao@uniontech.com> - 6.2.0-22
-- Don't cache device-mapper major
-- Handle kernel without device-mapper support
-
-* Fri Jul 30 2021 chenyanpanHW <chenyanpan@huawei.com> - 6.2.0-21
-- DESC: delete -S git_am from %autosetup, and delete BuildRequires git
-
-* Tue Jul 27 2021 Jingyi Wang <wangjingyi11@huawei.com> - 6.2.0-20
-- add new CPU model Cooperlake
-
-* Tue Jul 13 2021 imxcc <xingchaochao@huawei.com> - 6.2.0-19
-- tests: fix stat mocking with Fedora rawhide
-
-* Fri Mar 19 2021 Jiajie Li <lijiajie11@huawei.com> - 6.2.0-18
-- libvirt.spec: remove dtrace for aarch64 OS
-
-* Thu Mar 18 2021 Chen Qun <kuhn.chenqun@huawei.com> - 6.2.0-17
+- nodedev: fix potential heap use after free
 - libvirt/conf: Set default values of retry fileds
-
-* Sat Feb 27 2021 Huawei Technologies Co., Ltd <alex.chen@huawei.com>  - 6.2.0-16
-- add phytium 2000plus and s2500 support on arm architecture for capability
-
-* Sat Feb 27 2021 Huawei Technologies Co., Ltd <alex.chen@huawei.com>  - 6.2.0-15
-- libvirt: Add 'retry' support for error policy
 - qemu: Support 'retry' BLOCK_IO_ERROR event.
-
-* Wed Jan 20 2021 Huawei Technologies Co., Ltd <alex.chen@huawei.com>  - 6.2.0-15
-- util: Move virIsDevMapperDevice() to virdevmapper.c
-- virdevmapper: Don't use libdevmapper to obtain dependencies
-
-* Wed Oct 14 2020 Huawei Technologies Co., Ltd <alex.chen@huawei.com>  - 6.2.0-14
-- rpc: gendispatch: handle empty flags
-- rpc: add support for filtering @acls by uint params
-- rpc: require write acl for guest agent in virDomainInterfaceAddresses
-- qemu: agent: set ifname to NULL after freeing
-
-* Tue Sep 22 2020 AlexChen <alex.chen@huawei.com> - 6.2.0-13
-- bugfix: cherry-pick some bugfix patches from opensource community
-
-* Tue Sep 22 2020 Hao Wang <wanghao232@huawei.com> - 6.2.0-12
-- backport upstream patches
-
-* Tue Sep 22 2020 Zeyu Jin <jinzeyu@huawei.com> - 6.2.0-11
-- bugfix: backport an upstream patch to fix '/run/libvirt/qemu/dbus' racing bug.
-
-* Tue Sep 22 2020 Jin Yan <jinyan12@huawei.com> - 6.2.0-10
-- bugfix: cherry-pick some bugfix patches from opensource community
-
-* Wed Aug 5 2020 AlexChen <alex.chen@huawei.com> - 6.2.0-9
-- tests: skip the test4 if the testcase is run in the container env
-
-* Wed Aug 5 2020 Jiang Fangjie <jiangfangjie@huawei.com> - 6.2.0-8
-- Libvirt supports aarch64 vtpm with parameter tpm-tis-device
-
-* Tue Aug 4 2020 Xu Yandong <xuyandong2@huawei.com> - 6.2.0-7
-- Substitute security_context_t with char pointer.
-
-* Tue May 26 2020 Xu Yandong <xuyandong2@huawei.com> - 6.2.0-6
-- Introduce Kunpeng-920 cpu features.
-
-* Wed May 20 2020 Xu Yandong <xuyandong2@huawei.com> - 6.2.0-5
-- Enable 'host-model' cpu mode.
-
-* Mon May 11 2020 Xu Yandong <xuyandong2@huawei.com> - 6.2.0-4
-- Fix virdaemon waiting for child processes return code error.
-- Fix virsh dump and migrate return code error.
-
-* Mon May 11 2020 Xu Yandong <xuyandong2@huawei.com> - 6.2.0-3
-- Checkout cpu capabilities support for ARM architecture.
-- Support Kunpeng-920 CPU.
-
-* Mon Apr 20 2020 Xu Yandong <xuyandong2@huawei.com> - 6.2.0-2
-- Checkout bugfixs from 5.5.0 release.
-
-* Tue Apr 14 2020 Xu Yandong <xuyandong2@huawei.com> - 6.2.0-1
-- Rebase to version 6.2.0.
-
-* Fri Jul 19 2019 openEuler Buildteam <buildteam@openeuler.org> - 5.5.0-1
-- Update to 5.5.0 release, Initial package for openEuler.
+- libvirt: Add 'retry' support for error policy
+- vdpa: support vdpa device migrate
+- vdpa: support vdpa device hot plug/unplug
+- hostdev:Introduce vDPA device to hostdev subsystem as a new subtype
+- node_device: fix leak of DIR*
+- migration/multifd-pin: support migration multifd thread pin
+- migration/multifd-pin: add qemu monitor callback functions
+- migration/migration-pin: add domainMigrationPid for qemuMonitorCallbacks
+- migration/migration-pin: add migrationpin for migration parameters
+- migration/migration-pin: add qemu monitor callback functions
+- migration/migration-pin:add some migration/multiFd params
+- qemu: add pointer check in qemuMonitorLastError
+- qemu: fix a concurrent operation situation
+- test/commandtest: skip the test4 if the testcase is run in the container env
+
+* Tue Apr 2 2024 mayunlong <mayunlong6@huawei.com> - 9.10.0-3
+- Incorrect tar package, update it
+
+* Wed Mar 27 2024 mayunlong <mayunlong6@huawei.com> - 9.10.0-2
+- nodedev: delete mdev
+- spec: fix some switch in spec
+- spec: isolate the client-qemu using macros
+
+* Thu Feb 29 2024 mayunlong <mayunlong6@huawei.com> - 9.10.0-1
+- Update to 9.10.0 release, Initial package for openEuler.
diff --git a/live_migrate-virsh-migrate-command-supports-the-zstd.patch b/live_migrate-virsh-migrate-command-supports-the-zstd.patch
deleted file mode 100644
index cd0987ad9ec50ce18c0b6525f5d1f4ba85da1682..0000000000000000000000000000000000000000
--- a/live_migrate-virsh-migrate-command-supports-the-zstd.patch
+++ /dev/null
@@ -1,137 +0,0 @@
-From f098a118012a298516521b92c7c7ca844c868176 Mon Sep 17 00:00:00 2001
-From: jipengfei <jipengfei_yewu@cmss.chinamobile.com>
-Date: Thu, 9 Feb 2023 08:33:01 +0800
-Subject: [PATCH] live_migrate: virsh migrate command supports the zstd
- compression algorithm
-
-When executing virsh migrate, specify a compression algorithm using
---comp-algorithm. You can choose zlib or zstd.
-
-Signed-off-by: jipengfei <jipengfei_yewu@cmss.chinamobile.com>
----
- include/libvirt/libvirt-domain.h | 10 ++++++++++
- src/qemu/qemu_migration.h        |  1 +
- src/qemu/qemu_migration_params.c |  9 ++++++++-
- src/qemu/qemu_migration_params.h |  1 +
- tools/virsh-domain.c             | 12 ++++++++++++
- 5 files changed, 32 insertions(+), 1 deletion(-)
-
-diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h
-index 8fe723198d..36319c9130 100644
---- a/include/libvirt/libvirt-domain.h
-+++ b/include/libvirt/libvirt-domain.h
-@@ -1073,6 +1073,16 @@ typedef enum {
-  */
- # define VIR_MIGRATE_PARAM_TLS_DESTINATION          "tls.destination"
- 
-+/**
-+* VIR_MIGRATE_PARAM_COMPRESSION_ALGORITHM:
-+*
-+* virDomainMigrate* params field: choose compression algorithm, you can choose
-+* zlib or zstd.
-+*
-+* Since: 6.2.0
-+*/
-+# define VIR_MIGRATE_PARAM_COMPRESSION_ALGORITHM     "compression.algorithm"
-+
- /* Domain migration. */
- virDomainPtr virDomainMigrate (virDomainPtr domain, virConnectPtr dconn,
-                                unsigned long flags, const char *dname,
-diff --git a/src/qemu/qemu_migration.h b/src/qemu/qemu_migration.h
-index 316a1a10f4..28e4cd7fe7 100644
---- a/src/qemu/qemu_migration.h
-+++ b/src/qemu/qemu_migration.h
-@@ -85,6 +85,7 @@
-     VIR_MIGRATE_PARAM_PARALLEL_CONNECTIONS, VIR_TYPED_PARAM_INT, \
-     VIR_MIGRATE_PARAM_TLS_DESTINATION, VIR_TYPED_PARAM_STRING, \
-     VIR_MIGRATE_PARAM_MIGRATIONPIN,    VIR_TYPED_PARAM_STRING, \
-+    VIR_MIGRATE_PARAM_COMPRESSION_ALGORITHM, VIR_TYPED_PARAM_STRING, \
-     NULL
- 
- 
-diff --git a/src/qemu/qemu_migration_params.c b/src/qemu/qemu_migration_params.c
-index 4001fb2b34..d1423ff4cf 100644
---- a/src/qemu/qemu_migration_params.c
-+++ b/src/qemu/qemu_migration_params.c
-@@ -109,6 +109,7 @@ VIR_ENUM_IMPL(qemuMigrationParam,
-               "max-postcopy-bandwidth",
-               "multifd-channels",
-               "migrationpin",
-+              "compress-method",
- );
- 
- typedef struct _qemuMigrationParamsAlwaysOnItem qemuMigrationParamsAlwaysOnItem;
-@@ -206,6 +207,10 @@ static const qemuMigrationParamsTPMapItem qemuMigrationParamsTPMap[] = {
-     {.typedParam = VIR_MIGRATE_PARAM_MIGRATIONPIN,
-      .param = QEMU_MIGRATION_PARAM_MIGRATIONPIN,
-      .party = QEMU_MIGRATION_SOURCE},
-+
-+    {.typedParam = VIR_MIGRATE_PARAM_COMPRESSION_ALGORITHM,
-+     .param = QEMU_MIGRATION_PARAM_COMPRESS_METHOD,
-+     .party = QEMU_MIGRATION_SOURCE | QEMU_MIGRATION_DESTINATION},
- };
- 
- static const qemuMigrationParamType qemuMigrationParamTypes[] = {
-@@ -223,6 +228,7 @@ static const qemuMigrationParamType qemuMigrationParamTypes[] = {
-     [QEMU_MIGRATION_PARAM_MAX_POSTCOPY_BANDWIDTH] = QEMU_MIGRATION_PARAM_TYPE_ULL,
-     [QEMU_MIGRATION_PARAM_MULTIFD_CHANNELS] = QEMU_MIGRATION_PARAM_TYPE_INT,
-     [QEMU_MIGRATION_PARAM_MIGRATIONPIN] = QEMU_MIGRATION_PARAM_TYPE_STRING,
-+    [QEMU_MIGRATION_PARAM_COMPRESS_METHOD] = QEMU_MIGRATION_PARAM_TYPE_STRING,
- };
- G_STATIC_ASSERT(G_N_ELEMENTS(qemuMigrationParamTypes) == QEMU_MIGRATION_PARAM_LAST);
- 
-@@ -516,7 +522,8 @@ qemuMigrationParamsSetCompression(virTypedParameterPtr params,
- 
-     if ((migParams->params[QEMU_MIGRATION_PARAM_COMPRESS_LEVEL].set ||
-          migParams->params[QEMU_MIGRATION_PARAM_COMPRESS_THREADS].set ||
--         migParams->params[QEMU_MIGRATION_PARAM_DECOMPRESS_THREADS].set) &&
-+         migParams->params[QEMU_MIGRATION_PARAM_DECOMPRESS_THREADS].set ||
-+         migParams->params[QEMU_MIGRATION_PARAM_COMPRESS_METHOD].set) &&
-         !(migParams->compMethods & (1ULL << QEMU_MIGRATION_COMPRESS_MT))) {
-         virReportError(VIR_ERR_INVALID_ARG, "%s",
-                        _("Turn multithread compression on to tune it"));
-diff --git a/src/qemu/qemu_migration_params.h b/src/qemu/qemu_migration_params.h
-index f3deffb4cc..ae95723705 100644
---- a/src/qemu/qemu_migration_params.h
-+++ b/src/qemu/qemu_migration_params.h
-@@ -59,6 +59,7 @@ typedef enum {
-     QEMU_MIGRATION_PARAM_MAX_POSTCOPY_BANDWIDTH,
-     QEMU_MIGRATION_PARAM_MULTIFD_CHANNELS,
-     QEMU_MIGRATION_PARAM_MIGRATIONPIN,
-+    QEMU_MIGRATION_PARAM_COMPRESS_METHOD,
- 
-     QEMU_MIGRATION_PARAM_LAST
- } qemuMigrationParam;
-diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
-index 0d58775289..595a210493 100644
---- a/tools/virsh-domain.c
-+++ b/tools/virsh-domain.c
-@@ -10723,6 +10723,11 @@ static const vshCmdOptDef opts_migrate[] = {
-      .type = VSH_OT_STRING,
-      .help = N_("override the destination host name used for TLS verification")
-     },
-+    {.name = "comp-algorithm",
-+     .type = VSH_OT_STRING,
-+     .help = N_("choose migration compression algorithm")
-+    },
-+
-     {.name = NULL}
- };
- 
-@@ -10866,6 +10871,13 @@ doMigrate(void *opaque)
-             goto save_error;
-     }
- 
-+    if (vshCommandOptStringReq(ctl, cmd, "comp-algorithm", &opt) < 0)
-+        goto out;
-+    if (opt &&
-+        virTypedParamsAddString(&params, &nparams, &maxparams,
-+                                VIR_MIGRATE_PARAM_COMPRESSION_ALGORITHM, opt) < 0)
-+        goto save_error;
-+
-     if (vshCommandOptStringReq(ctl, cmd, "xml", &opt) < 0)
-         goto out;
-     if (opt) {
--- 
-2.25.1
-
diff --git a/locking-Resolve-mem-leak-in-virLockDaemonPreExecRest.patch b/locking-Resolve-mem-leak-in-virLockDaemonPreExecRest.patch
deleted file mode 100644
index 71d944dd1ac07110d6305028ba36cbca717eed42..0000000000000000000000000000000000000000
--- a/locking-Resolve-mem-leak-in-virLockDaemonPreExecRest.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 3542d88e097199e80419ebcb1a82b68cc71d3e2b Mon Sep 17 00:00:00 2001
-From: John Ferlan <jferlan@redhat.com>
-Date: Wed, 2 Dec 2020 07:43:20 -0500
-Subject: [PATCH 021/108] locking: Resolve mem leak in
- virLockDaemonPreExecRestart
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Initialize and free @magic since virJSONValueObjectAppendString
-does not free it for us eventually.
-
-Signed-off-by: John Ferlan <jferlan@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Signed-off-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 6f0418173b5567d17dba43247efc058f0318485b)
----
- src/locking/lock_daemon.c | 7 +++----
- 1 file changed, 3 insertions(+), 4 deletions(-)
-
-diff --git a/src/locking/lock_daemon.c b/src/locking/lock_daemon.c
-index 3d33995beb..9bf505c939 100644
---- a/src/locking/lock_daemon.c
-+++ b/src/locking/lock_daemon.c
-@@ -722,7 +722,7 @@ virLockDaemonPreExecRestart(const char *state_file,
-     char *state = NULL;
-     int ret = -1;
-     virJSONValuePtr object = virJSONValueNewObject();
--    char *magic;
-+    char *magic = NULL;
-     virHashKeyValuePairPtr pairs = NULL, tmp;
-     virJSONValuePtr lockspaces;
- 
-@@ -770,10 +770,8 @@ virLockDaemonPreExecRestart(const char *state_file,
-     if (!(magic = virLockDaemonGetExecRestartMagic()))
-         goto cleanup;
- 
--    if (virJSONValueObjectAppendString(object, "magic", magic) < 0) {
--        VIR_FREE(magic);
-+    if (virJSONValueObjectAppendString(object, "magic", magic) < 0)
-         goto cleanup;
--    }
- 
-     if (!(state = virJSONValueToString(object, true)))
-         goto cleanup;
-@@ -797,6 +795,7 @@ virLockDaemonPreExecRestart(const char *state_file,
-     abort(); /* This should be impossible to reach */
- 
-  cleanup:
-+    VIR_FREE(magic);
-     VIR_FREE(pairs);
-     VIR_FREE(state);
-     virJSONValueFree(object);
--- 
-2.33.0
-
diff --git a/logging-fix-endless-loop-on-EOF.patch b/logging-fix-endless-loop-on-EOF.patch
deleted file mode 100644
index 789433e71524837d5b3a0e430a3f4424e407894c..0000000000000000000000000000000000000000
--- a/logging-fix-endless-loop-on-EOF.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 8a4f9cab7d08bf13ac794fa2800a37c59ac14728 Mon Sep 17 00:00:00 2001
-From: Nikolay Shirokovskiy <nshirokovskiy@virtuozzo.com>
-Date: Thu, 24 Sep 2020 15:54:24 +0300
-Subject: [PATCH 033/108] logging: fix endless loop on EOF
-
-On EOF condition we always have POLLHUP event and read returns
-0 thus we never break loop in virLogHandlerDomainLogFileDrain.
-
-Signed-off-by: Nikolay Shirokovskiy <nshirokovskiy@virtuozzo.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-(cherry picked from commit bde9e2c6c018f79d8e3b0bd30ea7aa80dcc9e435)
----
- src/logging/log_handler.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/logging/log_handler.c b/src/logging/log_handler.c
-index 87748d96d1..3cc197a396 100644
---- a/src/logging/log_handler.c
-+++ b/src/logging/log_handler.c
-@@ -464,6 +464,8 @@ virLogHandlerDomainLogFileDrain(virLogHandlerLogFilePtr file)
-             if (errno == EINTR)
-                 continue;
-             return;
-+        } else if (len == 0) {
-+            return;
-         }
- 
-         if (virRotatingFileWriterAppend(file->file, buf, len) != len)
--- 
-2.33.0
-
diff --git a/logging-read-all-bytes-on-EOF-in-event-handler.patch b/logging-read-all-bytes-on-EOF-in-event-handler.patch
deleted file mode 100644
index b9784eaa6156c98ebab7acb6685bdfa850adffdc..0000000000000000000000000000000000000000
--- a/logging-read-all-bytes-on-EOF-in-event-handler.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From f2f21f4f7a5f0fdf43fa957f0628045ed373a025 Mon Sep 17 00:00:00 2001
-From: Nikolay Shirokovskiy <nshirokovskiy@virtuozzo.com>
-Date: Thu, 24 Sep 2020 15:47:09 +0300
-Subject: [PATCH 036/108] logging: read all bytes on EOF in event handler
-
-If writing side writes enough bytes to the pipe and closes writing
-end then we got both VIR_EVENT_HANDLE_HANGUP and VIR_EVENT_HANDLE_READ
-in handler. Currently in this situation handler reads 1024 bytes
-and finish reading leaving unread data in pipe.
-
-Signed-off-by: Nikolay Shirokovskiy <nshirokovskiy@virtuozzo.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-(cherry picked from commit 7c0e1a8631773788a96702252931541290288ef6)
----
- src/logging/log_handler.c | 7 +++----
- 1 file changed, 3 insertions(+), 4 deletions(-)
-
-diff --git a/src/logging/log_handler.c b/src/logging/log_handler.c
-index 3cc197a396..00fca7b653 100644
---- a/src/logging/log_handler.c
-+++ b/src/logging/log_handler.c
-@@ -138,7 +138,7 @@ virLogHandlerGetLogFileFromWatch(virLogHandlerPtr handler,
- static void
- virLogHandlerDomainLogFileEvent(int watch,
-                                 int fd,
--                                int events,
-+                                int events G_GNUC_UNUSED,
-                                 void *opaque)
- {
-     virLogHandlerPtr handler = opaque;
-@@ -168,14 +168,13 @@ virLogHandlerDomainLogFileEvent(int watch,
-         virReportSystemError(errno, "%s",
-                              _("Unable to read from log pipe"));
-         goto error;
-+    } else if (len == 0) {
-+        goto error;
-     }
- 
-     if (virRotatingFileWriterAppend(logfile->file, buf, len) != len)
-         goto error;
- 
--    if (events & VIR_EVENT_HANDLE_HANGUP)
--        goto error;
--
-  cleanup:
-     virObjectUnlock(handler);
-     return;
--- 
-2.33.0
-
diff --git a/lxc-Fix-memory-leak-in-virLXCControllerPopulateDevic.patch b/lxc-Fix-memory-leak-in-virLXCControllerPopulateDevic.patch
deleted file mode 100644
index 2ac1dbac162cdd4774008e5f107135b43208c656..0000000000000000000000000000000000000000
--- a/lxc-Fix-memory-leak-in-virLXCControllerPopulateDevic.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 39baaf38c00b4ff78100bf3d1b378140678e9dfb Mon Sep 17 00:00:00 2001
-From: John Ferlan <jferlan@redhat.com>
-Date: Tue, 16 Jun 2020 08:07:04 -0400
-Subject: [PATCH 003/108] lxc: Fix memory leak in
- virLXCControllerPopulateDevices
-
-Since 5b82f7f3, @path should have been placed inside the for loop
-since it'd need to be free'd for each pass through the loop; otherwise,
-we'd leak like a sieve.
-
-Found by Coverity.
-
-Signed-off-by: John Ferlan <jferlan@redhat.com>
-Reviewed-by: Peter Krempa <pkrempa@redhat.com>
-(cherry picked from commit 52e3c2b4801c4ef3d8be5c1398de1884e93a1f52)
----
- src/lxc/lxc_controller.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c
-index 453b435dd6..7a3a79a9a0 100644
---- a/src/lxc/lxc_controller.c
-+++ b/src/lxc/lxc_controller.c
-@@ -1490,7 +1490,6 @@ static int virLXCControllerSetupDev(virLXCControllerPtr ctrl)
- static int virLXCControllerPopulateDevices(virLXCControllerPtr ctrl)
- {
-     size_t i;
--    g_autofree char *path = NULL;
-     const struct {
-         int maj;
-         int min;
-@@ -1510,6 +1509,8 @@ static int virLXCControllerPopulateDevices(virLXCControllerPtr ctrl)
- 
-     /* Populate /dev/ with a few important bits */
-     for (i = 0; i < G_N_ELEMENTS(devs); i++) {
-+        g_autofree char *path = NULL;
-+
-         path = g_strdup_printf("/%s/%s.dev/%s", LXC_STATE_DIR, ctrl->def->name,
-                                devs[i].path);
- 
--- 
-2.33.0
-
diff --git a/lxc-Fix-syntax-error-in-lxcNodeGetSecurityModel.patch b/lxc-Fix-syntax-error-in-lxcNodeGetSecurityModel.patch
deleted file mode 100644
index f2d6009e1529c81c9a6a4d3c9c8eeafb26b3eb6f..0000000000000000000000000000000000000000
--- a/lxc-Fix-syntax-error-in-lxcNodeGetSecurityModel.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 275e5fe562d1645683c59f777b453cc24d4c8bec Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Hyman=20Huang=28=E9=BB=84=E5=8B=87=29?=
- <huangy81@chinatelecom.cn>
-Date: Mon, 5 Dec 2022 08:07:40 -0500
-Subject: [PATCH 24/24] lxc: Fix syntax error in lxcNodeGetSecurityModel
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Fix syntax error, which is introduced by the following commit
-be72edbfc14440cceb63fa2d38811e5cbd962ad8
-
-Signed-off-by: Hyman Huang(黄勇) <huangy81@chinatelecom.cn>
----
- src/lxc/lxc_driver.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c
-index aa4cddc275..120d41f2b6 100644
---- a/src/lxc/lxc_driver.c
-+++ b/src/lxc/lxc_driver.c
-@@ -1241,11 +1241,11 @@ static int lxcNodeGetSecurityModel(virConnectPtr conn,
-     memset(secmodel, 0, sizeof(*secmodel));
- 
-     if (virNodeGetSecurityModelEnsureACL(conn) < 0) {
--         ret = -1;
-+        ret = -1;
-     }
- 
-     if (!(caps = virLXCDriverGetCapabilities(driver, false))) {
--        return = -1;
-+        ret = -1;
-     }
- 
-     /* we treat no driver as success, but simply return no data in *secmodel */
--- 
-2.27.0
-
diff --git a/lxc-fix-error-value-of-lxcNodeGetSecurityModel.patch b/lxc-fix-error-value-of-lxcNodeGetSecurityModel.patch
deleted file mode 100644
index e4362ad2ab72db5ea5d14b130b65e550f9571583..0000000000000000000000000000000000000000
--- a/lxc-fix-error-value-of-lxcNodeGetSecurityModel.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From be72edbfc14440cceb63fa2d38811e5cbd962ad8 Mon Sep 17 00:00:00 2001
-From: wangmeiyang <wangmeiyang_yewu@cmss.chinamobile.com>
-Date: Wed, 30 Nov 2022 20:06:45 +0800
-Subject: [PATCH 19/24] lxc: fix error value of lxcNodeGetSecurityModel
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-When adding the ACL check and caps getter, we assumed that
-the default return value is -1, not 0 as usual.
-
-Fix the return value on error by assigning them explicitly.
-
-cherry-pick from efe98ca98bb0febe6a8274175b7c5493c0d6c9f3
-
-Signed-off-by: Ján Tomko <jtomko@redhat.com>
-Signed-off-by: Meiyang Wang <wangmeiyang_yewu@cmss.chinamobile.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
----
- src/lxc/lxc_driver.c | 10 ++++++----
- 1 file changed, 6 insertions(+), 4 deletions(-)
-
-diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c
-index 71c7068bbf..aa4cddc275 100644
---- a/src/lxc/lxc_driver.c
-+++ b/src/lxc/lxc_driver.c
-@@ -1240,11 +1240,13 @@ static int lxcNodeGetSecurityModel(virConnectPtr conn,
- 
-     memset(secmodel, 0, sizeof(*secmodel));
- 
--    if (virNodeGetSecurityModelEnsureACL(conn) < 0)
--        goto cleanup;
-+    if (virNodeGetSecurityModelEnsureACL(conn) < 0) {
-+         ret = -1;
-+    }
- 
--    if (!(caps = virLXCDriverGetCapabilities(driver, false)))
--        goto cleanup;
-+    if (!(caps = virLXCDriverGetCapabilities(driver, false))) {
-+        return = -1;
-+    }
- 
-     /* we treat no driver as success, but simply return no data in *secmodel */
-     if (caps->host.nsecModels == 0
--- 
-2.27.0
-
diff --git a/lxc-fix-lxcContainerMountAllFS-DEREF_BEFORE_CHECK.patch b/lxc-fix-lxcContainerMountAllFS-DEREF_BEFORE_CHECK.patch
deleted file mode 100644
index c3515b4c9f675750c93be197c258c4b7c50bbba7..0000000000000000000000000000000000000000
--- a/lxc-fix-lxcContainerMountAllFS-DEREF_BEFORE_CHECK.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 24994ec0adb7385e56b740f85a1bc0ed0a8002cd Mon Sep 17 00:00:00 2001
-From: Dmitry Frolov <frolov@swemel.ru>
-Date: Thu, 7 Sep 2023 12:04:57 +0300
-Subject: [PATCH] lxc: fix lxcContainerMountAllFS() DEREF_BEFORE_CHECK
-
-vmDef->fss[i]->src->path may be NULL,
-so check is needed before passing it to VIR_DEBUG.
-Also removed checking vmDef->fss[i]->src for NULL, since it may not be NULL.
-
-Fixes: 57487085dc ("lxc: don't try to reference NULL when mounting filesystems")
-
-Signed-off-by: Dmitry Frolov <frolov@swemel.ru>
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-Signed-off-by: zhujun2 <zhujun2_yewu@cmss.chinamobile.com>
----
- src/lxc/lxc_container.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/src/lxc/lxc_container.c b/src/lxc/lxc_container.c
-index 1c28ecfdb7..4736c14cb7 100644
---- a/src/lxc/lxc_container.c
-+++ b/src/lxc/lxc_container.c
-@@ -1579,12 +1579,13 @@ static int lxcContainerMountAllFS(virDomainDefPtr vmDef,
-         if (STREQ(vmDef->fss[i]->dst, "/"))
-             continue;
- 
--        VIR_DEBUG("Mounting '%s' -> '%s'", vmDef->fss[i]->src->path, vmDef->fss[i]->dst);
-+        VIR_DEBUG("Mounting '%s' -> '%s'", NULLSTR(vmDef->fss[i]->src->path),
-+                  vmDef->fss[i]->dst);
- 
-         if (lxcContainerResolveSymlinks(vmDef->fss[i], false) < 0)
-             return -1;
- 
--        if (!(vmDef->fss[i]->src && vmDef->fss[i]->src->path &&
-+        if (!(vmDef->fss[i]->src->path &&
-               STRPREFIX(vmDef->fss[i]->src->path, vmDef->fss[i]->dst)) &&
-             lxcContainerUnmountSubtree(vmDef->fss[i]->dst, false) < 0)
-             return -1;
--- 
-2.27.0
-
diff --git a/mdev-Fix-daemon-crash-when-reattaching-mdevs-on-assi.patch b/mdev-Fix-daemon-crash-when-reattaching-mdevs-on-assi.patch
deleted file mode 100644
index f248437fb20480cca0e87090936301a7b0828d43..0000000000000000000000000000000000000000
--- a/mdev-Fix-daemon-crash-when-reattaching-mdevs-on-assi.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 69ea920668827c16ab27016d67a8e58e25f2aa55 Mon Sep 17 00:00:00 2001
-From: tangbinzy <tangbin_yewu@cmss.chinamobile.com>
-Date: Wed, 23 Nov 2022 10:03:38 +0000
-Subject: [PATCH 08/23] mdev: Fix daemon crash when reattaching mdevs on 
- assignment conflict If there's a list of mdevs to be assigned to a domain,
- but one of them (NOT the first) is already assigned to a different domain
- we're going to crash in the qemuProcessStop phase in
- virMediatedDeviceListFindIndex, because some of the pointers in
- mgr->activeMediatedHostdevs are dangling. This is due to
- virMediatedDeviceListMarkDevices using cleanup instead of rollback when we
- find out that a device is already taken.
-
-Reproducer steps:
-1. start vm1 with mdev1
-2. start vm2 with mdev2, mdev1 (the order is important!)
-
-Backtrace:
- #0  0x0000ffffb8c36250 in strcmp
- #1  0x0000ffffb9b80754 in virMediatedDeviceListFindIndex
- #2  0x0000ffffb9b80870 in virMediatedDeviceListFind
- #3  0x0000ffffb9c9e168 in virHostdevReAttachMediatedDevices
- #4  0x0000ffff9949f724 in qemuHostdevReAttachMediatedDevices
- #5  0x0000ffff9949f7f8 in qemuHostdevReAttachDomainDevices
- #6  0x0000ffff994bcd70 in qemuProcessStop
- #7  0x0000ffff994bf4e0 in qemuProcessStart
-
-Signed-off-by: Binfeng Wu <wubinfeng@huawei.com>
-Reviewed-by: Erik Skultety <eskultet@redhat.com>
-
-Signed-off-by: tangbin <tangbin_yewu@cmss.chinamobile.com>
-(cherry-pick from 8361d335ab77cb1f3b70a3fa92f7e2d0aaa31bac)
----
- src/util/virmdev.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/util/virmdev.c b/src/util/virmdev.c
-index bae4a7d2c1..a40d2f4fb5 100644
---- a/src/util/virmdev.c
-+++ b/src/util/virmdev.c
-@@ -445,7 +445,7 @@ virMediatedDeviceListMarkDevices(virMediatedDeviceListPtr dst,
- 
-         if (virMediatedDeviceIsUsed(mdev, dst) ||
-             virMediatedDeviceSetUsedBy(mdev, drvname, domname) < 0)
--            goto cleanup;
-+            goto rollback;
- 
-         /* Copy mdev references to the driver list:
-          * - caller is responsible for NOT freeing devices in @src on success
--- 
-2.27.0
-
diff --git a/meson.build-isolate-the-client-qemu-using-macros.patch b/meson.build-isolate-the-client-qemu-using-macros.patch
new file mode 100644
index 0000000000000000000000000000000000000000..7278e7716abf78763e2dc9855a8dc99e6af52e2b
--- /dev/null
+++ b/meson.build-isolate-the-client-qemu-using-macros.patch
@@ -0,0 +1,64 @@
+From 00e273149d7584750df88be94ce7f53beea26f6d Mon Sep 17 00:00:00 2001
+From: MaYunlong <mayunlong6@huawei.com>
+Date: Wed, 27 Mar 2024 07:56:14 +0800
+Subject: [PATCH] meson.build: isolate the client-qemu using macros
+
+---
+ docs/manpages/meson.build | 4 ++--
+ meson.build               | 1 +
+ tools/meson.build         | 4 ++--
+ 3 files changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/docs/manpages/meson.build b/docs/manpages/meson.build
+index bdc1701..38ee547 100644
+--- a/docs/manpages/meson.build
++++ b/docs/manpages/meson.build
+@@ -18,9 +18,9 @@ docs_man_files = [
+   { 'name': 'virt-pki-query-dn', 'section': '1', 'install': true },
+   { 'name': 'virt-pki-validate', 'section': '1', 'install': true },
+   { 'name': 'virt-qemu-run', 'section': '1', 'install': conf.has('WITH_QEMU') },
+-  { 'name': 'virt-qemu-qmp-proxy', 'section': '1', 'install': conf.has('WITH_QEMU') },
++  { 'name': 'virt-qemu-qmp-proxy', 'section': '1', 'install': conf.has('WITH_CLIENT_QEMU') },
+   { 'name': 'virt-xml-validate', 'section': '1', 'install': true },
+-  { 'name': 'virt-qemu-sev-validate', 'section': '1', 'install': conf.has('WITH_QEMU') },
++  { 'name': 'virt-qemu-sev-validate', 'section': '1', 'install': conf.has('WITH_CLIENT_QEMU') },
+ 
+   { 'name': 'libvirt-guests', 'section': '8', 'install': conf.has('WITH_LIBVIRTD') },
+   { 'name': 'libvirtd', 'section': '8', 'install': conf.has('WITH_LIBVIRTD') },
+diff --git a/meson.build b/meson.build
+index 611cc58..2a7fa8c 100644
+--- a/meson.build
++++ b/meson.build
+@@ -1637,6 +1637,7 @@ if not get_option('driver_qemu').disabled()
+   if use_qemu
+     conf.set('WITH_QEMU', 1)
+ 
++    conf.set('WITH_CLIENT_QEMU', 0)
+     qemu_moddir = get_option('qemu_moddir')
+     if qemu_moddir == ''
+       qemu_moddir = libdir / 'qemu'
+diff --git a/tools/meson.build b/tools/meson.build
+index c72f760..9a5bbd6 100644
+--- a/tools/meson.build
++++ b/tools/meson.build
+@@ -301,7 +301,7 @@ if conf.has('WITH_SANLOCK')
+   )
+ endif
+ 
+-if conf.has('WITH_QEMU')
++if conf.has('WITH_CLIENT_QEMU')
+   install_data('virt-qemu-sev-validate',
+                install_dir: bindir)
+ endif
+@@ -327,7 +327,7 @@ if conf.has('WITH_LIBVIRTD')
+   endif
+ endif
+ 
+-if conf.has('WITH_QEMU')
++if conf.has('WITH_CLIENT_QEMU')
+     install_data('virt-qemu-qmp-proxy',
+                  install_dir: bindir)
+ endif
+-- 
+2.33.0
+
diff --git a/migration-dirtyrate-Extend-dirtyrate-statistics-for-.patch b/migration-dirtyrate-Extend-dirtyrate-statistics-for-.patch
deleted file mode 100644
index bf5156df0a7020f13f589642efba5fca4de3729a..0000000000000000000000000000000000000000
--- a/migration-dirtyrate-Extend-dirtyrate-statistics-for-.patch
+++ /dev/null
@@ -1,133 +0,0 @@
-From d38fa8e57331b666839b6d9cc3744058f8de8093 Mon Sep 17 00:00:00 2001
-From: Hao Wang <wanghao232@huawei.com>
-Date: Tue, 16 Mar 2021 20:32:50 +0800
-Subject: [PATCH 6/7] migration/dirtyrate: Extend dirtyrate statistics for
- domGetStats
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Extend dirtyrate statistics for domGetStats to display the information
-of a domain's memory dirty rate produced by domainStartDirtyRateCalc.
-
-cherry-pick from fee42ea12044d1414c1a5c0b0dca30091f42e65d
-
-Signed-off-by: Hao Wang <wanghao232@huawei.com>
-Signed-off-by: Hyman Huang(黄勇) <huangy81@chinatelecom.cn>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
----
- include/libvirt/libvirt-domain.h |  1 +
- src/libvirt-domain.c             | 15 ++++++++++
- src/qemu/qemu_driver.c           | 51 ++++++++++++++++++++++++++++++++
- 3 files changed, 67 insertions(+)
-
-diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h
-index 01dc64f4f4..e1954ae663 100644
---- a/include/libvirt/libvirt-domain.h
-+++ b/include/libvirt/libvirt-domain.h
-@@ -2167,6 +2167,7 @@ typedef enum {
-     VIR_DOMAIN_STATS_PERF = (1 << 6), /* return domain perf event info */
-     VIR_DOMAIN_STATS_IOTHREAD = (1 << 7), /* return iothread poll info */
-     VIR_DOMAIN_STATS_MEMORY = (1 << 8), /* return domain memory info */
-+    VIR_DOMAIN_STATS_DIRTYRATE = (1 << 9), /* return domain dirty rate info */
- } virDomainStatsTypes;
- 
- typedef enum {
-diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c
-index 974a5a5f36..6a37ea85b7 100644
---- a/src/libvirt-domain.c
-+++ b/src/libvirt-domain.c
-@@ -11683,6 +11683,21 @@ virConnectGetDomainCapabilities(virConnectPtr conn,
-  *                       bytes consumed by @vcpus that passing through all
-  *                       memory controllers, either local or remote controller.
-  *
-+ * VIR_DOMAIN_STATS_DIRTYRATE:
-+ *     Return memory dirty rate information. The typed parameter keys are in
-+ *     this format:
-+ *
-+ *     "dirtyrate.calc_status" - the status of last memory dirty rate calculation,
-+ *                               returned as int from virDomainDirtyRateStatus
-+ *                               enum.
-+ *     "dirtyrate.calc_start_time" - the start time of last memory dirty rate
-+ *                                   calculation as long long.
-+ *     "dirtyrate.calc_period" - the period of last memory dirty rate calculation
-+ *                               as int.
-+ *     "dirtyrate.megabytes_per_second" - the calculated memory dirty rate in
-+ *                                        MiB/s as long long. It is produced
-+ *                                        only if the calc_status is measured.
-+ *
-  * Note that entire stats groups or individual stat fields may be missing from
-  * the output in case they are not supported by the given hypervisor, are not
-  * applicable for the current state of the guest domain, or their retrieval
-diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
-index b0a4905279..5e9af6399d 100644
---- a/src/qemu/qemu_driver.c
-+++ b/src/qemu/qemu_driver.c
-@@ -21734,6 +21734,56 @@ qemuDomainGetStatsPerf(virQEMUDriverPtr driver G_GNUC_UNUSED,
-     return 0;
- }
- 
-+static int
-+qemuDomainGetStatsDirtyRateMon(virQEMUDriverPtr driver,
-+                               virDomainObjPtr vm,
-+                               qemuMonitorDirtyRateInfoPtr info)
-+{
-+    qemuDomainObjPrivatePtr priv = vm->privateData;
-+    int ret;
-+
-+    qemuDomainObjEnterMonitor(driver, vm);
-+    ret = qemuMonitorQueryDirtyRate(priv->mon, info);
-+    if (qemuDomainObjExitMonitor(driver, vm) < 0)
-+        ret = -1;
-+
-+    return ret;
-+}
-+
-+static int
-+qemuDomainGetStatsDirtyRate(virQEMUDriverPtr driver,
-+                           virDomainObjPtr dom,
-+                           virTypedParamListPtr params,
-+                           unsigned int privflags)
-+{
-+    qemuMonitorDirtyRateInfo info;
-+
-+    if (!HAVE_JOB(privflags) || !virDomainObjIsActive(dom))
-+        return 0;
-+
-+    if (qemuDomainGetStatsDirtyRateMon(driver, dom, &info) < 0)
-+        return -1;
-+
-+    if (virTypedParamListAddInt(params, info.status,
-+                                "dirtyrate.calc_status") < 0)
-+        return -1;
-+
-+    if (virTypedParamListAddLLong(params, info.startTime,
-+                                  "dirtyrate.calc_start_time") < 0)
-+        return -1;
-+
-+    if (virTypedParamListAddInt(params, info.calcTime,
-+                                "dirtyrate.calc_period") < 0)
-+        return -1;
-+
-+    if ((info.status == VIR_DOMAIN_DIRTYRATE_MEASURED) &&
-+        virTypedParamListAddLLong(params, info.dirtyRate,
-+                                  "dirtyrate.megabytes_per_second") < 0)
-+        return -1;
-+
-+    return 0;
-+}
-+
- typedef int
- (*qemuDomainGetStatsFunc)(virQEMUDriverPtr driver,
-                           virDomainObjPtr dom,
-@@ -21756,6 +21806,7 @@ static struct qemuDomainGetStatsWorker qemuDomainGetStatsWorkers[] = {
-     { qemuDomainGetStatsPerf, VIR_DOMAIN_STATS_PERF, false },
-     { qemuDomainGetStatsIOThread, VIR_DOMAIN_STATS_IOTHREAD, true },
-     { qemuDomainGetStatsMemory, VIR_DOMAIN_STATS_MEMORY, false },
-+    { qemuDomainGetStatsDirtyRate, VIR_DOMAIN_STATS_DIRTYRATE, true },
-     { NULL, 0, false }
- };
- 
--- 
-2.27.0
-
diff --git a/migration-dirtyrate-Implement-qemuDomainStartDirtyRa.patch b/migration-dirtyrate-Implement-qemuDomainStartDirtyRa.patch
deleted file mode 100644
index 174a174b50ff731ef0ca9281cb1b993454b893e1..0000000000000000000000000000000000000000
--- a/migration-dirtyrate-Implement-qemuDomainStartDirtyRa.patch
+++ /dev/null
@@ -1,178 +0,0 @@
-From d6dd8dba23726495026b721da0835f7916000f94 Mon Sep 17 00:00:00 2001
-From: Hao Wang <wanghao232@huawei.com>
-Date: Tue, 16 Mar 2021 20:32:46 +0800
-Subject: [PATCH 2/7] migration/dirtyrate: Implement
- qemuDomainStartDirtyRateCalc
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Implement qemuDomainStartDirtyRateCalc which calculates domain's memory
-dirty rate calling qmp "calc-dirty-rate".
-
-cherry-pick from fbe99823e2a1b30e770620b0b51930e15c88de00
-
-Signed-off-by: Hao Wang <wanghao232@huawei.com>
-Signed-off-by: Hyman Huang(黄勇) <huangy81@chinatelecom.cn>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
----
- src/qemu/qemu_driver.c       | 59 ++++++++++++++++++++++++++++++++++++
- src/qemu/qemu_monitor.c      | 12 ++++++++
- src/qemu/qemu_monitor.h      |  4 +++
- src/qemu/qemu_monitor_json.c | 21 +++++++++++++
- src/qemu/qemu_monitor_json.h |  4 +++
- 5 files changed, 100 insertions(+)
-
-diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
-index e7166e4af3..b0a4905279 100644
---- a/src/qemu/qemu_driver.c
-+++ b/src/qemu/qemu_driver.c
-@@ -23298,6 +23298,64 @@ qemuDomainHotpatchManage(virDomainPtr domain,
-     return ret;
- }
- 
-+#define MIN_DIRTYRATE_CALC_PERIOD 1  /* supported min dirtyrate calculating time: 1s */
-+#define MAX_DIRTYRATE_CALC_PERIOD 60 /* supported max dirtyrate calculating time: 60s */
-+
-+static int
-+qemuDomainStartDirtyRateCalc(virDomainPtr dom,
-+                             int seconds,
-+                             unsigned int flags)
-+{
-+    virQEMUDriverPtr driver = dom->conn->privateData;
-+    virDomainObjPtr vm;
-+    qemuDomainObjPrivatePtr priv;
-+    int ret = -1;
-+
-+    virCheckFlags(0, -1);
-+
-+    if (seconds < MIN_DIRTYRATE_CALC_PERIOD ||
-+        seconds > MAX_DIRTYRATE_CALC_PERIOD) {
-+        virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-+                       _("seconds=%d is invalid, please choose value within [%d, %d]."),
-+                       seconds,
-+                       MIN_DIRTYRATE_CALC_PERIOD,
-+                       MAX_DIRTYRATE_CALC_PERIOD);
-+        return -1;
-+    }
-+
-+    if (!(vm = qemuDomainObjFromDomain(dom)))
-+        return -1;
-+
-+    if (virDomainStartDirtyRateCalcEnsureACL(dom->conn, vm->def) < 0)
-+        goto cleanup;
-+
-+    if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_QUERY) < 0)
-+        goto cleanup;
-+
-+    if (!virDomainObjIsActive(vm)) {
-+        virReportError(VIR_ERR_OPERATION_INVALID,
-+                       "%s", _("domain is not running"));
-+        goto endjob;
-+    }
-+
-+    VIR_DEBUG("Calculate dirty rate in next %d seconds", seconds);
-+
-+    priv = vm->privateData;
-+    qemuDomainObjEnterMonitor(driver, vm);
-+    ret = qemuMonitorStartDirtyRateCalc(priv->mon, seconds);
-+
-+    if (qemuDomainObjExitMonitor(driver, vm) < 0)
-+        ret = -1;
-+
-+ endjob:
-+    qemuDomainObjEndJob(driver, vm);
-+
-+ cleanup:
-+    virDomainObjEndAPI(&vm);
-+    return ret;
-+}
-+
-+
- static virHypervisorDriver qemuHypervisorDriver = {
-     .name = QEMU_DRIVER_NAME,
-     .connectURIProbe = qemuConnectURIProbe,
-@@ -23538,6 +23596,7 @@ static virHypervisorDriver qemuHypervisorDriver = {
-     .domainBackupBegin = qemuDomainBackupBegin, /* 6.0.0 */
-     .domainBackupGetXMLDesc = qemuDomainBackupGetXMLDesc, /* 6.0.0 */
-     .domainHotpatchManage = qemuDomainHotpatchManage, /* 6.2.0 */
-+    .domainStartDirtyRateCalc = qemuDomainStartDirtyRateCalc, /* 6.2.0 */
- };
- 
- 
-diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
-index ec79fa6368..cdfe5fbed9 100644
---- a/src/qemu/qemu_monitor.c
-+++ b/src/qemu/qemu_monitor.c
-@@ -4615,3 +4615,15 @@ qemuMonitorTransactionBackup(virJSONValuePtr actions,
-     return qemuMonitorJSONTransactionBackup(actions, device, jobname, target,
-                                             bitmap, syncmode);
- }
-+
-+
-+int
-+qemuMonitorStartDirtyRateCalc(qemuMonitorPtr mon,
-+                              int seconds)
-+{
-+    VIR_DEBUG("seconds=%d", seconds);
-+
-+    QEMU_CHECK_MONITOR(mon);
-+
-+    return qemuMonitorJSONStartDirtyRateCalc(mon, seconds);
-+}
-diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
-index 73c8af9e78..7b859155c3 100644
---- a/src/qemu/qemu_monitor.h
-+++ b/src/qemu/qemu_monitor.h
-@@ -1425,3 +1425,7 @@ qemuMonitorTransactionBackup(virJSONValuePtr actions,
-                              const char *target,
-                              const char *bitmap,
-                              qemuMonitorTransactionBackupSyncMode syncmode);
-+
-+int
-+qemuMonitorStartDirtyRateCalc(qemuMonitorPtr mon,
-+                              int seconds);
-diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
-index cc6644c9c3..fad9a2c233 100644
---- a/src/qemu/qemu_monitor_json.c
-+++ b/src/qemu/qemu_monitor_json.c
-@@ -9374,3 +9374,24 @@ qemuMonitorJSONGetJobInfo(qemuMonitorPtr mon,
- 
-     return 0;
- }
-+
-+int
-+qemuMonitorJSONStartDirtyRateCalc(qemuMonitorPtr mon,
-+                                  int seconds)
-+{
-+    g_autoptr(virJSONValue) cmd = NULL;
-+    g_autoptr(virJSONValue) reply = NULL;
-+
-+    if (!(cmd = qemuMonitorJSONMakeCommand("calc-dirty-rate",
-+                                           "i:calc-time", seconds,
-+                                           NULL)))
-+        return -1;
-+
-+    if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
-+        return -1;
-+
-+    if (qemuMonitorJSONCheckError(cmd, reply) < 0)
-+        return -1;
-+
-+    return 0;
-+}
-diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h
-index 2c0e3ec07a..048e7c267c 100644
---- a/src/qemu/qemu_monitor_json.h
-+++ b/src/qemu/qemu_monitor_json.h
-@@ -691,3 +691,7 @@ int qemuMonitorJSONSetDBusVMStateIdList(qemuMonitorPtr mon,
-                                         const char *vmstatepath,
-                                         const char **list)
-     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3);
-+
-+int
-+qemuMonitorJSONStartDirtyRateCalc(qemuMonitorPtr mon,
-+                                  int seconds);
--- 
-2.27.0
-
diff --git a/migration-dirtyrate-Implement-qemuMonitorQueryDirtyR.patch b/migration-dirtyrate-Implement-qemuMonitorQueryDirtyR.patch
deleted file mode 100644
index 5f02773a63856d6b4858ab18cc01c0097f4871bf..0000000000000000000000000000000000000000
--- a/migration-dirtyrate-Implement-qemuMonitorQueryDirtyR.patch
+++ /dev/null
@@ -1,168 +0,0 @@
-From c89672b2f41e1905b3b6e4fd0e37b709f629c422 Mon Sep 17 00:00:00 2001
-From: Hao Wang <wanghao232@huawei.com>
-Date: Tue, 16 Mar 2021 20:32:49 +0800
-Subject: [PATCH 5/7] migration/dirtyrate: Implement qemuMonitorQueryDirtyRate
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Implement qemuMonitorQueryDirtyRate which query domain's memory
-dirty rate calling qmp "query-dirty-rate".
-
-cherry-pick from 4ae60b1cafec45209198d5ef2e1300474d63f327
-
-Signed-off-by: Hao Wang <wanghao232@huawei.com>
-Signed-off-by: Hyman Huang(黄勇) <huangy81@chinatelecom.cn>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
----
- src/qemu/qemu_monitor.c      | 12 ++++++
- src/qemu/qemu_monitor.h      | 15 +++++++
- src/qemu/qemu_monitor_json.c | 79 ++++++++++++++++++++++++++++++++++++
- src/qemu/qemu_monitor_json.h |  4 ++
- 4 files changed, 110 insertions(+)
-
-diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
-index cdfe5fbed9..704c45d77d 100644
---- a/src/qemu/qemu_monitor.c
-+++ b/src/qemu/qemu_monitor.c
-@@ -4627,3 +4627,15 @@ qemuMonitorStartDirtyRateCalc(qemuMonitorPtr mon,
- 
-     return qemuMonitorJSONStartDirtyRateCalc(mon, seconds);
- }
-+
-+
-+int
-+qemuMonitorQueryDirtyRate(qemuMonitorPtr mon,
-+                          qemuMonitorDirtyRateInfoPtr info)
-+{
-+    VIR_DEBUG("info=%p", info);
-+
-+    QEMU_CHECK_MONITOR(mon);
-+
-+    return qemuMonitorJSONQueryDirtyRate(mon, info);
-+}
-diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
-index 7b859155c3..9c797d5ff5 100644
---- a/src/qemu/qemu_monitor.h
-+++ b/src/qemu/qemu_monitor.h
-@@ -1429,3 +1429,18 @@ qemuMonitorTransactionBackup(virJSONValuePtr actions,
- int
- qemuMonitorStartDirtyRateCalc(qemuMonitorPtr mon,
-                               int seconds);
-+
-+typedef struct _qemuMonitorDirtyRateInfo qemuMonitorDirtyRateInfo;
-+typedef qemuMonitorDirtyRateInfo *qemuMonitorDirtyRateInfoPtr;
-+
-+struct _qemuMonitorDirtyRateInfo {
-+    int status;             /* the status of last dirtyrate calculation,
-+                               one of virDomainDirtyRateStatus */
-+    int calcTime;           /* the period of dirtyrate calculation */
-+    long long startTime;    /* the start time of dirtyrate calculation */
-+    long long dirtyRate;    /* the dirtyrate in MiB/s */
-+};
-+
-+int
-+qemuMonitorQueryDirtyRate(qemuMonitorPtr mon,
-+                          qemuMonitorDirtyRateInfoPtr info);
-diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
-index fad9a2c233..3ec7fc84f5 100644
---- a/src/qemu/qemu_monitor_json.c
-+++ b/src/qemu/qemu_monitor_json.c
-@@ -9395,3 +9395,82 @@ qemuMonitorJSONStartDirtyRateCalc(qemuMonitorPtr mon,
- 
-     return 0;
- }
-+
-+VIR_ENUM_DECL(qemuMonitorDirtyRateStatus);
-+VIR_ENUM_IMPL(qemuMonitorDirtyRateStatus,
-+              VIR_DOMAIN_DIRTYRATE_LAST,
-+              "unstarted",
-+              "measuring",
-+              "measured");
-+
-+static int
-+qemuMonitorJSONExtractDirtyRateInfo(virJSONValuePtr data,
-+                                    qemuMonitorDirtyRateInfoPtr info)
-+{
-+    const char *statusstr;
-+    int status;
-+
-+    if (!(statusstr = virJSONValueObjectGetString(data, "status"))) {
-+        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-+                       _("query-dirty-rate reply was missing 'status' data"));
-+        return -1;
-+    }
-+
-+    if ((status = qemuMonitorDirtyRateStatusTypeFromString(statusstr)) < 0) {
-+        virReportError(VIR_ERR_INTERNAL_ERROR,
-+                       _("Unknown dirty rate status: %s"), statusstr);
-+        return -1;
-+    }
-+    info->status = status;
-+
-+    /* `query-dirty-rate` replies `dirty-rate` data only if the status of the latest
-+     * calculation is `measured`.
-+     */
-+    if ((info->status == VIR_DOMAIN_DIRTYRATE_MEASURED) &&
-+        (virJSONValueObjectGetNumberLong(data, "dirty-rate", &info->dirtyRate) < 0)) {
-+        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-+                       _("query-dirty-rate reply was missing 'dirty-rate' data"));
-+        return -1;
-+    }
-+
-+    if (virJSONValueObjectGetNumberLong(data, "start-time", &info->startTime) < 0) {
-+        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-+                       _("query-dirty-rate reply was missing 'start-time' data"));
-+        return -1;
-+    }
-+
-+    if (virJSONValueObjectGetNumberInt(data, "calc-time", &info->calcTime) < 0) {
-+        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-+                       _("query-dirty-rate reply was missing 'calc-time' data"));
-+        return -1;
-+    }
-+
-+    return 0;
-+}
-+
-+
-+int
-+qemuMonitorJSONQueryDirtyRate(qemuMonitorPtr mon,
-+                              qemuMonitorDirtyRateInfoPtr info)
-+{
-+    g_autoptr(virJSONValue) cmd = NULL;
-+    g_autoptr(virJSONValue) reply = NULL;
-+    virJSONValuePtr data = NULL;
-+
-+    if (!(cmd = qemuMonitorJSONMakeCommand("query-dirty-rate", NULL)))
-+        return -1;
-+
-+    if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
-+        return -1;
-+
-+    if (qemuMonitorJSONCheckError(cmd, reply) < 0)
-+        return -1;
-+
-+    if (!(data = virJSONValueObjectGetObject(reply, "return"))) {
-+        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-+                       _("query-dirty-rate reply was missing 'return' data"));
-+        return -1;
-+    }
-+
-+    return qemuMonitorJSONExtractDirtyRateInfo(data, info);
-+}
-diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h
-index 048e7c267c..531ff59a00 100644
---- a/src/qemu/qemu_monitor_json.h
-+++ b/src/qemu/qemu_monitor_json.h
-@@ -695,3 +695,7 @@ int qemuMonitorJSONSetDBusVMStateIdList(qemuMonitorPtr mon,
- int
- qemuMonitorJSONStartDirtyRateCalc(qemuMonitorPtr mon,
-                                   int seconds);
-+
-+int
-+qemuMonitorJSONQueryDirtyRate(qemuMonitorPtr mon,
-+                              qemuMonitorDirtyRateInfoPtr info);
--- 
-2.27.0
-
diff --git a/migration-dirtyrate-Introduce-command-virsh-domstats.patch b/migration-dirtyrate-Introduce-command-virsh-domstats.patch
deleted file mode 100644
index afc275d27478401fc5c662b3ff1877d89f375d61..0000000000000000000000000000000000000000
--- a/migration-dirtyrate-Introduce-command-virsh-domstats.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-From a914cfe2abd42395cc1f4cab9c435d82fdd697cb Mon Sep 17 00:00:00 2001
-From: Hao Wang <wanghao232@huawei.com>
-Date: Tue, 16 Mar 2021 20:32:51 +0800
-Subject: [PATCH 7/7] migration/dirtyrate: Introduce command 'virsh domstats
- --dirtyrate'
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Introduce command 'virsh domstats --dirtyrate' for reporting memory
-dirty rate information. The info is listed as:
-
-Domain: 'vm0'
-  dirtyrate.calc_status=2
-  dirtyrate.calc_start_time=1534523
-  dirtyrate.calc_period=1
-  dirtyrate.megabytes_per_second=5
-
-cherry-pick from 5be6decbb131a2139161bf8ec4575f45997e31ee
-
-Signed-off-by: Hao Wang <wanghao232@huawei.com>
-Signed-off-by: Hyman Huang(黄勇) <huangy81@chinatelecom.cn>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
----
- docs/manpages/virsh.rst      | 16 ++++++++++++++--
- tools/virsh-domain-monitor.c |  7 +++++++
- 2 files changed, 21 insertions(+), 2 deletions(-)
-
-diff --git a/docs/manpages/virsh.rst b/docs/manpages/virsh.rst
-index b44e8f9301..3d4fadc041 100644
---- a/docs/manpages/virsh.rst
-+++ b/docs/manpages/virsh.rst
-@@ -2208,7 +2208,7 @@ domstats
- 
-    domstats [--raw] [--enforce] [--backing] [--nowait] [--state]
-       [--cpu-total] [--balloon] [--vcpu] [--interface]
--      [--block] [--perf] [--iothread] [--memory]
-+      [--block] [--perf] [--iothread] [--memory] [--dirtyrate]
-       [[--list-active] [--list-inactive]
-        [--list-persistent] [--list-transient] [--list-running]y
-        [--list-paused] [--list-shutoff] [--list-other]] | [domain ...]
-@@ -2227,7 +2227,8 @@ behavior use the *--raw* flag.
- The individual statistics groups are selectable via specific flags. By
- default all supported statistics groups are returned. Supported
- statistics groups flags are: *--state*, *--cpu-total*, *--balloon*,
--*--vcpu*, *--interface*, *--block*, *--perf*, *--iothread*, *--memory*.
-+*--vcpu*, *--interface*, *--block*, *--perf*, *--iothread*, *--memory*,
-+*--dirtyrate*.
- 
- Note that - depending on the hypervisor type and version or the domain state
- - not all of the following statistics may be returned.
-@@ -2411,6 +2412,17 @@ not available for statistical purposes.
-   bytes consumed by @vcpus that passing through all memory controllers, either
-   local or remote controller.
- 
-+*--dirtyrate* returns:
-+
-+* ``dirtyrate.calc_status`` - the status of last memory dirty rate
-+  calculation, returned as number from virDomainDirtyRateStatus enum.
-+* ``dirtyrate.calc_start_time`` - the start time of last memory dirty
-+  rate calculation.
-+* ``dirtyrate.calc_period`` - the period of last memory dirty rate
-+  calculation.
-+* ``dirtyrate.megabytes_per_second`` - the calculated memory dirty
-+  rate in MiB/s.
-+
- 
- Selecting a specific statistics groups doesn't guarantee that the
- daemon supports the selected group of stats. Flag *--enforce*
-diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c
-index 74ff369597..e692fefa2c 100644
---- a/tools/virsh-domain-monitor.c
-+++ b/tools/virsh-domain-monitor.c
-@@ -2130,6 +2130,10 @@ static const vshCmdOptDef opts_domstats[] = {
-      .type = VSH_OT_BOOL,
-      .help = N_("report domain memory usage"),
-     },
-+    {.name = "dirtyrate",
-+     .type = VSH_OT_BOOL,
-+     .help = N_("report domain dirty rate information"),
-+    },
-     {.name = "list-active",
-      .type = VSH_OT_BOOL,
-      .help = N_("list only active domains"),
-@@ -2249,6 +2253,9 @@ cmdDomstats(vshControl *ctl, const vshCmd *cmd)
-     if (vshCommandOptBool(cmd, "memory"))
-         stats |= VIR_DOMAIN_STATS_MEMORY;
- 
-+    if (vshCommandOptBool(cmd, "dirtyrate"))
-+        stats |= VIR_DOMAIN_STATS_DIRTYRATE;
-+
-     if (vshCommandOptBool(cmd, "list-active"))
-         flags |= VIR_CONNECT_GET_ALL_DOMAINS_STATS_ACTIVE;
- 
--- 
-2.27.0
-
diff --git a/migration-dirtyrate-Introduce-domdirtyrate-calc-virs.patch b/migration-dirtyrate-Introduce-domdirtyrate-calc-virs.patch
deleted file mode 100644
index 51b87bafba63c13757e925b386f2e4387950ffcb..0000000000000000000000000000000000000000
--- a/migration-dirtyrate-Introduce-domdirtyrate-calc-virs.patch
+++ /dev/null
@@ -1,129 +0,0 @@
-From f254d3fe1e7b50c850c634adf554e4e384a4abad Mon Sep 17 00:00:00 2001
-From: Hao Wang <wanghao232@huawei.com>
-Date: Tue, 16 Mar 2021 20:32:47 +0800
-Subject: [PATCH 3/7] migration/dirtyrate: Introduce domdirtyrate-calc virsh
- api
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Introduce domdirtyrate-calc virsh api to start calculating domain's
-memory dirty rate:
-	# virsh domdirtyrate-calc <domain> [--seconds <sec>]
-
-cherry-pick from a2ae2dad062e8b23efac132488ce6aaea388de51
-
-Signed-off-by: Hao Wang <wanghao232@huawei.com>
-Signed-off-by: Hyman Huang(黄勇) <huangy81@chinatelecom.cn>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
----
- docs/manpages/virsh.rst | 17 ++++++++++++
- tools/virsh-domain.c    | 58 +++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 75 insertions(+)
-
-diff --git a/docs/manpages/virsh.rst b/docs/manpages/virsh.rst
-index dc404ddfe8..b44e8f9301 100644
---- a/docs/manpages/virsh.rst
-+++ b/docs/manpages/virsh.rst
-@@ -1696,6 +1696,23 @@ states other than "ok" or "error" the command also prints number of
- seconds elapsed since the control interface entered its current state.
- 
- 
-+domdirtyrate-calc
-+-----------------
-+
-+**Syntax:**
-+
-+::
-+
-+   domdirtyrate-calc <domain> [--seconds <sec>]
-+
-+Calculate an active domain's memory dirty rate which may be expected by
-+user in order to decide whether it's proper to be migrated out or not.
-+The ``seconds`` parameter can be used to calculate dirty rate in a
-+specific time which allows 60s at most now and would be default to 1s
-+if missing. The calculated dirty rate information is available by calling
-+'domstats --dirtyrate'.
-+
-+
- domdisplay
- ----------
- 
-diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
-index b5375ebd3e..0d42496898 100644
---- a/tools/virsh-domain.c
-+++ b/tools/virsh-domain.c
-@@ -14399,6 +14399,58 @@ cmdHotpatch(vshControl *ctl,
-     return true;
- }
- 
-+/*
-+ * "domdirtyrate" command
-+ */
-+static const vshCmdInfo info_domdirtyrate_calc[] = {
-+    {.name = "help",
-+     .data = N_("Calculate a vm's memory dirty rate")
-+    },
-+    {.name = "desc",
-+     .data = N_("Calculate memory dirty rate of a domain in order to "
-+                "decide whether it's proper to be migrated out or not.\n"
-+                "The calculated dirty rate information is available by "
-+                "calling 'domstats --dirtyrate'.")
-+    },
-+    {.name = NULL}
-+};
-+
-+static const vshCmdOptDef opts_domdirtyrate_calc[] = {
-+    VIRSH_COMMON_OPT_DOMAIN_FULL(0),
-+    {.name = "seconds",
-+     .type = VSH_OT_INT,
-+     .help = N_("calculate memory dirty rate within specified seconds, "
-+                "the supported value range from 1 to 60, default to 1.")
-+    },
-+    {.name = NULL}
-+};
-+
-+static bool
-+cmdDomDirtyRateCalc(vshControl *ctl, const vshCmd *cmd)
-+{
-+    virDomainPtr dom = NULL;
-+    int seconds = 1; /* the default value is 1 */
-+    bool ret = false;
-+
-+    if (!(dom = virshCommandOptDomain(ctl, cmd, NULL)))
-+        return false;
-+
-+    if (vshCommandOptInt(ctl, cmd, "seconds", &seconds) < 0)
-+        goto cleanup;
-+
-+    if (virDomainStartDirtyRateCalc(dom, seconds, 0) < 0)
-+        goto cleanup;
-+
-+    vshPrintExtra(ctl, _("Start to calculate domain's memory "
-+                         "dirty rate successfully.\n"));
-+    ret = true;
-+
-+ cleanup:
-+    virshDomainFree(dom);
-+    return ret;
-+}
-+
-+
- const vshCmdDef domManagementCmds[] = {
-     {.name = "attach-device",
-      .handler = cmdAttachDevice,
-@@ -15032,5 +15084,11 @@ const vshCmdDef domManagementCmds[] = {
-      .info = info_hotpatch,
-      .flags = 0
-     },
-+    {.name = "domdirtyrate-calc",
-+     .handler = cmdDomDirtyRateCalc,
-+     .opts = opts_domdirtyrate_calc,
-+     .info = info_domdirtyrate_calc,
-+     .flags = 0
-+    },
-     {.name = NULL}
- };
--- 
-2.27.0
-
diff --git a/migration-dirtyrate-Introduce-virDomainDirtyRateStat.patch b/migration-dirtyrate-Introduce-virDomainDirtyRateStat.patch
deleted file mode 100644
index efeb23165832e9406da76d0f5f37904f8d6887c3..0000000000000000000000000000000000000000
--- a/migration-dirtyrate-Introduce-virDomainDirtyRateStat.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 752ee833cda682db3cb0a38b094f3a2ec1317486 Mon Sep 17 00:00:00 2001
-From: Hao Wang <wanghao232@huawei.com>
-Date: Tue, 16 Mar 2021 20:32:48 +0800
-Subject: [PATCH 4/7] migration/dirtyrate: Introduce virDomainDirtyRateStatus
- enum
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Introduce virDomainDirtyRateStatus enum.
-
-cherry-pick from a0c7f61f37c087dcc1fadfba9f5308b0bcb5784a
-
-Signed-off-by: Hao Wang <wanghao232@huawei.com>
-Signed-off-by: Hyman Huang(黄勇) <huangy81@chinatelecom.cn>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
----
- include/libvirt/libvirt-domain.h | 18 ++++++++++++++++++
- 1 file changed, 18 insertions(+)
-
-diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h
-index 24df273045..01dc64f4f4 100644
---- a/include/libvirt/libvirt-domain.h
-+++ b/include/libvirt/libvirt-domain.h
-@@ -5011,6 +5011,24 @@ virDomainHotpatchManage(virDomainPtr domain,
-                         const char *id,
-                         unsigned int flags);
- 
-+/**
-+ * virDomainDirtyRateStatus:
-+ *
-+ * Details on the cause of a dirty rate calculation status.
-+ */
-+typedef enum {
-+    VIR_DOMAIN_DIRTYRATE_UNSTARTED = 0, /* the dirtyrate calculation has
-+                                           not been started */
-+    VIR_DOMAIN_DIRTYRATE_MEASURING = 1, /* the dirtyrate calculation is
-+                                           measuring */
-+    VIR_DOMAIN_DIRTYRATE_MEASURED  = 2, /* the dirtyrate calculation is
-+                                           completed */
-+
-+# ifdef VIR_ENUM_SENTINELS
-+    VIR_DOMAIN_DIRTYRATE_LAST
-+# endif
-+} virDomainDirtyRateStatus;
-+
- int virDomainStartDirtyRateCalc(virDomainPtr domain,
-                                 int seconds,
-                                 unsigned int flags);
--- 
-2.27.0
-
diff --git a/migration-dirtyrate-Introduce-virDomainStartDirtyRat.patch b/migration-dirtyrate-Introduce-virDomainStartDirtyRat.patch
deleted file mode 100644
index 26ab600deae847c43dab5f317759637dc6106bf7..0000000000000000000000000000000000000000
--- a/migration-dirtyrate-Introduce-virDomainStartDirtyRat.patch
+++ /dev/null
@@ -1,192 +0,0 @@
-From cd1852cbccb7a9b5055bcc11d1ed3b4b26c4d213 Mon Sep 17 00:00:00 2001
-From: Hao Wang <wanghao232@huawei.com>
-Date: Tue, 16 Mar 2021 20:32:45 +0800
-Subject: [PATCH 1/7] migration/dirtyrate: Introduce
- virDomainStartDirtyRateCalc API
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Introduce virDomainStartDirtyRateCalc API for start calculation of
-a domain's memory dirty rate with a specified time.
-
-cherry-pick from df5c5c3e60e5a3b8e9b827cc51984f055ba1ce01
-
-Signed-off-by: Hao Wang <wanghao232@huawei.com>
-Signed-off-by: Hyman Huang(黄勇) <huangy81@chinatelecom.cn>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
----
- include/libvirt/libvirt-domain.h |  4 +++
- src/driver-hypervisor.h          |  6 +++++
- src/libvirt-domain.c             | 44 ++++++++++++++++++++++++++++++++
- src/libvirt_public.syms          |  1 +
- src/remote/remote_driver.c       |  1 +
- src/remote/remote_protocol.x     | 12 +++++++++
- src/remote_protocol-structs      |  6 +++++
- 7 files changed, 74 insertions(+)
-
-diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h
-index 4ab0c9c0b2..24df273045 100644
---- a/include/libvirt/libvirt-domain.h
-+++ b/include/libvirt/libvirt-domain.h
-@@ -5011,4 +5011,8 @@ virDomainHotpatchManage(virDomainPtr domain,
-                         const char *id,
-                         unsigned int flags);
- 
-+int virDomainStartDirtyRateCalc(virDomainPtr domain,
-+                                int seconds,
-+                                unsigned int flags);
-+
- #endif /* LIBVIRT_DOMAIN_H */
-diff --git a/src/driver-hypervisor.h b/src/driver-hypervisor.h
-index afc21a0b3f..82f808905d 100644
---- a/src/driver-hypervisor.h
-+++ b/src/driver-hypervisor.h
-@@ -1394,6 +1394,11 @@ typedef char *
-                               const char *id,
-                               unsigned int flags);
- 
-+typedef int
-+(*virDrvDomainStartDirtyRateCalc)(virDomainPtr domain,
-+                                  int seconds,
-+                                  unsigned int flags);
-+
- typedef struct _virHypervisorDriver virHypervisorDriver;
- typedef virHypervisorDriver *virHypervisorDriverPtr;
- 
-@@ -1658,4 +1663,5 @@ struct _virHypervisorDriver {
-     virDrvDomainBackupBegin domainBackupBegin;
-     virDrvDomainBackupGetXMLDesc domainBackupGetXMLDesc;
-     virDrvDomainHotpatchManage domainHotpatchManage;
-+    virDrvDomainStartDirtyRateCalc domainStartDirtyRateCalc;
- };
-diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c
-index 3cf6bcb3b4..974a5a5f36 100644
---- a/src/libvirt-domain.c
-+++ b/src/libvirt-domain.c
-@@ -12800,3 +12800,47 @@ virDomainHotpatchManage(virDomainPtr domain,
-     virDispatchError(conn);
-     return NULL;
- }
-+
-+
-+/**
-+ * virDomainStartDirtyRateCalc:
-+ * @domain: a domain object
-+ * @seconds: specified calculating time in seconds
-+ * @flags: extra flags; not used yet, so callers should always pass 0
-+ *
-+ * Calculate the current domain's memory dirty rate in next @seconds.
-+ * The calculated dirty rate information is available by calling
-+ * virConnectGetAllDomainStats.
-+ *
-+ * Returns 0 in case of success, -1 otherwise.
-+ */
-+int
-+virDomainStartDirtyRateCalc(virDomainPtr domain,
-+                            int seconds,
-+                            unsigned int flags)
-+{
-+    virConnectPtr conn;
-+
-+    VIR_DOMAIN_DEBUG(domain, "seconds=%d, flags=0x%x", seconds, flags);
-+
-+    virResetLastError();
-+
-+    virCheckDomainReturn(domain, -1);
-+    conn = domain->conn;
-+
-+    virCheckReadOnlyGoto(conn->flags, error);
-+
-+    if (conn->driver->domainStartDirtyRateCalc) {
-+        int ret;
-+        ret = conn->driver->domainStartDirtyRateCalc(domain, seconds, flags);
-+        if (ret < 0)
-+            goto error;
-+        return ret;
-+    }
-+
-+    virReportUnsupportedError();
-+
-+ error:
-+    virDispatchError(conn);
-+    return -1;
-+}
-diff --git a/src/libvirt_public.syms b/src/libvirt_public.syms
-index 0ad0b9e489..f006516208 100644
---- a/src/libvirt_public.syms
-+++ b/src/libvirt_public.syms
-@@ -876,5 +876,6 @@ LIBVIRT_6.0.0 {
- LIBVIRT_6.2.0 {
-     global:
-         virDomainHotpatchManage;
-+        virDomainStartDirtyRateCalc;
- } LIBVIRT_6.0.0;
- # .... define new API here using predicted next version number ....
-diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
-index 1202d44017..e8ccbcb4f8 100644
---- a/src/remote/remote_driver.c
-+++ b/src/remote/remote_driver.c
-@@ -8685,6 +8685,7 @@ static virHypervisorDriver hypervisor_driver = {
-     .domainBackupBegin = remoteDomainBackupBegin, /* 6.0.0 */
-     .domainBackupGetXMLDesc = remoteDomainBackupGetXMLDesc, /* 6.0.0 */
-     .domainHotpatchManage = remoteDomainHotpatchManage, /* 6.2.0 */
-+    .domainStartDirtyRateCalc = remoteDomainStartDirtyRateCalc, /* 6.2.0 */
- };
- 
- static virNetworkDriver network_driver = {
-diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x
-index ee13075ce1..d89cc1a087 100644
---- a/src/remote/remote_protocol.x
-+++ b/src/remote/remote_protocol.x
-@@ -3783,6 +3783,12 @@ struct remote_domain_hotpatch_manage_ret {
-     remote_string info;
- };
- 
-+struct remote_domain_start_dirty_rate_calc_args {
-+    remote_nonnull_domain dom;
-+    int seconds;
-+    unsigned int flags;
-+};
-+
- /*----- Protocol. -----*/
- 
- /* Define the program number, protocol version and procedure numbers here. */
-@@ -6682,6 +6688,12 @@ enum remote_procedure {
-      */
-     REMOTE_PROC_DOMAIN_BACKUP_GET_XML_DESC = 422,
- 
-+    /**
-+     * @generate: both
-+     * @acl: domain:read
-+     */
-+    REMOTE_PROC_DOMAIN_START_DIRTY_RATE_CALC = 427,
-+
-     /**
-      * @generate: both
-      * @acl: domain:read
-diff --git a/src/remote_protocol-structs b/src/remote_protocol-structs
-index bae0f0b545..1e81814690 100644
---- a/src/remote_protocol-structs
-+++ b/src/remote_protocol-structs
-@@ -3135,6 +3135,11 @@ struct remote_domain_backup_get_xml_desc_args {
- struct remote_domain_backup_get_xml_desc_ret {
-         remote_nonnull_string      xml;
- };
-+struct remote_domain_start_dirty_rate_calc_args {
-+        remote_nonnull_domain      dom;
-+        int                        seconds;
-+        u_int                      flags;
-+};
- enum remote_procedure {
-         REMOTE_PROC_CONNECT_OPEN = 1,
-         REMOTE_PROC_CONNECT_CLOSE = 2,
-@@ -3558,4 +3563,5 @@ enum remote_procedure {
-         REMOTE_PROC_DOMAIN_AGENT_SET_RESPONSE_TIMEOUT = 420,
-         REMOTE_PROC_DOMAIN_BACKUP_BEGIN = 421,
-         REMOTE_PROC_DOMAIN_BACKUP_GET_XML_DESC = 422,
-+        REMOTE_PROC_DOMAIN_START_DIRTY_RATE_CALC = 427,
- };
--- 
-2.27.0
-
diff --git a/migration-migration-pin-add-domainMigrationPid-for-q.patch b/migration-migration-pin-add-domainMigrationPid-for-q.patch
index bf958f80d7d230d828dad3cd2af15ec03203bc66..a3f4855579f8224765cd2f645e6b2a30a3d1bb86 100644
--- a/migration-migration-pin-add-domainMigrationPid-for-q.patch
+++ b/migration-migration-pin-add-domainMigrationPid-for-q.patch
@@ -1,35 +1,35 @@
-From 18b3736c7a0dd1915401981750a5d1a3b3560031 Mon Sep 17 00:00:00 2001
+From c98bd215cdd2ac3e4296d5ff6264eae18a8cda90 Mon Sep 17 00:00:00 2001
 From: zhengchuan <zhengchuan@huawei.com>
 Date: Wed, 30 Nov 2022 15:01:12 +0800
-Subject: [PATCH 4/6] migration/migration-pin: add domainMigrationPid for
+Subject: [PATCH] migration/migration-pin: add domainMigrationPid for
  qemuMonitorCallbacks
 
 add domainMigrationPid for qemuMonitorCallbacks
 
 Signed-off-by:zhengchuan<zhengchuan@huawei.com>
 ---
- src/qemu/qemu_process.c | 189 ++++++++++++++++++++++++++++++++++++++++
- src/qemu/qemu_process.h |  13 +++
- 2 files changed, 202 insertions(+)
+ src/qemu/qemu_process.c | 184 ++++++++++++++++++++++++++++++++++++++++
+ src/qemu/qemu_process.h |  12 +++
+ 2 files changed, 196 insertions(+)
 
 diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
-index 9cbf34a046..ce1c597da1 100644
+index fc05b4b24f..5be6710ea7 100644
 --- a/src/qemu/qemu_process.c
 +++ b/src/qemu/qemu_process.c
-@@ -1914,6 +1914,7 @@ static qemuMonitorCallbacks monitorCallbacks = {
-     .domainPRManagerStatusChanged = qemuProcessHandlePRManagerStatusChanged,
-     .domainRdmaGidStatusChanged = qemuProcessHandleRdmaGidStatusChanged,
-     .domainGuestCrashloaded = qemuProcessHandleGuestCrashloaded,
+@@ -1819,6 +1819,7 @@ static qemuMonitorCallbacks monitorCallbacks = {
+     .domainMemoryFailure = qemuProcessHandleMemoryFailure,
+     .domainMemoryDeviceSizeChange = qemuProcessHandleMemoryDeviceSizeChange,
+     .domainDeviceUnplugError = qemuProcessHandleDeviceUnplugErr,
 +    .domainMigrationPid = qemuProcessHandleMigrationPid,
+     .domainNetdevStreamDisconnected = qemuProcessHandleNetdevStreamDisconnected,
  };
  
- static void
-@@ -2782,6 +2783,194 @@ qemuProcessResctrlCreate(virQEMUDriverPtr driver,
+@@ -2676,6 +2677,189 @@ qemuProcessResctrlCreate(virQEMUDriver *driver,
  }
  
  
 +int
-+qemuProcessSetupMigration(virDomainObjPtr vm,
++qemuProcessSetupMigration(virDomainObj *vm,
 +                          virDomainMigrationIDDefPtr migration)
 +{
 +    return qemuProcessSetupPid(vm, migration->thread_id,
@@ -45,8 +45,9 @@ index 9cbf34a046..ce1c597da1 100644
 +unsigned char *
 +virParseCPUList(int *cpumaplen, const char *cpulist, int maxcpu)
 +{
++    int lastcpu;
 +    unsigned char *cpumap = NULL;
-+    virBitmapPtr map = NULL;
++    virBitmap *map = NULL;
 +
 +    if (cpulist[0] == 'r') {
 +        map = virBitmapNew(maxcpu);
@@ -59,7 +60,7 @@ index 9cbf34a046..ce1c597da1 100644
 +                goto cleanup;
 +            }
 +
-+            int lastcpu = virBitmapLastSetBit(map);
++            lastcpu = virBitmapLastSetBit(map);
 +            if (lastcpu >= maxcpu)
 +                goto cleanup;
 +    }
@@ -77,20 +78,20 @@ index 9cbf34a046..ce1c597da1 100644
 + * If priv->pcpumap is NULL, it means migrationpin command is not called,
 + * otherwise we set the affinity of migration thread by migrationpin.
 + */
-+static virBitmapPtr
-+qemuProcessGetPcpumap(qemuDomainObjPrivatePtr priv)
++static virBitmap *
++qemuProcessGetPcpumap(qemuDomainObjPrivate *priv)
 +{
 +    int cpumaplen = 0;
 +    int maxcpu = 0;
 +    g_autofree unsigned char *cpumap = NULL;
-+    virBitmapPtr pcpumap = NULL;
++    virBitmap *pcpumap = NULL;
 +
 +    if(priv->pcpumap)
 +        return priv->pcpumap;
 +
 +    if (!(priv->migrationThreadPinList) || STREQ(priv->migrationThreadPinList, "")) {
 +        VIR_ERROR(_("didn't set the migratin thread pin"));
-+            return NULL;
++        return NULL;
 +    }
 +
 +    /* judge whether migration.pin is default value or not */
@@ -124,12 +125,12 @@ index 9cbf34a046..ce1c597da1 100644
 + * we should create the cgroup for migration thread.
 + */
 +static void
-+qemuProcessSetMigthreadAffinity(qemuDomainObjPrivatePtr priv,
-+                                virBitmapPtr pcpumap,
++qemuProcessSetMigthreadAffinity(qemuDomainObjPrivate *priv,
++                                virBitmap *pcpumap,
 +                                int mpid)
 +{
 +    int migration_id = 0;
-+    virCgroupPtr cgroup_migthread = NULL;
++    virCgroup *cgroup_migthread = NULL;
 +
 +    if (!pcpumap)
 +        return;
@@ -140,7 +141,7 @@ index 9cbf34a046..ce1c597da1 100644
 +                               migration_id, false, &cgroup_migthread) < 0)
 +            goto cleanup;
 +
-+        if (qemuSetupCgroupCpusetCpus(cgroup_migthread, pcpumap) < 0) {
++        if (virCgroupSetupCpusetCpus(cgroup_migthread, pcpumap) < 0) {
 +            virReportError(VIR_ERR_OPERATION_INVALID,
 +                           _("failed to set cpuset.cpus in cgroup"
 +                             " for migration%d thread"), migration_id);
@@ -148,41 +149,37 @@ index 9cbf34a046..ce1c597da1 100644
 +        }
 +   }
 +
-+   if (virProcessSetAffinity(mpid, pcpumap) < 0)
++   if (virProcessSetAffinity(mpid, pcpumap, false) < 0)
 +       VIR_WARN("failed to set affinity in migration");
 +
 + cleanup:
 +    if (cgroup_migthread)
-+        virCgroupFree(&cgroup_migthread);
++        virCgroupFree(cgroup_migthread);
 +    return;
 +}
 +
 +
-+int
-+qemuProcessHandleMigrationPid(qemuMonitorPtr mon ATTRIBUTE_UNUSED,
-+                              virDomainObjPtr vm,
-+                              int mpid,
-+                              void *opaque G_GNUC_UNUSED)
++void
++qemuProcessHandleMigrationPid(qemuMonitor *mon ATTRIBUTE_UNUSED,
++                              virDomainObj *vm,
++                              int mpid)
 +{
-+    qemuDomainObjPrivatePtr priv;
++    qemuDomainObjPrivate *priv;
 +    char *mpidStr = NULL;
 +    virDomainMigrationIDDefPtr migration = NULL;
-+    virBitmapPtr pcpumap = NULL;
++    virBitmap *pcpumap = NULL;
 +    virObjectLock(vm);
 +
 +    VIR_INFO("Migrating domain %p %s, migration pid %d",
 +              vm, vm->def->name, mpid);
 +
 +    priv = vm->privateData;
-+    if (priv->job.asyncJob == QEMU_ASYNC_JOB_NONE) {
++    if (vm->job->asyncJob == VIR_ASYNC_JOB_NONE) {
 +        VIR_DEBUG("got MIGRATION_PID event without a migration job");
 +        goto cleanup;
 +    }
 +
-+    if (VIR_ALLOC(migration) < 0) {
-+        VIR_ERROR(_("alloc migrationIDDefPtr failure"));
-+        goto cleanup;
-+    }
++    migration = g_malloc0(sizeof(*migration));
 +    migration->thread_id = mpid;
 +
 +    if (qemuProcessSetupMigration(vm, migration) < 0) {
@@ -211,42 +208,42 @@ index 9cbf34a046..ce1c597da1 100644
 +        virBitmapFree(pcpumap);
 +    virDomainMigrationIDDefFree(migration);
 +    virObjectUnlock(vm);
-+
-+    return 0;
 +}
 +
 +
  static char *
- qemuProcessBuildPRHelperPidfilePath(virDomainObjPtr vm)
+ qemuProcessBuildPRHelperPidfilePathOld(virDomainObj *vm)
  {
 diff --git a/src/qemu/qemu_process.h b/src/qemu/qemu_process.h
-index 15e67b9762..be062b9f95 100644
+index c1ea949215..fff976f6f7 100644
 --- a/src/qemu/qemu_process.h
 +++ b/src/qemu/qemu_process.h
 @@ -25,6 +25,7 @@
  #include "qemu_domain.h"
- #include "virstoragefile.h"
+ #include "qemu_saveimage.h"
  #include "vireventthread.h"
 +#include "domain_conf.h"
  
- int qemuProcessPrepareMonitorChr(virDomainChrSourceDefPtr monConfig,
+ int qemuProcessPrepareMonitorChr(virDomainChrSourceDef *monConfig,
                                   const char *domainDir);
-@@ -236,3 +237,15 @@ qemuProcessQMPPtr qemuProcessQMPNew(const char *binary,
- void qemuProcessQMPFree(qemuProcessQMPPtr proc);
+@@ -250,6 +251,17 @@ int qemuProcessQMPStart(qemuProcessQMP *proc);
  
- int qemuProcessQMPStart(qemuProcessQMPPtr proc);
-+
-+int qemuProcessSetupMigration(virDomainObjPtr vm,
+ bool qemuProcessRebootAllowed(const virDomainDef *def);
+ 
++int qemuProcessSetupMigration(virDomainObj *vm,
 +                              virDomainMigrationIDDefPtr migration);
 +
 +unsigned char * virParseCPUList(int *cpumaplen,
 +                                const char *cpulist,
 +                                int maxcpu);
 +
-+int qemuProcessHandleMigrationPid(qemuMonitorPtr mon ATTRIBUTE_UNUSED,
-+                                  virDomainObjPtr vm,
-+                                  int mpid,
-+                                  void *opaque);
++void qemuProcessHandleMigrationPid(qemuMonitor *mon ATTRIBUTE_UNUSED,
++                                   virDomainObj *vm,
++                                   int mpid);
++
+ void qemuProcessCleanupMigrationJob(virQEMUDriver *driver,
+                                     virDomainObj *vm);
+ 
 -- 
-2.25.1
+2.27.0
 
diff --git a/migration-migration-pin-add-migrationpin-for-migrati.patch b/migration-migration-pin-add-migrationpin-for-migrati.patch
index f0d3cf165c9cb5cb93b8ba4e182945400c6f6994..ff9ecbe77ac22649a0f57f05bd47495abb4c11c7 100644
--- a/migration-migration-pin-add-migrationpin-for-migrati.patch
+++ b/migration-migration-pin-add-migrationpin-for-migrati.patch
@@ -1,7 +1,7 @@
-From 4483bab5e3d6b031c851e6b10323a37818f147e4 Mon Sep 17 00:00:00 2001
+From 4b1281075aacc2e968e2e35bd8a81f3199faef7d Mon Sep 17 00:00:00 2001
 From: zhengchuan <zhengchuan@huawei.com>
 Date: Wed, 30 Nov 2022 15:01:12 +0800
-Subject: [PATCH 3/6] migration/migration-pin: add migrationpin for migration
+Subject: [PATCH] migration/migration-pin: add migrationpin for migration
  parameters
 
 Add a migrationpin to the migration parameters of live migration to bind cores
@@ -9,20 +9,23 @@ to the migration thread during VM migration.
 
 Signed-off-by:zhengchuan<zhengchuan@huawei.com>
 ---
- include/libvirt/libvirt-domain.h |  8 ++++++++
+ include/libvirt/libvirt-domain.h |  9 +++++++++
  src/qemu/qemu_domain.c           |  1 +
  src/qemu/qemu_domain.h           |  1 +
- src/qemu/qemu_migration.c        |  3 +++
+ src/qemu/qemu_migration.c        |  2 ++
  src/qemu/qemu_migration.h        |  1 +
- src/qemu/qemu_migration_params.c | 20 ++++++++++++++++++++
+ src/qemu/qemu_migration_params.c | 22 ++++++++++++++++++++++
  src/qemu/qemu_migration_params.h |  4 ++++
- 7 files changed, 38 insertions(+)
+ src/qemu/qemu_monitor.c          |  9 +++------
+ src/qemu/qemu_monitor.h          |  9 ++++-----
+ src/qemu/qemu_monitor_json.c     |  6 +++---
+ 10 files changed, 50 insertions(+), 14 deletions(-)
 
 diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h
-index c7956c81d6..8fe723198d 100644
+index a1902546bb..26bf60ce34 100644
 --- a/include/libvirt/libvirt-domain.h
 +++ b/include/libvirt/libvirt-domain.h
-@@ -1016,6 +1016,14 @@ typedef enum {
+@@ -1312,6 +1312,15 @@ typedef enum {
   */
  # define VIR_MIGRATE_PARAM_COMPRESSION_MT_DTHREADS "compression.mt.dthreads"
  
@@ -31,6 +34,7 @@ index c7956c81d6..8fe723198d 100644
 + *
 + * virDomainMigrate* params field: the pin of migration threads for
 + * migration as VIR_TYPED_PARAM_STRING.
++ * Since: 6.2.0
 + */
 +# define VIR_MIGRATE_PARAM_MIGRATIONPIN "migration.pin"
 +
@@ -38,75 +42,67 @@ index c7956c81d6..8fe723198d 100644
   * VIR_MIGRATE_PARAM_COMPRESSION_XBZRLE_CACHE:
   *
 diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
-index 71d034fa42..b7fb4eb9f9 100644
+index 6b09c15f7a..f8a6c43797 100644
 --- a/src/qemu/qemu_domain.c
 +++ b/src/qemu/qemu_domain.c
-@@ -2323,6 +2323,7 @@ qemuDomainObjPrivateFree(void *data)
-     VIR_FREE(priv->lockState);
-     VIR_FREE(priv->origname);
+@@ -1880,6 +1880,7 @@ qemuDomainObjPrivateFree(void *data)
+     g_free(priv->lockState);
+     g_free(priv->origname);
      VIR_FREE(priv->migrationPids);
 +    VIR_FREE(priv->migrationThreadPinList);
      virBitmapFree(priv->pcpumap);
  
      VIR_FREE(priv->migrationMultiFdPids);
 diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h
-index 38a842ebf6..7603724ccd 100644
+index 0eff9eab72..7074023229 100644
 --- a/src/qemu/qemu_domain.h
 +++ b/src/qemu/qemu_domain.h
-@@ -333,6 +333,7 @@ struct _qemuDomainObjPrivate {
-     char *origname;
-     int nbdPort; /* Port used for migration with NBD */
+@@ -147,6 +147,7 @@ struct _qemuDomainObjPrivate {
+                                                it was changed for the current
+                                                migration job. */
      char *migrationPids;
 +    char *migrationThreadPinList;
-     unsigned short migrationPort;
-     int preMigrationState;
      char *migrationMultiFdPids;
+     unsigned int migrationMultiFdCount;
+     virChrdevs *devs;
 diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
-index faf4e223a8..b47e69c642 100644
+index b13f2e0c24..00dfd46ae7 100644
 --- a/src/qemu/qemu_migration.c
 +++ b/src/qemu/qemu_migration.c
-@@ -2533,6 +2533,7 @@ qemuMigrationDstPrepareAny(virQEMUDriverPtr driver,
- 
-     priv = vm->privateData;
-     priv->origname = g_strdup(origname);
-+    VIR_FREE(priv->migrationPids);
- 
-     if (taint_hook) {
-         /* Domain XML has been altered by a hook script. */
-@@ -3601,6 +3602,8 @@ qemuMigrationSrcRun(virQEMUDriverPtr driver,
-                                   migrate_speed * 1024 * 1024) < 0)
+@@ -4838,6 +4838,8 @@ qemuMigrationSrcRun(virQEMUDriver *driver,
+                                   priv->migMaxBandwidth * 1024 * 1024) < 0)
          goto error;
  
 +    qemuMigrationMigrationParamsToVM(migParams, vm);
 +
-     if (qemuMigrationParamsApply(driver, vm, QEMU_ASYNC_JOB_MIGRATION_OUT,
-                                  migParams) < 0)
+     if (qemuMigrationParamsApply(vm, VIR_ASYNC_JOB_MIGRATION_OUT,
+                                  migParams, flags) < 0)
          goto error;
 diff --git a/src/qemu/qemu_migration.h b/src/qemu/qemu_migration.h
-index b6f88d3fd9..316a1a10f4 100644
+index ed62fd4a91..1f309bbdc2 100644
 --- a/src/qemu/qemu_migration.h
 +++ b/src/qemu/qemu_migration.h
-@@ -84,6 +84,7 @@
-     VIR_MIGRATE_PARAM_BANDWIDTH_POSTCOPY, VIR_TYPED_PARAM_ULLONG, \
-     VIR_MIGRATE_PARAM_PARALLEL_CONNECTIONS, VIR_TYPED_PARAM_INT, \
+@@ -89,6 +89,7 @@
+     VIR_MIGRATE_PARAM_COMPRESSION_ZLIB_LEVEL, VIR_TYPED_PARAM_INT, \
+     VIR_MIGRATE_PARAM_COMPRESSION_ZSTD_LEVEL, VIR_TYPED_PARAM_INT, \
      VIR_MIGRATE_PARAM_TLS_DESTINATION, VIR_TYPED_PARAM_STRING, \
 +    VIR_MIGRATE_PARAM_MIGRATIONPIN,    VIR_TYPED_PARAM_STRING, \
+     VIR_MIGRATE_PARAM_DISKS_URI,     VIR_TYPED_PARAM_STRING, \
      NULL
  
- 
 diff --git a/src/qemu/qemu_migration_params.c b/src/qemu/qemu_migration_params.c
-index df9d5d205a..4001fb2b34 100644
+index 79fe6e97c8..5c75fa4d8e 100644
 --- a/src/qemu/qemu_migration_params.c
 +++ b/src/qemu/qemu_migration_params.c
-@@ -108,6 +108,7 @@ VIR_ENUM_IMPL(qemuMigrationParam,
-               "xbzrle-cache-size",
-               "max-postcopy-bandwidth",
-               "multifd-channels",
+@@ -121,6 +121,7 @@ VIR_ENUM_IMPL(qemuMigrationParam,
+               "multifd-compression",
+               "multifd-zlib-level",
+               "multifd-zstd-level",
 +              "migrationpin",
  );
  
  typedef struct _qemuMigrationParamsAlwaysOnItem qemuMigrationParamsAlwaysOnItem;
-@@ -201,6 +202,10 @@ static const qemuMigrationParamsTPMapItem qemuMigrationParamsTPMap[] = {
+@@ -243,6 +244,10 @@ static const qemuMigrationParamsTPMapItem qemuMigrationParamsTPMap[] = {
      {.typedParam = VIR_MIGRATE_PARAM_TLS_DESTINATION,
       .param = QEMU_MIGRATION_PARAM_TLS_HOSTNAME,
       .party = QEMU_MIGRATION_SOURCE},
@@ -116,33 +112,35 @@ index df9d5d205a..4001fb2b34 100644
 +     .party = QEMU_MIGRATION_SOURCE},
  };
  
- static const qemuMigrationParamType qemuMigrationParamTypes[] = {
-@@ -217,6 +222,7 @@ static const qemuMigrationParamType qemuMigrationParamTypes[] = {
-     [QEMU_MIGRATION_PARAM_XBZRLE_CACHE_SIZE] = QEMU_MIGRATION_PARAM_TYPE_ULL,
-     [QEMU_MIGRATION_PARAM_MAX_POSTCOPY_BANDWIDTH] = QEMU_MIGRATION_PARAM_TYPE_ULL,
-     [QEMU_MIGRATION_PARAM_MULTIFD_CHANNELS] = QEMU_MIGRATION_PARAM_TYPE_INT,
-+    [QEMU_MIGRATION_PARAM_MIGRATIONPIN] = QEMU_MIGRATION_PARAM_TYPE_STRING,
+ static const qemuMigrationParamInfoItem qemuMigrationParamInfo[] = {
+@@ -295,6 +300,9 @@ static const qemuMigrationParamInfoItem qemuMigrationParamInfo[] = {
+     [QEMU_MIGRATION_PARAM_MULTIFD_ZSTD_LEVEL] = {
+         .type = QEMU_MIGRATION_PARAM_TYPE_INT,
+     },
++    [QEMU_MIGRATION_PARAM_MIGRATIONPIN] = {
++        .type = QEMU_MIGRATION_PARAM_TYPE_STRING,
++    }
  };
- G_STATIC_ASSERT(G_N_ELEMENTS(qemuMigrationParamTypes) == QEMU_MIGRATION_PARAM_LAST);
+ G_STATIC_ASSERT(G_N_ELEMENTS(qemuMigrationParamInfo) == QEMU_MIGRATION_PARAM_LAST);
  
-@@ -534,6 +540,16 @@ qemuMigrationParamsSetCompression(virTypedParameterPtr params,
+@@ -651,6 +659,16 @@ qemuMigrationParamsSetCompression(virTypedParameterPtr params,
  }
  
  
 +void
-+qemuMigrationMigrationParamsToVM(const qemuMigrationParamsPtr migParams, const virDomainObjPtr vm)
++qemuMigrationMigrationParamsToVM(const qemuMigrationParams *migParams, const virDomainObj *vm)
 +{
 +    if (migParams && migParams->params[QEMU_MIGRATION_PARAM_MIGRATIONPIN].set) {
-+        qemuDomainObjPrivatePtr priv = vm->privateData;
++        qemuDomainObjPrivate *priv = vm->privateData;
 +        priv->migrationThreadPinList = g_strdup(migParams->params[QEMU_MIGRATION_PARAM_MIGRATIONPIN].value.s);
 +    }
 +}
 +
 +
- qemuMigrationParamsPtr
- qemuMigrationParamsFromFlags(virTypedParameterPtr params,
-                              int nparams,
-@@ -741,6 +757,10 @@ qemuMigrationParamsToJSON(qemuMigrationParamsPtr migParams)
+ void
+ qemuMigrationParamsSetBlockDirtyBitmapMapping(qemuMigrationParams *migParams,
+                                               virJSONValue **params)
+@@ -870,6 +888,10 @@ qemuMigrationParamsToJSON(qemuMigrationParams *migParams,
          if (!pv->set)
              continue;
  
@@ -150,31 +148,105 @@ index df9d5d205a..4001fb2b34 100644
 +            continue;
 +        }
 +
-         rc = 0;
-         switch (qemuMigrationParamTypes[i]) {
-         case QEMU_MIGRATION_PARAM_TYPE_INT:
+         if (postcopyResume && !qemuMigrationParamInfo[i].applyOnPostcopyResume)
+             continue;
+ 
 diff --git a/src/qemu/qemu_migration_params.h b/src/qemu/qemu_migration_params.h
-index 9aea24725f..f3deffb4cc 100644
+index 5857673227..5df4d3738e 100644
 --- a/src/qemu/qemu_migration_params.h
 +++ b/src/qemu/qemu_migration_params.h
-@@ -58,6 +58,7 @@ typedef enum {
-     QEMU_MIGRATION_PARAM_XBZRLE_CACHE_SIZE,
-     QEMU_MIGRATION_PARAM_MAX_POSTCOPY_BANDWIDTH,
-     QEMU_MIGRATION_PARAM_MULTIFD_CHANNELS,
+@@ -62,6 +62,7 @@ typedef enum {
+     QEMU_MIGRATION_PARAM_MULTIFD_COMPRESSION,
+     QEMU_MIGRATION_PARAM_MULTIFD_ZLIB_LEVEL,
+     QEMU_MIGRATION_PARAM_MULTIFD_ZSTD_LEVEL,
 +    QEMU_MIGRATION_PARAM_MIGRATIONPIN,
  
      QEMU_MIGRATION_PARAM_LAST
  } qemuMigrationParam;
-@@ -74,6 +75,9 @@ typedef enum {
- virBitmapPtr
+@@ -77,6 +78,9 @@ typedef enum {
+ virBitmap *
  qemuMigrationParamsGetAlwaysOnCaps(qemuMigrationParty party);
  
 +void
-+qemuMigrationMigrationParamsToVM(const qemuMigrationParamsPtr migParams, const virDomainObjPtr vm);
++qemuMigrationMigrationParamsToVM(const qemuMigrationParams *migParams, const virDomainObj *vm);
 +
- qemuMigrationParamsPtr
+ qemuMigrationParams *
  qemuMigrationParamsFromFlags(virTypedParameterPtr params,
                               int nparams,
+diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
+index c2ab9b0070..1d5d47ea22 100644
+--- a/src/qemu/qemu_monitor.c
++++ b/src/qemu/qemu_monitor.c
+@@ -1401,15 +1401,12 @@ qemuMonitorEmitPRManagerStatusChanged(qemuMonitor *mon,
+ }
+ 
+ 
+-int
+-qemuMonitorEmitMigrationPid(qemuMonitorPtr mon,
++void
++qemuMonitorEmitMigrationPid(qemuMonitor *mon,
+                             int mpid)
+ {
+-    int ret = -1;
+     VIR_DEBUG("mon=%p, pass=%d", mon, mpid);
+-    QEMU_MONITOR_CALLBACK(mon, ret, domainMigrationPid, mon->vm, mpid);
+-
+-    return ret;
++    QEMU_MONITOR_CALLBACK(mon, domainMigrationPid, mon->vm, mpid);
+ }
+ 
+ 
+diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
+index 44eaa00cd8..646e97a8e6 100644
+--- a/src/qemu/qemu_monitor.h
++++ b/src/qemu/qemu_monitor.h
+@@ -328,10 +328,9 @@ typedef void (*qemuMonitorDomainRdmaGidStatusChangedCallback)(qemuMonitor *mon,
+ typedef void (*qemuMonitorDomainGuestCrashloadedCallback)(qemuMonitor *mon,
+                                                           virDomainObj *vm);
+ 
+-typedef int (*qemuMonitorDomainMigrationPidCallback)(qemuMonitorPtr mon,
+-                                                     virDomainObjPtr vm,
+-                                                     int mcpid,
+-                                                     void *opaque);
++typedef void (*qemuMonitorDomainMigrationPidCallback)(qemuMonitor *mon,
++                                                      virDomainObj *vm,
++                                                      int mcpid);
+ 
+ typedef enum {
+     QEMU_MONITOR_MEMORY_FAILURE_RECIPIENT_HYPERVISOR,
+@@ -511,7 +510,7 @@ void qemuMonitorEmitMigrationStatus(qemuMonitor *mon,
+ void qemuMonitorEmitMigrationPass(qemuMonitor *mon,
+                                   int pass);
+ 
+-int qemuMonitorEmitMigrationPid(qemuMonitorPtr mon, int mpid);
++void qemuMonitorEmitMigrationPid(qemuMonitor *mon, int mpid);
+ 
+ void qemuMonitorEmitAcpiOstInfo(qemuMonitor *mon,
+                                 const char *alias,
+diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
+index 167fb7356a..4c1b8c9eb7 100644
+--- a/src/qemu/qemu_monitor_json.c
++++ b/src/qemu/qemu_monitor_json.c
+@@ -84,7 +84,7 @@ static void qemuMonitorJSONHandleRdmaGidStatusChanged(qemuMonitor *mon, virJSONV
+ static void qemuMonitorJSONHandleMemoryFailure(qemuMonitor *mon, virJSONValue *data);
+ static void qemuMonitorJSONHandleMemoryDeviceSizeChange(qemuMonitor *mon, virJSONValue *data);
+ static void qemuMonitorJSONHandleDeviceUnplugErr(qemuMonitor *mon, virJSONValue *data);
+-static void qemuMonitorJSONHandleMigrationPid(qemuMonitorPtr mon, virJSONValuePtr data);
++static void qemuMonitorJSONHandleMigrationPid(qemuMonitor *mon, virJSONValue *data);
+ static void qemuMonitorJSONHandleNetdevStreamDisconnected(qemuMonitor *mon, virJSONValue *data);
+ 
+ typedef struct {
+@@ -133,8 +133,8 @@ static qemuEventHandler eventHandlers[] = {
+     /* We use bsearch, so keep this list sorted.  */
+ };
+ 
+-static void qemuMonitorJSONHandleMigrationPid(qemuMonitorPtr mon,
+-                                              virJSONValuePtr data)
++static void qemuMonitorJSONHandleMigrationPid(qemuMonitor *mon,
++                                              virJSONValue *data)
+ {
+     int mpid;
+ 
 -- 
-2.25.1
+2.27.0
 
diff --git a/migration-migration-pin-add-qemu-monitor-callback-fu.patch b/migration-migration-pin-add-qemu-monitor-callback-fu.patch
index 68cf739a45419cba117eafb4157ce34f3d34c1c7..bf7f1237e4f0ab1d2d2deab251cc155e0c8520c6 100644
--- a/migration-migration-pin-add-qemu-monitor-callback-fu.patch
+++ b/migration-migration-pin-add-qemu-monitor-callback-fu.patch
@@ -1,8 +1,7 @@
-From b0035c45ecfed66f0406a6064b33f296fd65afd9 Mon Sep 17 00:00:00 2001
+From 6656a916c6db824c9bd914d29709407013627b3d Mon Sep 17 00:00:00 2001
 From: zhengchuan <zhengchuan@huawei.com>
 Date: Wed, 30 Nov 2022 11:30:12 +0800
-Subject: [PATCH 2/6] migration/migration-pin: add qemu monitor callback
- functions
+Subject: [PATCH] migration/migration-pin: add qemu monitor callback functions
 
 add qemu monitor callback functions
 
@@ -14,10 +13,10 @@ Signed-off-by:zhengchuan<zhengchuan@huawei.com>
  3 files changed, 35 insertions(+)
 
 diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
-index 04592fdcd5..fcda2c0771 100644
+index a69ead6109..c2ab9b0070 100644
 --- a/src/qemu/qemu_monitor.c
 +++ b/src/qemu/qemu_monitor.c
-@@ -1547,6 +1547,18 @@ qemuMonitorEmitPRManagerStatusChanged(qemuMonitorPtr mon,
+@@ -1401,6 +1401,18 @@ qemuMonitorEmitPRManagerStatusChanged(qemuMonitor *mon,
  }
  
  
@@ -33,63 +32,63 @@ index 04592fdcd5..fcda2c0771 100644
 +}
 +
 +
- int
- qemuMonitorEmitRdmaGidStatusChanged(qemuMonitorPtr mon,
+ void
+ qemuMonitorEmitRdmaGidStatusChanged(qemuMonitor *mon,
                                      const char *netdev,
 diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
-index 4f9b70d820..4b34ea3b4a 100644
+index c4af9b407d..44eaa00cd8 100644
 --- a/src/qemu/qemu_monitor.h
 +++ b/src/qemu/qemu_monitor.h
-@@ -340,6 +340,11 @@ typedef int (*qemuMonitorDomainGuestCrashloadedCallback)(qemuMonitorPtr mon,
-                                                          virDomainObjPtr vm,
-                                                          void *opaque);
+@@ -328,6 +328,11 @@ typedef void (*qemuMonitorDomainRdmaGidStatusChangedCallback)(qemuMonitor *mon,
+ typedef void (*qemuMonitorDomainGuestCrashloadedCallback)(qemuMonitor *mon,
+                                                           virDomainObj *vm);
  
 +typedef int (*qemuMonitorDomainMigrationPidCallback)(qemuMonitorPtr mon,
 +                                                     virDomainObjPtr vm,
 +                                                     int mcpid,
 +                                                     void *opaque);
 +
- typedef struct _qemuMonitorCallbacks qemuMonitorCallbacks;
- typedef qemuMonitorCallbacks *qemuMonitorCallbacksPtr;
- struct _qemuMonitorCallbacks {
-@@ -376,6 +381,7 @@ struct _qemuMonitorCallbacks {
-     qemuMonitorDomainPRManagerStatusChangedCallback domainPRManagerStatusChanged;
-     qemuMonitorDomainRdmaGidStatusChangedCallback domainRdmaGidStatusChanged;
-     qemuMonitorDomainGuestCrashloadedCallback domainGuestCrashloaded;
+ typedef enum {
+     QEMU_MONITOR_MEMORY_FAILURE_RECIPIENT_HYPERVISOR,
+     QEMU_MONITOR_MEMORY_FAILURE_RECIPIENT_GUEST,
+@@ -400,6 +405,7 @@ struct _qemuMonitorCallbacks {
+     qemuMonitorDomainMemoryFailureCallback domainMemoryFailure;
+     qemuMonitorDomainMemoryDeviceSizeChange domainMemoryDeviceSizeChange;
+     qemuMonitorDomainDeviceUnplugErrCallback domainDeviceUnplugError;
 +    qemuMonitorDomainMigrationPidCallback domainMigrationPid;
+     qemuMonitorDomainNetdevStreamDisconnectedCallback domainNetdevStreamDisconnected;
  };
  
- qemuMonitorPtr qemuMonitorOpen(virDomainObjPtr vm,
-@@ -477,6 +483,8 @@ int qemuMonitorEmitMigrationStatus(qemuMonitorPtr mon,
- int qemuMonitorEmitMigrationPass(qemuMonitorPtr mon,
-                                  int pass);
+@@ -505,6 +511,8 @@ void qemuMonitorEmitMigrationStatus(qemuMonitor *mon,
+ void qemuMonitorEmitMigrationPass(qemuMonitor *mon,
+                                   int pass);
  
 +int qemuMonitorEmitMigrationPid(qemuMonitorPtr mon, int mpid);
 +
- int qemuMonitorEmitAcpiOstInfo(qemuMonitorPtr mon,
-                                const char *alias,
-                                const char *slotType,
+ void qemuMonitorEmitAcpiOstInfo(qemuMonitor *mon,
+                                 const char *alias,
+                                 const char *slotType,
 diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
-index a1617cdfed..7d2fbec5f4 100644
+index a9133793f6..167fb7356a 100644
 --- a/src/qemu/qemu_monitor_json.c
 +++ b/src/qemu/qemu_monitor_json.c
-@@ -112,6 +112,7 @@ static void qemuMonitorJSONHandleBlockThreshold(qemuMonitorPtr mon, virJSONValue
- static void qemuMonitorJSONHandleDumpCompleted(qemuMonitorPtr mon, virJSONValuePtr data);
- static void qemuMonitorJSONHandlePRManagerStatusChanged(qemuMonitorPtr mon, virJSONValuePtr data);
- static void qemuMonitorJSONHandleRdmaGidStatusChanged(qemuMonitorPtr mon, virJSONValuePtr data);
+@@ -84,6 +84,7 @@ static void qemuMonitorJSONHandleRdmaGidStatusChanged(qemuMonitor *mon, virJSONV
+ static void qemuMonitorJSONHandleMemoryFailure(qemuMonitor *mon, virJSONValue *data);
+ static void qemuMonitorJSONHandleMemoryDeviceSizeChange(qemuMonitor *mon, virJSONValue *data);
+ static void qemuMonitorJSONHandleDeviceUnplugErr(qemuMonitor *mon, virJSONValue *data);
 +static void qemuMonitorJSONHandleMigrationPid(qemuMonitorPtr mon, virJSONValuePtr data);
+ static void qemuMonitorJSONHandleNetdevStreamDisconnected(qemuMonitor *mon, virJSONValue *data);
  
  typedef struct {
-     const char *type;
-@@ -134,6 +135,7 @@ static qemuEventHandler eventHandlers[] = {
-     { "JOB_STATUS_CHANGE", qemuMonitorJSONHandleJobStatusChange, },
+@@ -107,6 +108,7 @@ static qemuEventHandler eventHandlers[] = {
+     { "MEMORY_FAILURE", qemuMonitorJSONHandleMemoryFailure, },
      { "MIGRATION", qemuMonitorJSONHandleMigrationStatus, },
      { "MIGRATION_PASS", qemuMonitorJSONHandleMigrationPass, },
 +    { "MIGRATION_PID", qemuMonitorJSONHandleMigrationPid, },
+     { "NETDEV_STREAM_DISCONNECTED", qemuMonitorJSONHandleNetdevStreamDisconnected, },
      { "NIC_RX_FILTER_CHANGED", qemuMonitorJSONHandleNicRxFilterChanged, },
-     { "POWERDOWN", qemuMonitorJSONHandlePowerdown, },
      { "PR_MANAGER_STATUS_CHANGED", qemuMonitorJSONHandlePRManagerStatusChanged, },
-@@ -158,6 +160,19 @@ static qemuEventHandler eventHandlers[] = {
+@@ -131,6 +133,19 @@ static qemuEventHandler eventHandlers[] = {
      /* We use bsearch, so keep this list sorted.  */
  };
  
@@ -110,5 +109,5 @@ index a1617cdfed..7d2fbec5f4 100644
  qemuMonitorEventCompare(const void *key, const void *elt)
  {
 -- 
-2.25.1
+2.27.0
 
diff --git a/migration-migration-pin-add-some-migration-multiFd-p.patch b/migration-migration-pin-add-some-migration-multiFd-p.patch
index 2b22a7c68a94a6b54dc8f8ee8989d98bca480ccd..4ccce9b993b22c3473a5a488be64bac72a68cd27 100644
--- a/migration-migration-pin-add-some-migration-multiFd-p.patch
+++ b/migration-migration-pin-add-some-migration-multiFd-p.patch
@@ -1,30 +1,30 @@
-From 36295c0cc955fee9afc7b0fb70822c8e1e030b87 Mon Sep 17 00:00:00 2001
+From c934558ff8d535a91146be93d45c730b8023a8cd Mon Sep 17 00:00:00 2001
 From: zhengchuan <zhengchuan@huawei.com>
 Date: Wed, 14 Dec 2022 11:07:58 +0800
-Subject: [PATCH 1/6] migration/migration-pin:add some migration/multiFd params
+Subject: [PATCH] migration/migration-pin:add some migration/multiFd params
 
 add migration/multiFd params.
 
 Signed-off-by:zhengchuan<zhengchuan@huawei.com>
 ---
- src/conf/domain_conf.c   |  9 +++++++++
- src/conf/domain_conf.h   | 12 ++++++++++++
- src/libvirt_private.syms |  1 +
- src/qemu/qemu_domain.c   |  6 ++++++
- src/qemu/qemu_domain.h   |  4 ++++
- src/util/vircgroup.c     |  3 +++
- src/util/vircgroup.h     |  1 +
- 7 files changed, 36 insertions(+)
+ src/conf/domain_conf.c    |  8 ++++++++
+ src/conf/domain_conf.h    | 12 ++++++++++++
+ src/libvirt_private.syms  |  1 +
+ src/qemu/qemu_domain.c    |  6 ++++++
+ src/qemu/qemu_domain.h    |  5 ++++-
+ src/qemu/qemu_migration.c |  1 +
+ src/util/vircgroup.c      |  3 +++
+ src/util/vircgroup.h      |  1 +
+ 8 files changed, 36 insertions(+), 1 deletion(-)
 
 diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
-index 8b1ca76d39..1689d92c51 100644
+index 22ad43e1d7..f54f99f379 100644
 --- a/src/conf/domain_conf.c
 +++ b/src/conf/domain_conf.c
-@@ -32617,3 +32617,12 @@ virHostdevIsVFIODevice(const virDomainHostdevDef *hostdev)
-         hostdev->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI &&
-         hostdev->source.subsys.u.pci.backend == VIR_DOMAIN_HOSTDEV_PCI_BACKEND_VFIO;
+@@ -31075,6 +31075,14 @@ virDomainDefHasSpiceGraphics(const virDomainDef *def)
+     return false;
  }
-+
+ 
 +void
 +virDomainMigrationIDDefFree(virDomainMigrationIDDefPtr def)
 +{
@@ -33,8 +33,11 @@ index 8b1ca76d39..1689d92c51 100644
 +    virBitmapFree(def->cpumask);
 +    VIR_FREE(def);
 +}
+ 
+ ssize_t
+ virDomainWatchdogDefFind(const virDomainDef *def,
 diff --git a/src/conf/domain_conf.h b/src/conf/domain_conf.h
-index c0a323d465..98fa323679 100644
+index ed07859bc5..196053d950 100644
 --- a/src/conf/domain_conf.h
 +++ b/src/conf/domain_conf.h
 @@ -27,6 +27,7 @@
@@ -44,42 +47,42 @@ index c0a323d465..98fa323679 100644
 +#include "viralloc.h"
  #include "virconftypes.h"
  #include "capabilities.h"
- #include "virstorageencryption.h"
-@@ -3775,3 +3776,14 @@ virHostdevIsMdevDevice(const virDomainHostdevDef *hostdev)
+ #include "cpu_conf.h"
+@@ -4498,3 +4499,14 @@ virDomainObjGetMessages(virDomainObj *vm,
+ 
  bool
- virHostdevIsVFIODevice(const virDomainHostdevDef *hostdev)
-     ATTRIBUTE_NONNULL(1);
+ virDomainDefHasSpiceGraphics(const virDomainDef *def);
 +
 +typedef struct _virDomainMigrationIDDef virDomainMigrationIDDef;
 +typedef virDomainMigrationIDDef *virDomainMigrationIDDefPtr;
 +struct _virDomainMigrationIDDef {
 +    bool autofill;
 +    int thread_id;
-+    virBitmapPtr cpumask;
++    virBitmap *cpumask;
 +    virDomainThreadSchedParam sched;
 +};
 +
 +void virDomainMigrationIDDefFree(virDomainMigrationIDDefPtr def);
 diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
-index 14ad7ecde3..f30eb7ffb5 100644
+index 553b01b8c0..4d712f0d79 100644
 --- a/src/libvirt_private.syms
 +++ b/src/libvirt_private.syms
-@@ -492,6 +492,7 @@ virDomainMemoryModelTypeToString;
+@@ -523,6 +523,7 @@ virDomainMemoryModelTypeToString;
  virDomainMemoryRemove;
  virDomainMemorySourceTypeFromString;
  virDomainMemorySourceTypeToString;
 +virDomainMigrationIDDefFree;
+ virDomainMouseModeTypeFromString;
+ virDomainMouseModeTypeToString;
  virDomainNetAllocateActualDevice;
- virDomainNetAppendIPAddress;
- virDomainNetARPInterfaces;
 diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
-index b2ac1d37cc..71d034fa42 100644
+index 953808fcfe..6b09c15f7a 100644
 --- a/src/qemu/qemu_domain.c
 +++ b/src/qemu/qemu_domain.c
-@@ -2322,6 +2322,12 @@ qemuDomainObjPrivateFree(void *data)
-     qemuDomainObjFreeJob(priv);
-     VIR_FREE(priv->lockState);
-     VIR_FREE(priv->origname);
+@@ -1879,6 +1879,12 @@ qemuDomainObjPrivateFree(void *data)
+     virObjectUnref(priv->monConfig);
+     g_free(priv->lockState);
+     g_free(priv->origname);
 +    VIR_FREE(priv->migrationPids);
 +    virBitmapFree(priv->pcpumap);
 +
@@ -90,34 +93,45 @@ index b2ac1d37cc..71d034fa42 100644
      virChrdevFree(priv->devs);
  
 diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h
-index 164fb36f0c..38a842ebf6 100644
+index 1e56e50672..0eff9eab72 100644
 --- a/src/qemu/qemu_domain.h
 +++ b/src/qemu/qemu_domain.h
-@@ -332,8 +332,11 @@ struct _qemuDomainObjPrivate {
-     unsigned long migMaxBandwidth;
-     char *origname;
-     int nbdPort; /* Port used for migration with NBD */
+@@ -146,7 +146,9 @@ struct _qemuDomainObjPrivate {
+     unsigned long long preMigrationMemlock; /* Original RLIMIT_MEMLOCK in case
+                                                it was changed for the current
+                                                migration job. */
+-
 +    char *migrationPids;
-     unsigned short migrationPort;
-     int preMigrationState;
 +    char *migrationMultiFdPids;
 +    unsigned int migrationMultiFdCount;
+     virChrdevs *devs;
  
-     virChrdevsPtr devs;
- 
-@@ -354,6 +357,7 @@ struct _qemuDomainObjPrivate {
+     qemuDomainCleanupCallback *cleanupCallbacks;
+@@ -166,6 +168,7 @@ struct _qemuDomainObjPrivate {
      /* Bitmaps below hold data from the auto NUMA feature */
-     virBitmapPtr autoNodeset;
-     virBitmapPtr autoCpuset;
-+    virBitmapPtr pcpumap;
+     virBitmap *autoNodeset;
+     virBitmap *autoCpuset;
++    virBitmap *pcpumap;
  
      bool signalIOError; /* true if the domain condition should be signalled on
                             I/O error */
+diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
+index 7ae1cd7051..b13f2e0c24 100644
+--- a/src/qemu/qemu_migration.c
++++ b/src/qemu/qemu_migration.c
+@@ -3362,6 +3362,7 @@ qemuMigrationDstPrepareFresh(virQEMUDriver *driver,
+ 
+     priv = vm->privateData;
+     priv->origname = g_strdup(origname);
++    VIR_FREE(priv->migrationPids);
+ 
+     if (taint_hook) {
+         /* Domain XML has been altered by a hook script. */
 diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
-index f52a8cc843..b075dd1ecb 100644
+index b424e1b5d4..62c6df2206 100644
 --- a/src/util/vircgroup.c
 +++ b/src/util/vircgroup.c
-@@ -969,6 +969,9 @@ virCgroupNewThread(virCgroupPtr domain,
+@@ -1123,6 +1123,9 @@ virCgroupNewThread(virCgroup *domain,
      case VIR_CGROUP_THREAD_IOTHREAD:
          name = g_strdup_printf("iothread%d", id);
          break;
@@ -126,12 +140,12 @@ index f52a8cc843..b075dd1ecb 100644
 +        break;
      case VIR_CGROUP_THREAD_LAST:
          virReportError(VIR_ERR_INTERNAL_ERROR,
-                        _("unexpected name value %d"), nameval);
+                        _("unexpected name value %1$d"), nameval);
 diff --git a/src/util/vircgroup.h b/src/util/vircgroup.h
-index 1dcd0688f1..5639f36c1f 100644
+index adf3850b22..c5f6ddd7a6 100644
 --- a/src/util/vircgroup.h
 +++ b/src/util/vircgroup.h
-@@ -54,6 +54,7 @@ typedef enum {
+@@ -53,6 +53,7 @@ typedef enum {
      VIR_CGROUP_THREAD_VCPU = 0,
      VIR_CGROUP_THREAD_EMULATOR,
      VIR_CGROUP_THREAD_IOTHREAD,
@@ -140,5 +154,5 @@ index 1dcd0688f1..5639f36c1f 100644
      VIR_CGROUP_THREAD_LAST
  } virCgroupThreadName;
 -- 
-2.25.1
+2.27.0
 
diff --git a/migration-multifd-pin-add-qemu-monitor-callback-func.patch b/migration-multifd-pin-add-qemu-monitor-callback-func.patch
index bf1a89af4427b2fe4664baf47609ee0c60e02a00..4d2f6ba60f6e925aa9963a7f942c05f68bd0297b 100644
--- a/migration-multifd-pin-add-qemu-monitor-callback-func.patch
+++ b/migration-multifd-pin-add-qemu-monitor-callback-func.patch
@@ -1,101 +1,96 @@
-From d0c3db4eb01ac0c31003c333173aa2b8dceb8032 Mon Sep 17 00:00:00 2001
+From c9074196761ed6c180a53ccdc0bb692f31491158 Mon Sep 17 00:00:00 2001
 From: zhengchuan <zhengchuan@huawei.com>
 Date: Wed, 30 Nov 2022 15:59:27 +0800
-Subject: [PATCH 5/6] migration/multifd-pin: add qemu monitor callback
- functions
+Subject: [PATCH] migration/multifd-pin: add qemu monitor callback functions
 
 add qemu monitor callback functions
 
 Signed-off-by:zhengchuan<zhengchuan@huawei.com>
 ---
- src/qemu/qemu_monitor.c      | 12 ++++++++++++
- src/qemu/qemu_monitor.h      |  9 +++++++++
+ src/qemu/qemu_monitor.c      |  9 +++++++++
+ src/qemu/qemu_monitor.h      |  8 ++++++++
  src/qemu/qemu_monitor_json.c | 15 +++++++++++++++
- 3 files changed, 36 insertions(+)
+ 3 files changed, 32 insertions(+)
 
 diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
-index fcda2c0771..ffd1d348e5 100644
+index 1d5d47ea22..e4a1852d05 100644
 --- a/src/qemu/qemu_monitor.c
 +++ b/src/qemu/qemu_monitor.c
-@@ -1559,6 +1559,18 @@ qemuMonitorEmitMigrationPid(qemuMonitorPtr mon,
+@@ -1410,6 +1410,15 @@ qemuMonitorEmitMigrationPid(qemuMonitor *mon,
  }
  
  
-+int
-+qemuMonitorEmitMigrationMultiFdPids(qemuMonitorPtr mon,
++void
++qemuMonitorEmitMigrationMultiFdPids(qemuMonitor *mon,
 +                                    int mpid)
 +{
-+    int ret = -1;
 +    VIR_DEBUG("mon=%p, pass=%d", mon, mpid);
-+    QEMU_MONITOR_CALLBACK(mon, ret, domainMigrationMultiFdPids, mon->vm, mpid);
-+
-+    return ret;
++    QEMU_MONITOR_CALLBACK(mon, domainMigrationMultiFdPids, mon->vm, mpid);
 +}
 +
 +
- int
- qemuMonitorEmitRdmaGidStatusChanged(qemuMonitorPtr mon,
+ void
+ qemuMonitorEmitRdmaGidStatusChanged(qemuMonitor *mon,
                                      const char *netdev,
 diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
-index 4b34ea3b4a..76d0bbb753 100644
+index 646e97a8e6..e893542971 100644
 --- a/src/qemu/qemu_monitor.h
 +++ b/src/qemu/qemu_monitor.h
-@@ -345,6 +345,11 @@ typedef int (*qemuMonitorDomainMigrationPidCallback)(qemuMonitorPtr mon,
-                                                      int mcpid,
-                                                      void *opaque);
+@@ -332,6 +332,10 @@ typedef void (*qemuMonitorDomainMigrationPidCallback)(qemuMonitor *mon,
+                                                       virDomainObj *vm,
+                                                       int mcpid);
  
-+typedef int (*qemuMonitorDomainMigrationMultiFdPidsCallback)(qemuMonitorPtr mon,
-+                                                             virDomainObjPtr vm,
-+                                                             int mcpid,
-+                                                             void *opaque);
++typedef void (*qemuMonitorDomainMigrationMultiFdPidsCallback)(qemuMonitor *mon,
++                                                             virDomainObj *vm,
++                                                             int mcpid);
 +
- typedef struct _qemuMonitorCallbacks qemuMonitorCallbacks;
- typedef qemuMonitorCallbacks *qemuMonitorCallbacksPtr;
- struct _qemuMonitorCallbacks {
-@@ -382,6 +387,7 @@ struct _qemuMonitorCallbacks {
-     qemuMonitorDomainRdmaGidStatusChangedCallback domainRdmaGidStatusChanged;
-     qemuMonitorDomainGuestCrashloadedCallback domainGuestCrashloaded;
+ typedef enum {
+     QEMU_MONITOR_MEMORY_FAILURE_RECIPIENT_HYPERVISOR,
+     QEMU_MONITOR_MEMORY_FAILURE_RECIPIENT_GUEST,
+@@ -405,6 +409,7 @@ struct _qemuMonitorCallbacks {
+     qemuMonitorDomainMemoryDeviceSizeChange domainMemoryDeviceSizeChange;
+     qemuMonitorDomainDeviceUnplugErrCallback domainDeviceUnplugError;
      qemuMonitorDomainMigrationPidCallback domainMigrationPid;
 +    qemuMonitorDomainMigrationMultiFdPidsCallback domainMigrationMultiFdPids;
+     qemuMonitorDomainNetdevStreamDisconnectedCallback domainNetdevStreamDisconnected;
  };
  
- qemuMonitorPtr qemuMonitorOpen(virDomainObjPtr vm,
-@@ -485,6 +491,9 @@ int qemuMonitorEmitMigrationPass(qemuMonitorPtr mon,
+@@ -512,6 +517,9 @@ void qemuMonitorEmitMigrationPass(qemuMonitor *mon,
  
- int qemuMonitorEmitMigrationPid(qemuMonitorPtr mon, int mpid);
+ void qemuMonitorEmitMigrationPid(qemuMonitor *mon, int mpid);
  
-+int qemuMonitorEmitMigrationMultiFdPids(qemuMonitorPtr mon,
-+                                        int mpid);
++void qemuMonitorEmitMigrationMultiFdPids(qemuMonitor *mon,
++                                         int mpid);
 +
- int qemuMonitorEmitAcpiOstInfo(qemuMonitorPtr mon,
-                                const char *alias,
-                                const char *slotType,
+ void qemuMonitorEmitAcpiOstInfo(qemuMonitor *mon,
+                                 const char *alias,
+                                 const char *slotType,
 diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
-index 7d2fbec5f4..a02d0e2780 100644
+index 4c1b8c9eb7..acd5ce5297 100644
 --- a/src/qemu/qemu_monitor_json.c
 +++ b/src/qemu/qemu_monitor_json.c
-@@ -113,6 +113,7 @@ static void qemuMonitorJSONHandleDumpCompleted(qemuMonitorPtr mon, virJSONValueP
- static void qemuMonitorJSONHandlePRManagerStatusChanged(qemuMonitorPtr mon, virJSONValuePtr data);
- static void qemuMonitorJSONHandleRdmaGidStatusChanged(qemuMonitorPtr mon, virJSONValuePtr data);
- static void qemuMonitorJSONHandleMigrationPid(qemuMonitorPtr mon, virJSONValuePtr data);
-+static void qemuMonitorJSONHandleMigrationMultiFdPids(qemuMonitorPtr mon, virJSONValuePtr data);
+@@ -85,6 +85,7 @@ static void qemuMonitorJSONHandleMemoryFailure(qemuMonitor *mon, virJSONValue *d
+ static void qemuMonitorJSONHandleMemoryDeviceSizeChange(qemuMonitor *mon, virJSONValue *data);
+ static void qemuMonitorJSONHandleDeviceUnplugErr(qemuMonitor *mon, virJSONValue *data);
+ static void qemuMonitorJSONHandleMigrationPid(qemuMonitor *mon, virJSONValue *data);
++static void qemuMonitorJSONHandleMigrationMultiFdPids(qemuMonitor *mon, virJSONValue *data);
+ static void qemuMonitorJSONHandleNetdevStreamDisconnected(qemuMonitor *mon, virJSONValue *data);
  
  typedef struct {
-     const char *type;
-@@ -134,6 +135,7 @@ static qemuEventHandler eventHandlers[] = {
-     { "GUEST_PANICKED", qemuMonitorJSONHandleGuestPanic, },
-     { "JOB_STATUS_CHANGE", qemuMonitorJSONHandleJobStatusChange, },
+@@ -107,6 +108,7 @@ static qemuEventHandler eventHandlers[] = {
+     { "MEMORY_DEVICE_SIZE_CHANGE", qemuMonitorJSONHandleMemoryDeviceSizeChange, },
+     { "MEMORY_FAILURE", qemuMonitorJSONHandleMemoryFailure, },
      { "MIGRATION", qemuMonitorJSONHandleMigrationStatus, },
 +    { "MIGRATION_MULTIFD_PID", qemuMonitorJSONHandleMigrationMultiFdPids, },
      { "MIGRATION_PASS", qemuMonitorJSONHandleMigrationPass, },
      { "MIGRATION_PID", qemuMonitorJSONHandleMigrationPid, },
-     { "NIC_RX_FILTER_CHANGED", qemuMonitorJSONHandleNicRxFilterChanged, },
-@@ -173,6 +175,19 @@ static void qemuMonitorJSONHandleMigrationPid(qemuMonitorPtr mon,
+     { "NETDEV_STREAM_DISCONNECTED", qemuMonitorJSONHandleNetdevStreamDisconnected, },
+@@ -146,6 +148,19 @@ static void qemuMonitorJSONHandleMigrationPid(qemuMonitor *mon,
      qemuMonitorEmitMigrationPid(mon, mpid);
  }
  
-+static void qemuMonitorJSONHandleMigrationMultiFdPids(qemuMonitorPtr mon,
-+                                                      virJSONValuePtr data)
++static void qemuMonitorJSONHandleMigrationMultiFdPids(qemuMonitor *mon,
++                                                      virJSONValue *data)
 +{
 +    int mpid;
 +
@@ -111,5 +106,5 @@ index 7d2fbec5f4..a02d0e2780 100644
  qemuMonitorEventCompare(const void *key, const void *elt)
  {
 -- 
-2.25.1
+2.27.0
 
diff --git a/migration-multifd-pin-support-migration-multifd-thre.patch b/migration-multifd-pin-support-migration-multifd-thre.patch
index 1c292e5c9efcde2daca09fdcc4cc603869784cc7..b5bd6a86d5b2047c74f4387acb54e89616232118 100644
--- a/migration-multifd-pin-support-migration-multifd-thre.patch
+++ b/migration-multifd-pin-support-migration-multifd-thre.patch
@@ -1,23 +1,22 @@
-From 8c07702d9280ef5235bb2bdb1ee472452cffca02 Mon Sep 17 00:00:00 2001
+From 5ddedd900bf5556f0c01715148b387fa451d9399 Mon Sep 17 00:00:00 2001
 From: zhengchuan <zhengchuan@huawei.com>
 Date: Wed, 30 Nov 2022 16:47:30 +0800
-Subject: [PATCH 6/6] migration/multifd-pin: support migration multifd thread
- pin
+Subject: [PATCH] migration/multifd-pin: support migration multifd thread pin
 
 support migration multifd thread pin by configuration.
 
 Signed-off-by:zhengchuan<zhengchuan@huawei.com>
 ---
  src/qemu/qemu_migration.c |   2 +
- src/qemu/qemu_process.c   | 119 ++++++++++++++++++++++++++++++++++++++
- src/qemu/qemu_process.h   |   5 ++
- 3 files changed, 126 insertions(+)
+ src/qemu/qemu_process.c   | 114 ++++++++++++++++++++++++++++++++++++++
+ src/qemu/qemu_process.h   |   4 ++
+ 3 files changed, 120 insertions(+)
 
 diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
-index b47e69c642..c2a694eff1 100644
+index 00dfd46ae7..41ce565ede 100644
 --- a/src/qemu/qemu_migration.c
 +++ b/src/qemu/qemu_migration.c
-@@ -2534,6 +2534,8 @@ qemuMigrationDstPrepareAny(virQEMUDriverPtr driver,
+@@ -3363,6 +3363,8 @@ qemuMigrationDstPrepareFresh(virQEMUDriver *driver,
      priv = vm->privateData;
      priv->origname = g_strdup(origname);
      VIR_FREE(priv->migrationPids);
@@ -27,17 +26,18 @@ index b47e69c642..c2a694eff1 100644
      if (taint_hook) {
          /* Domain XML has been altered by a hook script. */
 diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
-index ce1c597da1..0f3e651630 100644
+index 5be6710ea7..e85862333c 100644
 --- a/src/qemu/qemu_process.c
 +++ b/src/qemu/qemu_process.c
-@@ -1629,6 +1629,57 @@ qemuProcessHandleSpiceMigrated(qemuMonitorPtr mon G_GNUC_UNUSED,
+@@ -1438,6 +1438,58 @@ qemuProcessHandleSpiceMigrated(qemuMonitor *mon G_GNUC_UNUSED,
  }
  
  
 +static void
-+qemuProcessHandleMigrationPinStatus(qemuDomainObjPrivatePtr priv, int status)
++qemuProcessHandleMigrationPinStatus(virDomainObj *vm, int status)
 +{
-+    if (priv->job.asyncJob != QEMU_ASYNC_JOB_MIGRATION_OUT)
++    qemuDomainObjPrivate *priv = vm->privateData;
++    if (vm->job->asyncJob != VIR_ASYNC_JOB_MIGRATION_OUT)
 +        return;
 +
 +    switch (status) {
@@ -85,56 +85,52 @@ index ce1c597da1..0f3e651630 100644
 +}
 +
 +
- static int
- qemuProcessHandleMigrationStatus(qemuMonitorPtr mon G_GNUC_UNUSED,
-                                  virDomainObjPtr vm,
-@@ -1675,6 +1726,8 @@ qemuProcessHandleMigrationStatus(qemuMonitorPtr mon G_GNUC_UNUSED,
-         }
+ static void
+ qemuProcessHandleMigrationStatus(qemuMonitor *mon G_GNUC_UNUSED,
+                                  virDomainObj *vm,
+@@ -1553,6 +1605,8 @@ qemuProcessHandleMigrationStatus(qemuMonitor *mon G_GNUC_UNUSED,
+         break;
      }
  
-+    qemuProcessHandleMigrationPinStatus(priv, status);
++    qemuProcessHandleMigrationPinStatus(vm, status);
 +
   cleanup:
      virObjectUnlock(vm);
      virObjectEventStateQueue(driver->domainEventState, event);
-@@ -1915,6 +1968,7 @@ static qemuMonitorCallbacks monitorCallbacks = {
-     .domainRdmaGidStatusChanged = qemuProcessHandleRdmaGidStatusChanged,
-     .domainGuestCrashloaded = qemuProcessHandleGuestCrashloaded,
+@@ -1820,6 +1874,7 @@ static qemuMonitorCallbacks monitorCallbacks = {
+     .domainMemoryDeviceSizeChange = qemuProcessHandleMemoryDeviceSizeChange,
+     .domainDeviceUnplugError = qemuProcessHandleDeviceUnplugErr,
      .domainMigrationPid = qemuProcessHandleMigrationPid,
 +    .domainMigrationMultiFdPids = qemuProcessHandleMigrationMultiFdPids,
+     .domainNetdevStreamDisconnected = qemuProcessHandleNetdevStreamDisconnected,
  };
  
- static void
-@@ -2971,6 +3025,71 @@ qemuProcessHandleMigrationPid(qemuMonitorPtr mon ATTRIBUTE_UNUSED,
+@@ -2860,6 +2915,65 @@ qemuProcessHandleMigrationPid(qemuMonitor *mon ATTRIBUTE_UNUSED,
  }
  
  
-+int
-+qemuProcessHandleMigrationMultiFdPids(qemuMonitorPtr mon ATTRIBUTE_UNUSED,
-+                                      virDomainObjPtr vm,
-+                                      int mpid,
-+                                      void *opaque G_GNUC_UNUSED)
++void
++qemuProcessHandleMigrationMultiFdPids(qemuMonitor *mon ATTRIBUTE_UNUSED,
++                                      virDomainObj *vm,
++                                      int mpid)
 +{
-+    qemuDomainObjPrivatePtr priv;
++    qemuDomainObjPrivate *priv;
 +    char *mpidOldStr = NULL;
 +    char *mpidStr = NULL;
 +    virDomainMigrationIDDefPtr migration = NULL;
-+    virBitmapPtr pcpumap = NULL;
++    virBitmap *pcpumap = NULL;
 +    virObjectLock(vm);
 +
 +    VIR_INFO("Migrating domain %p %s, migration-multifd pid %d",
 +              vm, vm->def->name, mpid);
 +
 +    priv = vm->privateData;
-+    if (priv->job.asyncJob == QEMU_ASYNC_JOB_NONE) {
++    if (vm->job->asyncJob == VIR_ASYNC_JOB_NONE) {
 +        VIR_DEBUG("got MIGRATION_MULTIFD_PID event without a migration job");
 +        goto cleanup;
 +    }
 +
-+    if (VIR_ALLOC(migration) < 0) {
-+        VIR_ERROR(_("alloc migrationIDDefPtr failure"));
-+        goto cleanup;
-+    }
++    migration = g_malloc0(sizeof(*migration));
 +    migration->thread_id = mpid;
 +
 +    if (qemuProcessSetupMigration(vm, migration) < 0) {
@@ -169,27 +165,27 @@ index ce1c597da1..0f3e651630 100644
 +        virBitmapFree(pcpumap);
 +    virDomainMigrationIDDefFree(migration);
 +    virObjectUnlock(vm);
-+
-+    return 0;
 +}
 +
 +
  static char *
- qemuProcessBuildPRHelperPidfilePath(virDomainObjPtr vm)
+ qemuProcessBuildPRHelperPidfilePathOld(virDomainObj *vm)
  {
 diff --git a/src/qemu/qemu_process.h b/src/qemu/qemu_process.h
-index be062b9f95..561795edeb 100644
+index fff976f6f7..69a240e1e8 100644
 --- a/src/qemu/qemu_process.h
 +++ b/src/qemu/qemu_process.h
-@@ -249,3 +249,8 @@ int qemuProcessHandleMigrationPid(qemuMonitorPtr mon ATTRIBUTE_UNUSED,
-                                   virDomainObjPtr vm,
-                                   int mpid,
-                                   void *opaque);
-+
-+int qemuProcessHandleMigrationMultiFdPids(qemuMonitorPtr mon ATTRIBUTE_UNUSED,
-+                                          virDomainObjPtr vm,
-+                                          int mpid,
-+                                          void *opaque);
+@@ -262,6 +262,10 @@ void qemuProcessHandleMigrationPid(qemuMonitor *mon ATTRIBUTE_UNUSED,
+                                    virDomainObj *vm,
+                                    int mpid);
+ 
++void qemuProcessHandleMigrationMultiFdPids(qemuMonitor *mon ATTRIBUTE_UNUSED,
++                                           virDomainObj *vm,
++                                           int mpid);
++
+ void qemuProcessCleanupMigrationJob(virQEMUDriver *driver,
+                                     virDomainObj *vm);
+ 
 -- 
-2.25.1
+2.27.0
 
diff --git a/network-Introduce-mutex-for-bridge-name-generation.patch b/network-Introduce-mutex-for-bridge-name-generation.patch
deleted file mode 100644
index 7d6729a6bbe4134f8a8b80716eb0b6781ac5bf37..0000000000000000000000000000000000000000
--- a/network-Introduce-mutex-for-bridge-name-generation.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-From b85da76baeebccdb35c12bbc16f82692c42a7372 Mon Sep 17 00:00:00 2001
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Thu, 7 Jan 2021 15:51:02 +0100
-Subject: [PATCH 077/108] network: Introduce mutex for bridge name generation
-
-When defining/creating a network the bridge name may be filled in
-automatically by libvirt (if none provided in the input XML or
-the one provided is a pattern, e.g. "virbr%d"). During the
-bridge name generation process a candidate name is generated
-which is then checked with the rest of already defined/running
-networks for collisions.
-
-Problem is, that there is no mutex guarding this critical section
-and thus if two threads line up so that they both generate the
-same candidate they won't find any collision and the same name is
-then stored.
-
-Resolves: https://gitlab.com/libvirt/libvirt/-/issues/78
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Laine Stump <laine@redhat.com>
-(cherry picked from commit ea0cfa115307ecb9fe05dd1953ec7ddd8dd39d72)
----
- src/network/bridge_driver.c | 13 +++++++++++--
- 1 file changed, 11 insertions(+), 2 deletions(-)
-
-diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c
-index 21d02dd304..ce61ff483a 100644
---- a/src/network/bridge_driver.c
-+++ b/src/network/bridge_driver.c
-@@ -74,6 +74,8 @@
- #define VIR_FROM_THIS VIR_FROM_NETWORK
- #define MAX_BRIDGE_ID 256
- 
-+static virMutex bridgeNameValidateMutex = VIR_MUTEX_INITIALIZER;
-+
- /**
-  * VIR_NETWORK_DHCP_LEASE_FILE_SIZE_MAX:
-  *
-@@ -3255,20 +3257,27 @@ static int
- networkBridgeNameValidate(virNetworkObjListPtr nets,
-                           virNetworkDefPtr def)
- {
-+    virMutexLock(&bridgeNameValidateMutex);
-+
-     if (def->bridge && !strstr(def->bridge, "%d")) {
-         if (virNetworkObjBridgeInUse(nets, def->bridge, def->name)) {
-             virReportError(VIR_ERR_INTERNAL_ERROR,
-                            _("bridge name '%s' already in use."),
-                            def->bridge);
--            return -1;
-+            goto error;
-         }
-     } else {
-         /* Allocate a bridge name */
-         if (networkFindUnusedBridgeName(nets, def) < 0)
--            return -1;
-+            goto error;
-     }
- 
-+    virMutexUnlock(&bridgeNameValidateMutex);
-     return 0;
-+
-+ error:
-+    virMutexUnlock(&bridgeNameValidateMutex);
-+    return -1;
- }
- 
- 
--- 
-2.33.0
-
diff --git a/networkGetDHCPLeases-Use-VIR_APPEND_ELEMENT-instead-.patch b/networkGetDHCPLeases-Use-VIR_APPEND_ELEMENT-instead-.patch
deleted file mode 100644
index 54ab3bf514bf59b7d6eacd00868473567509abbb..0000000000000000000000000000000000000000
--- a/networkGetDHCPLeases-Use-VIR_APPEND_ELEMENT-instead-.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 9c6ee47619deb2553dafd498ba03aff29a484069 Mon Sep 17 00:00:00 2001
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Fri, 18 Dec 2020 16:09:13 +0100
-Subject: [PATCH 025/108] networkGetDHCPLeases: Use VIR_APPEND_ELEMENT()
- instead of VIR_INSERT_ELEMENT()
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This function is misusing VIR_INSERT_ELEMENT() to behave like
-VIR_APPEND_ELEMENT(). Use the latter to make it explicit what we
-are trying to achieve.
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
-(cherry picked from commit ee93656c40467fa614e999a146a56011a9c500e3)
----
- src/network/bridge_driver.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c
-index f06099297a..21d02dd304 100644
---- a/src/network/bridge_driver.c
-+++ b/src/network/bridge_driver.c
-@@ -4322,7 +4322,7 @@ networkGetDHCPLeases(virNetworkPtr net,
-             lease->clientid = g_strdup(virJSONValueObjectGetString(lease_tmp, "client-id"));
-             lease->hostname = g_strdup(virJSONValueObjectGetString(lease_tmp, "hostname"));
- 
--            if (VIR_INSERT_ELEMENT(leases_ret, nleases, nleases, lease) < 0)
-+            if (VIR_APPEND_ELEMENT(leases_ret, nleases, lease) < 0)
-                 goto error;
- 
-         } else {
--- 
-2.33.0
-
diff --git a/node_device-fix-leak-of-DIR.patch b/node_device-fix-leak-of-DIR.patch
index f52b7b41c35d33d7a57428924cad7d7106341452..8e4d76e1426375e4fbace9d671c4991183290fc1 100644
--- a/node_device-fix-leak-of-DIR.patch
+++ b/node_device-fix-leak-of-DIR.patch
@@ -1,4 +1,4 @@
-From bbe1178cd6375270b01324dbbd4b34f17ff6ac1a Mon Sep 17 00:00:00 2001
+From 3cd86072fd6725178b669174eb99ab24a0bcee6c Mon Sep 17 00:00:00 2001
 From: AlexChen <alex.chen@huawei.com>
 Date: Tue, 27 Oct 2020 21:43:47 -0400
 Subject: [PATCH] node_device: fix leak of DIR*
@@ -17,26 +17,27 @@ Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
 Reviewed-by: Ján Tomko <jtomko@redhat.com>
 Signed-off-by: AlexChen <alex.chen@huawei.com>
 ---
- src/node_device/node_device_udev.c | 3 +++
- 1 file changed, 3 insertions(+)
+ src/node_device/node_device_udev.c | 4 ++++
+ 1 file changed, 4 insertions(+)
 
 diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c
-index 2764315325..a5a018652b 100644
+index 911325600e..c82d3e7dea 100644
 --- a/src/node_device/node_device_udev.c
 +++ b/src/node_device/node_device_udev.c
-@@ -1108,6 +1108,7 @@ udevGetVDPACharDev(const char *sysfs_path,
+@@ -1198,6 +1198,7 @@ udevGetVDPACharDev(const char *sysfs_path,
                  virReportError(VIR_ERR_INTERNAL_ERROR,
-                                _("vDPA chardev path '%s' does not exist"),
+                                _("vDPA chardev path '%1$s' does not exist"),
                                 chardev);
-+                VIR_DIR_CLOSE(dir);
++                virDirClose(dir);
                  return -1;
              }
              VIR_DEBUG("vDPA chardev is at '%s'", chardev);
-@@ -1117,6 +1118,8 @@ udevGetVDPACharDev(const char *sysfs_path,
+@@ -1206,6 +1207,9 @@ udevGetVDPACharDev(const char *sysfs_path,
+             break;
          }
      }
- 
-+    VIR_DIR_CLOSE(dir);
++
++    virDirClose(dir);
 +
      if (direrr < 0)
          return -1;
diff --git a/node_device_udev.h-Drop-unused-macro.patch b/node_device_udev.h-Drop-unused-macro.patch
deleted file mode 100644
index de4a0bcab18bd055f0f3a1c5c260e343bfe89c76..0000000000000000000000000000000000000000
--- a/node_device_udev.h-Drop-unused-macro.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 4111ae4dcc2f9158a8e4e7a9a4787bcc39b3704b Mon Sep 17 00:00:00 2001
-From: Xu Zheng <xuzheng_yewu@cmss.chinamobile.com>
-Date: Thu, 24 Nov 2022 10:50:04 +0800
-Subject: [PATCH 14/23] node_device_udev.h: Drop unused macro
-
-The SYSFS_DATA_SIZE macro is Unused since its introduction in
-v0.7.3~48.
-
-cherry-pick from 4a00efe9cb3b60c8729b4262440747db17356f32
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Signed-off-by: Xu Zheng <xuzheng_yewu@cmss.chinamobile.com>
-Reviewed-by: Jonathon Jongsma <jjongsma@redhat.com>
----
- src/node_device/node_device_udev.h | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/src/node_device/node_device_udev.h b/src/node_device/node_device_udev.h
-index 996677dfe0..6d796fb0dd 100644
---- a/src/node_device/node_device_udev.h
-+++ b/src/node_device/node_device_udev.h
-@@ -22,6 +22,5 @@
- 
- #include <libudev.h>
- 
--#define SYSFS_DATA_SIZE 4096
- #define DMI_DEVPATH "/sys/devices/virtual/dmi/id"
- #define DMI_DEVPATH_FALLBACK "/sys/class/dmi/id"
--- 
-2.27.0
-
diff --git a/nodedev-Don-t-crash-when-exiting-before-init-is-done.patch b/nodedev-Don-t-crash-when-exiting-before-init-is-done.patch
deleted file mode 100644
index 31c0961c6c5063d2efe01cd7c22a0363425d0f52..0000000000000000000000000000000000000000
--- a/nodedev-Don-t-crash-when-exiting-before-init-is-done.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From 7ff49868cf6a80d14f83a064b6524de233f5b6b0 Mon Sep 17 00:00:00 2001
-From: Jonathon Jongsma <jjongsma@redhat.com>
-Date: Tue, 16 Mar 2021 17:27:25 -0500
-Subject: [PATCH 090/108] nodedev: Don't crash when exiting before init is done
-
-If libvirtd is terminated before the node driver finishes
-initialization, it can crash with a backtrace similar to the following:
-
-    Stack trace of thread 1922933:
-    #0  0x00007f8515178774 g_hash_table_find (libglib-2.0.so.0)
-    #1  0x00007f851593ea98 virHashSearch (libvirt.so.0)
-    #2  0x00007f8515a1dd83 virNodeDeviceObjListSearch (libvirt.so.0)
-    #3  0x00007f84cceb40a1 udevAddOneDevice (libvirt_driver_nodedev.so)
-    #4  0x00007f84cceb5fae nodeStateInitializeEnumerate (libvirt_driver_nodedev.so)
-    #5  0x00007f85159840cb virThreadHelper (libvirt.so.0)
-    #6  0x00007f8511c7d14a start_thread (libpthread.so.0)
-    #7  0x00007f851442bdb3 __clone (libc.so.6)
-
-    Stack trace of thread 1922863:
-    #0  0x00007f851442651d syscall (libc.so.6)
-    #1  0x00007f85159842d4 virThreadSelfID (libvirt.so.0)
-    #2  0x00007f851594e240 virLogFormatString (libvirt.so.0)
-    #3  0x00007f851596635d vir_object_finalize (libvirt.so.0)
-    #4  0x00007f8514efe8e9 g_object_unref (libgobject-2.0.so.0)
-    #5  0x00007f85159667f8 virObjectUnref (libvirt.so.0)
-    #6  0x00007f851517755f g_hash_table_remove_all_nodes.part.0 (libglib-2.0.so.0)
-    #7  0x00007f8515177e62 g_hash_table_unref (libglib-2.0.so.0)
-    #8  0x00007f851596637e vir_object_finalize (libvirt.so.0)
-    #9  0x00007f8514efe8e9 g_object_unref (libgobject-2.0.so.0)
-    #10 0x00007f85159667f8 virObjectUnref (libvirt.so.0)
-    #11 0x00007f84cceb2b42 nodeStateCleanup (libvirt_driver_nodedev.so)
-    #12 0x00007f8515b37950 virStateCleanup (libvirt.so.0)
-    #13 0x00005648085348e8 main (libvirtd)
-    #14 0x00007f8514352493 __libc_start_main (libc.so.6)
-    #15 0x00005648085350fe _start (libvirtd)
-
-This is because the initial population of the device list is done in a
-separate initialization thread. If we attempt to exit libvirtd before
-this init thread has completed, we'll try to free the device list while
-accessing it from the other thread. In order to guarantee that this
-init thread is not accessing the device list when we're cleaning up the
-nodedev driver, make it joinable and wait for it to finish before
-proceding with the cleanup. This is similar to how we handle the udev
-event handler thread.
-
-The separate initialization thread was added in commit
-9f0ae0b1.
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1836865
-
-Signed-off-by: Jonathon Jongsma <jjongsma@redhat.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-(cherry picked from commit caf23cdc9b628ae3acd89478fbace093b23649b8)
----
- src/node_device/node_device_udev.c | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c
-index e65979c1b6..94e8469dcb 100644
---- a/src/node_device/node_device_udev.c
-+++ b/src/node_device/node_device_udev.c
-@@ -66,6 +66,9 @@ struct _udevEventData {
-     virCond threadCond;
-     bool threadQuit;
-     bool dataReady;
-+
-+    /* init thread */
-+    virThread initThread;
- };
- 
- static virClassPtr udevEventDataClass;
-@@ -1467,6 +1470,7 @@ nodeStateCleanup(void)
-         priv->threadQuit = true;
-         virCondSignal(&priv->threadCond);
-         virObjectUnlock(priv);
-+        virThreadJoin(&priv->initThread);
-         virThreadJoin(&priv->th);
-     }
- 
-@@ -1799,7 +1803,6 @@ nodeStateInitialize(bool privileged,
- {
-     udevEventDataPtr priv = NULL;
-     struct udev *udev = NULL;
--    virThread enumThread;
- 
-     if (root != NULL) {
-         virReportError(VIR_ERR_INVALID_ARG, "%s",
-@@ -1908,7 +1911,7 @@ nodeStateInitialize(bool privileged,
-     if (udevSetupSystemDev() != 0)
-         goto cleanup;
- 
--    if (virThreadCreateFull(&enumThread, false, nodeStateInitializeEnumerate,
-+    if (virThreadCreateFull(&priv->initThread, true, nodeStateInitializeEnumerate,
-                             "nodedev-init", false, udev) < 0) {
-         virReportSystemError(errno, "%s",
-                              _("failed to create udev enumerate thread"));
--- 
-2.33.0
-
diff --git a/nodedev-Mark-device-initialization-complete-even-in-.patch b/nodedev-Mark-device-initialization-complete-even-in-.patch
deleted file mode 100644
index 57c4d5bdbe4525b15f4c33466c599a758dc5cd98..0000000000000000000000000000000000000000
--- a/nodedev-Mark-device-initialization-complete-even-in-.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 557fe55a1c0c6f913cfa41c0b42b7d2fbb70c55a Mon Sep 17 00:00:00 2001
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Tue, 13 Apr 2021 10:45:24 +0200
-Subject: [PATCH 060/108] nodedev: Mark device initialization complete even in
- case of an error
-
-To speed up nodedev driver initialization, the device enumeration
-is done in a separate thread. Once finished, the thread sets a
-boolean variable that allows public APIs to be called (instead of
-waiting for the thread to finish).
-
-However, if there's an error in the device enumeration thread
-then the control jumps over at the 'error' label and the boolean
-is never set. This means, that any virNodeDev*() API is stuck
-forever. Mark the initialization as complete (the thread is
-quitting anyway) and let the APIs proceed.
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Erik Skultety <eskultet@redhat.com>
-(cherry picked from commit 54d97f020b6349b9e3e1cb966078625dcdd964a8)
----
- src/node_device/node_device_udev.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c
-index 000494f9e3..e65979c1b6 100644
---- a/src/node_device/node_device_udev.c
-+++ b/src/node_device/node_device_udev.c
-@@ -1747,6 +1747,7 @@ nodeStateInitializeEnumerate(void *opaque)
-     if (udevEnumerateDevices(udev) != 0)
-         goto error;
- 
-+ cleanup:
-     nodeDeviceLock();
-     driver->initialized = true;
-     virCondBroadcast(&driver->initCond);
-@@ -1761,6 +1762,8 @@ nodeStateInitializeEnumerate(void *opaque)
-     priv->threadQuit = true;
-     virCondSignal(&priv->threadCond);
-     virObjectUnlock(priv);
-+
-+    goto cleanup;
- }
- 
- 
--- 
-2.33.0
-
diff --git a/nodedev-Signal-initCond-with-driver-locked.patch b/nodedev-Signal-initCond-with-driver-locked.patch
deleted file mode 100644
index e83c1c14c21591dcf213deaaf69fbbc1b2c83407..0000000000000000000000000000000000000000
--- a/nodedev-Signal-initCond-with-driver-locked.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From f5b37c4f1768df3464a7666255975f7c7f2d14b3 Mon Sep 17 00:00:00 2001
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Tue, 13 Apr 2021 10:52:07 +0200
-Subject: [PATCH 059/108] nodedev: Signal initCond with driver locked
-
-This is more academic dispute than a real bug, but this is taken
-from pthread_cond_broadcast(3p) man:
-
-  The pthread_cond_broadcast() or pthread_cond_signal() functions
-  may be called by a thread whether or not it currently owns the
-  mutex that threads calling pthread_cond_wait() or
-  pthread_cond_timedwait() have associated with the condition
-  variable during their waits; however, if predictable scheduling
-  behavior is required, then that mutex shall be locked by the
-  thread calling pthread_cond_broadcast() or
-  pthread_cond_signal().
-
-Therefore, broadcast the initCond while the nodedev driver is
-still locked.
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Erik Skultety <eskultet@redhat.com>
-(cherry picked from commit 5b56a288cab097896832dc9d4acb7f23dfca377c)
----
- src/node_device/node_device_udev.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c
-index a1391fb0de..000494f9e3 100644
---- a/src/node_device/node_device_udev.c
-+++ b/src/node_device/node_device_udev.c
-@@ -1749,8 +1749,8 @@ nodeStateInitializeEnumerate(void *opaque)
- 
-     nodeDeviceLock();
-     driver->initialized = true;
--    nodeDeviceUnlock();
-     virCondBroadcast(&driver->initCond);
-+    nodeDeviceUnlock();
- 
-     return;
- 
--- 
-2.33.0
-
diff --git a/nodedev-delete-mdev.patch b/nodedev-delete-mdev.patch
new file mode 100644
index 0000000000000000000000000000000000000000..74280778d708be4748b348c32f46f4e1a26fb489
--- /dev/null
+++ b/nodedev-delete-mdev.patch
@@ -0,0 +1,30 @@
+From b782178492141454fc263040708dffa039e7de2a Mon Sep 17 00:00:00 2001
+From: mayunlong <mayunlong6@huawei.com>
+Date: Wed, 27 Mar 2024 01:08:02 +0800
+Subject: [PATCH] nodedev: delete mdev
+
+mdev is deleted because it has no application scenario
+
+Signed-off-by: mayunlong <mayunlong6@huawei.com>
+---
+ src/node_device/node_device_driver.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/node_device/node_device_driver.c b/src/node_device/node_device_driver.c
+index a59cd08..f2c3b36 100644
+--- a/src/node_device/node_device_driver.c
++++ b/src/node_device/node_device_driver.c
+@@ -850,6 +850,10 @@ nodeDeviceCreateXMLMdev(virConnectPtr conn,
+ {
+     g_autofree char *uuid = NULL;
+ 
++    virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
++		   _("Unsupported device type"));
++    return NULL;
++
+     if (!def->parent) {
+         virReportError(VIR_ERR_XML_ERROR, "%s",
+                        _("cannot create a mediated device without a parent"));
+-- 
+2.33.0
+
diff --git a/libvirt-nodedev-fix-potential-heap-use-after-free.patch b/nodedev-fix-potential-heap-use-after-free.patch
similarity index 73%
rename from libvirt-nodedev-fix-potential-heap-use-after-free.patch
rename to nodedev-fix-potential-heap-use-after-free.patch
index 827d260860435f26f12c795750ccb6ed3684e0f3..0d5fe9a2ab0a6f99e33a038e624543c644a04d03 100644
--- a/libvirt-nodedev-fix-potential-heap-use-after-free.patch
+++ b/nodedev-fix-potential-heap-use-after-free.patch
@@ -1,7 +1,7 @@
-From cdf8379fbddb8c51f35af2934908e80524a3fd6a Mon Sep 17 00:00:00 2001
+From 43acc011c55208570c27cef333fdda46102b1d21 Mon Sep 17 00:00:00 2001
 From: Xu Yandong <xuyandong2@huawei.com>
 Date: Wed, 15 Apr 2020 14:03:07 +0800
-Subject: nodedev: fix potential heap use after free
+Subject: [PATCH] nodedev: fix potential heap use after free
 
 After move device enumumeration into a thread(commit 9f0ae0b18e3),
 flag driversInitialized no longer represent stateInitialized finished
@@ -9,16 +9,17 @@ complete, so reference driver->devs before use it to prevent devs freed
 by virStateCleanup.
 
 Signed-off-by: Xu Yandong <xuyandong2@huawei.com>
+Signed-off-by: Adttil <yangtao286@huawei.com>
 ---
  src/node_device/node_device_udev.c | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c
-index 8451903..a1391fb 100644
+index 911325600e..6c5b788279 100644
 --- a/src/node_device/node_device_udev.c
 +++ b/src/node_device/node_device_udev.c
-@@ -1261,8 +1261,8 @@ udevSetParent(struct udev_device *device,
-     virNodeDeviceDefPtr objdef;
+@@ -1512,8 +1512,8 @@ udevSetParent(struct udev_device *device,
+     virNodeDeviceDef *objdef;
  
      parent_device = device;
 +    virObjectRef(driver->devs);
@@ -27,15 +28,15 @@ index 8451903..a1391fb 100644
          parent_device = udev_device_get_parent(parent_device);
          if (parent_device == NULL)
              break;
-@@ -1272,6 +1272,7 @@ udevSetParent(struct udev_device *device,
+@@ -1523,6 +1523,7 @@ udevSetParent(struct udev_device *device,
              virReportError(VIR_ERR_INTERNAL_ERROR,
-                            _("Could not get syspath for parent of '%s'"),
+                            _("Could not get syspath for parent of '%1$s'"),
                             udev_device_get_syspath(parent_device));
 +            virObjectUnref(driver->devs);
              return -1;
          }
  
-@@ -1289,6 +1290,7 @@ udevSetParent(struct udev_device *device,
+@@ -1540,6 +1541,7 @@ udevSetParent(struct udev_device *device,
      if (!def->parent)
          def->parent = g_strdup("computer");
  
@@ -44,5 +45,5 @@ index 8451903..a1391fb 100644
  }
  
 -- 
-2.23.0
+2.27.0
 
diff --git a/nodedev-ignore-EINVAL-from-libudev-in-udevEventHandl.patch b/nodedev-ignore-EINVAL-from-libudev-in-udevEventHandl.patch
deleted file mode 100644
index 624612a0595f0b049489465a710abaf2b15ce4d5..0000000000000000000000000000000000000000
--- a/nodedev-ignore-EINVAL-from-libudev-in-udevEventHandl.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From c8f5445399e057a8974a77a882be502dba605301 Mon Sep 17 00:00:00 2001
-From: Christian Ehrhardt <christian.ehrhardt@canonical.com>
-Date: Thu, 10 Nov 2022 10:36:28 +0100
-Subject: [PATCH] nodedev: ignore EINVAL from libudev in udevEventHandleThread
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Certain udev entries might be of a size that makes libudev emit EINVAL
-which right now leads to udevEventHandleThread exiting. Due to no more
-handling events other elements of libvirt will start pushing for events
-to be consumed which never happens causing a busy loop burning a cpu
-without any gain.
-
-After evaluation of the example case discussed in in #245 and a test
-run ignoring EINVAL it was considered safe to add EINVAL to the ignored
-errnos to not exit udevEventHandleThread giving it more resilience.
-
-The root cause is in systemd and by now was discussed and fixed via
-https://github.com/systemd/systemd/issues/24987, but hardening libvirt
-to be able to better deal with EINVAL returned still is the right thing
-to avoid the reported busy loops on systemd with older systemd versions.
-
-Fixes: https://gitlab.com/libvirt/libvirt/-/issues/245
-
-Signed-off-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
-Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
----
- src/node_device/node_device_udev.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c
-index a674380f19..0d8a7db5c6 100644
---- a/src/node_device/node_device_udev.c
-+++ b/src/node_device/node_device_udev.c
-@@ -1594,10 +1594,12 @@ udevEventHandleThread(void *opaque G_GNUC_UNUSED)
-             }
- 
-             /* POSIX allows both EAGAIN and EWOULDBLOCK to be used
--             * interchangeably when the read would block or timeout was fired
-+             * interchangeably when the read would block or timeout was fired.
-+             * EINVAL might happen on too large udev entries, ignore those for
-+             * the robustness of udevEventHandleThread.
-              */
-             VIR_WARNINGS_NO_WLOGICALOP_EQUAL_EXPR
--            if (errno != EAGAIN && errno != EWOULDBLOCK) {
-+            if (errno != EAGAIN && errno != EWOULDBLOCK && errno != EINVAL) {
-             VIR_WARNINGS_RESET
-                 virReportSystemError(errno, "%s",
-                                      _("failed to receive device from udev "
--- 
-2.25.1
-
diff --git a/nodedev-wait-a-bit-longer-for-new-node-devices.patch b/nodedev-wait-a-bit-longer-for-new-node-devices.patch
deleted file mode 100644
index bf74dccb5bbe69275bc77b78fa8c71da184dfde6..0000000000000000000000000000000000000000
--- a/nodedev-wait-a-bit-longer-for-new-node-devices.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 523320a7c4a457a90576c73539abf3b25466bb26 Mon Sep 17 00:00:00 2001
-From: jipengfei <jipengfei_yewu@cmss.chinamobile.com>
-Date: Thu, 24 Nov 2022 17:42:21 +0800
-Subject: [PATCH 19/23] nodedev: wait a bit longer for new node devices
-
-cherry-pick from e4f9682ebc442bb5dfee807ba618c8863355776d
-
-Openstack developers reported that newly-created mdevs were not
-recognized by libvirt until after a libvirt daemon restart. The source
-of the problem appears to be that when libvirt gets the udev 'add'
-event, the sysfs tree for that device might not be ready and so libvirt
-waits 100ms for it to appear (max 100 waits of 1ms each). But in the
-OpenStack environment, the sysfs tree for new mediated devices was
-taking closer to 250ms to appear and therefore libvirt gave up waiting
-and didn't add these new devices to its list of nodedevs.
-
-By changing the wait time to 1 second (max 100 waits of 10ms each), this
-should provide enough time to enable these deployments to recognize
-newly-created mediated devices, but it shouldn't increase the delay for
-more traditional deployments too much.
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2109450
-
-Signed-off-by: Jonathon Jongsma <jjongsma@redhat.com>
-Reviewed-by: Erik Skultety <eskultet@redhat.com>
----
- src/node_device/node_device_udev.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/node_device/node_device_udev.c b/src/node_device/node_device_udev.c
-index 94e8469dcb..a674380f19 100644
---- a/src/node_device/node_device_udev.c
-+++ b/src/node_device/node_device_udev.c
-@@ -1030,7 +1030,7 @@ udevProcessMediatedDevice(struct udev_device *dev,
- 
-     linkpath = g_strdup_printf("%s/mdev_type", udev_device_get_syspath(dev));
- 
--    if (virFileWaitForExists(linkpath, 1, 100) < 0) {
-+    if (virFileWaitForExists(linkpath, 10, 100) < 0) {
-         virReportSystemError(errno,
-                              _("failed to wait for file '%s' to appear"),
-                              linkpath);
--- 
-2.27.0
-
diff --git a/nwfilter-fix-crash-when-counting-number-of-network-f.patch b/nwfilter-fix-crash-when-counting-number-of-network-f.patch
deleted file mode 100644
index ddb5cafed9396a0ec3236cd3e86c260e5475dfb7..0000000000000000000000000000000000000000
--- a/nwfilter-fix-crash-when-counting-number-of-network-f.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From b67c839e409b4e49b69ffdab947af91791820411 Mon Sep 17 00:00:00 2001
-From: AlexChen <alex.chen@huawei.com>
-Date: Tue, 8 Mar 2022 17:28:38 +0000
-Subject: [PATCH] nwfilter: fix crash when counting number of network filters
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The virNWFilterObjListNumOfNWFilters method iterates over the
-driver->nwfilters, accessing virNWFilterObj instances. As such
-it needs to be protected against concurrent modification of
-the driver->nwfilters object.
-
-This API allows unprivileged users to connect, so users with
-read-only access to libvirt can cause a denial of service
-crash if they are able to race with a call of virNWFilterUndefine.
-Since network filters are usually statically defined, this is
-considered a low severity problem.
-
-This is assigned CVE-2022-0897.
-
-Reviewed-by: Eric Blake <eblake@redhat.com>
-Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
-cherry-picked from a4947e8f63c3e6
-Signed-off-by: AlexChen <alex.chen@huawei.com>
----
- src/nwfilter/nwfilter_driver.c | 8 ++++++--
- 1 file changed, 6 insertions(+), 2 deletions(-)
-
-diff --git a/src/nwfilter/nwfilter_driver.c b/src/nwfilter/nwfilter_driver.c
-index 1c407727db..27500d192a 100644
---- a/src/nwfilter/nwfilter_driver.c
-+++ b/src/nwfilter/nwfilter_driver.c
-@@ -514,11 +514,15 @@ nwfilterLookupByName(virConnectPtr conn,
- static int
- nwfilterConnectNumOfNWFilters(virConnectPtr conn)
- {
-+    int ret;
-     if (virConnectNumOfNWFiltersEnsureACL(conn) < 0)
-         return -1;
- 
--    return virNWFilterObjListNumOfNWFilters(driver->nwfilters, conn,
--                                        virConnectNumOfNWFiltersCheckACL);
-+    nwfilterDriverLock();
-+    ret = virNWFilterObjListNumOfNWFilters(driver->nwfilters, conn,
-+                                           virConnectNumOfNWFiltersCheckACL);
-+    nwfilterDriverUnlock();
-+    return ret;
- }
- 
- 
--- 
-2.27.0
-
diff --git a/parthelper-Don-t-leak-canonical_path.patch b/parthelper-Don-t-leak-canonical_path.patch
deleted file mode 100644
index 61ec541a221dad0b710b0ab3223ea63353bd9acf..0000000000000000000000000000000000000000
--- a/parthelper-Don-t-leak-canonical_path.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 87376268b3baf188e85095c5429d707d9a5e59a4 Mon Sep 17 00:00:00 2001
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Thu, 22 Oct 2020 12:55:40 +0200
-Subject: [PATCH 069/108] parthelper: Don't leak @canonical_path
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The @canonical_path variable holds canonicalized path passed as
-argv[1]. The canonicalized path is obtained either via
-virFileResolveLink() or plain g_strdup(). Nevertheless, in both
-cases it must be freed.
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit db8e747af98df732aff67eca9fb67514310359bf)
----
- src/storage/parthelper.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/storage/parthelper.c b/src/storage/parthelper.c
-index 812e90d3cb..8278ddf31e 100644
---- a/src/storage/parthelper.c
-+++ b/src/storage/parthelper.c
-@@ -62,7 +62,7 @@ int main(int argc, char **argv)
-     PedPartition *part;
-     int cmd = DISK_LAYOUT;
-     const char *path;
--    char *canonical_path;
-+    g_autofree char *canonical_path = NULL;
-     const char *partsep;
-     bool devmap_partsep = false;
- 
--- 
-2.33.0
-
diff --git a/parthelper-Initialize-error-object.patch b/parthelper-Initialize-error-object.patch
deleted file mode 100644
index 3419a94df36fb782680e366cb44aa8302368387c..0000000000000000000000000000000000000000
--- a/parthelper-Initialize-error-object.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 164e4821d0333812b32f9ce9e64133df31dd6443 Mon Sep 17 00:00:00 2001
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Thu, 22 Oct 2020 12:49:44 +0200
-Subject: [PATCH 070/108] parthelper: Initialize error object
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Some functions called from parthelper can report an error. But
-that means that the error object must be initialized otherwise
-virResetError() (which happens as a part of virReportError())
-will free random pointers.
-
-Reported-by: Katerina Koukiou <kkoukiou@redhat.com>
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 3b8deb9603fb2a393a28fe4750aba91626619305)
----
- src/storage/parthelper.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/storage/parthelper.c b/src/storage/parthelper.c
-index 8278ddf31e..caa2e8fa62 100644
---- a/src/storage/parthelper.c
-+++ b/src/storage/parthelper.c
-@@ -66,7 +66,8 @@ int main(int argc, char **argv)
-     const char *partsep;
-     bool devmap_partsep = false;
- 
--    if (virGettextInitialize() < 0)
-+    if (virGettextInitialize() < 0 ||
-+        virErrorInitialize() < 0)
-         exit(EXIT_FAILURE);
- 
-     if (argc == 3 && STREQ(argv[2], "-g")) {
--- 
-2.33.0
-
diff --git a/qemu-Add-missing-lock-in-qemuProcessHandleMonitorEOF.patch b/qemu-Add-missing-lock-in-qemuProcessHandleMonitorEOF.patch
deleted file mode 100644
index 94331e8eecb9995ea73aa0acd7f5d2182e7a249b..0000000000000000000000000000000000000000
--- a/qemu-Add-missing-lock-in-qemuProcessHandleMonitorEOF.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 0f32142c4a92c9aca7890f25e89b56973a906201 Mon Sep 17 00:00:00 2001
-From: Peng Liang <liangpeng10@huawei.com>
-Date: Wed, 24 Feb 2021 19:28:23 +0800
-Subject: [PATCH] qemu: Add missing lock in qemuProcessHandleMonitorEOF
-
-qemuMonitorUnregister will be called in multiple threads (e.g. threads
-in rpc worker pool and the vm event thread).  In some cases, it isn't
-protected by the monitor lock, which may lead to call g_source_unref
-more than one time and a use-after-free problem eventually.
-
-Add the missing lock in qemuProcessHandleMonitorEOF (which is the only
-position missing lock of monitor I found).
-
-Suggested-by: Michal Privoznik <mprivozn@redhat.com>
-Signed-off-by: Peng Liang <liangpeng10@huawei.com>
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
----
- src/qemu/qemu_process.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
-index d9209ac6d2..74bb9613bc 100644
---- a/src/qemu/qemu_process.c
-+++ b/src/qemu/qemu_process.c
-@@ -316,7 +316,9 @@ qemuProcessHandleMonitorEOF(qemuMonitorPtr mon,
-     /* We don't want this EOF handler to be called over and over while the
-      * thread is waiting for a job.
-      */
-+    virObjectLock(mon);
-     qemuMonitorUnregister(mon);
-+    virObjectUnlock(mon);
- 
-     /* We don't want any cleanup from EOF handler (or any other
-      * thread) to enter qemu namespace. */
--- 
-2.27.0
-
diff --git a/qemu-Avoid-deprecated-migrate-set-cache-size-QMP-com.patch b/qemu-Avoid-deprecated-migrate-set-cache-size-QMP-com.patch
deleted file mode 100644
index 84b84143837bd384af6fe63a1e43135f7ae528f5..0000000000000000000000000000000000000000
--- a/qemu-Avoid-deprecated-migrate-set-cache-size-QMP-com.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From 4fe1ead5da84610bba30cae9315ff38de765711f Mon Sep 17 00:00:00 2001
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Wed, 10 Jun 2020 16:13:15 +0200
-Subject: [PATCH 5/8] qemu: Avoid deprecated migrate-set-cache-size QMP command
-
-The same functionality can be achieved using migrate-set-parameters QMP
-command with xbzrle-cache-size parameter.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1845012
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Peter Krempa <pkrempa@redhat.com>
----
- src/qemu/qemu_driver.c           | 26 +++++++++++++++++++++-----
- src/qemu/qemu_migration_params.c |  3 +--
- 2 files changed, 22 insertions(+), 7 deletions(-)
-
-diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
-index 1ad33197e0..e7166e4af3 100644
---- a/src/qemu/qemu_driver.c
-+++ b/src/qemu/qemu_driver.c
-@@ -14067,7 +14067,9 @@ qemuDomainMigrateSetCompressionCache(virDomainPtr dom,
-     virQEMUDriverPtr driver = dom->conn->privateData;
-     virDomainObjPtr vm;
-     qemuDomainObjPrivatePtr priv;
-+    g_autoptr(qemuMigrationParams) migParams = NULL;
-     int ret = -1;
-+    int rc;
- 
-     virCheckFlags(0, -1);
- 
-@@ -14092,13 +14094,27 @@ qemuDomainMigrateSetCompressionCache(virDomainPtr dom,
-         goto endjob;
-     }
- 
--    qemuDomainObjEnterMonitor(driver, vm);
--
-     VIR_DEBUG("Setting compression cache to %llu B", cacheSize);
--    ret = qemuMonitorSetMigrationCacheSize(priv->mon, cacheSize);
-+    if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_MIGRATION_PARAM_XBZRLE_CACHE_SIZE)) {
-+        if (!(migParams = qemuMigrationParamsNew()))
-+            goto endjob;
- 
--    if (qemuDomainObjExitMonitor(driver, vm) < 0)
--        ret = -1;
-+        if (qemuMigrationParamsSetULL(migParams,
-+                                      QEMU_MIGRATION_PARAM_XBZRLE_CACHE_SIZE,
-+                                      cacheSize) < 0)
-+            goto endjob;
-+
-+        if (qemuMigrationParamsApply(driver, vm, QEMU_ASYNC_JOB_NONE,
-+                                     migParams) < 0)
-+            goto endjob;
-+    } else {
-+        qemuDomainObjEnterMonitor(driver, vm);
-+        rc = qemuMonitorSetMigrationCacheSize(priv->mon, cacheSize);
-+        if (qemuDomainObjExitMonitor(driver, vm) < 0 || rc < 0)
-+            goto endjob;
-+    }
-+
-+    ret = 0;
- 
-  endjob:
-     qemuDomainObjEndJob(driver, vm);
-diff --git a/src/qemu/qemu_migration_params.c b/src/qemu/qemu_migration_params.c
-index 810199370f..6953badcfe 100644
---- a/src/qemu/qemu_migration_params.c
-+++ b/src/qemu/qemu_migration_params.c
-@@ -869,8 +869,7 @@ qemuMigrationParamsApply(virQEMUDriverPtr driver,
-      * qemuMonitorSetMigrationParams to ignore this parameter.
-      */
-     if (migParams->params[xbzrle].set &&
--        (!priv->job.migParams ||
--         !priv->job.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;
--- 
-2.27.0
-
diff --git a/qemu-Avoid-deprecated-migrate_set_downtime-QMP-comma.patch b/qemu-Avoid-deprecated-migrate_set_downtime-QMP-comma.patch
deleted file mode 100644
index 6bab2e21817175dc4165d271f46c0cc7b30bcc19..0000000000000000000000000000000000000000
--- a/qemu-Avoid-deprecated-migrate_set_downtime-QMP-comma.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From df9385f88c666783c7ac53800f00e359a4177145 Mon Sep 17 00:00:00 2001
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Wed, 10 Jun 2020 16:13:15 +0200
-Subject: [PATCH 3/8] qemu: Avoid deprecated migrate_set_downtime QMP command
-
-The same functionality can be achieved using migrate-set-parameters QMP
-command with downtime-limit parameter.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1829543
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Peter Krempa <pkrempa@redhat.com>
----
- src/qemu/qemu_driver.c | 27 +++++++++++++++++++++++----
- 1 file changed, 23 insertions(+), 4 deletions(-)
-
-diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
-index 1521bc6b2b..3482dccc43 100644
---- a/src/qemu/qemu_driver.c
-+++ b/src/qemu/qemu_driver.c
-@@ -13892,7 +13892,9 @@ qemuDomainMigrateSetMaxDowntime(virDomainPtr dom,
-     virQEMUDriverPtr driver = dom->conn->privateData;
-     virDomainObjPtr vm;
-     qemuDomainObjPrivatePtr priv;
-+    g_autoptr(qemuMigrationParams) migParams = NULL;
-     int ret = -1;
-+    int rc;
- 
-     virCheckFlags(0, -1);
- 
-@@ -13911,10 +13913,27 @@ qemuDomainMigrateSetMaxDowntime(virDomainPtr dom,
-     priv = vm->privateData;
- 
-     VIR_DEBUG("Setting migration downtime to %llums", downtime);
--    qemuDomainObjEnterMonitor(driver, vm);
--    ret = qemuMonitorSetMigrationDowntime(priv->mon, downtime);
--    if (qemuDomainObjExitMonitor(driver, vm) < 0)
--        ret = -1;
-+
-+    if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_MIGRATION_PARAM_DOWNTIME)) {
-+        if (!(migParams = qemuMigrationParamsNew()))
-+            goto endjob;
-+
-+        if (qemuMigrationParamsSetULL(migParams,
-+                                      QEMU_MIGRATION_PARAM_DOWNTIME_LIMIT,
-+                                      downtime) < 0)
-+            goto endjob;
-+
-+        if (qemuMigrationParamsApply(driver, vm, QEMU_ASYNC_JOB_NONE,
-+                                     migParams) < 0)
-+            goto endjob;
-+    } else {
-+        qemuDomainObjEnterMonitor(driver, vm);
-+        rc = qemuMonitorSetMigrationDowntime(priv->mon, downtime);
-+        if (qemuDomainObjExitMonitor(driver, vm) < 0 || rc < 0)
-+            goto endjob;
-+    }
-+
-+    ret = 0;
- 
-  endjob:
-     qemuDomainObjEndJob(driver, vm);
--- 
-2.27.0
-
diff --git a/qemu-Avoid-deprecated-migrate_set_speed-QMP-command.patch b/qemu-Avoid-deprecated-migrate_set_speed-QMP-command.patch
deleted file mode 100644
index 814f5086ab252159cef07de13355d5c73d5ca745..0000000000000000000000000000000000000000
--- a/qemu-Avoid-deprecated-migrate_set_speed-QMP-command.patch
+++ /dev/null
@@ -1,174 +0,0 @@
-From d72c84f9369152d0ca69fb201d4ae41ee559a94b Mon Sep 17 00:00:00 2001
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Wed, 10 Jun 2020 16:13:15 +0200
-Subject: [PATCH 2/8] qemu: Avoid deprecated migrate_set_speed QMP command
-
-The same functionality can be achieved using migrate-set-parameters QMP
-command with max-bandwidth parameter.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1829545
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Peter Krempa <pkrempa@redhat.com>
----
- src/qemu/qemu_driver.c    | 18 ++++++++++---
- src/qemu/qemu_migration.c | 53 +++++++++++++++++++++++++++++++--------
- 2 files changed, 57 insertions(+), 14 deletions(-)
-
-diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
-index 21e9a8760e..1521bc6b2b 100644
---- a/src/qemu/qemu_driver.c
-+++ b/src/qemu/qemu_driver.c
-@@ -14086,6 +14086,7 @@ qemuDomainMigrateSetMaxSpeed(virDomainPtr dom,
-     qemuDomainObjPrivatePtr priv;
-     bool postcopy = !!(flags & VIR_DOMAIN_MIGRATE_MAX_SPEED_POSTCOPY);
-     g_autoptr(qemuMigrationParams) migParams = NULL;
-+    bool bwParam;
-     unsigned long long max;
-     int ret = -1;
- 
-@@ -14124,12 +14125,20 @@ qemuDomainMigrateSetMaxSpeed(virDomainPtr dom,
- 
-     VIR_DEBUG("Setting migration bandwidth to %luMbs", bandwidth);
- 
--    if (postcopy) {
-+    bwParam = virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_MIGRATION_PARAM_BANDWIDTH);
-+
-+    if (postcopy || bwParam) {
-+        qemuMigrationParam param;
-+
-         if (!(migParams = qemuMigrationParamsNew()))
-             goto endjob;
- 
--        if (qemuMigrationParamsSetULL(migParams,
--                                      QEMU_MIGRATION_PARAM_MAX_POSTCOPY_BANDWIDTH,
-+        if (postcopy)
-+            param = QEMU_MIGRATION_PARAM_MAX_POSTCOPY_BANDWIDTH;
-+        else
-+            param = QEMU_MIGRATION_PARAM_MAX_BANDWIDTH;
-+
-+        if (qemuMigrationParamsSetULL(migParams, param,
-                                       bandwidth * 1024 * 1024) < 0)
-             goto endjob;
- 
-@@ -14143,9 +14152,10 @@ qemuDomainMigrateSetMaxSpeed(virDomainPtr dom,
-         rc = qemuMonitorSetMigrationSpeed(priv->mon, bandwidth);
-         if (qemuDomainObjExitMonitor(driver, vm) < 0 || rc < 0)
-             goto endjob;
-+    }
- 
-+    if (!postcopy)
-         priv->migMaxBandwidth = bandwidth;
--    }
- 
-     ret = 0;
- 
-diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
-index 1665071eb3..cd40a886e3 100644
---- a/src/qemu/qemu_migration.c
-+++ b/src/qemu/qemu_migration.c
-@@ -3507,6 +3507,7 @@ qemuMigrationSrcRun(virQEMUDriverPtr driver,
-     unsigned int cookieFlags = 0;
-     bool abort_on_error = !!(flags & VIR_MIGRATE_ABORT_ON_ERROR);
-     bool events = virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_MIGRATION_EVENT);
-+    bool bwParam = virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_MIGRATION_PARAM_BANDWIDTH);
-     bool cancel = false;
-     unsigned int waitFlags;
-     virDomainDefPtr persistDef = NULL;
-@@ -3594,6 +3595,11 @@ qemuMigrationSrcRun(virQEMUDriverPtr driver,
-             goto error;
-     }
- 
-+    if (bwParam &&
-+        qemuMigrationParamsSetULL(migParams, QEMU_MIGRATION_PARAM_MAX_BANDWIDTH,
-+                                  migrate_speed * 1024 * 1024) < 0)
-+        goto error;
-+
-     if (qemuMigrationParamsApply(driver, vm, QEMU_ASYNC_JOB_MIGRATION_OUT,
-                                  migParams) < 0)
-         goto error;
-@@ -3656,7 +3662,8 @@ qemuMigrationSrcRun(virQEMUDriverPtr driver,
-         goto exit_monitor;
-     }
- 
--    if (qemuMonitorSetMigrationSpeed(priv->mon, migrate_speed) < 0)
-+    if (!bwParam &&
-+        qemuMonitorSetMigrationSpeed(priv->mon, migrate_speed) < 0)
-         goto exit_monitor;
- 
-     /* connect to the destination qemu if needed */
-@@ -5311,24 +5318,41 @@ qemuMigrationSrcToFile(virQEMUDriverPtr driver, virDomainObjPtr vm,
-                        qemuDomainAsyncJob asyncJob)
- {
-     qemuDomainObjPrivatePtr priv = vm->privateData;
-+    bool bwParam = virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_MIGRATION_PARAM_BANDWIDTH);
-     int rc;
-     int ret = -1;
-     int pipeFD[2] = { -1, -1 };
-     unsigned long saveMigBandwidth = priv->migMaxBandwidth;
-     char *errbuf = NULL;
-     virErrorPtr orig_err = NULL;
-+    g_autoptr(qemuMigrationParams) migParams = NULL;
- 
-     if (qemuMigrationSetDBusVMState(driver, vm) < 0)
-         return -1;
- 
-     /* Increase migration bandwidth to unlimited since target is a file.
-      * Failure to change migration speed is not fatal. */
--    if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) == 0) {
--        qemuMonitorSetMigrationSpeed(priv->mon,
--                                     QEMU_DOMAIN_MIG_BANDWIDTH_MAX);
--        priv->migMaxBandwidth = QEMU_DOMAIN_MIG_BANDWIDTH_MAX;
--        if (qemuDomainObjExitMonitor(driver, vm) < 0)
-+    if (bwParam) {
-+        if (!(migParams = qemuMigrationParamsNew()))
-+            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)
-             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;
-+            if (qemuDomainObjExitMonitor(driver, vm) < 0)
-+                return -1;
-+        }
-     }
- 
-     if (!virDomainObjIsActive(vm)) {
-@@ -5409,11 +5433,20 @@ qemuMigrationSrcToFile(virQEMUDriverPtr driver, virDomainObjPtr vm,
-         virErrorPreserveLast(&orig_err);
- 
-     /* Restore max migration bandwidth */
--    if (virDomainObjIsActive(vm) &&
--        qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) == 0) {
--        qemuMonitorSetMigrationSpeed(priv->mon, saveMigBandwidth);
-+    if (virDomainObjIsActive(vm)) {
-+        if (bwParam) {
-+            if (qemuMigrationParamsSetULL(migParams,
-+                                          QEMU_MIGRATION_PARAM_MAX_BANDWIDTH,
-+                                          saveMigBandwidth * 1024 * 1024) == 0)
-+                ignore_value(qemuMigrationParamsApply(driver, vm, asyncJob,
-+                                                      migParams));
-+        } else {
-+            if (qemuDomainObjEnterMonitorAsync(driver, vm, asyncJob) == 0) {
-+                qemuMonitorSetMigrationSpeed(priv->mon, saveMigBandwidth);
-+                ignore_value(qemuDomainObjExitMonitor(driver, vm));
-+            }
-+        }
-         priv->migMaxBandwidth = saveMigBandwidth;
--        ignore_value(qemuDomainObjExitMonitor(driver, vm));
-     }
- 
-     VIR_FORCE_CLOSE(pipeFD[0]);
--- 
-2.27.0
-
diff --git a/qemu-Avoid-deprecated-query-migrate-cache-size-QMP-c.patch b/qemu-Avoid-deprecated-query-migrate-cache-size-QMP-c.patch
deleted file mode 100644
index 3fe24e4ea9acb64aac584369bd34fcc98403b013..0000000000000000000000000000000000000000
--- a/qemu-Avoid-deprecated-query-migrate-cache-size-QMP-c.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From c458102192d82a3a8a5f045cd9df34c29b287ab8 Mon Sep 17 00:00:00 2001
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Wed, 10 Jun 2020 16:13:15 +0200
-Subject: [PATCH 4/8] qemu: Avoid deprecated query-migrate-cache-size QMP
- command
-
-The same functionality can be achieved using query-migrate-parameters
-QMP command and checking the xbzrle-cache-size parameter.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1829544
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Peter Krempa <pkrempa@redhat.com>
----
- src/qemu/qemu_driver.c | 21 +++++++++++++++++----
- 1 file changed, 17 insertions(+), 4 deletions(-)
-
-diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
-index 3482dccc43..1ad33197e0 100644
---- a/src/qemu/qemu_driver.c
-+++ b/src/qemu/qemu_driver.c
-@@ -14006,7 +14006,9 @@ qemuDomainMigrateGetCompressionCache(virDomainPtr dom,
-     virQEMUDriverPtr driver = dom->conn->privateData;
-     virDomainObjPtr vm;
-     qemuDomainObjPrivatePtr priv;
-+    g_autoptr(qemuMigrationParams) migParams = NULL;
-     int ret = -1;
-+    int rc;
- 
-     virCheckFlags(0, -1);
- 
-@@ -14031,12 +14033,23 @@ qemuDomainMigrateGetCompressionCache(virDomainPtr dom,
-         goto endjob;
-     }
- 
--    qemuDomainObjEnterMonitor(driver, vm);
-+    if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_MIGRATION_PARAM_XBZRLE_CACHE_SIZE)) {
-+        if (qemuMigrationParamsFetch(driver, vm, QEMU_ASYNC_JOB_NONE,
-+                                     &migParams) < 0)
-+            goto endjob;
- 
--    ret = qemuMonitorGetMigrationCacheSize(priv->mon, cacheSize);
-+        if (qemuMigrationParamsGetULL(migParams,
-+                                      QEMU_MIGRATION_PARAM_XBZRLE_CACHE_SIZE,
-+                                      cacheSize) < 0)
-+            goto endjob;
-+    } else {
-+        qemuDomainObjEnterMonitor(driver, vm);
-+        rc = qemuMonitorGetMigrationCacheSize(priv->mon, cacheSize);
-+        if (qemuDomainObjExitMonitor(driver, vm) < 0 || rc < 0)
-+            goto endjob;
-+    }
- 
--    if (qemuDomainObjExitMonitor(driver, vm) < 0)
--        ret = -1;
-+    ret = 0;
- 
-  endjob:
-     qemuDomainObjEndJob(driver, vm);
--- 
-2.27.0
-
diff --git a/qemu-Do-not-pass-negative-ncpus-to-virCapabilitiesCl.patch b/qemu-Do-not-pass-negative-ncpus-to-virCapabilitiesCl.patch
deleted file mode 100644
index aadb9a2864543150de891ed05a7236c7b2f5042f..0000000000000000000000000000000000000000
--- a/qemu-Do-not-pass-negative-ncpus-to-virCapabilitiesCl.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 95d8d2662b91263f75c0b3813bd23d2b9f89f704 Mon Sep 17 00:00:00 2001
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Thu, 4 Nov 2021 19:49:36 +0100
-Subject: [PATCH 102/108] qemu: Do not pass negative ncpus to
- virCapabilitiesClearHostNUMACellCPUTopology
-
-It won't cause any harm as cpus is NULL when we pass a negative ncpus,
-but doing so when the function expects unsigned value is not right.
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-(cherry picked from commit 6cb5464ab4697acbc56341732a15519234edfef0)
----
- src/conf/capabilities.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c
-index deb99cecd3..12c8c3a324 100644
---- a/src/conf/capabilities.c
-+++ b/src/conf/capabilities.c
-@@ -1650,6 +1650,7 @@ virCapabilitiesHostNUMAInitReal(virCapsHostNUMAPtr caps)
-             if (ncpus == -2)
-                 continue;
- 
-+            ncpus = 0;
-             goto cleanup;
-         }
- 
--- 
-2.33.0
-
diff --git a/qemu-Do-not-require-TSC-frequency-to-strictly-match-.patch b/qemu-Do-not-require-TSC-frequency-to-strictly-match-.patch
deleted file mode 100644
index b971dab6265d2c2f2bb3033449ab944aaa66e597..0000000000000000000000000000000000000000
--- a/qemu-Do-not-require-TSC-frequency-to-strictly-match-.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-From e24914dcbeb169f2608fd03cf6e701697844e065 Mon Sep 17 00:00:00 2001
-From: tangbinzy <tangbin_yewu@cmss.chinamobile.com>
-Date: Wed, 30 Nov 2022 09:38:41 +0000
-Subject: [PATCH 12/24] qemu: Do not require TSC frequency to strictly  match
- host Some CPUs provide a way to read exact TSC frequency, while measuring it
- is required on other CPUs. However, measuring is never exact and the result
- may slightly differ across reboots. For this reason both Linux kernel and
- QEMU recently started allowing for guests TSC frequency to fall into +/- 250
- ppm tolerance interval around the host TSC frequency.
-
-Let's do the same to avoid unnecessary failures (esp. during migration)
-in case the host frequency does not exactly match the frequency
-configured in a domain XML.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1839095
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
-
-Signed-off-by: tangbin <tangbin_yewu@cmss.chinamobile.com>
-(cherry-pick from d8e5b4560006590668d4669f54a46b08ec14c1a2)
----
- src/qemu/qemu_process.c | 35 ++++++++++++++++++++++++++---------
- 1 file changed, 26 insertions(+), 9 deletions(-)
-
-diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
-index 360c4fcbb1..9cbf34a046 100644
---- a/src/qemu/qemu_process.c
-+++ b/src/qemu/qemu_process.c
-@@ -5271,12 +5271,18 @@ qemuProcessStartValidateDisks(virDomainObjPtr vm,
- }
- 
- 
-+/* 250 parts per million (ppm) is a half of NTP threshold */
-+#define TSC_TOLERANCE 250
-+
- static int
- qemuProcessStartValidateTSC(virQEMUDriverPtr driver,
-                             virDomainObjPtr vm)
- {
-     size_t i;
-     unsigned long long freq = 0;
-+    unsigned long long tolerance;
-+    unsigned long long minFreq;
-+    unsigned long long maxFreq;
-     virHostCPUTscInfoPtr tsc;
-     g_autoptr(virCPUDef) cpu = NULL;
- 
-@@ -5302,23 +5308,34 @@ qemuProcessStartValidateTSC(virQEMUDriverPtr driver,
-     }
- 
-     tsc = cpu->tsc;
--    VIR_DEBUG("Host TSC frequency %llu Hz, scaling %s",
--              tsc->frequency, virTristateBoolTypeToString(tsc->scaling));
-+    tolerance = tsc->frequency * TSC_TOLERANCE / 1000000;
-+    minFreq = tsc->frequency - tolerance;
-+    maxFreq = tsc->frequency + tolerance;
-+
-+    VIR_DEBUG("Host TSC frequency %llu Hz, scaling %s, tolerance +/- %llu Hz",
-+              tsc->frequency, virTristateBoolTypeToString(tsc->scaling),
-+              tolerance);
-+
-+    if (freq > minFreq && freq < maxFreq) {
-+        VIR_DEBUG("Requested TSC frequency is within tolerance interval");
-+        return 0;
-+    }
- 
--    if (freq == tsc->frequency || tsc->scaling == VIR_TRISTATE_BOOL_YES)
-+    if (tsc->scaling == VIR_TRISTATE_BOOL_YES)
-         return 0;
- 
-     if (tsc->scaling == VIR_TRISTATE_BOOL_ABSENT) {
--        VIR_DEBUG("TSC frequencies do not match and scaling support is "
--                  "unknown, QEMU will try and possibly fail later");
-+        VIR_DEBUG("Requested TSC frequency falls outside tolerance range and "
-+                  "scaling support is unknown, QEMU will try and possibly "
-+                  "fail later");
-         return 0;
-     }
- 
-     virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
--                   _("Requested TSC frequency %llu Hz does not match "
--                     "host (%llu Hz) and TSC scaling is not supported "
--                     "by the host CPU"),
--                   freq, tsc->frequency);
-+                   _("Requested TSC frequency %llu Hz is outside tolerance "
-+                     "range ([%llu, %llu] Hz) around host frequency %llu Hz "
-+                     "and TSC scaling is not supported by the host CPU"),
-+                   freq, minFreq, maxFreq, tsc->frequency);
-     return -1;
- }
- 
--- 
-2.27.0
-
diff --git a/qemu-Don-t-cache-domCaps-in-virQEMUDriverGetDomainCa.patch b/qemu-Don-t-cache-domCaps-in-virQEMUDriverGetDomainCa.patch
deleted file mode 100644
index e497a3534845019a2b168afc929f8853db42ab4b..0000000000000000000000000000000000000000
--- a/qemu-Don-t-cache-domCaps-in-virQEMUDriverGetDomainCa.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-From 1fecad527ab391c045551f7b0d472bc2925683b3 Mon Sep 17 00:00:00 2001
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Fri, 13 Nov 2020 21:09:33 +0100
-Subject: [PATCH 076/108] qemu: Don't cache domCaps in
- virQEMUDriverGetDomainCapabilities()
-
-Currently, whenever a domain capabilities is needed (fortunately,
-after cleanup done by previous commits it is now only in
-virConnectGetDomainCapabilities()), the object is stored in a
-cache. But there is no invalidation mechanism for the cache
-(except the implicit one - the cache is part of qemuCaps and thus
-share its lifetime, but that is not enough). Therefore, if
-something changes - for instance new firmware files are
-installed, or old are removed these changes are not reflected in
-the virConnectGetDomainCapabilities() output.
-
-Originally, the caching was there because domCaps were used
-during device XML validation and they were used a lot from our
-test suite. But this is no longer the case. And therefore, we
-don't need the cache and can construct fresh domCaps on each
-virConnectGetDomainCapabilities() call.
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1807198
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
-(cherry picked from commit 7db61843b05a6e4295b1d2e27a3d86f162ef04a0)
----
- src/qemu/qemu_conf.c | 27 ++++++++++++++-------------
- 1 file changed, 14 insertions(+), 13 deletions(-)
-
-diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
-index da2a1bdfe4..28319a1baf 100644
---- a/src/qemu/qemu_conf.c
-+++ b/src/qemu/qemu_conf.c
-@@ -1397,11 +1397,8 @@ virCapsPtr virQEMUDriverGetCapabilities(virQEMUDriverPtr driver,
- /**
-  * virQEMUDriverGetDomainCapabilities:
-  *
-- * Get a reference to the virDomainCapsPtr instance from the virQEMUCapsPtr
-- * domCapsCache. If there's no domcaps in the cache, create a new instance,
-- * add it to the cache, and return a reference.
-- *
-- * The caller must release the reference with virObjetUnref
-+ * Get a reference to the virDomainCapsPtr instance. The caller
-+ * must release the reference with virObjetUnref().
-  *
-  * Returns: a reference to a virDomainCapsPtr instance or NULL
-  */
-@@ -1413,15 +1410,19 @@ virQEMUDriverGetDomainCapabilities(virQEMUDriverPtr driver,
-                                    virDomainVirtType virttype)
- {
-     g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver);
-+    g_autoptr(virDomainCaps) domCaps = NULL;
-+    const char *path = virQEMUCapsGetBinary(qemuCaps);
-+
-+    if (!(domCaps = virDomainCapsNew(path, machine, arch, virttype)))
-+        return NULL;
-+
-+    if (virQEMUCapsFillDomainCaps(qemuCaps, driver->hostarch,
-+                                  domCaps, driver->privileged,
-+                                  cfg->firmwares,
-+                                  cfg->nfirmwares) < 0)
-+        return NULL;
- 
--    return virQEMUCapsGetDomainCapsCache(qemuCaps,
--                                         machine,
--                                         arch,
--                                         virttype,
--                                         driver->hostarch,
--                                         driver->privileged,
--                                         cfg->firmwares,
--                                         cfg->nfirmwares);
-+    return g_steal_pointer(&domCaps);
- }
- 
- 
--- 
-2.33.0
-
diff --git a/qemu-Drop-unused-qemuSecuritySetSavedStateLabel.patch b/qemu-Drop-unused-qemuSecuritySetSavedStateLabel.patch
deleted file mode 100644
index 416120eca9ba9336a8546bd7087faf5cc1d1eb3f..0000000000000000000000000000000000000000
--- a/qemu-Drop-unused-qemuSecuritySetSavedStateLabel.patch
+++ /dev/null
@@ -1,75 +0,0 @@
-From 11481239cc36aa9076a1eb44b4dbaa2968c248cb Mon Sep 17 00:00:00 2001
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Wed, 17 Jun 2020 11:10:49 +0200
-Subject: [PATCH 010/108] qemu: Drop unused qemuSecuritySetSavedStateLabel()
-
-After previous commit this function is used no more.
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Erik Skultety <eskultet@redhat.com>
-(cherry picked from commit 3cc557c7faeeaf503ca22dac8e9c7bb9c43740e0)
----
- src/qemu/qemu_security.c | 31 -------------------------------
- src/qemu/qemu_security.h |  4 ----
- 2 files changed, 35 deletions(-)
-
-diff --git a/src/qemu/qemu_security.c b/src/qemu/qemu_security.c
-index e7f38cb69b..5cfbcbd592 100644
---- a/src/qemu/qemu_security.c
-+++ b/src/qemu/qemu_security.c
-@@ -607,37 +607,6 @@ qemuSecurityDomainSetPathLabel(virQEMUDriverPtr driver,
- }
- 
- 
--int
--qemuSecuritySetSavedStateLabel(virQEMUDriverPtr driver,
--                                   virDomainObjPtr vm,
--                                   const char *savefile)
--{
--    qemuDomainObjPrivatePtr priv = vm->privateData;
--    pid_t pid = -1;
--    int ret = -1;
--
--    if (qemuDomainNamespaceEnabled(vm, QEMU_DOMAIN_NS_MOUNT))
--        pid = vm->pid;
--
--    if (virSecurityManagerTransactionStart(driver->securityManager) < 0)
--        goto cleanup;
--
--    if (virSecurityManagerSetSavedStateLabel(driver->securityManager,
--                                             vm->def,
--                                             savefile) < 0)
--        goto cleanup;
--
--    if (virSecurityManagerTransactionCommit(driver->securityManager,
--                                            pid, priv->rememberOwner) < 0)
--        goto cleanup;
--
--    ret = 0;
-- cleanup:
--    virSecurityManagerTransactionAbort(driver->securityManager);
--    return ret;
--}
--
--
- int
- qemuSecurityRestoreSavedStateLabel(virQEMUDriverPtr driver,
-                                        virDomainObjPtr vm,
-diff --git a/src/qemu/qemu_security.h b/src/qemu/qemu_security.h
-index 89dca61c3a..738c6b2ab7 100644
---- a/src/qemu/qemu_security.h
-+++ b/src/qemu/qemu_security.h
-@@ -101,10 +101,6 @@ int qemuSecurityDomainSetPathLabel(virQEMUDriverPtr driver,
-                                    const char *path,
-                                    bool allowSubtree);
- 
--int qemuSecuritySetSavedStateLabel(virQEMUDriverPtr driver,
--                                   virDomainObjPtr vm,
--                                   const char *savefile);
--
- int qemuSecurityRestoreSavedStateLabel(virQEMUDriverPtr driver,
-                                        virDomainObjPtr vm,
-                                        const char *savefile);
--- 
-2.33.0
-
diff --git a/qemu-Fix-incorrect-command-name-in-error-messages.patch b/qemu-Fix-incorrect-command-name-in-error-messages.patch
deleted file mode 100644
index be4878a3379d4df057deeab294d6e5af2ecfad88..0000000000000000000000000000000000000000
--- a/qemu-Fix-incorrect-command-name-in-error-messages.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From a538fbbfb2d12de1b3c33db7c7f25a133a4e94df Mon Sep 17 00:00:00 2001
-From: Xu Zheng <xuzheng_yewu@cmss.chinamobile.com>
-Date: Wed, 2 Aug 2023 16:56:49 +0800
-Subject: [PATCH] qemu: Fix incorrect command name in error messages
-
-cherry-pick from 194cfb44e77ce25d99240f24321559f569251e68
-Signed-off-by: Andrea Bolognani <abologna@redhat.com>
-Signed-off-by: Xu Zheng <xuzheng_yewu@cmss.chinamobile.com>
----
- src/qemu/qemu_monitor_json.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
-index afd826bc2f..8f040bbe59 100644
---- a/src/qemu/qemu_monitor_json.c
-+++ b/src/qemu/qemu_monitor_json.c
-@@ -5665,7 +5665,7 @@ int qemuMonitorJSONGetMachines(qemuMonitorPtr mon,
-         if (virJSONValueObjectHasKey(child, "numa-mem-supported")) {
-             if (virJSONValueObjectGetBoolean(child, "numa-mem-supported", &info->numaMemSupported) < 0) {
-                 virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
--                               _("qemu-machines reply has malformed "
-+                               _("query-machines reply has malformed "
-                                  "'numa-mem-supported' data"));
-                 goto cleanup;
-             }
--- 
-2.27.0
-
diff --git a/qemu-Fix-libvirt-hang-due-to-early-TPM-device-stop.patch b/qemu-Fix-libvirt-hang-due-to-early-TPM-device-stop.patch
deleted file mode 100644
index d191dd5a30a5e9b480c2a7f2a4ee4335df21439f..0000000000000000000000000000000000000000
--- a/qemu-Fix-libvirt-hang-due-to-early-TPM-device-stop.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 6d4e247786117b0b9b57722778c26328993a8f52 Mon Sep 17 00:00:00 2001
-From: Stefan Berger <stefanb@linux.vnet.ibm.com>
-Date: Fri, 19 Feb 2021 10:57:41 -0500
-Subject: [PATCH 3/6] qemu: Fix libvirt hang due to early TPM device stop
-
-This patch partially reverts commit 5cde9dee where the qemuExtDevicesStop()
-was moved to a location before the QEMU process is stopped. It may be
-alright to tear down some devices before QEMU is stopped, but it doesn't work
-for the external TPM (swtpm) which assumes that QEMU sends it a signal to stop
-it before libvirt may try to clean it up. So this patch moves the
-virFileDeleteTree() calls after the call to qemuExtDevicesStop() so that the
-pid file of virtiofsd is not deleted before that call.
-
-Afftected libvirt versions are 6.10 and 7.0.
-
-Fixes: 5cde9dee8c70b17c458d031ab6cf71dce476eea2
-Cc: Masayoshi Mizuma <m.mizuma@jp.fujitsu.com>
-Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-Signed-off-by: yezengruan <yezengruan@huawei.com>
----
- src/qemu/qemu_process.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
-index 4f7bd0586d..d9209ac6d2 100644
---- a/src/qemu/qemu_process.c
-+++ b/src/qemu/qemu_process.c
-@@ -7410,9 +7410,6 @@ void qemuProcessStop(virQEMUDriverPtr driver,
-     /* Do this before we delete the tree and remove pidfile. */
-     qemuProcessKillManagedPRDaemon(vm);
- 
--    virFileDeleteTree(priv->libDir);
--    virFileDeleteTree(priv->channelTargetDir);
--
-     ignore_value(virDomainChrDefForeach(vm->def,
-                                         false,
-                                         qemuProcessCleanupChardevDevice,
-@@ -7432,6 +7429,9 @@ void qemuProcessStop(virQEMUDriverPtr driver,
- 
-     vm->def->id = -1;
- 
-+    virFileDeleteTree(priv->libDir);
-+    virFileDeleteTree(priv->channelTargetDir);
-+
-     /* Stop autodestroy in case guest is restarted */
-     qemuProcessAutoDestroyRemove(driver, vm);
- 
--- 
-2.27.0
-
diff --git a/qemu-Fix-memstat-for-non-transitional-memballoon.patch b/qemu-Fix-memstat-for-non-transitional-memballoon.patch
deleted file mode 100644
index 542f13fc76fa6b1c49556f62e88590344d6d6027..0000000000000000000000000000000000000000
--- a/qemu-Fix-memstat-for-non-transitional-memballoon.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From b7993fb89518de145d41a631040900b42cf97858 Mon Sep 17 00:00:00 2001
-From: Andrea Bolognani <abologna@redhat.com>
-Date: Tue, 12 Jan 2021 17:17:44 +0100
-Subject: [PATCH 084/108] qemu: Fix memstat for (non-)transitional memballoon
-
-Depending on the memballoon model, the corresponding QOM node
-will have a different type and we need to account for this
-when searching for it in the QOM tree.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1911786
-
-Signed-off-by: Andrea Bolognani <abologna@redhat.com>
-Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-(cherry picked from commit 0a6cb05e953d315b7a05103d707cff4d36221211)
----
- src/qemu/qemu_monitor.c | 22 +++++++++++++++++++++-
- 1 file changed, 21 insertions(+), 1 deletion(-)
-
-diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
-index c98edbd254..8f6261ace2 100644
---- a/src/qemu/qemu_monitor.c
-+++ b/src/qemu/qemu_monitor.c
-@@ -1031,7 +1031,27 @@ qemuMonitorInitBalloonObjectPath(qemuMonitorPtr mon,
- 
-     switch (balloon->info.type) {
-     case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_PCI:
--        name = "virtio-balloon-pci";
-+        switch ((virDomainMemballoonModel) balloon->model) {
-+            case VIR_DOMAIN_MEMBALLOON_MODEL_VIRTIO:
-+                name = "virtio-balloon-pci";
-+                break;
-+            case VIR_DOMAIN_MEMBALLOON_MODEL_VIRTIO_TRANSITIONAL:
-+                name = "virtio-balloon-pci-transitional";
-+                break;
-+            case VIR_DOMAIN_MEMBALLOON_MODEL_VIRTIO_NON_TRANSITIONAL:
-+                name = "virtio-balloon-pci-non-transitional";
-+                break;
-+            case VIR_DOMAIN_MEMBALLOON_MODEL_XEN:
-+            case VIR_DOMAIN_MEMBALLOON_MODEL_NONE:
-+                virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-+                        _("invalid model for virtio-balloon-pci"));
-+                return;
-+            case VIR_DOMAIN_MEMBALLOON_MODEL_LAST:
-+            default:
-+                virReportEnumRangeError(virDomainMemballoonModel,
-+                                        balloon->model);
-+                return;
-+        }
-         break;
-     case VIR_DOMAIN_DEVICE_ADDRESS_TYPE_CCW:
-         name = "virtio-balloon-ccw";
--- 
-2.33.0
-
diff --git a/qemu-Fix-swtpm-device-with-aarch64.patch b/qemu-Fix-swtpm-device-with-aarch64.patch
deleted file mode 100644
index b5160d6390950817bd8ce44e01d5c837a32ac615..0000000000000000000000000000000000000000
--- a/qemu-Fix-swtpm-device-with-aarch64.patch
+++ /dev/null
@@ -1,208 +0,0 @@
-From 2480d7857c6ea384567009840040b900f5440616 Mon Sep 17 00:00:00 2001
-From: Jim Fehlig <jfehlig@suse.com>
-Date: Tue, 9 Feb 2021 14:57:22 -0700
-Subject: [PATCH 2/6] qemu: Fix swtpm device with aarch64
-
-Starting a VM with swtpm device fails with qemu-system-aarch64.
-E.g. with TPM device config
-
-     <tpm model='tpm-tis'>
-       <backend type='emulator' version='2.0'/>
-      </tpm>
-
-QEMU reports the following error
-
-error: internal error: process exited while connecting to monitor:
-2021-02-07T05:15:35.378927Z qemu-system-aarch64: -device
-tpm-tis,tpmdev=tpm-tpm0,id=tpm0: 'tpm-tis' is not a valid device model name
-
-Indeed the TPM device name is 'tpm-tis-device' [1][2] for aarch64,
-versus the shorter 'tpm-tis' for x86. The devices are the same from
-a functional POV, i.e. they both emulate a TPM device conforming to
-the TIS specification. Account for the unfortunate name difference
-when building the TPM device option in qemuBuildTPMDevStr(). Also
-include a test case for 'tpm-tis-device'.
-
-[1] https://qemu.readthedocs.io/en/latest/specs/tpm.html
-[2] https://github.com/qemu/qemu/commit/c294ac327ca99342b90bd3a83d2cef9b447afaa7
-
-Signed-off-by: Jim Fehlig <jfehlig@suse.com>
-Reviewed-by: Andrea Bolognani <abologna@redhat.com>
-Signed-off-by: yezengruan <yezengruan@huawei.com>
----
- src/qemu/qemu_command.c                       |  3 ++
- .../caps_5.0.0.aarch64.replies                | 15 ++++++++
- .../caps_5.0.0.aarch64.xml                    |  3 ++
- .../aarch64-tpm.aarch64-latest.args           | 35 +++++++++++++++++++
- tests/qemuxml2argvdata/aarch64-tpm.xml        | 15 ++++++++
- tests/qemuxml2argvtest.c                      |  1 +
- 6 files changed, 72 insertions(+)
- create mode 100644 tests/qemuxml2argvdata/aarch64-tpm.aarch64-latest.args
- create mode 100644 tests/qemuxml2argvdata/aarch64-tpm.xml
-
-diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
-index f8331a7455..d5d46c0892 100644
---- a/src/qemu/qemu_command.c
-+++ b/src/qemu/qemu_command.c
-@@ -9232,6 +9232,9 @@ qemuBuildTPMDevStr(const virDomainDef *def,
-     virDomainTPMDef *tpm = def->tpm;
-     const char *model = virDomainTPMModelTypeToString(tpm->model);
- 
-+    if (tpm->model == VIR_DOMAIN_TPM_MODEL_TIS && def->os.arch == VIR_ARCH_AARCH64)
-+        model = "tpm-tis-device";
-+
-     virBufferAsprintf(&buf, "%s,tpmdev=tpm-%s,id=%s",
-                       model, tpm->info.alias, tpm->info.alias);
- 
-diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.replies b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.replies
-index a3136a0966..e848860e45 100644
---- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.replies
-+++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.replies
-@@ -2734,6 +2734,10 @@
-       "name": "armv7m_systick",
-       "parent": "sys-bus-device"
-     },
-+    {
-+      "name": "tpm-emulator",
-+      "parent": "tpm-backend"
-+    },
-     {
-       "name": "imx6ul.ccm",
-       "parent": "imx.ccm"
-@@ -3198,6 +3202,10 @@
-       "name": "authz-list",
-       "parent": "authz"
-     },
-+    {
-+      "name": "tpm-passthrough",
-+      "parent": "tpm-backend"
-+    },
-     {
-       "name": "xlnx.ps7-spi",
-       "parent": "sys-bus-device"
-@@ -3286,6 +3294,10 @@
-       "name": "bcm2835-peripherals",
-       "parent": "sys-bus-device"
-     },
-+    {
-+      "name": "tpm-tis-device",
-+      "parent": "sys-bus-device"
-+    },
-     {
-       "name": "arm-its-kvm",
-       "parent": "arm-gicv3-its-common"
-@@ -7768,6 +7780,7 @@
- 
- {
-   "return": [
-+    "tpm-tis"
-   ],
-   "id": "libvirt-36"
- }
-@@ -7779,6 +7792,8 @@
- 
- {
-   "return": [
-+    "passthrough",
-+    "emulator"
-   ],
-   "id": "libvirt-37"
- }
-diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
-index 92ad10c9b8..af282f33c1 100644
---- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
-+++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
-@@ -42,6 +42,8 @@
-   <flag name='rng-random'/>
-   <flag name='rng-egd'/>
-   <flag name='megasas'/>
-+  <flag name='tpm-passthrough'/>
-+  <flag name='tpm-tis'/>
-   <flag name='pci-bridge'/>
-   <flag name='vfio-pci'/>
-   <flag name='mem-merge'/>
-@@ -150,6 +152,7 @@
-   <flag name='blockdev-del'/>
-   <flag name='vhost-vsock'/>
-   <flag name='chardev-fd-pass'/>
-+  <flag name='tpm-emulator'/>
-   <flag name='usb-storage.werror'/>
-   <flag name='egl-headless'/>
-   <flag name='vfio-pci.display'/>
-diff --git a/tests/qemuxml2argvdata/aarch64-tpm.aarch64-latest.args b/tests/qemuxml2argvdata/aarch64-tpm.aarch64-latest.args
-new file mode 100644
-index 0000000000..4ca09a1fb0
---- /dev/null
-+++ b/tests/qemuxml2argvdata/aarch64-tpm.aarch64-latest.args
-@@ -0,0 +1,35 @@
-+LC_ALL=C \
-+PATH=/bin \
-+HOME=/tmp/lib/domain--1-aarch64test \
-+USER=test \
-+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 \
-+-object secret,id=masterKey0,format=raw,\
-+file=/tmp/lib/domain--1-aarch64test/master-key.aes \
-+-machine virt,accel=tcg,usb=off,dump-guest-core=off,gic-version=2 \
-+-cpu cortex-a15 \
-+-m 1024 \
-+-overcommit mem-lock=off \
-+-smp 1,sockets=1,cores=1,threads=1 \
-+-uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \
-+-display none \
-+-no-user-config \
-+-nodefaults \
-+-chardev socket,id=charmonitor,fd=1729,server,nowait \
-+-mon chardev=charmonitor,id=monitor,mode=control \
-+-rtc base=utc \
-+-no-shutdown \
-+-no-acpi \
-+-boot strict=on \
-+-tpmdev emulator,id=tpm-tpm0,chardev=chrtpm \
-+-chardev socket,id=chrtpm,path=/dev/test \
-+-device tpm-tis-device,tpmdev=tpm-tpm0,id=tpm0 \
-+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\
-+resourcecontrol=deny \
-+-msg timestamp=on
-diff --git a/tests/qemuxml2argvdata/aarch64-tpm.xml b/tests/qemuxml2argvdata/aarch64-tpm.xml
-new file mode 100644
-index 0000000000..d338a20f17
---- /dev/null
-+++ b/tests/qemuxml2argvdata/aarch64-tpm.xml
-@@ -0,0 +1,15 @@
-+<domain type="qemu">
-+  <name>aarch64test</name>
-+  <uuid>496d7ea8-9739-544b-4ebd-ef08be936e8b</uuid>
-+  <memory>1048576</memory>
-+  <vcpu placement='static'>1</vcpu>
-+  <os>
-+    <type arch="aarch64" machine="virt">hvm</type>
-+  </os>
-+  <devices>
-+    <emulator>/usr/bin/qemu-system-aarch64</emulator>
-+    <tpm model='tpm-tis'>
-+      <backend type='emulator' version='2.0'/>
-+    </tpm>
-+  </devices>
-+</domain>
-diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
-index dc871d5698..47fce1c3bf 100644
---- a/tests/qemuxml2argvtest.c
-+++ b/tests/qemuxml2argvtest.c
-@@ -2305,6 +2305,7 @@ mymain(void)
-     DO_TEST_CAPS_LATEST("tpm-emulator-tpm2");
-     DO_TEST_CAPS_LATEST("tpm-emulator-tpm2-enc");
-     DO_TEST_CAPS_LATEST_PPC64("tpm-emulator-spapr");
-+    DO_TEST_CAPS_ARCH_LATEST("aarch64-tpm", "aarch64");
- 
-     DO_TEST_PARSE_ERROR("pci-domain-invalid", NONE);
-     DO_TEST_PARSE_ERROR("pci-bus-invalid", NONE);
--- 
-2.27.0
-
diff --git a/qemu-Introduce-QEMU_CAPS_SMP_CLUSTERS.patch b/qemu-Introduce-QEMU_CAPS_SMP_CLUSTERS.patch
new file mode 100644
index 0000000000000000000000000000000000000000..0ba8d84616d37b0d1ce96e764e566999c5e6aac9
--- /dev/null
+++ b/qemu-Introduce-QEMU_CAPS_SMP_CLUSTERS.patch
@@ -0,0 +1,177 @@
+From 534c989f39c7bc9953f05f8e606bc45bb2f73a63 Mon Sep 17 00:00:00 2001
+From: Andrea Bolognani <abologna@redhat.com>
+Date: Fri, 5 Jan 2024 18:42:13 +0100
+Subject: [PATCH] qemu: Introduce QEMU_CAPS_SMP_CLUSTERS
+
+Signed-off-by: Andrea Bolognani <abologna@redhat.com>
+Reviewed-by: Peter Krempa <pkrempa@redhat.com>
+---
+ src/qemu/qemu_capabilities.c                         | 2 ++
+ src/qemu/qemu_capabilities.h                         | 1 +
+ tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml      | 1 +
+ tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml     | 1 +
+ tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml        | 1 +
+ tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml | 1 +
+ tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml     | 1 +
+ tests/qemucapabilitiesdata/caps_8.0.0_riscv64.xml    | 1 +
+ tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml     | 1 +
+ tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml      | 1 +
+ tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml     | 1 +
+ tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml     | 1 +
+ 12 files changed, 13 insertions(+)
+
+diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
+index 83119e871a..d25062b225 100644
+--- a/src/qemu/qemu_capabilities.c
++++ b/src/qemu/qemu_capabilities.c
+@@ -698,6 +698,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
+               /* 450 */
+               "run-with.async-teardown", /* QEMU_CAPS_RUN_WITH_ASYNC_TEARDOWN */
+               "virtio-blk-vhost-vdpa", /* QEMU_CAPS_DEVICE_VIRTIO_BLK_VHOST_VDPA */
++              "smp-clusters", /* QEMU_CAPS_SMP_CLUSTERS */
+     );
+ 
+ 
+@@ -1550,6 +1551,7 @@ static struct virQEMUCapsStringFlags virQEMUCapsQMPSchemaQueries[] = {
+     { "query-display-options/ret-type/+sdl", QEMU_CAPS_SDL },
+     { "query-display-options/ret-type/+egl-headless", QEMU_CAPS_EGL_HEADLESS },
+     { "query-hotpluggable-cpus/ret-type/props/die-id", QEMU_CAPS_SMP_DIES },
++    { "query-hotpluggable-cpus/ret-type/props/cluster-id", QEMU_CAPS_SMP_CLUSTERS },
+     { "query-named-block-nodes/arg-type/flat", QEMU_CAPS_QMP_QUERY_NAMED_BLOCK_NODES_FLAT },
+     { "screendump/arg-type/device", QEMU_CAPS_SCREENDUMP_DEVICE },
+     { "set-numa-node/arg-type/+hmat-lb", QEMU_CAPS_NUMA_HMAT },
+diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
+index 3c4f7f625b..959fbe6378 100644
+--- a/src/qemu/qemu_capabilities.h
++++ b/src/qemu/qemu_capabilities.h
+@@ -677,6 +677,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
+     /* 450 */
+     QEMU_CAPS_RUN_WITH_ASYNC_TEARDOWN, /* asynchronous teardown -run-with async-teardown=on|off */
+     QEMU_CAPS_DEVICE_VIRTIO_BLK_VHOST_VDPA, /* virtio-blk-vhost-vdpa block driver */
++    QEMU_CAPS_SMP_CLUSTERS, /* -smp clusters= */
+ 
+     QEMU_CAPS_LAST /* this must always be the last item */
+ } virQEMUCapsFlags;
+diff --git a/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml b/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml
+index 4315241d1d..536524cf18 100644
+--- a/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml
++++ b/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml
+@@ -154,6 +154,7 @@
+   <flag name='virtio-crypto'/>
+   <flag name='pvpanic-pci'/>
+   <flag name='virtio-gpu.blob'/>
++  <flag name='smp-clusters'/>
+   <version>7001000</version>
+   <microcodeVersion>42900244</microcodeVersion>
+   <package>v7.1.0</package>
+diff --git a/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml
+index bd84750dc5..58e1111982 100644
+--- a/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml
++++ b/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml
+@@ -188,6 +188,7 @@
+   <flag name='virtio-crypto'/>
+   <flag name='pvpanic-pci'/>
+   <flag name='virtio-gpu.blob'/>
++  <flag name='smp-clusters'/>
+   <version>7001000</version>
+   <microcodeVersion>43100244</microcodeVersion>
+   <package>v7.1.0</package>
+diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml b/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml
+index a1fc441412..127b8ee4c2 100644
+--- a/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml
++++ b/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml
+@@ -149,6 +149,7 @@
+   <flag name='virtio-crypto'/>
+   <flag name='pvpanic-pci'/>
+   <flag name='virtio-gpu.blob'/>
++  <flag name='smp-clusters'/>
+   <version>7002000</version>
+   <microcodeVersion>0</microcodeVersion>
+   <package>qemu-7.2.0-6.fc37</package>
+diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml
+index 06a01a2c4c..a30ec3c164 100644
+--- a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml
++++ b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml
+@@ -192,6 +192,7 @@
+   <flag name='cryptodev-backend-lkcf'/>
+   <flag name='pvpanic-pci'/>
+   <flag name='virtio-gpu.blob'/>
++  <flag name='smp-clusters'/>
+   <version>7002000</version>
+   <microcodeVersion>43100245</microcodeVersion>
+   <package>v7.2.0</package>
+diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml
+index 8ac1529c30..24ac7b8f6e 100644
+--- a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml
++++ b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml
+@@ -192,6 +192,7 @@
+   <flag name='cryptodev-backend-lkcf'/>
+   <flag name='pvpanic-pci'/>
+   <flag name='virtio-gpu.blob'/>
++  <flag name='smp-clusters'/>
+   <version>7002000</version>
+   <microcodeVersion>43100245</microcodeVersion>
+   <package>v7.2.0</package>
+diff --git a/tests/qemucapabilitiesdata/caps_8.0.0_riscv64.xml b/tests/qemucapabilitiesdata/caps_8.0.0_riscv64.xml
+index 31300d3d31..3f2acb5018 100644
+--- a/tests/qemucapabilitiesdata/caps_8.0.0_riscv64.xml
++++ b/tests/qemucapabilitiesdata/caps_8.0.0_riscv64.xml
+@@ -138,6 +138,7 @@
+   <flag name='virtio-crypto'/>
+   <flag name='pvpanic-pci'/>
+   <flag name='virtio-gpu.blob'/>
++  <flag name='smp-clusters'/>
+   <version>7002050</version>
+   <microcodeVersion>0</microcodeVersion>
+   <package>v7.2.0-333-g222059a0fc</package>
+diff --git a/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml
+index c2fa8eb028..85869f6b5d 100644
+--- a/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml
++++ b/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml
+@@ -196,6 +196,7 @@
+   <flag name='virtio-gpu.blob'/>
+   <flag name='rbd-encryption-layering'/>
+   <flag name='rbd-encryption-luks-any'/>
++  <flag name='smp-clusters'/>
+   <version>8000000</version>
+   <microcodeVersion>43100244</microcodeVersion>
+   <package>v8.0.0</package>
+diff --git a/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml b/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml
+index 427ee9d5c7..19422f08fa 100644
+--- a/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml
++++ b/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml
+@@ -112,6 +112,7 @@
+   <flag name='rbd-encryption-layering'/>
+   <flag name='rbd-encryption-luks-any'/>
+   <flag name='run-with.async-teardown'/>
++  <flag name='smp-clusters'/>
+   <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 d266dd0f31..0caee53550 100644
+--- a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml
++++ b/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml
+@@ -198,6 +198,7 @@
+   <flag name='qcow2-discard-no-unref'/>
+   <flag name='run-with.async-teardown'/>
+   <flag name='virtio-blk-vhost-vdpa'/>
++  <flag name='smp-clusters'/>
+   <version>8001000</version>
+   <microcodeVersion>43100245</microcodeVersion>
+   <package>v8.1.0</package>
+diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml
+index ef3bd14597..08967e9a8f 100644
+--- a/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml
++++ b/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml
+@@ -199,6 +199,7 @@
+   <flag name='qcow2-discard-no-unref'/>
+   <flag name='run-with.async-teardown'/>
+   <flag name='virtio-blk-vhost-vdpa'/>
++  <flag name='smp-clusters'/>
+   <version>8001050</version>
+   <microcodeVersion>43100246</microcodeVersion>
+   <package>v8.1.0-3111-gad6ef0a42e</package>
+-- 
+2.27.0
+
diff --git a/qemu-Log-which-API-is-trying-to-acquire-a-job.patch b/qemu-Log-which-API-is-trying-to-acquire-a-job.patch
deleted file mode 100644
index 48da1302331439f6942ba73f2408ebb3b5a1d608..0000000000000000000000000000000000000000
--- a/qemu-Log-which-API-is-trying-to-acquire-a-job.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 6c3639df31680a03e03ad1e0f1ad489db595c02d Mon Sep 17 00:00:00 2001
-From: Bihong Yu <yubihong@huawei.com>
-Date: Tue, 11 Jan 2022 10:28:43 +0100
-Subject: [PATCH 02/22] qemu: Log which API is trying to acquire a job
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Log which API is trying to acquire a job.
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Signed-off-by: Bihong Yu <yubihong@huawei.com>
----
- src/qemu/qemu_domain.c | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
-index b7fb4eb9f9..bf09ad517b 100644
---- a/src/qemu/qemu_domain.c
-+++ b/src/qemu/qemu_domain.c
-@@ -9811,9 +9811,11 @@ qemuDomainObjBeginJobInternal(virQEMUDriverPtr driver,
-     unsigned long long duration = 0;
-     unsigned long long agentDuration = 0;
-     unsigned long long asyncDuration = 0;
-+    const char *currentAPI = virThreadJobGet();
- 
--    VIR_DEBUG("Starting job: job=%s agentJob=%s asyncJob=%s "
-+    VIR_DEBUG("Starting job: API=%s job=%s agentJob=%s asyncJob=%s "
-               "(vm=%p name=%s, current job=%s agentJob=%s async=%s)",
-+              NULLSTR(currentAPI),
-               qemuDomainJobTypeToString(job),
-               qemuDomainAgentJobTypeToString(agentJob),
-               qemuDomainAsyncJobTypeToString(asyncJob),
-@@ -9916,13 +9918,14 @@ qemuDomainObjBeginJobInternal(virQEMUDriverPtr driver,
-     if (priv->job.asyncJob && priv->job.asyncStarted)
-         asyncDuration = now - priv->job.asyncStarted;
- 
--    VIR_WARN("Cannot start job (%s, %s, %s) for domain %s; "
-+    VIR_WARN("Cannot start job (%s, %s, %s) in API %s for domain %s; "
-              "current job is (%s, %s, %s) "
-              "owned by (%llu %s, %llu %s, %llu %s (flags=0x%lx)) "
-              "for (%llus, %llus, %llus)",
-              qemuDomainJobTypeToString(job),
-              qemuDomainAgentJobTypeToString(agentJob),
-              qemuDomainAsyncJobTypeToString(asyncJob),
-+             NULLSTR(currentAPI),
-              obj->def->name,
-              qemuDomainJobTypeToString(priv->job.active),
-              qemuDomainAgentJobTypeToString(priv->job.agentActive),
--- 
-2.33.0
-
diff --git a/cpu_topo-fix-detection-of-vCPU-pids-when-multiple-cl.patch b/qemu-Make-monitor-aware-of-CPU-clusters.patch
similarity index 62%
rename from cpu_topo-fix-detection-of-vCPU-pids-when-multiple-cl.patch
rename to qemu-Make-monitor-aware-of-CPU-clusters.patch
index 123b7819449d76d4e0cacb95ec6848dce6b9b9d9..e65afd5930e3ebab2fbce7ec28d4da3f80e99dd8 100644
--- a/cpu_topo-fix-detection-of-vCPU-pids-when-multiple-cl.patch
+++ b/qemu-Make-monitor-aware-of-CPU-clusters.patch
@@ -1,14 +1,18 @@
-From a450496281dbbc2b240bf5dc0829a17d113aed22 Mon Sep 17 00:00:00 2001
-From: zhangxinhao <zhangxinhao1@huawei.com>
-Date: Wed, 17 May 2023 09:41:19 +0800
-Subject: cpu_topo: fix detection of vCPU pids when multiple
- clusters are present
+From 7ae220e6640315b2b10f79a98eee81c1c6f3ea1d Mon Sep 17 00:00:00 2001
+From: Andrea Bolognani <abologna@redhat.com>
+Date: Fri, 5 Jan 2024 18:51:29 +0100
+Subject: [PATCH] qemu: Make monitor aware of CPU clusters
 
-The logic for querying hotpluggable CPUs needs to sort the list
-of CPUs returned by QEMU. Add the logic of cluster when sorting
-the hotpluggable CPUs.
+This makes it so libvirt can obtain accurate information about
+guest CPUs from QEMU, and should make it possible to correctly
+perform operations such as CPU hotplug.
 
-Signed-off-by: zhangxinhao <zhangxinhao1@huawei.com>
+Of course this is mostly moot at the moment: only aarch64 can use
+CPU clusters, and CPU hotplug is not yet implemented on that
+architecture.
+
+Signed-off-by: Andrea Bolognani <abologna@redhat.com>
+Reviewed-by: Peter Krempa <pkrempa@redhat.com>
 ---
  src/qemu/qemu_domain.c       | 3 ++-
  src/qemu/qemu_monitor.c      | 2 ++
@@ -17,10 +21,10 @@ Signed-off-by: zhangxinhao <zhangxinhao1@huawei.com>
  4 files changed, 11 insertions(+), 1 deletion(-)
 
 diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
-index 152c8615d5..fbc665aff3 100644
+index 39fd3270fc..d54846e734 100644
 --- a/src/qemu/qemu_domain.c
 +++ b/src/qemu/qemu_domain.c
-@@ -13877,11 +13877,12 @@ qemuDomainRefreshVcpuInfo(virQEMUDriverPtr driver,
+@@ -9909,11 +9909,12 @@ qemuDomainRefreshVcpuInfo(virDomainObj *vm,
  
          if (validTIDs)
              VIR_DEBUG("vCPU[%zu] PID %llu is valid "
@@ -35,10 +39,10 @@ index 152c8615d5..fbc665aff3 100644
                        info[i].thread_id);
      }
 diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
-index ffd1d348e5..3bdfdbe078 100644
+index e4a1852d05..e270bee2cd 100644
 --- a/src/qemu/qemu_monitor.c
 +++ b/src/qemu/qemu_monitor.c
-@@ -1676,6 +1676,7 @@ qemuMonitorCPUInfoClear(qemuMonitorCPUInfoPtr cpus,
+@@ -1519,6 +1519,7 @@ qemuMonitorCPUInfoClear(qemuMonitorCPUInfo *cpus,
          cpus[i].qemu_id = -1;
          cpus[i].socket_id = -1;
          cpus[i].die_id = -1;
@@ -46,19 +50,19 @@ index ffd1d348e5..3bdfdbe078 100644
          cpus[i].core_id = -1;
          cpus[i].thread_id = -1;
          cpus[i].node_id = -1;
-@@ -1832,6 +1833,7 @@ qemuMonitorGetCPUInfoHotplug(struct qemuMonitorQueryHotpluggableCpusEntry *hotpl
-                                          !vcpus[mastervcpu].online;
-         vcpus[mastervcpu].socket_id = hotplugvcpus[i].socket_id;
-         vcpus[mastervcpu].die_id = hotplugvcpus[i].die_id;
-+        vcpus[mastervcpu].cluster_id = hotplugvcpus[i].cluster_id;
-         vcpus[mastervcpu].core_id = hotplugvcpus[i].core_id;
-         vcpus[mastervcpu].thread_id = hotplugvcpus[i].thread_id;
-         vcpus[mastervcpu].node_id = hotplugvcpus[i].node_id;
+@@ -1676,6 +1677,7 @@ qemuMonitorGetCPUInfoHotplug(struct qemuMonitorQueryHotpluggableCpusEntry *hotpl
+                                          !vcpus[mainvcpu].online;
+         vcpus[mainvcpu].socket_id = hotplugvcpus[i].socket_id;
+         vcpus[mainvcpu].die_id = hotplugvcpus[i].die_id;
++        vcpus[mainvcpu].cluster_id = hotplugvcpus[i].cluster_id;
+         vcpus[mainvcpu].core_id = hotplugvcpus[i].core_id;
+         vcpus[mainvcpu].thread_id = hotplugvcpus[i].thread_id;
+         vcpus[mainvcpu].node_id = hotplugvcpus[i].node_id;
 diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
-index 76d0bbb753..1c6b001872 100644
+index e893542971..4cbd225e8f 100644
 --- a/src/qemu/qemu_monitor.h
 +++ b/src/qemu/qemu_monitor.h
-@@ -579,6 +579,7 @@ struct qemuMonitorQueryHotpluggableCpusEntry {
+@@ -605,6 +605,7 @@ struct qemuMonitorQueryHotpluggableCpusEntry {
      int node_id;
      int socket_id;
      int die_id;
@@ -66,7 +70,7 @@ index 76d0bbb753..1c6b001872 100644
      int core_id;
      int thread_id;
  
-@@ -602,6 +603,7 @@ struct _qemuMonitorCPUInfo {
+@@ -628,6 +629,7 @@ struct _qemuMonitorCPUInfo {
       * all entries are -1 */
      int socket_id;
      int die_id;
@@ -75,10 +79,10 @@ index 76d0bbb753..1c6b001872 100644
      int thread_id;
      int node_id;
 diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
-index a02d0e2780..afd826bc2f 100644
+index 8bf56e99f5..3748034bb9 100644
 --- a/src/qemu/qemu_monitor_json.c
 +++ b/src/qemu/qemu_monitor_json.c
-@@ -8598,12 +8598,14 @@ qemuMonitorJSONProcessHotpluggableCpusReply(virJSONValuePtr vcpu,
+@@ -7606,12 +7606,14 @@ qemuMonitorJSONProcessHotpluggableCpusReply(virJSONValue *vcpu,
      entry->node_id = -1;
      entry->socket_id = -1;
      entry->die_id = -1;
@@ -93,7 +97,7 @@ index a02d0e2780..afd826bc2f 100644
      ignore_value(virJSONValueObjectGetNumberInt(props, "core-id", &entry->core_id));
      ignore_value(virJSONValueObjectGetNumberInt(props, "thread-id", &entry->thread_id));
  
-@@ -8641,6 +8643,9 @@ qemuMonitorQueryHotpluggableCpusEntrySort(const void *p1,
+@@ -7649,6 +7651,9 @@ qemuMonitorQueryHotpluggableCpusEntrySort(const void *p1,
      if (a->die_id != b->die_id)
          return a->die_id - b->die_id;
  
@@ -104,5 +108,5 @@ index a02d0e2780..afd826bc2f 100644
          return a->core_id - b->core_id;
  
 -- 
-2.25.1
+2.27.0
 
diff --git a/qemu-Prepare-for-testing-of-netdev_add-props-via-qem.patch b/qemu-Prepare-for-testing-of-netdev_add-props-via-qem.patch
deleted file mode 100644
index 07bd69d4bdfe7d6b3f602c939bf6e3eb68b9ebad..0000000000000000000000000000000000000000
--- a/qemu-Prepare-for-testing-of-netdev_add-props-via-qem.patch
+++ /dev/null
@@ -1,305 +0,0 @@
-From fb869a0d3a28591d17a9f047eafd3b77513d6d77 Mon Sep 17 00:00:00 2001
-From: Peter Krempa <pkrempa@redhat.com>
-Date: Fri, 15 May 2020 14:24:21 +0200
-Subject: [PATCH 17/18] qemu: Prepare for testing of 'netdev_add' props via
- qemuxml2argvtest
-
-qemuxml2argv test suite is way more comprehensive than the hotplug
-suite. Since we share the code paths for monitor and command line
-hotplug we can easily test the properties of devices against the QAPI
-schema.
-
-To achieve this we'll need to skip the JSON->commandline conversion for
-the test run so that we can analyze the pure properties. This patch adds
-flags for the comand line generator and hook them into the
-JSON->commandline convertor for -netdev. An upcoming patch will make use
-of this new infrastructure.
-
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Eric Blake <eblake@redhat.com>
----
- src/qemu/qemu_command.c  | 28 +++++++++++++++++-----------
- src/qemu/qemu_command.h  |  7 ++++++-
- src/qemu/qemu_driver.c   |  2 +-
- src/qemu/qemu_process.c  | 11 +++++++++--
- src/qemu/qemu_process.h  |  1 +
- src/util/virqemu.c       |  9 ++++++++-
- src/util/virqemu.h       |  3 ++-
- tests/qemuxml2argvtest.c |  6 ++++--
- 8 files changed, 48 insertions(+), 19 deletions(-)
-
-diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
-index bd78bfb31b..dae6b5a7f9 100644
---- a/src/qemu/qemu_command.c
-+++ b/src/qemu/qemu_command.c
-@@ -8027,7 +8027,8 @@ qemuBuildInterfaceCommandLine(virQEMUDriverPtr driver,
-                               virNetDevVPortProfileOp vmop,
-                               bool standalone,
-                               size_t *nnicindexes,
--                              int **nicindexes)
-+                              int **nicindexes,
-+                              unsigned int flags)
- {
-     virDomainDefPtr def = vm->def;
-     int ret = -1;
-@@ -8256,7 +8257,8 @@ qemuBuildInterfaceCommandLine(virQEMUDriverPtr driver,
-                                              slirpfdName)))
-         goto cleanup;
- 
--    if (!(host = virQEMUBuildNetdevCommandlineFromJSON(hostnetprops)))
-+    if (!(host = virQEMUBuildNetdevCommandlineFromJSON(hostnetprops,
-+                                                       (flags & QEMU_BUILD_COMMANDLINE_VALIDATE_KEEP_JSON))))
-         goto cleanup;
- 
-     virCommandAddArgList(cmd, "-netdev", host, NULL);
-@@ -8332,7 +8334,8 @@ qemuBuildNetCommandLine(virQEMUDriverPtr driver,
-                         bool standalone,
-                         size_t *nnicindexes,
-                         int **nicindexes,
--                        unsigned int *bootHostdevNet)
-+                        unsigned int *bootHostdevNet,
-+                        unsigned int flags)
- {
-     size_t i;
-     int last_good_net = -1;
-@@ -8356,7 +8359,7 @@ qemuBuildNetCommandLine(virQEMUDriverPtr driver,
-             if (qemuBuildInterfaceCommandLine(driver, vm, logManager, secManager, cmd, net,
-                                               qemuCaps, bootNet, vmop,
-                                               standalone, nnicindexes,
--                                              nicindexes) < 0)
-+                                              nicindexes, flags) < 0)
-                 goto error;
- 
-             last_good_net = i;
-@@ -8892,7 +8895,8 @@ qemuBuildChannelsCommandLine(virLogManagerPtr logManager,
-                              virQEMUDriverConfigPtr cfg,
-                              const virDomainDef *def,
-                              virQEMUCapsPtr qemuCaps,
--                             bool chardevStdioLogd)
-+                             bool chardevStdioLogd,
-+                             unsigned int flags)
- {
-     size_t i;
-     unsigned int cdevflags = QEMU_BUILD_CHARDEV_TCP_NOWAIT |
-@@ -8921,7 +8925,8 @@ qemuBuildChannelsCommandLine(virLogManagerPtr logManager,
-             if (!(netdevprops = qemuBuildChannelGuestfwdNetdevProps(channel)))
-                 return -1;
- 
--            if (!(netdevstr = virQEMUBuildNetdevCommandlineFromJSON(netdevprops)))
-+            if (!(netdevstr = virQEMUBuildNetdevCommandlineFromJSON(netdevprops,
-+                                                                    (flags & QEMU_BUILD_COMMANDLINE_VALIDATE_KEEP_JSON))))
-                 return -1;
- 
-             virCommandAddArgList(cmd, "-netdev", netdevstr, NULL);
-@@ -9857,7 +9862,8 @@ qemuBuildCommandLine(virQEMUDriverPtr driver,
-                      bool standalone,
-                      bool enableFips,
-                      size_t *nnicindexes,
--                     int **nicindexes)
-+                     int **nicindexes,
-+                     unsigned int flags)
- {
-     size_t i;
-     char uuid[VIR_UUID_STRING_BUFLEN];
-@@ -9870,9 +9876,9 @@ qemuBuildCommandLine(virQEMUDriverPtr driver,
-     bool chardevStdioLogd = priv->chardevStdioLogd;
- 
-     VIR_DEBUG("driver=%p def=%p mon=%p "
--              "qemuCaps=%p migrateURI=%s snapshot=%p vmop=%d",
-+              "qemuCaps=%p migrateURI=%s snapshot=%p vmop=%d flags=0x%x",
-               driver, def, priv->monConfig,
--              qemuCaps, migrateURI, snapshot, vmop);
-+              qemuCaps, migrateURI, snapshot, vmop, flags);
- 
-     if (qemuBuildCommandLineValidate(driver, def) < 0)
-         return NULL;
-@@ -10017,7 +10023,7 @@ qemuBuildCommandLine(virQEMUDriverPtr driver,
- 
-     if (qemuBuildNetCommandLine(driver, vm, logManager, secManager, cmd,
-                                 qemuCaps, vmop, standalone,
--                                nnicindexes, nicindexes, &bootHostdevNet) < 0)
-+                                nnicindexes, nicindexes, &bootHostdevNet, flags) < 0)
-         return NULL;
- 
-     if (qemuBuildSmartcardCommandLine(logManager, secManager, cmd, cfg, def, qemuCaps,
-@@ -10033,7 +10039,7 @@ qemuBuildCommandLine(virQEMUDriverPtr driver,
-         return NULL;
- 
-     if (qemuBuildChannelsCommandLine(logManager, secManager, cmd, cfg, def, qemuCaps,
--                                     chardevStdioLogd) < 0)
-+                                     chardevStdioLogd, flags) < 0)
-         return NULL;
- 
-     if (qemuBuildConsoleCommandLine(logManager, secManager, cmd, cfg, def, qemuCaps,
-diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h
-index 1e6b23ba05..4b1c2103c5 100644
---- a/src/qemu/qemu_command.h
-+++ b/src/qemu/qemu_command.h
-@@ -43,6 +43,10 @@
- VIR_ENUM_DECL(qemuVideo);
- VIR_ENUM_DECL(qemuSoundCodec);
- 
-+typedef enum {
-+    QEMU_BUILD_COMMANDLINE_VALIDATE_KEEP_JSON = 1 << 0,
-+} qemuBuildCommandLineFlags;
-+
- virCommandPtr qemuBuildCommandLine(virQEMUDriverPtr driver,
-                                    virLogManagerPtr logManager,
-                                    virSecurityManagerPtr secManager,
-@@ -53,7 +57,8 @@ virCommandPtr qemuBuildCommandLine(virQEMUDriverPtr driver,
-                                    bool standalone,
-                                    bool enableFips,
-                                    size_t *nnicindexes,
--                                   int **nicindexes);
-+                                   int **nicindexes,
-+                                   unsigned int flags);
- 
- /* Generate the object properties for pr-manager */
- virJSONValuePtr qemuBuildPRManagerInfoProps(virStorageSourcePtr src);
-diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
-index 2b24881f75..b3ebf3aa9b 100644
---- a/src/qemu/qemu_driver.c
-+++ b/src/qemu/qemu_driver.c
-@@ -7449,7 +7449,7 @@ static char *qemuConnectDomainXMLToNative(virConnectPtr conn,
-     }
- 
-     if (!(cmd = qemuProcessCreatePretendCmd(driver, vm, NULL,
--                                            qemuCheckFips(), true,
-+                                            qemuCheckFips(), true, false,
-                                             VIR_QEMU_PROCESS_START_COLD)))
-         goto cleanup;
- 
-diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
-index 818a72d8f9..db564cae36 100644
---- a/src/qemu/qemu_process.c
-+++ b/src/qemu/qemu_process.c
-@@ -6750,7 +6750,7 @@ qemuProcessLaunch(virConnectPtr conn,
-                                      snapshot, vmop,
-                                      false,
-                                      qemuCheckFips(),
--                                     &nnicindexes, &nicindexes)))
-+                                     &nnicindexes, &nicindexes, 0)))
-         goto cleanup;
- 
-     if (incoming && incoming->fd != -1)
-@@ -7193,8 +7193,11 @@ qemuProcessCreatePretendCmd(virQEMUDriverPtr driver,
-                             const char *migrateURI,
-                             bool enableFips,
-                             bool standalone,
-+                            bool jsonPropsValidation,
-                             unsigned int flags)
- {
-+    unsigned int buildflags = 0;
-+
-     virCheckFlags(VIR_QEMU_PROCESS_START_COLD |
-                   VIR_QEMU_PROCESS_START_PAUSED |
-                   VIR_QEMU_PROCESS_START_AUTODESTROY, NULL);
-@@ -7204,6 +7207,9 @@ qemuProcessCreatePretendCmd(virQEMUDriverPtr driver,
-     if (standalone)
-         flags |= VIR_QEMU_PROCESS_START_STANDALONE;
- 
-+    if (jsonPropsValidation)
-+        buildflags = QEMU_BUILD_COMMANDLINE_VALIDATE_KEEP_JSON;
-+
-     if (qemuProcessInit(driver, vm, NULL, QEMU_ASYNC_JOB_NONE,
-                         !!migrateURI, flags) < 0)
-         return NULL;
-@@ -7222,7 +7228,8 @@ qemuProcessCreatePretendCmd(virQEMUDriverPtr driver,
-                                 standalone,
-                                 enableFips,
-                                 NULL,
--                                NULL);
-+                                NULL,
-+                                buildflags);
- }
- 
- 
-diff --git a/src/qemu/qemu_process.h b/src/qemu/qemu_process.h
-index 3077d3ef9e..15e67b9762 100644
---- a/src/qemu/qemu_process.h
-+++ b/src/qemu/qemu_process.h
-@@ -101,6 +101,7 @@ virCommandPtr qemuProcessCreatePretendCmd(virQEMUDriverPtr driver,
-                                           const char *migrateURI,
-                                           bool enableFips,
-                                           bool standalone,
-+                                          bool jsonPropsValidation,
-                                           unsigned int flags);
- 
- int qemuProcessInit(virQEMUDriverPtr driver,
-diff --git a/src/util/virqemu.c b/src/util/virqemu.c
-index 9823ebc14d..321ddeb7e3 100644
---- a/src/util/virqemu.c
-+++ b/src/util/virqemu.c
-@@ -292,16 +292,23 @@ virQEMUBuildCommandLineJSON(virJSONValuePtr value,
- /**
-  * virQEMUBuildNetdevCommandlineFromJSON:
-  * @props: JSON properties describing a netdev
-+ * @rawjson: don't transform to commandline args, but just stringify json
-  *
-  * Converts @props into arguments for -netdev including all the quirks and
-  * differences between the monitor and command line syntax.
-+ *
-+ * @rawjson is meant for testing of the schema in the xml2argvtest
-  */
- char *
--virQEMUBuildNetdevCommandlineFromJSON(virJSONValuePtr props)
-+virQEMUBuildNetdevCommandlineFromJSON(virJSONValuePtr props,
-+                                      bool rawjson)
- {
-     const char *type = virJSONValueObjectGetString(props, "type");
-     g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
- 
-+    if (rawjson)
-+        return virJSONValueToString(props, false);
-+
-     virBufferAsprintf(&buf, "%s,", type);
- 
-     if (virQEMUBuildCommandLineJSON(props, &buf, "type", true,
-diff --git a/src/util/virqemu.h b/src/util/virqemu.h
-index 22f47851df..b1296cb657 100644
---- a/src/util/virqemu.h
-+++ b/src/util/virqemu.h
-@@ -50,7 +50,8 @@ int virQEMUBuildCommandLineJSON(virJSONValuePtr value,
-                                 virQEMUBuildCommandLineJSONArrayFormatFunc array);
- 
- char *
--virQEMUBuildNetdevCommandlineFromJSON(virJSONValuePtr props);
-+virQEMUBuildNetdevCommandlineFromJSON(virJSONValuePtr props,
-+                                      bool rawjson);
- 
- int virQEMUBuildObjectCommandlineFromJSON(virBufferPtr buf,
-                                           virJSONValuePtr objprops);
-diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
-index 762d65f521..2217e2d81e 100644
---- a/tests/qemuxml2argvtest.c
-+++ b/tests/qemuxml2argvtest.c
-@@ -400,7 +400,8 @@ testCompareXMLToArgvCreateArgs(virQEMUDriverPtr drv,
-                                virDomainObjPtr vm,
-                                const char *migrateURI,
-                                struct testQemuInfo *info,
--                               unsigned int flags)
-+                               unsigned int flags,
-+                               bool jsonPropsValidation)
- {
-     size_t i;
- 
-@@ -475,6 +476,7 @@ testCompareXMLToArgvCreateArgs(virQEMUDriverPtr drv,
- 
-     return qemuProcessCreatePretendCmd(drv, vm, migrateURI,
-                                        (flags & FLAG_FIPS), false,
-+                                       jsonPropsValidation,
-                                        VIR_QEMU_PROCESS_START_COLD);
- }
- 
-@@ -570,7 +572,7 @@ testCompareXMLToArgv(const void *data)
-     virResetLastError();
- 
-     if (!(cmd = testCompareXMLToArgvCreateArgs(&driver, vm, migrateURI, info,
--                                               flags))) {
-+                                               flags, false))) {
-         if (flags & FLAG_EXPECT_FAILURE)
-             goto ok;
-         goto cleanup;
--- 
-2.23.0.windows.1
-
diff --git a/qemu-Probe-for-a-few-params-supported-by-migrate-set.patch b/qemu-Probe-for-a-few-params-supported-by-migrate-set.patch
deleted file mode 100644
index f4f1cc7c577172cd0b72fc457648671f0c286f74..0000000000000000000000000000000000000000
--- a/qemu-Probe-for-a-few-params-supported-by-migrate-set.patch
+++ /dev/null
@@ -1,589 +0,0 @@
-From aa0f670f9d558c518a5890cbfa7f969e1d2841aa Mon Sep 17 00:00:00 2001
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Wed, 10 Jun 2020 15:09:00 +0200
-Subject: [PATCH 1/8] qemu: Probe for a few params supported by
- migrate-set-parameters
-
-These parameters were originally set via dedicated commands which are
-now deprecated. We want to use migrate-set-parameters instead if
-possible.
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Peter Krempa <pkrempa@redhat.com>
----
- src/qemu/qemu_capabilities.c                       | 6 ++++++
- src/qemu/qemu_capabilities.h                       | 3 +++
- tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml | 2 ++
- tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml   | 2 ++
- tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml   | 2 ++
- tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml  | 2 ++
- tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml   | 3 +++
- tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml  | 3 +++
- tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 3 +++
- tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml   | 3 +++
- tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml   | 3 +++
- tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml  | 3 +++
- tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml    | 2 ++
- tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml   | 2 ++
- tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml    | 2 ++
- tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml    | 2 ++
- tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml   | 2 ++
- tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml    | 3 +++
- tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml  | 3 +++
- tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml  | 3 +++
- tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml    | 3 +++
- tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml   | 3 +++
- tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml    | 3 +++
- tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml   | 3 +++
- tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml  | 3 +++
- tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml    | 3 +++
- tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml  | 3 +++
- tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml  | 3 +++
- tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml    | 3 +++
- tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml   | 3 +++
- tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml   | 3 +++
- tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml  | 3 +++
- tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml    | 3 +++
- 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.x86_64.xml   | 3 +++
- 38 files changed, 108 insertions(+)
-
-diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
-index 18bf37b569..fb7726235d 100644
---- a/src/qemu/qemu_capabilities.c
-+++ b/src/qemu/qemu_capabilities.c
-@@ -571,6 +571,9 @@ VIR_ENUM_IMPL(virQEMUCaps,
- 	      
-               /* 360 */
-               "tpm-tis-device",
-+	      "migration-param.bandwidth",
-+	      "migration-param.downtime",
-+	      "migration-param.xbzrle-cache-size",
-     );
- 
- 
-@@ -1451,6 +1454,9 @@ static struct virQEMUCapsStringFlags virQEMUCapsQMPSchemaQueries[] = {
-     { "blockdev-add/arg-type/+nvme", QEMU_CAPS_DRIVE_NVME },
-     { "query-named-block-nodes/arg-type/flat", QEMU_CAPS_QMP_QUERY_NAMED_BLOCK_NODES_FLAT },
-     { "blockdev-snapshot/$allow-write-only-overlay", QEMU_CAPS_BLOCKDEV_SNAPSHOT_ALLOW_WRITE_ONLY },
-+    { "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 },
- };
- 
- typedef struct _virQEMUCapsObjectTypeProps virQEMUCapsObjectTypeProps;
-diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
-index 8e16fc0e78..0ac92d77c3 100644
---- a/src/qemu/qemu_capabilities.h
-+++ b/src/qemu/qemu_capabilities.h
-@@ -552,6 +552,9 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
-     
-     /* 360 */
-     QEMU_CAPS_DEVICE_TPM_TIS_DEVICE, /* -device tpm-tis-device */
-+    QEMU_CAPS_MIGRATION_PARAM_BANDWIDTH, /* max-bandwidth field in migrate-set-parameters */
-+    QEMU_CAPS_MIGRATION_PARAM_DOWNTIME, /* downtime-limit field in migrate-set-parameters */
-+    QEMU_CAPS_MIGRATION_PARAM_XBZRLE_CACHE_SIZE, /* xbzrle-cache-size field in migrate-set-parameters */
- 
-     QEMU_CAPS_LAST /* this must always be the last item */
- } virQEMUCapsFlags;
-diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
-index f598b4678a..e253df4077 100644
---- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
-+++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
-@@ -140,6 +140,8 @@
-   <flag name='vhost-vsock'/>
-   <flag name='egl-headless'/>
-   <flag name='iothread.poll-max-ns'/>
-+  <flag name='migration-param.bandwidth'/>
-+  <flag name='migration-param.downtime'/>
-   <version>2010000</version>
-   <kvmVersion>0</kvmVersion>
-   <microcodeVersion>61700287</microcodeVersion>
-diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
-index b95a9d42ad..8df611353f 100644
---- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
-+++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
-@@ -140,6 +140,8 @@
-   <flag name='egl-headless'/>
-   <flag name='iothread.poll-max-ns'/>
-   <flag name='i8042'/>
-+  <flag name='migration-param.bandwidth'/>
-+  <flag name='migration-param.downtime'/>
-   <version>2010000</version>
-   <kvmVersion>0</kvmVersion>
-   <microcodeVersion>42900287</microcodeVersion>
-diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
-index 04ac872985..27ce348b80 100644
---- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
-+++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
-@@ -107,6 +107,8 @@
-   <flag name='query-cpu-model-baseline'/>
-   <flag name='query-cpu-model-comparison'/>
-   <flag name='storage.werror'/>
-+  <flag name='migration-param.bandwidth'/>
-+  <flag name='migration-param.downtime'/>
-   <version>2010000</version>
-   <kvmVersion>0</kvmVersion>
-   <microcodeVersion>39100287</microcodeVersion>
-diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
-index 7ebe97b6ab..368985a611 100644
---- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
-+++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
-@@ -183,6 +183,8 @@
-   <flag name='iothread.poll-max-ns'/>
-   <flag name='x86-max-cpu'/>
-   <flag name='i8042'/>
-+  <flag name='migration-param.bandwidth'/>
-+  <flag name='migration-param.downtime'/>
-   <version>2010000</version>
-   <kvmVersion>0</kvmVersion>
-   <microcodeVersion>43100287</microcodeVersion>
-diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
-index 6d36a6e484..c5bcf1c818 100644
---- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
-+++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
-@@ -114,6 +114,9 @@
-   <flag name='query-cpu-model-baseline'/>
-   <flag name='query-cpu-model-comparison'/>
-   <flag name='storage.werror'/>
-+  <flag name='migration-param.bandwidth'/>
-+  <flag name='migration-param.downtime'/>
-+  <flag name='migration-param.xbzrle-cache-size'/>
-   <version>2011000</version>
-   <kvmVersion>0</kvmVersion>
-   <microcodeVersion>39100288</microcodeVersion>
-diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
-index b8eb3abd40..717ef46f78 100644
---- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
-+++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
-@@ -189,6 +189,9 @@
-   <flag name='iothread.poll-max-ns'/>
-   <flag name='x86-max-cpu'/>
-   <flag name='i8042'/>
-+  <flag name='migration-param.bandwidth'/>
-+  <flag name='migration-param.downtime'/>
-+  <flag name='migration-param.xbzrle-cache-size'/>
-   <version>2011000</version>
-   <kvmVersion>0</kvmVersion>
-   <microcodeVersion>43100288</microcodeVersion>
-diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
-index 64d8d4951c..fbee7661a1 100644
---- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
-+++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
-@@ -156,6 +156,9 @@
-   <flag name='memory-backend-file.align'/>
-   <flag name='arm-max-cpu'/>
-   <flag name='drive-nvme'/>
-+  <flag name='migration-param.bandwidth'/>
-+  <flag name='migration-param.downtime'/>
-+  <flag name='migration-param.xbzrle-cache-size'/>
-   <version>2012000</version>
-   <kvmVersion>0</kvmVersion>
-   <microcodeVersion>61700289</microcodeVersion>
-diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
-index 38a3103c4a..31a643f5d1 100644
---- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
-+++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
-@@ -154,6 +154,9 @@
-   <flag name='memory-backend-file.align'/>
-   <flag name='drive-nvme'/>
-   <flag name='i8042'/>
-+  <flag name='migration-param.bandwidth'/>
-+  <flag name='migration-param.downtime'/>
-+  <flag name='migration-param.xbzrle-cache-size'/>
-   <version>2011090</version>
-   <kvmVersion>0</kvmVersion>
-   <microcodeVersion>42900289</microcodeVersion>
-diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
-index 21a168dd3b..d0ea4d780a 100644
---- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
-+++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
-@@ -126,6 +126,9 @@
-   <flag name='query-cpu-model-comparison'/>
-   <flag name='drive-nvme'/>
-   <flag name='storage.werror'/>
-+  <flag name='migration-param.bandwidth'/>
-+  <flag name='migration-param.downtime'/>
-+  <flag name='migration-param.xbzrle-cache-size'/>
-   <version>2012000</version>
-   <kvmVersion>0</kvmVersion>
-   <microcodeVersion>39100289</microcodeVersion>
-diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
-index 0c30cc75da..3db7162a34 100644
---- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
-+++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
-@@ -198,6 +198,9 @@
-   <flag name='x86-max-cpu'/>
-   <flag name='drive-nvme'/>
-   <flag name='i8042'/>
-+  <flag name='migration-param.bandwidth'/>
-+  <flag name='migration-param.downtime'/>
-+  <flag name='migration-param.xbzrle-cache-size'/>
-   <version>2011090</version>
-   <kvmVersion>0</kvmVersion>
-   <microcodeVersion>43100289</microcodeVersion>
-diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
-index d204b82030..7becf1bfb6 100644
---- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
-+++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
-@@ -96,6 +96,8 @@
-   <flag name='query-cpu-model-baseline'/>
-   <flag name='query-cpu-model-comparison'/>
-   <flag name='storage.werror'/>
-+  <flag name='migration-param.bandwidth'/>
-+  <flag name='migration-param.downtime'/>
-   <version>2007093</version>
-   <kvmVersion>0</kvmVersion>
-   <microcodeVersion>39100246</microcodeVersion>
-diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
-index 489b67f99a..2a0b1f61de 100644
---- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
-+++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
-@@ -160,6 +160,8 @@
-   <flag name='vhost-vsock'/>
-   <flag name='mch'/>
-   <flag name='i8042'/>
-+  <flag name='migration-param.bandwidth'/>
-+  <flag name='migration-param.downtime'/>
-   <version>2008000</version>
-   <kvmVersion>0</kvmVersion>
-   <microcodeVersion>43100246</microcodeVersion>
-diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
-index 3bc6ec8dab..9141e29757 100644
---- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
-+++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
-@@ -132,6 +132,8 @@
-   <flag name='vhost-vsock'/>
-   <flag name='iothread.poll-max-ns'/>
-   <flag name='i8042'/>
-+  <flag name='migration-param.bandwidth'/>
-+  <flag name='migration-param.downtime'/>
-   <version>2009000</version>
-   <kvmVersion>0</kvmVersion>
-   <microcodeVersion>42900247</microcodeVersion>
-diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
-index 9a6d94d37b..bcc7d4bd4e 100644
---- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
-+++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
-@@ -101,6 +101,8 @@
-   <flag name='query-cpu-model-baseline'/>
-   <flag name='query-cpu-model-comparison'/>
-   <flag name='storage.werror'/>
-+  <flag name='migration-param.bandwidth'/>
-+  <flag name='migration-param.downtime'/>
-   <version>2009000</version>
-   <kvmVersion>0</kvmVersion>
-   <microcodeVersion>39100247</microcodeVersion>
-diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
-index 83fc6cde97..5cd82aa979 100644
---- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
-+++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
-@@ -177,6 +177,8 @@
-   <flag name='iothread.poll-max-ns'/>
-   <flag name='x86-max-cpu'/>
-   <flag name='i8042'/>
-+  <flag name='migration-param.bandwidth'/>
-+  <flag name='migration-param.downtime'/>
-   <version>2009000</version>
-   <kvmVersion>0</kvmVersion>
-   <microcodeVersion>43100247</microcodeVersion>
-diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
-index 9a0b9c05c2..6916da2047 100644
---- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
-+++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
-@@ -156,6 +156,9 @@
-   <flag name='ramfb'/>
-   <flag name='drive-nvme'/>
-   <flag name='i8042'/>
-+  <flag name='migration-param.bandwidth'/>
-+  <flag name='migration-param.downtime'/>
-+  <flag name='migration-param.xbzrle-cache-size'/>
-   <version>2012050</version>
-   <kvmVersion>0</kvmVersion>
-   <microcodeVersion>42900239</microcodeVersion>
-diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
-index 6814a2f9c6..802b624073 100644
---- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
-+++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
-@@ -96,6 +96,9 @@
-   <flag name='ramfb'/>
-   <flag name='drive-nvme'/>
-   <flag name='storage.werror'/>
-+  <flag name='migration-param.bandwidth'/>
-+  <flag name='migration-param.downtime'/>
-+  <flag name='migration-param.xbzrle-cache-size'/>
-   <version>3000000</version>
-   <kvmVersion>0</kvmVersion>
-   <microcodeVersion>0</microcodeVersion>
-diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
-index b81f5825cc..a16db0912d 100644
---- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
-+++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
-@@ -96,6 +96,9 @@
-   <flag name='ramfb'/>
-   <flag name='drive-nvme'/>
-   <flag name='storage.werror'/>
-+  <flag name='migration-param.bandwidth'/>
-+  <flag name='migration-param.downtime'/>
-+  <flag name='migration-param.xbzrle-cache-size'/>
-   <version>3000000</version>
-   <kvmVersion>0</kvmVersion>
-   <microcodeVersion>0</microcodeVersion>
-diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
-index 85cda12076..6992e10237 100644
---- a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
-+++ b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
-@@ -129,6 +129,9 @@
-   <flag name='ramfb'/>
-   <flag name='drive-nvme'/>
-   <flag name='storage.werror'/>
-+  <flag name='migration-param.bandwidth'/>
-+  <flag name='migration-param.downtime'/>
-+  <flag name='migration-param.xbzrle-cache-size'/>
-   <version>3000000</version>
-   <kvmVersion>0</kvmVersion>
-   <microcodeVersion>39100239</microcodeVersion>
-diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
-index 517e27d815..9fdfc634ff 100644
---- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
-+++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
-@@ -204,6 +204,9 @@
-   <flag name='drive-nvme'/>
-   <flag name='i8042'/>
-   <flag name='storage.werror'/>
-+  <flag name='migration-param.bandwidth'/>
-+  <flag name='migration-param.downtime'/>
-+  <flag name='migration-param.xbzrle-cache-size'/>
-   <version>3000000</version>
-   <kvmVersion>0</kvmVersion>
-   <microcodeVersion>43100239</microcodeVersion>
-diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
-index 6801023208..4039923e5f 100644
---- a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
-+++ b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
-@@ -161,6 +161,9 @@
-   <flag name='drive-nvme'/>
-   <flag name='i8042'/>
-   <flag name='storage.werror'/>
-+  <flag name='migration-param.bandwidth'/>
-+  <flag name='migration-param.downtime'/>
-+  <flag name='migration-param.xbzrle-cache-size'/>
-   <version>3000091</version>
-   <kvmVersion>0</kvmVersion>
-   <microcodeVersion>42900240</microcodeVersion>
-diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
-index d901715ffc..02fc245fca 100644
---- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
-+++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
-@@ -207,6 +207,9 @@
-   <flag name='drive-nvme'/>
-   <flag name='i8042'/>
-   <flag name='storage.werror'/>
-+  <flag name='migration-param.bandwidth'/>
-+  <flag name='migration-param.downtime'/>
-+  <flag name='migration-param.xbzrle-cache-size'/>
-   <version>3000092</version>
-   <kvmVersion>0</kvmVersion>
-   <microcodeVersion>43100240</microcodeVersion>
-diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
-index 6fd1880ae2..278f2d9135 100644
---- a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
-+++ b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
-@@ -170,6 +170,9 @@
-   <flag name='arm-max-cpu'/>
-   <flag name='drive-nvme'/>
-   <flag name='storage.werror'/>
-+  <flag name='migration-param.bandwidth'/>
-+  <flag name='migration-param.downtime'/>
-+  <flag name='migration-param.xbzrle-cache-size'/>
-   <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 f7e69fcc97..897ca08af0 100644
---- a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
-+++ b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
-@@ -175,6 +175,9 @@
-   <flag name='drive-nvme'/>
-   <flag name='i8042'/>
-   <flag name='storage.werror'/>
-+  <flag name='migration-param.bandwidth'/>
-+  <flag name='migration-param.downtime'/>
-+  <flag name='migration-param.xbzrle-cache-size'/>
-   <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 6a567239b9..1993d52d42 100644
---- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
-+++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
-@@ -171,6 +171,9 @@
-   <flag name='migration-file-drop-cache'/>
-   <flag name='drive-nvme'/>
-   <flag name='storage.werror'/>
-+  <flag name='migration-param.bandwidth'/>
-+  <flag name='migration-param.downtime'/>
-+  <flag name='migration-param.xbzrle-cache-size'/>
-   <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 d6686b7c68..348138ab5a 100644
---- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
-+++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
-@@ -171,6 +171,9 @@
-   <flag name='migration-file-drop-cache'/>
-   <flag name='drive-nvme'/>
-   <flag name='storage.werror'/>
-+  <flag name='migration-param.bandwidth'/>
-+  <flag name='migration-param.downtime'/>
-+  <flag name='migration-param.xbzrle-cache-size'/>
-   <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 9dc29832f9..1542ed6c68 100644
---- a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
-+++ b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
-@@ -137,6 +137,9 @@
-   <flag name='query-cpu-model-comparison'/>
-   <flag name='drive-nvme'/>
-   <flag name='storage.werror'/>
-+  <flag name='migration-param.bandwidth'/>
-+  <flag name='migration-param.downtime'/>
-+  <flag name='migration-param.xbzrle-cache-size'/>
-   <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 ae4004ad3c..9292313570 100644
---- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
-+++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
-@@ -212,6 +212,9 @@
-   <flag name='drive-nvme'/>
-   <flag name='i8042'/>
-   <flag name='storage.werror'/>
-+  <flag name='migration-param.bandwidth'/>
-+  <flag name='migration-param.downtime'/>
-+  <flag name='migration-param.xbzrle-cache-size'/>
-   <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 d9bdeb2516..d07a27b4f8 100644
---- a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
-+++ b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
-@@ -218,6 +218,9 @@
-   <flag name='smp-dies'/>
-   <flag name='i8042'/>
-   <flag name='storage.werror'/>
-+  <flag name='migration-param.bandwidth'/>
-+  <flag name='migration-param.downtime'/>
-+  <flag name='migration-param.xbzrle-cache-size'/>
-   <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 de16451b8b..fb3d5996c4 100644
---- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
-+++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
-@@ -180,6 +180,9 @@
-   <flag name='virtio-net.failover'/>
-   <flag name='vhost-user-fs'/>
-   <flag name='storage.werror'/>
-+  <flag name='migration-param.bandwidth'/>
-+  <flag name='migration-param.downtime'/>
-+  <flag name='migration-param.xbzrle-cache-size'/>
-   <version>4001050</version>
-   <kvmVersion>0</kvmVersion>
-   <microcodeVersion>61700242</microcodeVersion>
-diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
-index 99ec98e8cd..daea978d9f 100644
---- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
-+++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
-@@ -180,6 +180,9 @@
-   <flag name='i8042'/>
-   <flag name='rng-builtin'/>
-   <flag name='storage.werror'/>
-+  <flag name='migration-param.bandwidth'/>
-+  <flag name='migration-param.downtime'/>
-+  <flag name='migration-param.xbzrle-cache-size'/>
-   <version>4001050</version>
-   <kvmVersion>0</kvmVersion>
-   <microcodeVersion>42900242</microcodeVersion>
-diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
-index fa3c2ef3e4..d007ae65d6 100644
---- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
-+++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
-@@ -139,6 +139,9 @@
-   <flag name='rng-builtin'/>
-   <flag name='vhost-user-fs'/>
-   <flag name='storage.werror'/>
-+  <flag name='migration-param.bandwidth'/>
-+  <flag name='migration-param.downtime'/>
-+  <flag name='migration-param.xbzrle-cache-size'/>
-   <version>4001050</version>
-   <kvmVersion>0</kvmVersion>
-   <microcodeVersion>39100242</microcodeVersion>
-diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
-index c1b73f4ad5..2d5b2ad0f0 100644
---- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
-+++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
-@@ -224,6 +224,9 @@
-   <flag name='virtio-net.failover'/>
-   <flag name='vhost-user-fs'/>
-   <flag name='storage.werror'/>
-+  <flag name='migration-param.bandwidth'/>
-+  <flag name='migration-param.downtime'/>
-+  <flag name='migration-param.xbzrle-cache-size'/>
-   <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 53fcd750d9..be0be79fda 100644
---- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
-+++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
-@@ -182,6 +182,9 @@
-   <flag name='cpu.kvm-no-adjvtime'/>
-   <flag name='vhost-user-fs'/>
-   <flag name='storage.werror'/>
-+  <flag name='migration-param.bandwidth'/>
-+  <flag name='migration-param.downtime'/>
-+  <flag name='migration-param.xbzrle-cache-size'/>
-   <version>4002050</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 2fb5bb49a9..3ee17a66a4 100644
---- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
-+++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
-@@ -190,6 +190,9 @@
-   <flag name='query-named-block-nodes.flat'/>
-   <flag name='blockdev-snapshot.allow-write-only-overlay'/>
-   <flag name='storage.werror'/>
-+  <flag name='migration-param.bandwidth'/>
-+  <flag name='migration-param.downtime'/>
-+  <flag name='migration-param.xbzrle-cache-size'/>
-   <version>4002050</version>
-   <kvmVersion>0</kvmVersion>
-   <microcodeVersion>42900241</microcodeVersion>
-diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
-index f43090c9e7..73f9319199 100644
---- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
-+++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
-@@ -227,6 +227,9 @@
-   <flag name='query-named-block-nodes.flat'/>
-   <flag name='blockdev-snapshot.allow-write-only-overlay'/>
-   <flag name='storage.werror'/>
-+  <flag name='migration-param.bandwidth'/>
-+  <flag name='migration-param.downtime'/>
-+  <flag name='migration-param.xbzrle-cache-size'/>
-   <version>4002050</version>
-   <kvmVersion>0</kvmVersion>
-   <microcodeVersion>43100241</microcodeVersion>
--- 
-2.27.0
-
diff --git a/qemu-Return-perf-status-that-affect-next-boot-for-sh.patch b/qemu-Return-perf-status-that-affect-next-boot-for-sh.patch
deleted file mode 100644
index 4800dc71ffcac0ed5203e3d50f1510e4e8435165..0000000000000000000000000000000000000000
--- a/qemu-Return-perf-status-that-affect-next-boot-for-sh.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-From 1686b198dcf9b695a864f82d18fbc9b2e76f54df Mon Sep 17 00:00:00 2001
-From: tangbinzy <tangbin_yewu@cmss.chinamobile.com>
-Date: Thu, 16 Mar 2023 02:17:30 +0000
-Subject: [PATCH] qemu: Return perf status that affect next boot  for shutoff
- domains While we set up perf events for a shutoff domain and check the
- settings, All of perf events are reported as 'disabled', unless we add
- --config, This is redundant for a shutoff domain.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
- # virsh domstate $GUEST
-shut off
-
- # virsh perf --domain $GUEST
-cmt            : disabled
-mbmt           : disabled
-mbml           : disabled
-......
-
- # virsh perf --domain $GUEST --enable mbmt
-mbmt           : enabled
-
- # virsh perf --domain $GUEST
-cmt            : disabled
-mbmt           : disabled
-mbml           : disabled
-......
-
-Use virDomainObjGetOneDefState instead of virDomainObjGetOneDef to fix
-the issue. After patch, The perf event status of a shutoff domain is
-reported correctly:
-
- # virsh domstate $GUEST
-shut off
-
- # virsh perf --domain $GUEST
-cmt            : disabled
-mbmt           : disabled
-mbml           : disabled
-......
-
- # virsh perf --domain $GUEST --enable mbmt
-mbmt           : enabled
-
- # virsh perf --domain $GUEST
-cmt            : disabled
-mbmt           : enabled
-mbml           : disabled
-......
-
-Signed-off-by: Lin Ma <lma@suse.de>
-Reviewed-by: Erik Skultety <eskultet@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Signed-off-by: Ján Tomko <jtomko@redhat.com>
-
-Signed-off-by: tangbin <tangbin_yewu@cmss.chinamobile.com>
-(cherry-pick from 10841b6cb612fed1a4cb9be05c4f5e150008cac7)
----
- src/qemu/qemu_driver.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
-index 32b3ef3cf1..ed621262aa 100644
---- a/src/qemu/qemu_driver.c
-+++ b/src/qemu/qemu_driver.c
-@@ -9952,6 +9952,7 @@ qemuDomainGetPerfEvents(virDomainPtr dom,
-     int npar = 0;
-     size_t i;
-     int ret = -1;
-+    bool live = false;
- 
-     virCheckFlags(VIR_DOMAIN_AFFECT_LIVE |
-                   VIR_DOMAIN_AFFECT_CONFIG |
-@@ -9966,7 +9967,7 @@ qemuDomainGetPerfEvents(virDomainPtr dom,
-     if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_QUERY) < 0)
-         goto cleanup;
- 
--    if (!(def = virDomainObjGetOneDef(vm, flags)))
-+    if (!(def = virDomainObjGetOneDefState(vm, flags, &live)))
-         goto endjob;
- 
-     priv = vm->privateData;
-@@ -9974,7 +9975,7 @@ qemuDomainGetPerfEvents(virDomainPtr dom,
-     for (i = 0; i < VIR_PERF_EVENT_LAST; i++) {
-         bool perf_enabled;
- 
--        if (flags & VIR_DOMAIN_AFFECT_CONFIG)
-+        if ((flags & VIR_DOMAIN_AFFECT_CONFIG) || !live)
-             perf_enabled = def->perf.events[i] == VIR_TRISTATE_BOOL_YES;
-         else
-             perf_enabled = virPerfEventIsEnabled(priv->perf, i);
--- 
-2.27.0
-
diff --git a/qemu-Support-retry-BLOCK_IO_ERROR-event.patch b/qemu-Support-retry-BLOCK_IO_ERROR-event.patch
index 15992a6a5d0f90892339ffba99c82e8b9f13e4e1..d992dc2383b3d408a91f7e9a4365b29a1b0601e4 100644
--- a/qemu-Support-retry-BLOCK_IO_ERROR-event.patch
+++ b/qemu-Support-retry-BLOCK_IO_ERROR-event.patch
@@ -1,4 +1,4 @@
-From fbe0c3b91ca38be349999a1fab748951ba3331c4 Mon Sep 17 00:00:00 2001
+From e1a0ba5580ffb8d9de09885bef23b26d34b691c4 Mon Sep 17 00:00:00 2001
 From: Jiahui Cen <cenjiahui@huawei.com>
 Date: Thu, 25 Feb 2021 18:55:31 +0800
 Subject: [PATCH] qemu: Support 'retry' BLOCK_IO_ERROR event.
@@ -10,26 +10,26 @@ Signed-off-by: Ying Fang <fangying1@huawei.com>
 ---
  include/libvirt/libvirt-domain.h | 1 +
  src/qemu/qemu_monitor_json.c     | 2 +-
- tools/virsh-domain.c             | 3 ++-
- 3 files changed, 4 insertions(+), 2 deletions(-)
+ tools/virsh-domain-event.c       | 8 ++++++++
+ 3 files changed, 10 insertions(+), 1 deletion(-)
 
 diff --git a/include/libvirt/libvirt-domain.h b/include/libvirt/libvirt-domain.h
-index b440818ec2..90cb652db1 100644
+index a1902546bb..7d6117208b 100644
 --- a/include/libvirt/libvirt-domain.h
 +++ b/include/libvirt/libvirt-domain.h
-@@ -3701,6 +3701,7 @@ typedef enum {
-     VIR_DOMAIN_EVENT_IO_ERROR_NONE = 0,  /* No action, IO error ignored */
-     VIR_DOMAIN_EVENT_IO_ERROR_PAUSE,     /* Guest CPUs are paused */
-     VIR_DOMAIN_EVENT_IO_ERROR_REPORT,    /* IO error reported to guest OS */
-+    VIR_DOMAIN_EVENT_IO_ERROR_RETRY,     /* Failed IO retried */
+@@ -4695,6 +4695,7 @@ typedef enum {
+     VIR_DOMAIN_EVENT_IO_ERROR_NONE = 0,  /* No action, IO error ignored (Since: 0.8.0) */
+     VIR_DOMAIN_EVENT_IO_ERROR_PAUSE,     /* Guest CPUs are paused (Since: 0.8.0) */
+     VIR_DOMAIN_EVENT_IO_ERROR_REPORT,    /* IO error reported to guest OS (Since: 0.8.0) */
++    VIR_DOMAIN_EVENT_IO_ERROR_RETRY,     /* Failed IO retried (Since: 6.2.0) */
  
  # ifdef VIR_ENUM_SENTINELS
-     VIR_DOMAIN_EVENT_IO_ERROR_LAST
+     VIR_DOMAIN_EVENT_IO_ERROR_LAST /* (Since: 0.9.10) */
 diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
-index 619717eae5..ef25764a98 100644
+index a9133793f6..231a9d8a2b 100644
 --- a/src/qemu/qemu_monitor_json.c
 +++ b/src/qemu/qemu_monitor_json.c
-@@ -898,7 +898,7 @@ static void qemuMonitorJSONHandleWatchdog(qemuMonitorPtr mon, virJSONValuePtr da
+@@ -685,7 +685,7 @@ static void qemuMonitorJSONHandleWatchdog(qemuMonitor *mon, virJSONValue *data)
  VIR_ENUM_DECL(qemuMonitorIOErrorAction);
  VIR_ENUM_IMPL(qemuMonitorIOErrorAction,
                VIR_DOMAIN_EVENT_IO_ERROR_LAST,
@@ -38,20 +38,32 @@ index 619717eae5..ef25764a98 100644
  );
  
  
-diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
-index 0a623086a4..65d5c831ec 100644
---- a/tools/virsh-domain.c
-+++ b/tools/virsh-domain.c
-@@ -13065,7 +13065,8 @@ VIR_ENUM_IMPL(virshDomainEventIOError,
-               VIR_DOMAIN_EVENT_IO_ERROR_LAST,
-               N_("none"),
-               N_("pause"),
--              N_("report"));
-+              N_("report"),
-+              N_("retry"));
- 
- static const char *
- virshDomainEventIOErrorToString(int action)
+diff --git a/tools/virsh-domain-event.c b/tools/virsh-domain-event.c
+index 6887c195a0..822d9e1e83 100644
+--- a/tools/virsh-domain-event.c
++++ b/tools/virsh-domain-event.c
+@@ -397,6 +397,10 @@ virshEventIOErrorPrint(virConnectPtr conn G_GNUC_UNUSED,
+         virshEventPrintf(opaque, _("event 'io-error' for domain '%1$s': %2$s (%3$s) report\n"),
+                          virDomainGetName(dom), srcPath, devAlias);
+         break;
++    case VIR_DOMAIN_EVENT_IO_ERROR_RETRY:
++        virshEventPrintf(opaque, _("event 'io-error' for domain '%1$s': %2$s (%3$s) report\n"),
++                         virDomainGetName(dom), srcPath, devAlias);
++        break;
+     case VIR_DOMAIN_EVENT_IO_ERROR_LAST:
+     default:
+         virshEventPrintf(opaque, _("event 'io-error' for domain '%1$s': %2$s (%3$s) unknown\n"),
+@@ -458,6 +462,10 @@ virshEventIOErrorReasonPrint(virConnectPtr conn G_GNUC_UNUSED,
+         virshEventPrintf(opaque, _("event 'io-error' for domain '%1$s': %2$s (%3$s) report due to %4$s\n"),
+                          virDomainGetName(dom), srcPath, devAlias, reason);
+         break;
++    case VIR_DOMAIN_EVENT_IO_ERROR_RETRY:
++        virshEventPrintf(opaque, _("event 'io-error' for domain '%1$s': %2$s (%3$s) report\n"),
++                         virDomainGetName(dom), srcPath, devAlias);
++        break;
+     case VIR_DOMAIN_EVENT_IO_ERROR_LAST:
+     default:
+         virshEventPrintf(opaque, _("event 'io-error' for domain '%1$s': %2$s (%3$s) unknown due to %4$s\n"),
 -- 
 2.27.0
 
diff --git a/qemu-Switch-to-accel.patch b/qemu-Switch-to-accel.patch
deleted file mode 100644
index 1e717ecd885e3bc00b9a76e0c1bf0a0fcb01428a..0000000000000000000000000000000000000000
--- a/qemu-Switch-to-accel.patch
+++ /dev/null
@@ -1,11728 +0,0 @@
-From 7fb831be7d2e9d5bd0cf362920ca0d6727390c6a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Hyman=20Huang=28=E9=BB=84=E5=8B=87=29?=
- <huangy81@chinatelecom.cn>
-Date: Sat, 22 Oct 2022 23:40:15 +0800
-Subject: [PATCH 2/2] qemu: Switch to -accel
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-We currently use -machine accel=XXX which is just a syntax sugar
-for -accel XXX. The former doesn't allow specifying arguments for
-accelerator, because all arguments passed to -machine are
-treated as arguments of machine itself.
-
-The -accel argument was introduced in QEMU commit
-v2.9.0-rc0~70^2~19 and since our minimum required version is
-newer (2.11.0) we can safely assume its existence and use it
-without any capability.
-
-cherry-pick from d20ebdda28fe254727989102bd5522aafe42cc25
-
-Resolves: https://gitlab.com/libvirt/libvirt/-/issues/233
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Signed-off-by: Hyman Huang(黄勇) <huangy81@chinatelecom.cn>
-Tested-by: Kashyap Chamarthy <kchamart@redhat.com>
-Reviewed-by: Peter Krempa <pkrempa@redhat.com>
----
- src/qemu/qemu_command.c                       | 72 +++++++++++--------
- .../aarch64-aavmf-virtio-mmio.args            |  3 +-
- tests/qemuxml2argvdata/aarch64-acpi-uefi.args |  3 +-
- .../aarch64-cpu-passthrough.args              |  3 +-
- ...fault-cpu-kvm-virt-4.2.aarch64-latest.args |  3 +-
- ...fault-cpu-tcg-virt-4.2.aarch64-latest.args |  3 +-
- .../aarch64-features-sve.aarch64-latest.args  |  3 +-
- tests/qemuxml2argvdata/aarch64-gic-host.args  |  3 +-
- .../aarch64-gic-none-tcg.args                 |  3 +-
- tests/qemuxml2argvdata/aarch64-gic-v2.args    |  3 +-
- tests/qemuxml2argvdata/aarch64-gic-v3.args    |  3 +-
- .../aarch64-kvm-32-on-64.args                 |  3 +-
- .../aarch64-noacpi-nouefi.args                |  3 +-
- .../qemuxml2argvdata/aarch64-noacpi-uefi.args |  3 +-
- ...arch64-os-firmware-efi.aarch64-latest.args |  3 +-
- .../qemuxml2argvdata/aarch64-pci-serial.args  |  3 +-
- .../aarch64-tpm.aarch64-latest.args           |  3 +-
- .../aarch64-traditional-pci.args              |  3 +-
- .../aarch64-usb-controller-nec-xhci.args      |  3 +-
- .../aarch64-usb-controller-qemu-xhci.args     |  3 +-
- .../aarch64-video-default.args                |  3 +-
- .../aarch64-video-virtio-gpu-pci.args         |  3 +-
- .../aarch64-virt-2.6-virtio-pci-default.args  |  3 +-
- .../aarch64-virt-default-nic.args             |  3 +-
- .../aarch64-virt-graphics.aarch64-latest.args |  3 +-
- .../aarch64-virt-headless.aarch64-latest.args |  3 +-
- .../qemuxml2argvdata/aarch64-virt-virtio.args |  3 +-
- .../aarch64-virtio-pci-default.args           |  3 +-
- .../aarch64-virtio-pci-manual-addresses.args  |  3 +-
- tests/qemuxml2argvdata/acpi-table.args        |  3 +-
- .../arm-vexpressa9-basic.args                 |  3 +-
- .../arm-vexpressa9-nodevs.args                |  3 +-
- .../arm-vexpressa9-virtio.args                |  3 +-
- tests/qemuxml2argvdata/arm-virt-virtio.args   |  3 +-
- tests/qemuxml2argvdata/autoindex.args         |  3 +-
- .../qemuxml2argvdata/balloon-ccw-deflate.args |  3 +-
- .../qemuxml2argvdata/balloon-device-auto.args |  3 +-
- .../balloon-device-deflate-off.args           |  3 +-
- .../balloon-device-deflate.args               |  3 +-
- .../balloon-device-period.args                |  3 +-
- tests/qemuxml2argvdata/balloon-device.args    |  3 +-
- .../balloon-mmio-deflate.args                 |  3 +-
- tests/qemuxml2argvdata/bios-nvram-secure.args |  3 +-
- tests/qemuxml2argvdata/bios-nvram.args        |  3 +-
- tests/qemuxml2argvdata/bios.args              |  3 +-
- .../blkdeviotune-group-num.args               |  3 +-
- .../blkdeviotune-max-length.args              |  3 +-
- tests/qemuxml2argvdata/blkdeviotune-max.args  |  3 +-
- tests/qemuxml2argvdata/blkiotune-device.args  |  3 +-
- tests/qemuxml2argvdata/blkiotune.args         |  3 +-
- tests/qemuxml2argvdata/boot-cdrom.args        |  3 +-
- tests/qemuxml2argvdata/boot-complex.args      |  3 +-
- tests/qemuxml2argvdata/boot-floppy-q35.args   |  3 +-
- tests/qemuxml2argvdata/boot-floppy.args       |  3 +-
- .../boot-menu-disable-drive.args              |  3 +-
- tests/qemuxml2argvdata/boot-menu-disable.args |  3 +-
- .../boot-menu-enable-with-timeout.args        |  3 +-
- tests/qemuxml2argvdata/boot-menu-enable.args  |  3 +-
- tests/qemuxml2argvdata/boot-multi.args        |  3 +-
- tests/qemuxml2argvdata/boot-network.args      |  3 +-
- tests/qemuxml2argvdata/boot-order.args        |  3 +-
- tests/qemuxml2argvdata/boot-strict.args       |  3 +-
- tests/qemuxml2argvdata/channel-guestfwd.args  |  3 +-
- tests/qemuxml2argvdata/channel-spicevmc.args  |  3 +-
- .../channel-unix-guestfwd.x86_64-2.5.0.args   |  3 +-
- .../channel-unix-guestfwd.x86_64-latest.args  |  3 +-
- .../qemuxml2argvdata/channel-virtio-auto.args |  3 +-
- .../channel-virtio-autoadd.args               |  3 +-
- .../channel-virtio-autoassign.args            |  3 +-
- .../channel-virtio-default.args               |  3 +-
- .../channel-virtio-state.args                 |  3 +-
- .../qemuxml2argvdata/channel-virtio-unix.args |  3 +-
- tests/qemuxml2argvdata/channel-virtio.args    |  3 +-
- tests/qemuxml2argvdata/chardev-reconnect.args |  3 +-
- tests/qemuxml2argvdata/clock-catchup.args     |  3 +-
- tests/qemuxml2argvdata/clock-france.args      |  3 +-
- tests/qemuxml2argvdata/clock-hpet-off.args    |  3 +-
- .../clock-localtime-basis-localtime.args      |  3 +-
- tests/qemuxml2argvdata/clock-localtime.args   |  3 +-
- .../clock-timer-armvtimer.aarch64-latest.args |  3 +-
- .../clock-timer-hyperv-rtc.args               |  3 +-
- tests/qemuxml2argvdata/clock-utc.args         |  3 +-
- tests/qemuxml2argvdata/clock-variable.args    |  3 +-
- .../qemuxml2argvdata/console-compat-auto.args |  3 +-
- .../console-compat-chardev.args               |  3 +-
- tests/qemuxml2argvdata/console-compat.args    |  3 +-
- tests/qemuxml2argvdata/console-sclp.args      |  3 +-
- .../qemuxml2argvdata/console-virtio-ccw.args  |  3 +-
- .../qemuxml2argvdata/console-virtio-many.args |  3 +-
- .../qemuxml2argvdata/console-virtio-s390.args |  3 +-
- .../console-virtio-unix.x86_64-2.5.0.args     |  3 +-
- .../console-virtio-unix.x86_64-latest.args    |  3 +-
- tests/qemuxml2argvdata/console-virtio.args    |  3 +-
- tests/qemuxml2argvdata/controller-order.args  |  3 +-
- .../controller-virtio-scsi.x86_64-latest.args |  3 +-
- tests/qemuxml2argvdata/cpu-Haswell-noTSX.args |  3 +-
- tests/qemuxml2argvdata/cpu-Haswell.args       |  3 +-
- tests/qemuxml2argvdata/cpu-Haswell2.args      |  3 +-
- tests/qemuxml2argvdata/cpu-Haswell3.args      |  3 +-
- ...u-Icelake-Server-pconfig.x86_64-3.1.0.args |  3 +-
- ...-Icelake-Server-pconfig.x86_64-latest.args |  3 +-
- tests/qemuxml2argvdata/cpu-cache-disable.args |  3 +-
- .../qemuxml2argvdata/cpu-cache-disable2.args  |  3 +-
- .../qemuxml2argvdata/cpu-cache-disable3.args  |  3 +-
- .../cpu-cache-emulate-l3.args                 |  3 +-
- .../cpu-cache-passthrough.args                |  3 +-
- .../cpu-cache-passthrough2.args               |  3 +-
- .../cpu-check-default-none.args               |  3 +-
- .../cpu-check-default-none2.args              |  3 +-
- .../cpu-check-default-partial.args            |  3 +-
- .../cpu-check-default-partial2.args           |  3 +-
- tests/qemuxml2argvdata/cpu-check-none.args    |  3 +-
- tests/qemuxml2argvdata/cpu-eoi-disabled.args  |  3 +-
- tests/qemuxml2argvdata/cpu-eoi-enabled.args   |  3 +-
- tests/qemuxml2argvdata/cpu-exact1.args        |  3 +-
- .../cpu-exact2-nofallback.args                |  3 +-
- tests/qemuxml2argvdata/cpu-exact2.args        |  3 +-
- tests/qemuxml2argvdata/cpu-fallback.args      |  3 +-
- tests/qemuxml2argvdata/cpu-host-kvmclock.args |  3 +-
- .../qemuxml2argvdata/cpu-host-model-cmt.args  |  3 +-
- .../cpu-host-model-cmt.x86_64-4.0.0.args      |  3 +-
- .../cpu-host-model-fallback.args              |  3 +-
- .../cpu-host-model-vendor.args                |  3 +-
- tests/qemuxml2argvdata/cpu-host-model.args    |  3 +-
- .../cpu-host-passthrough-features.args        |  3 +-
- .../cpu-host-passthrough.args                 |  3 +-
- .../qemuxml2argvdata/cpu-hotplug-startup.args |  3 +-
- tests/qemuxml2argvdata/cpu-kvmclock.args      |  3 +-
- tests/qemuxml2argvdata/cpu-minimum1.args      |  3 +-
- tests/qemuxml2argvdata/cpu-minimum2.args      |  3 +-
- .../cpu-no-removed-features.args              |  3 +-
- tests/qemuxml2argvdata/cpu-numa-disjoint.args |  3 +-
- .../qemuxml2argvdata/cpu-numa-memshared.args  |  3 +-
- .../cpu-numa-no-memory-element.args           |  3 +-
- tests/qemuxml2argvdata/cpu-numa1.args         |  3 +-
- tests/qemuxml2argvdata/cpu-numa2.args         |  3 +-
- tests/qemuxml2argvdata/cpu-s390-features.args |  3 +-
- tests/qemuxml2argvdata/cpu-s390-zEC12.args    |  3 +-
- tests/qemuxml2argvdata/cpu-strict1.args       |  3 +-
- tests/qemuxml2argvdata/cpu-topology1.args     |  3 +-
- tests/qemuxml2argvdata/cpu-topology2.args     |  3 +-
- tests/qemuxml2argvdata/cpu-topology3.args     |  3 +-
- .../cpu-translation.x86_64-4.0.0.args         |  3 +-
- .../cpu-translation.x86_64-latest.args        |  3 +-
- tests/qemuxml2argvdata/cpu-tsc-frequency.args |  3 +-
- .../cpu-tsc-frequency.x86_64-4.0.0.args       |  3 +-
- tests/qemuxml2argvdata/cputune-numatune.args  |  3 +-
- .../qemuxml2argvdata/cputune-zero-shares.args |  3 +-
- tests/qemuxml2argvdata/cputune.args           |  3 +-
- tests/qemuxml2argvdata/debug-threads.args     |  3 +-
- .../default-kvm-host-arch.args                |  3 +-
- .../default-qemu-host-arch.args               |  3 +-
- ...ult-video-type-aarch64.aarch64-latest.args |  3 +-
- ...default-video-type-ppc64.ppc64-latest.args |  3 +-
- ...ult-video-type-riscv64.riscv64-latest.args |  3 +-
- ...default-video-type-s390x.s390x-latest.args |  3 +-
- tests/qemuxml2argvdata/disk-aio.args          |  3 +-
- .../disk-aio.x86_64-2.12.0.args               |  3 +-
- .../disk-aio.x86_64-latest.args               |  3 +-
- ...-backing-chains-noindex.x86_64-2.12.0.args |  3 +-
- ...-backing-chains-noindex.x86_64-latest.args |  3 +-
- tests/qemuxml2argvdata/disk-blockio.args      |  3 +-
- tests/qemuxml2argvdata/disk-boot-cdrom.args   |  3 +-
- tests/qemuxml2argvdata/disk-boot-disk.args    |  3 +-
- .../disk-cache.x86_64-1.5.3.args              |  3 +-
- .../disk-cache.x86_64-2.12.0.args             |  3 +-
- .../disk-cache.x86_64-2.6.0.args              |  3 +-
- .../disk-cache.x86_64-2.7.0.args              |  3 +-
- .../disk-cache.x86_64-latest.args             |  3 +-
- .../disk-cdrom-bus-other.x86_64-latest.args   |  3 +-
- ...m-empty-network-invalid.x86_64-latest.args |  3 +-
- .../qemuxml2argvdata/disk-cdrom-network.args  |  3 +-
- .../disk-cdrom-network.x86_64-2.12.0.args     |  3 +-
- .../disk-cdrom-network.x86_64-latest.args     |  3 +-
- tests/qemuxml2argvdata/disk-cdrom-tray.args   |  3 +-
- .../disk-cdrom-tray.x86_64-2.12.0.args        |  3 +-
- .../disk-cdrom-tray.x86_64-latest.args        |  3 +-
- tests/qemuxml2argvdata/disk-cdrom.args        |  3 +-
- .../disk-cdrom.x86_64-2.12.0.args             |  3 +-
- .../disk-cdrom.x86_64-latest.args             |  3 +-
- tests/qemuxml2argvdata/disk-copy_on_read.args |  3 +-
- .../disk-copy_on_read.x86_64-2.12.0.args      |  3 +-
- .../disk-copy_on_read.x86_64-latest.args      |  3 +-
- .../qemuxml2argvdata/disk-detect-zeroes.args  |  3 +-
- .../disk-detect-zeroes.x86_64-2.12.0.args     |  3 +-
- .../disk-detect-zeroes.x86_64-latest.args     |  3 +-
- tests/qemuxml2argvdata/disk-discard.args      |  3 +-
- .../disk-error-policy-s390x.s390x-2.12.0.args |  3 +-
- .../disk-error-policy-s390x.s390x-latest.args |  3 +-
- tests/qemuxml2argvdata/disk-error-policy.args |  3 +-
- .../disk-error-policy.x86_64-2.12.0.args      |  3 +-
- .../disk-error-policy.x86_64-latest.args      |  3 +-
- .../disk-floppy-q35-2_11.x86_64-2.12.0.args   |  3 +-
- .../disk-floppy-q35-2_11.x86_64-latest.args   |  3 +-
- .../disk-floppy-q35-2_9.x86_64-2.12.0.args    |  3 +-
- .../disk-floppy-q35-2_9.x86_64-latest.args    |  3 +-
- tests/qemuxml2argvdata/disk-floppy-tray.args  |  3 +-
- tests/qemuxml2argvdata/disk-floppy.args       |  3 +-
- .../disk-floppy.x86_64-2.12.0.args            |  3 +-
- .../disk-floppy.x86_64-latest.args            |  3 +-
- tests/qemuxml2argvdata/disk-fmt-qcow.args     |  3 +-
- tests/qemuxml2argvdata/disk-geometry.args     |  3 +-
- ...sk-hostdev-scsi-virtio-iscsi-auth-AES.args |  3 +-
- tests/qemuxml2argvdata/disk-ide-split.args    |  3 +-
- tests/qemuxml2argvdata/disk-ide-wwn.args      |  3 +-
- tests/qemuxml2argvdata/disk-ioeventfd.args    |  3 +-
- tests/qemuxml2argvdata/disk-iscsi.args        |  3 +-
- .../disk-network-gluster.args                 |  3 +-
- .../disk-network-gluster.x86_64-2.12.0.args   |  3 +-
- .../disk-network-gluster.x86_64-latest.args   |  3 +-
- .../disk-network-http.x86_64-latest.args      |  3 +-
- .../disk-network-iscsi-modern.args            |  3 +-
- .../qemuxml2argvdata/disk-network-iscsi.args  |  3 +-
- .../disk-network-iscsi.x86_64-2.12.0.args     |  3 +-
- .../disk-network-iscsi.x86_64-latest.args     |  3 +-
- tests/qemuxml2argvdata/disk-network-nbd.args  |  3 +-
- .../disk-network-nbd.x86_64-2.12.0.args       |  3 +-
- .../disk-network-nbd.x86_64-latest.args       |  3 +-
- .../disk-network-rbd.x86_64-2.12.0.args       |  3 +-
- .../disk-network-rbd.x86_64-2.5.0.args        |  3 +-
- .../disk-network-rbd.x86_64-latest.args       |  3 +-
- .../disk-network-sheepdog.args                |  3 +-
- .../disk-network-sheepdog.x86_64-2.12.0.args  |  3 +-
- .../disk-network-sheepdog.x86_64-latest.args  |  3 +-
- .../disk-network-source-auth.args             |  3 +-
- ...isk-network-source-auth.x86_64-2.12.0.args |  3 +-
- ...isk-network-source-auth.x86_64-latest.args |  3 +-
- .../disk-network-tlsx509.args                 |  3 +-
- .../disk-network-tlsx509.x86_64-2.12.0.args   |  3 +-
- .../disk-network-tlsx509.x86_64-latest.args   |  3 +-
- tests/qemuxml2argvdata/disk-network-vxhs.args |  3 +-
- tests/qemuxml2argvdata/disk-no-boot.args      |  3 +-
- .../disk-nvme.x86_64-latest.args              |  3 +-
- tests/qemuxml2argvdata/disk-order.args        |  3 +-
- .../qemuxml2argvdata/disk-readonly-disk.args  |  3 +-
- .../disk-readonly-disk.x86_64-2.12.0.args     |  3 +-
- .../disk-readonly-disk.x86_64-latest.args     |  3 +-
- tests/qemuxml2argvdata/disk-sata-device.args  |  3 +-
- .../disk-scsi-device-auto.x86_64-1.5.3.args   |  3 +-
- .../disk-scsi-device-auto.x86_64-latest.args  |  3 +-
- .../disk-scsi-disk-split.args                 |  3 +-
- .../qemuxml2argvdata/disk-scsi-disk-vpd.args  |  3 +-
- .../qemuxml2argvdata/disk-scsi-disk-wwn.args  |  3 +-
- .../disk-scsi-lun-passthrough.args            |  3 +-
- .../disk-scsi.x86_64-latest.args              |  3 +-
- tests/qemuxml2argvdata/disk-serial.args       |  3 +-
- .../disk-shared.x86_64-2.12.0.args            |  3 +-
- .../disk-shared.x86_64-latest.args            |  3 +-
- .../disk-slices.x86_64-latest.args            |  3 +-
- tests/qemuxml2argvdata/disk-snapshot.args     |  3 +-
- .../disk-source-pool-mode.args                |  3 +-
- tests/qemuxml2argvdata/disk-source-pool.args  |  3 +-
- .../disk-usb-device-removable.args            |  3 +-
- tests/qemuxml2argvdata/disk-usb-device.args   |  3 +-
- .../disk-virtio-ccw-many.args                 |  3 +-
- tests/qemuxml2argvdata/disk-virtio-ccw.args   |  3 +-
- .../qemuxml2argvdata/disk-virtio-queues.args  |  3 +-
- .../disk-virtio-s390-zpci.args                |  3 +-
- tests/qemuxml2argvdata/disk-virtio-s390.args  |  3 +-
- ...irtio-scsi-reservations.x86_64-2.12.0.args |  3 +-
- ...irtio-scsi-reservations.x86_64-latest.args |  3 +-
- tests/qemuxml2argvdata/disk-virtio.args       |  3 +-
- .../encrypted-disk-usage.args                 |  3 +-
- tests/qemuxml2argvdata/encrypted-disk.args    |  3 +-
- .../eoi-disabled.x86_64-2.7.0.args            |  3 +-
- .../eoi-disabled.x86_64-4.0.0.args            |  3 +-
- .../eoi-disabled.x86_64-latest.args           |  3 +-
- .../eoi-enabled.x86_64-2.7.0.args             |  3 +-
- .../eoi-enabled.x86_64-4.0.0.args             |  3 +-
- .../eoi-enabled.x86_64-latest.args            |  3 +-
- tests/qemuxml2argvdata/event_idx.args         |  3 +-
- .../fd-memory-no-numa-topology.args           |  3 +-
- .../fd-memory-numa-topology.args              |  3 +-
- .../fd-memory-numa-topology2.args             |  3 +-
- .../fd-memory-numa-topology3.args             |  3 +-
- tests/qemuxml2argvdata/fips-enabled.args      |  3 +-
- tests/qemuxml2argvdata/floppy-drive-fat.args  |  3 +-
- .../floppy-drive-fat.x86_64-2.12.0.args       |  3 +-
- .../floppy-drive-fat.x86_64-latest.args       |  3 +-
- tests/qemuxml2argvdata/fs9p-ccw.args          |  3 +-
- .../fs9p-ccw.s390x-latest.args                |  3 +-
- tests/qemuxml2argvdata/fs9p.args              |  3 +-
- .../qemuxml2argvdata/fs9p.x86_64-latest.args  |  3 +-
- .../genid-auto.x86_64-latest.args             |  3 +-
- .../qemuxml2argvdata/genid.x86_64-latest.args |  3 +-
- ...egl-headless-rendernode.x86_64-latest.args |  3 +-
- .../graphics-egl-headless.args                |  3 +-
- .../graphics-egl-headless.x86_64-latest.args  |  3 +-
- .../graphics-sdl-fullscreen.args              |  3 +-
- tests/qemuxml2argvdata/graphics-sdl.args      |  3 +-
- .../graphics-spice-agent-file-xfer.args       |  3 +-
- .../graphics-spice-agentmouse.args            |  3 +-
- .../graphics-spice-auto-socket-cfg.args       |  3 +-
- .../graphics-spice-auto-socket.args           |  3 +-
- .../graphics-spice-compression.args           |  3 +-
- .../graphics-spice-egl-headless.args          |  3 +-
- ...pice-gl-auto-rendernode.x86_64-latest.args |  3 +-
- .../graphics-spice-no-args.args               |  3 +-
- .../graphics-spice-qxl-vga.args               |  3 +-
- .../qemuxml2argvdata/graphics-spice-sasl.args |  3 +-
- .../graphics-spice-socket.args                |  3 +-
- .../graphics-spice-timeout.args               |  3 +-
- .../graphics-spice-usb-redir.args             |  3 +-
- tests/qemuxml2argvdata/graphics-spice.args    |  3 +-
- .../graphics-vnc-auto-socket-cfg.args         |  3 +-
- .../graphics-vnc-auto-socket.args             |  3 +-
- .../graphics-vnc-egl-headless.args            |  3 +-
- .../graphics-vnc-no-listen-attr.args          |  3 +-
- tests/qemuxml2argvdata/graphics-vnc-none.args |  3 +-
- .../qemuxml2argvdata/graphics-vnc-policy.args |  3 +-
- .../graphics-vnc-remove-generated-socket.args |  3 +-
- tests/qemuxml2argvdata/graphics-vnc-sasl.args |  3 +-
- .../graphics-vnc-socket-new-cmdline.args      |  3 +-
- .../qemuxml2argvdata/graphics-vnc-socket.args |  3 +-
- ...graphics-vnc-tls-secret.x86_64-latest.args |  3 +-
- tests/qemuxml2argvdata/graphics-vnc-tls.args  |  3 +-
- .../graphics-vnc-tls.x86_64-2.4.0.args        |  3 +-
- .../graphics-vnc-tls.x86_64-latest.args       |  3 +-
- .../graphics-vnc-websocket.args               |  3 +-
- tests/qemuxml2argvdata/graphics-vnc.args      |  3 +-
- ...tdev-mdev-display-ramfb.x86_64-latest.args |  3 +-
- ...play-spice-egl-headless.x86_64-latest.args |  3 +-
- ...ev-display-spice-opengl.x86_64-latest.args |  3 +-
- ...isplay-vnc-egl-headless.x86_64-latest.args |  3 +-
- ...ostdev-mdev-display-vnc.x86_64-latest.args |  3 +-
- .../hostdev-mdev-precreated.args              |  3 +-
- .../hostdev-pci-address-device.args           |  3 +-
- .../hostdev-pci-address-unassigned.args       |  3 +-
- .../qemuxml2argvdata/hostdev-pci-address.args |  3 +-
- .../hostdev-pci-multifunction.args            |  3 +-
- .../hostdev-scsi-lsi-iscsi-auth.args          |  3 +-
- .../hostdev-scsi-lsi-iscsi.args               |  3 +-
- tests/qemuxml2argvdata/hostdev-scsi-lsi.args  |  3 +-
- .../hostdev-scsi-readonly.args                |  3 +-
- .../hostdev-scsi-vhost-scsi-ccw.args          |  3 +-
- .../hostdev-scsi-vhost-scsi-pci.args          |  3 +-
- .../hostdev-scsi-vhost-scsi-pcie.args         |  3 +-
- .../hostdev-scsi-virtio-iscsi-auth.args       |  3 +-
- .../hostdev-scsi-virtio-iscsi.args            |  3 +-
- .../hostdev-scsi-virtio-scsi.args             |  3 +-
- ...tdev-subsys-mdev-vfio-ap.s390x-latest.args |  3 +-
- ...ubsys-mdev-vfio-ccw-boot.s390x-latest.args |  3 +-
- .../hostdev-subsys-mdev-vfio-ccw.args         |  3 +-
- .../hostdev-usb-address-device-boot.args      |  3 +-
- .../hostdev-usb-address-device.args           |  3 +-
- .../qemuxml2argvdata/hostdev-usb-address.args |  3 +-
- .../hostdev-vfio-multidomain.args             |  3 +-
- .../hostdev-vfio-zpci-autogenerate.args       |  3 +-
- .../hostdev-vfio-zpci-boundaries.args         |  3 +-
- .../hostdev-vfio-zpci-multidomain-many.args   |  3 +-
- tests/qemuxml2argvdata/hostdev-vfio-zpci.args |  3 +-
- tests/qemuxml2argvdata/hostdev-vfio.args      |  3 +-
- tests/qemuxml2argvdata/hotplug-base.args      |  3 +-
- .../hugepages-default-2M.args                 |  3 +-
- .../hugepages-default-system-size.args        |  3 +-
- tests/qemuxml2argvdata/hugepages-default.args |  3 +-
- .../qemuxml2argvdata/hugepages-memaccess.args |  3 +-
- .../hugepages-memaccess2.args                 |  3 +-
- tests/qemuxml2argvdata/hugepages-nodeset.args |  3 +-
- .../hugepages-numa-default-2M.args            |  3 +-
- .../hugepages-numa-default-dimm.args          |  3 +-
- .../hugepages-numa-default.args               |  3 +-
- .../hugepages-numa-nodeset-part.args          |  3 +-
- .../hugepages-numa-nodeset.args               |  3 +-
- .../hugepages-nvdimm.x86_64-latest.args       |  3 +-
- tests/qemuxml2argvdata/hugepages-shared.args  |  3 +-
- .../hyperv-off.x86_64-4.0.0.args              |  3 +-
- .../hyperv-off.x86_64-latest.args             |  3 +-
- .../hyperv-panic.x86_64-4.0.0.args            |  3 +-
- .../hyperv-panic.x86_64-latest.args           |  3 +-
- .../hyperv-stimer-direct.x86_64-latest.args   |  3 +-
- .../qemuxml2argvdata/hyperv.x86_64-4.0.0.args |  3 +-
- .../hyperv.x86_64-latest.args                 |  3 +-
- .../qemuxml2argvdata/input-usbmouse-addr.args |  3 +-
- tests/qemuxml2argvdata/input-usbmouse.args    |  3 +-
- tests/qemuxml2argvdata/input-usbtablet.args   |  3 +-
- tests/qemuxml2argvdata/input-virtio-ccw.args  |  3 +-
- ...ntel-iommu-caching-mode.x86_64-latest.args |  3 +-
- ...ntel-iommu-device-iotlb.x86_64-latest.args |  3 +-
- .../intel-iommu-eim.x86_64-latest.args        |  3 +-
- .../intel-iommu.x86_64-2.6.0.args             |  3 +-
- .../intel-iommu.x86_64-latest.args            |  3 +-
- .../iommu-smmuv3.aarch64-latest.args          |  3 +-
- .../iothreads-disk-virtio-ccw.args            |  3 +-
- tests/qemuxml2argvdata/iothreads-disk.args    |  3 +-
- .../iothreads-ids-partial.args                |  3 +-
- tests/qemuxml2argvdata/iothreads-ids.args     |  3 +-
- ...othreads-virtio-scsi-ccw.s390x-latest.args |  3 +-
- ...threads-virtio-scsi-pci.x86_64-latest.args |  3 +-
- tests/qemuxml2argvdata/iothreads.args         |  3 +-
- tests/qemuxml2argvdata/kvm-features-off.args  |  3 +-
- tests/qemuxml2argvdata/kvm-features.args      |  3 +-
- tests/qemuxml2argvdata/kvm-pit-delay.args     |  3 +-
- tests/qemuxml2argvdata/kvm-pit-discard.args   |  3 +-
- .../kvmclock+eoi-disabled.x86_64-2.7.0.args   |  3 +-
- .../kvmclock+eoi-disabled.x86_64-4.0.0.args   |  3 +-
- .../kvmclock+eoi-disabled.x86_64-latest.args  |  3 +-
- tests/qemuxml2argvdata/kvmclock.args          |  3 +-
- .../launch-security-sev.x86_64-2.12.0.args    |  3 +-
- .../luks-disks-source-qcow2.args              |  3 +-
- ...luks-disks-source-qcow2.x86_64-latest.args |  3 +-
- tests/qemuxml2argvdata/luks-disks-source.args |  3 +-
- tests/qemuxml2argvdata/luks-disks.args        |  3 +-
- .../mach-virt-console-virtio.args             |  3 +-
- .../mach-virt-serial-native.args              |  3 +-
- .../mach-virt-serial-pci.args                 |  3 +-
- .../mach-virt-serial-usb.args                 |  3 +-
- .../machine-aeskeywrap-off-cap.args           |  3 +-
- .../machine-aeskeywrap-off-caps.args          |  3 +-
- .../machine-aeskeywrap-on-cap.args            |  3 +-
- .../machine-aeskeywrap-on-caps.args           |  3 +-
- tests/qemuxml2argvdata/machine-aliases1.args  |  3 +-
- tests/qemuxml2argvdata/machine-aliases2.args  |  3 +-
- tests/qemuxml2argvdata/machine-core-off.args  |  3 +-
- tests/qemuxml2argvdata/machine-core-on.args   |  3 +-
- .../machine-deakeywrap-off-cap.args           |  3 +-
- .../machine-deakeywrap-off-caps.args          |  3 +-
- .../machine-deakeywrap-on-cap.args            |  3 +-
- .../machine-deakeywrap-on-caps.args           |  3 +-
- .../machine-keywrap-none-caps.args            |  3 +-
- .../machine-keywrap-none.args                 |  3 +-
- ...ine-loadparm-multiple-disks-nets-s390.args |  3 +-
- .../machine-loadparm-net-s390.args            |  3 +-
- .../machine-loadparm-s390.args                |  3 +-
- tests/qemuxml2argvdata/machine-smm-opt.args   |  3 +-
- .../qemuxml2argvdata/machine-vmport-opt.args  |  3 +-
- tests/qemuxml2argvdata/master-key.args        |  3 +-
- ...memory-default-hugepage.x86_64-latest.args |  3 +-
- .../memfd-memory-numa.x86_64-latest.args      |  3 +-
- .../memory-hotplug-dimm-addr.args             |  3 +-
- .../qemuxml2argvdata/memory-hotplug-dimm.args |  3 +-
- ...y-hotplug-nvdimm-access.x86_64-latest.args |  3 +-
- ...ry-hotplug-nvdimm-align.x86_64-latest.args |  3 +-
- ...ry-hotplug-nvdimm-label.x86_64-latest.args |  3 +-
- ...ory-hotplug-nvdimm-pmem.x86_64-latest.args |  3 +-
- .../memory-hotplug-nvdimm-ppc64.args          |  3 +-
- ...ory-hotplug-nvdimm-ppc64.ppc64-latest.args |  3 +-
- ...hotplug-nvdimm-readonly.x86_64-latest.args |  3 +-
- .../memory-hotplug-nvdimm.x86_64-latest.args  |  3 +-
- .../memory-hotplug-ppc64-nonuma.args          |  3 +-
- tests/qemuxml2argvdata/memory-hotplug.args    |  3 +-
- tests/qemuxml2argvdata/memtune-unlimited.args |  3 +-
- tests/qemuxml2argvdata/memtune.args           |  3 +-
- .../migrate-numa-unaligned.args               |  3 +-
- tests/qemuxml2argvdata/migrate.args           |  3 +-
- .../minimal-msg-timestamp.args                |  3 +-
- tests/qemuxml2argvdata/minimal-sandbox.args   |  3 +-
- tests/qemuxml2argvdata/minimal.args           |  3 +-
- tests/qemuxml2argvdata/misc-acpi.args         |  3 +-
- tests/qemuxml2argvdata/misc-disable-s3.args   |  3 +-
- .../misc-disable-suspends.args                |  3 +-
- tests/qemuxml2argvdata/misc-enable-s4.args    |  3 +-
- tests/qemuxml2argvdata/misc-no-reboot.args    |  3 +-
- tests/qemuxml2argvdata/misc-uuid.args         |  3 +-
- .../mlock-off.x86_64-3.0.0.args               |  3 +-
- .../mlock-off.x86_64-latest.args              |  3 +-
- .../mlock-on.x86_64-3.0.0.args                |  3 +-
- .../mlock-on.x86_64-latest.args               |  3 +-
- tests/qemuxml2argvdata/monitor-json.args      |  3 +-
- .../multifunction-pci-device.args             |  3 +-
- tests/qemuxml2argvdata/name-escape.args       |  3 +-
- tests/qemuxml2argvdata/net-client.args        |  3 +-
- tests/qemuxml2argvdata/net-eth-hostip.args    |  3 +-
- tests/qemuxml2argvdata/net-eth-ifname.args    |  3 +-
- tests/qemuxml2argvdata/net-eth-names.args     |  3 +-
- .../net-eth-unmanaged-tap.args                |  3 +-
- tests/qemuxml2argvdata/net-eth.args           |  3 +-
- .../net-hostdev-bootorder.args                |  3 +-
- .../net-hostdev-multidomain.args              |  3 +-
- .../net-hostdev-vfio-multidomain.args         |  3 +-
- tests/qemuxml2argvdata/net-hostdev-vfio.args  |  3 +-
- tests/qemuxml2argvdata/net-hostdev.args       |  3 +-
- tests/qemuxml2argvdata/net-many-models.args   |  3 +-
- tests/qemuxml2argvdata/net-mcast.args         |  3 +-
- tests/qemuxml2argvdata/net-server.args        |  3 +-
- tests/qemuxml2argvdata/net-udp.args           |  3 +-
- tests/qemuxml2argvdata/net-user-addr.args     |  3 +-
- tests/qemuxml2argvdata/net-user.args          |  3 +-
- .../net-user.x86_64-4.0.0.args                |  3 +-
- .../net-vhostuser-multiq.args                 |  3 +-
- tests/qemuxml2argvdata/net-vhostuser.args     |  3 +-
- .../net-vhostuser.x86_64-2.5.0.args           |  3 +-
- .../net-vhostuser.x86_64-latest.args          |  3 +-
- tests/qemuxml2argvdata/net-virtio-ccw.args    |  3 +-
- tests/qemuxml2argvdata/net-virtio-device.args |  3 +-
- .../net-virtio-disable-offloads.args          |  3 +-
- tests/qemuxml2argvdata/net-virtio-netdev.args |  3 +-
- .../net-virtio-rxtxqueuesize.args             |  3 +-
- tests/qemuxml2argvdata/net-virtio-s390.args   |  3 +-
- .../qemuxml2argvdata/net-virtio-teaming.args  |  3 +-
- tests/qemuxml2argvdata/net-virtio.args        |  3 +-
- tests/qemuxml2argvdata/nosharepages.args      |  3 +-
- .../numad-auto-memory-vcpu-cpuset.args        |  3 +-
- ...o-memory-vcpu-no-cpuset-and-placement.args |  3 +-
- .../numad-auto-vcpu-static-numatune.args      |  3 +-
- .../numad-static-memory-auto-vcpu.args        |  3 +-
- tests/qemuxml2argvdata/numad.args             |  3 +-
- .../numatune-auto-nodeset-invalid.args        |  3 +-
- .../numatune-auto-prefer.args                 |  3 +-
- .../qemuxml2argvdata/numatune-distances.args  |  3 +-
- .../numatune-memnode-no-memory.args           |  3 +-
- tests/qemuxml2argvdata/numatune-memnode.args  |  3 +-
- tests/qemuxml2argvdata/numatune-memory.args   |  3 +-
- .../os-firmware-bios.x86_64-latest.args       |  3 +-
- ...os-firmware-efi-secboot.x86_64-latest.args |  3 +-
- .../os-firmware-efi.x86_64-latest.args        |  3 +-
- .../qemuxml2argvdata/pages-dimm-discard.args  |  3 +-
- .../pages-discard-hugepages.args              |  3 +-
- tests/qemuxml2argvdata/pages-discard.args     |  3 +-
- tests/qemuxml2argvdata/panic-double.args      |  3 +-
- tests/qemuxml2argvdata/panic-no-address.args  |  3 +-
- tests/qemuxml2argvdata/panic.args             |  3 +-
- .../parallel-parport-chardev.args             |  3 +-
- .../parallel-tcp-chardev.args                 |  3 +-
- .../parallel-unix-chardev.x86_64-2.5.0.args   |  3 +-
- .../parallel-unix-chardev.x86_64-latest.args  |  3 +-
- tests/qemuxml2argvdata/pci-autoadd-addr.args  |  3 +-
- tests/qemuxml2argvdata/pci-autoadd-idx.args   |  3 +-
- tests/qemuxml2argvdata/pci-autofill-addr.args |  3 +-
- .../pci-bridge-many-disks.args                |  3 +-
- tests/qemuxml2argvdata/pci-bridge.args        |  3 +-
- tests/qemuxml2argvdata/pci-expander-bus.args  |  3 +-
- tests/qemuxml2argvdata/pci-many.args          |  3 +-
- tests/qemuxml2argvdata/pci-rom-disabled.args  |  3 +-
- tests/qemuxml2argvdata/pci-rom.args           |  3 +-
- .../pci-serial-dev-chardev.args               |  3 +-
- tests/qemuxml2argvdata/pcie-expander-bus.args |  3 +-
- .../pcie-root-port-model-generic.args         |  3 +-
- .../pcie-root-port-model-ioh3420.args         |  3 +-
- tests/qemuxml2argvdata/pcie-root-port.args    |  3 +-
- tests/qemuxml2argvdata/pcie-root.args         |  3 +-
- .../pcie-switch-downstream-port.args          |  3 +-
- .../pcie-switch-upstream-port.args            |  3 +-
- tests/qemuxml2argvdata/pcihole64-q35.args     |  3 +-
- tests/qemuxml2argvdata/pcihole64.args         |  3 +-
- tests/qemuxml2argvdata/pmu-feature-off.args   |  3 +-
- tests/qemuxml2argvdata/pmu-feature.args       |  3 +-
- tests/qemuxml2argvdata/ppc-dtb.args           |  3 +-
- ...ault-cpu-kvm-pseries-2.7.ppc64-latest.args |  3 +-
- ...ault-cpu-kvm-pseries-3.1.ppc64-latest.args |  3 +-
- ...ault-cpu-kvm-pseries-4.2.ppc64-latest.args |  3 +-
- ...ault-cpu-tcg-pseries-2.7.ppc64-latest.args |  3 +-
- ...ault-cpu-tcg-pseries-3.1.ppc64-latest.args |  3 +-
- ...ault-cpu-tcg-pseries-4.2.ppc64-latest.args |  3 +-
- .../ppc64-pseries-graphics.ppc64-latest.args  |  3 +-
- .../ppc64-pseries-headless.ppc64-latest.args  |  3 +-
- .../ppc64-usb-controller-legacy.args          |  3 +-
- .../ppc64-usb-controller-qemu-xhci.args       |  3 +-
- .../ppc64-usb-controller.args                 |  3 +-
- tests/qemuxml2argvdata/ppce500-serial.args    |  3 +-
- tests/qemuxml2argvdata/pseries-basic.args     |  3 +-
- .../pseries-console-virtio.args               |  3 +-
- .../pseries-cpu-compat-power9.args            |  3 +-
- .../qemuxml2argvdata/pseries-cpu-compat.args  |  3 +-
- tests/qemuxml2argvdata/pseries-cpu-exact.args |  3 +-
- tests/qemuxml2argvdata/pseries-cpu-le.args    |  3 +-
- tests/qemuxml2argvdata/pseries-features.args  |  3 +-
- .../qemuxml2argvdata/pseries-hostdevs-1.args  |  3 +-
- .../qemuxml2argvdata/pseries-hostdevs-2.args  |  3 +-
- .../qemuxml2argvdata/pseries-hostdevs-3.args  |  3 +-
- .../pseries-machine-max-cpu-compat.args       |  3 +-
- .../pseries-many-buses-1.args                 |  3 +-
- .../pseries-many-buses-2.args                 |  3 +-
- .../pseries-many-devices.args                 |  3 +-
- tests/qemuxml2argvdata/pseries-nvram.args     |  3 +-
- .../pseries-panic-missing.args                |  3 +-
- .../pseries-panic-no-address.args             |  3 +-
- .../pseries-phb-default-missing.args          |  3 +-
- .../pseries-phb-numa-node.args                |  3 +-
- .../qemuxml2argvdata/pseries-phb-simple.args  |  3 +-
- .../pseries-serial-native.args                |  3 +-
- .../qemuxml2argvdata/pseries-serial-pci.args  |  3 +-
- .../qemuxml2argvdata/pseries-serial-usb.args  |  3 +-
- .../qemuxml2argvdata/pseries-usb-default.args |  3 +-
- tests/qemuxml2argvdata/pseries-usb-kbd.args   |  3 +-
- tests/qemuxml2argvdata/pseries-usb-multi.args |  3 +-
- .../pseries-vio-user-assigned.args            |  3 +-
- tests/qemuxml2argvdata/pseries-vio.args       |  3 +-
- .../pv-spinlock-disabled.x86_64-2.7.0.args    |  3 +-
- .../pv-spinlock-disabled.x86_64-4.0.0.args    |  3 +-
- .../pv-spinlock-disabled.x86_64-latest.args   |  3 +-
- .../pv-spinlock-enabled.x86_64-2.7.0.args     |  3 +-
- .../pv-spinlock-enabled.x86_64-4.0.0.args     |  3 +-
- .../pv-spinlock-enabled.x86_64-latest.args    |  3 +-
- tests/qemuxml2argvdata/q35-acpi-nouefi.args   |  3 +-
- tests/qemuxml2argvdata/q35-acpi-uefi.args     |  3 +-
- .../q35-default-devices-only.args             |  3 +-
- tests/qemuxml2argvdata/q35-multifunction.args |  3 +-
- tests/qemuxml2argvdata/q35-noacpi-nouefi.args |  3 +-
- .../q35-pci-force-address.args                |  3 +-
- tests/qemuxml2argvdata/q35-pcie-autoadd.args  |  3 +-
- tests/qemuxml2argvdata/q35-pcie.args          |  3 +-
- .../q35-pm-disable-fallback.args              |  3 +-
- tests/qemuxml2argvdata/q35-pm-disable.args    |  3 +-
- tests/qemuxml2argvdata/q35-usb2-multi.args    |  3 +-
- tests/qemuxml2argvdata/q35-usb2-reorder.args  |  3 +-
- tests/qemuxml2argvdata/q35-usb2.args          |  3 +-
- .../q35-virt-manager-basic.args               |  3 +-
- tests/qemuxml2argvdata/q35-virtio-pci.args    |  3 +-
- tests/qemuxml2argvdata/q35.args               |  3 +-
- tests/qemuxml2argvdata/qemu-ns-alt.args       |  3 +-
- .../qemu-ns-commandline-ns0.args              |  3 +-
- .../qemu-ns-commandline-ns1.args              |  3 +-
- .../qemuxml2argvdata/qemu-ns-commandline.args |  3 +-
- .../qemu-ns-domain-commandline-ns0.args       |  3 +-
- .../qemu-ns-domain-commandline.args           |  3 +-
- .../qemuxml2argvdata/qemu-ns-domain-ns0.args  |  3 +-
- tests/qemuxml2argvdata/qemu-ns-no-env.args    |  3 +-
- .../qemu-ns.x86_64-4.0.0.args                 |  3 +-
- .../qemu-ns.x86_64-latest.args                |  3 +-
- .../reboot-timeout-disabled.args              |  3 +-
- .../reboot-timeout-enabled.args               |  3 +-
- tests/qemuxml2argvdata/restore-v2-fd.args     |  3 +-
- tests/qemuxml2argvdata/restore-v2.args        |  3 +-
- .../riscv64-virt-graphics.riscv64-latest.args |  3 +-
- .../riscv64-virt-headless.riscv64-latest.args |  3 +-
- tests/qemuxml2argvdata/riscv64-virt-pci.args  |  3 +-
- tests/qemuxml2argvdata/riscv64-virt.args      |  3 +-
- .../s390-allow-bogus-usb-controller.args      |  3 +-
- .../s390-allow-bogus-usb-none.args            |  3 +-
- ...t-cpu-kvm-ccw-virtio-2.7.s390x-latest.args |  3 +-
- ...t-cpu-kvm-ccw-virtio-4.2.s390x-latest.args |  3 +-
- ...t-cpu-tcg-ccw-virtio-2.7.s390x-latest.args |  3 +-
- ...t-cpu-tcg-ccw-virtio-4.2.s390x-latest.args |  3 +-
- .../qemuxml2argvdata/s390-panic-missing.args  |  3 +-
- .../s390-panic-no-address.args                |  3 +-
- tests/qemuxml2argvdata/s390-serial-2.args     |  3 +-
- .../qemuxml2argvdata/s390-serial-console.args |  3 +-
- tests/qemuxml2argvdata/s390-serial.args       |  3 +-
- .../s390x-ccw-graphics.s390x-latest.args      |  3 +-
- .../s390x-ccw-headless.s390x-latest.args      |  3 +-
- tests/qemuxml2argvdata/seclabel-dac-none.args |  3 +-
- .../seclabel-dynamic-baselabel.args           |  3 +-
- .../seclabel-dynamic-labelskip.args           |  3 +-
- .../seclabel-dynamic-override.args            |  3 +-
- .../seclabel-dynamic-relabel.args             |  3 +-
- tests/qemuxml2argvdata/seclabel-dynamic.args  |  3 +-
- tests/qemuxml2argvdata/seclabel-none.args     |  3 +-
- .../seclabel-static-labelskip.args            |  3 +-
- .../seclabel-static-relabel.args              |  3 +-
- tests/qemuxml2argvdata/seclabel-static.args   |  3 +-
- .../serial-dev-chardev-iobase.args            |  3 +-
- .../qemuxml2argvdata/serial-dev-chardev.args  |  3 +-
- .../qemuxml2argvdata/serial-file-chardev.args |  3 +-
- tests/qemuxml2argvdata/serial-file-log.args   |  3 +-
- .../qemuxml2argvdata/serial-many-chardev.args |  3 +-
- .../qemuxml2argvdata/serial-pty-chardev.args  |  3 +-
- .../serial-spiceport-nospice.args             |  3 +-
- tests/qemuxml2argvdata/serial-spiceport.args  |  3 +-
- .../qemuxml2argvdata/serial-tcp-chardev.args  |  3 +-
- .../serial-tcp-telnet-chardev.args            |  3 +-
- .../serial-tcp-tlsx509-chardev-notls.args     |  3 +-
- .../serial-tcp-tlsx509-chardev-verify.args    |  3 +-
- .../serial-tcp-tlsx509-chardev.args           |  3 +-
- .../serial-tcp-tlsx509-secret-chardev.args    |  3 +-
- .../qemuxml2argvdata/serial-udp-chardev.args  |  3 +-
- .../qemuxml2argvdata/serial-unix-chardev.args |  3 +-
- .../serial-unix-chardev.x86_64-latest.args    |  3 +-
- tests/qemuxml2argvdata/serial-vc-chardev.args |  3 +-
- .../shmem-plain-doorbell.args                 |  3 +-
- tests/qemuxml2argvdata/shmem.args             |  3 +-
- .../smartcard-controller.args                 |  3 +-
- .../smartcard-host-certificates-database.args |  3 +-
- .../smartcard-host-certificates.args          |  3 +-
- tests/qemuxml2argvdata/smartcard-host.args    |  3 +-
- .../smartcard-passthrough-spicevmc.args       |  3 +-
- .../smartcard-passthrough-tcp.args            |  3 +-
- ...artcard-passthrough-unix.x86_64-2.5.0.args |  3 +-
- ...rtcard-passthrough-unix.x86_64-latest.args |  3 +-
- tests/qemuxml2argvdata/smbios.args            |  3 +-
- tests/qemuxml2argvdata/smp-dies.args          |  3 +-
- tests/qemuxml2argvdata/smp.args               |  3 +-
- tests/qemuxml2argvdata/sound-device.args      |  3 +-
- tests/qemuxml2argvdata/sound.args             |  3 +-
- .../tpm-emulator-spapr.ppc64-latest.args      |  3 +-
- .../tpm-emulator-tpm2-enc.x86_64-latest.args  |  3 +-
- .../tpm-emulator-tpm2.x86_64-latest.args      |  3 +-
- .../tpm-emulator.x86_64-latest.args           |  3 +-
- .../tpm-passthrough-crb.x86_64-latest.args    |  3 +-
- .../tpm-passthrough.x86_64-latest.args        |  3 +-
- .../tseg-explicit-size.x86_64-latest.args     |  3 +-
- .../usb-controller-default-q35.args           |  3 +-
- .../usb-controller-explicit-q35.args          |  3 +-
- .../usb-controller-qemu-xhci.args             |  3 +-
- .../qemuxml2argvdata/usb-controller-xhci.args |  3 +-
- tests/qemuxml2argvdata/usb-controller.args    |  3 +-
- .../usb-hub-autoadd-deluxe.args               |  3 +-
- tests/qemuxml2argvdata/usb-hub-autoadd.args   |  3 +-
- tests/qemuxml2argvdata/usb-hub.args           |  3 +-
- .../qemuxml2argvdata/usb-ich9-autoassign.args |  3 +-
- .../qemuxml2argvdata/usb-ich9-companion.args  |  3 +-
- .../qemuxml2argvdata/usb-ich9-ehci-addr.args  |  3 +-
- .../qemuxml2argvdata/usb-long-port-path.args  |  3 +-
- tests/qemuxml2argvdata/usb-none.args          |  3 +-
- .../usb-piix3-controller.args                 |  3 +-
- .../qemuxml2argvdata/usb-port-autoassign.args |  3 +-
- tests/qemuxml2argvdata/usb-port-missing.args  |  3 +-
- tests/qemuxml2argvdata/usb-ports.args         |  3 +-
- tests/qemuxml2argvdata/usb-redir-boot.args    |  3 +-
- .../usb-redir-filter-version.args             |  3 +-
- tests/qemuxml2argvdata/usb-redir-filter.args  |  3 +-
- .../usb-redir-unix.x86_64-2.5.0.args          |  3 +-
- .../usb-redir-unix.x86_64-latest.args         |  3 +-
- tests/qemuxml2argvdata/usb-redir.args         |  3 +-
- .../qemuxml2argvdata/usb-xhci-autoassign.args |  3 +-
- tests/qemuxml2argvdata/usb1-usb2.args         |  3 +-
- tests/qemuxml2argvdata/user-aliases-usb.args  |  3 +-
- tests/qemuxml2argvdata/user-aliases.args      |  3 +-
- .../vcpu-placement-static.args                |  3 +-
- ...vhost-user-fs-fd-memory.x86_64-latest.args |  3 +-
- ...vhost-user-fs-hugepages.x86_64-latest.args |  3 +-
- ...host-user-gpu-secondary.x86_64-latest.args |  3 +-
- .../vhost-user-vga.x86_64-latest.args         |  3 +-
- .../vhost-vsock-auto.x86_64-latest.args       |  3 +-
- .../vhost-vsock-ccw-auto.s390x-latest.args    |  3 +-
- .../vhost-vsock-ccw.s390x-latest.args         |  3 +-
- .../vhost-vsock.x86_64-latest.args            |  3 +-
- ...eo-bochs-display-device.x86_64-latest.args |  3 +-
- .../video-device-pciaddr-default.args         |  3 +-
- tests/qemuxml2argvdata/video-none-device.args |  3 +-
- .../video-qxl-device-vgamem.args              |  3 +-
- ...video-qxl-device-vram64.x86_64-latest.args |  3 +-
- tests/qemuxml2argvdata/video-qxl-device.args  |  3 +-
- tests/qemuxml2argvdata/video-qxl-heads.args   |  3 +-
- .../qemuxml2argvdata/video-qxl-nodevice.args  |  3 +-
- tests/qemuxml2argvdata/video-qxl-noheads.args |  3 +-
- .../video-qxl-resolution.args                 |  3 +-
- .../video-qxl-sec-device-vgamem.args          |  3 +-
- ...o-qxl-sec-device-vram64.x86_64-latest.args |  3 +-
- .../video-qxl-sec-device.args                 |  3 +-
- ...eo-ramfb-display-device.x86_64-latest.args |  3 +-
- .../video-vga-device-vgamem.args              |  3 +-
- tests/qemuxml2argvdata/video-vga-device.args  |  3 +-
- .../qemuxml2argvdata/video-vga-nodevice.args  |  3 +-
- .../qemuxml2argvdata/video-vga-qxl-heads.args |  3 +-
- .../video-virtio-gpu-ccw.args                 |  3 +-
- .../video-virtio-gpu-device.args              |  3 +-
- .../video-virtio-gpu-sdl-gl.args              |  3 +-
- .../video-virtio-gpu-secondary.args           |  3 +-
- .../video-virtio-gpu-spice-gl.args            |  3 +-
- .../video-virtio-gpu-virgl.args               |  3 +-
- tests/qemuxml2argvdata/video-virtio-vga.args  |  3 +-
- .../virtio-input-passthrough.args             |  3 +-
- tests/qemuxml2argvdata/virtio-input.args      |  3 +-
- tests/qemuxml2argvdata/virtio-lun.args        |  3 +-
- .../virtio-non-transitional.x86_64-3.1.0.args |  3 +-
- ...virtio-non-transitional.x86_64-latest.args |  3 +-
- tests/qemuxml2argvdata/virtio-options.args    |  3 +-
- .../virtio-rng-builtin.x86_64-latest.args     |  3 +-
- tests/qemuxml2argvdata/virtio-rng-ccw.args    |  3 +-
- .../qemuxml2argvdata/virtio-rng-default.args  |  3 +-
- .../virtio-rng-egd-unix.x86_64-2.5.0.args     |  3 +-
- .../virtio-rng-egd-unix.x86_64-latest.args    |  3 +-
- tests/qemuxml2argvdata/virtio-rng-egd.args    |  3 +-
- .../qemuxml2argvdata/virtio-rng-multiple.args |  3 +-
- tests/qemuxml2argvdata/virtio-rng-random.args |  3 +-
- .../virtio-transitional.x86_64-3.1.0.args     |  3 +-
- .../virtio-transitional.x86_64-latest.args    |  3 +-
- tests/qemuxml2argvdata/vmcoreinfo.args        |  3 +-
- tests/qemuxml2argvdata/watchdog-device.args   |  3 +-
- tests/qemuxml2argvdata/watchdog-diag288.args  |  3 +-
- tests/qemuxml2argvdata/watchdog-dump.args     |  3 +-
- .../qemuxml2argvdata/watchdog-injectnmi.args  |  3 +-
- tests/qemuxml2argvdata/watchdog.args          |  3 +-
- tests/qemuxml2argvdata/x86-kvm-32-on-64.args  |  3 +-
- ...-default-cpu-kvm-pc-4.2.x86_64-latest.args |  3 +-
- ...default-cpu-kvm-q35-4.2.x86_64-latest.args |  3 +-
- ...-default-cpu-tcg-pc-4.2.x86_64-latest.args |  3 +-
- ...default-cpu-tcg-q35-4.2.x86_64-latest.args |  3 +-
- .../x86_64-pc-graphics.x86_64-latest.args     |  3 +-
- .../x86_64-pc-headless.x86_64-latest.args     |  3 +-
- .../x86_64-q35-graphics.x86_64-latest.args    |  3 +-
- .../x86_64-q35-headless.x86_64-latest.args    |  3 +-
- 773 files changed, 1587 insertions(+), 801 deletions(-)
-
-diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
-index b009890e35..481d29b14e 100644
---- a/src/qemu/qemu_command.c
-+++ b/src/qemu/qemu_command.c
-@@ -190,7 +190,7 @@ VIR_ENUM_IMPL(qemuNumaPolicy,
-               "interleave",
- );
- 
-- 
-+
- static int
- qemuBuildObjectCommandlineFromJSON(virBuffer *buf,
-                                    virJSONValue *props,
-@@ -7061,33 +7061,6 @@ qemuBuildMachineCommandLine(virCommandPtr cmd,
-     virCommandAddArg(cmd, "-machine");
-     virBufferAdd(&buf, def->os.machine, -1);
- 
--    switch ((virDomainVirtType)def->virtType) {
--    case VIR_DOMAIN_VIRT_QEMU:
--        virBufferAddLit(&buf, ",accel=tcg");
--        break;
--
--    case VIR_DOMAIN_VIRT_KVM:
--        virBufferAddLit(&buf, ",accel=kvm");
--        break;
--
--    case VIR_DOMAIN_VIRT_KQEMU:
--    case VIR_DOMAIN_VIRT_XEN:
--    case VIR_DOMAIN_VIRT_LXC:
--    case VIR_DOMAIN_VIRT_UML:
--    case VIR_DOMAIN_VIRT_OPENVZ:
--    case VIR_DOMAIN_VIRT_TEST:
--    case VIR_DOMAIN_VIRT_VMWARE:
--    case VIR_DOMAIN_VIRT_HYPERV:
--    case VIR_DOMAIN_VIRT_VBOX:
--    case VIR_DOMAIN_VIRT_PHYP:
--    case VIR_DOMAIN_VIRT_PARALLELS:
--    case VIR_DOMAIN_VIRT_BHYVE:
--    case VIR_DOMAIN_VIRT_VZ:
--    case VIR_DOMAIN_VIRT_NONE:
--    case VIR_DOMAIN_VIRT_LAST:
--        break;
--    }
--
-     /* To avoid the collision of creating USB controllers when calling
-      * machine->init in QEMU, it needs to set usb=off
-      */
-@@ -7253,7 +7226,46 @@ qemuBuildMachineCommandLine(virCommandPtr cmd,
- 
- 
- static void
--qemuBuildTSEGCommandLine(virCommandPtr cmd,
-+qemuBuildAccelCommandLine(virCommand *cmd,
-+                          const virDomainDef *def)
-+{
-+    g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
-+
-+    virCommandAddArg(cmd, "-accel");
-+
-+    switch ((virDomainVirtType)def->virtType) {
-+    case VIR_DOMAIN_VIRT_QEMU:
-+        virBufferAddLit(&buf, "tcg");
-+        break;
-+
-+    case VIR_DOMAIN_VIRT_KVM:
-+        virBufferAddLit(&buf, "kvm");
-+        break;
-+
-+    case VIR_DOMAIN_VIRT_KQEMU:
-+    case VIR_DOMAIN_VIRT_XEN:
-+    case VIR_DOMAIN_VIRT_LXC:
-+    case VIR_DOMAIN_VIRT_UML:
-+    case VIR_DOMAIN_VIRT_OPENVZ:
-+    case VIR_DOMAIN_VIRT_TEST:
-+    case VIR_DOMAIN_VIRT_VMWARE:
-+    case VIR_DOMAIN_VIRT_HYPERV:
-+    case VIR_DOMAIN_VIRT_VBOX:
-+    case VIR_DOMAIN_VIRT_PHYP:
-+    case VIR_DOMAIN_VIRT_PARALLELS:
-+    case VIR_DOMAIN_VIRT_BHYVE:
-+    case VIR_DOMAIN_VIRT_VZ:
-+    case VIR_DOMAIN_VIRT_NONE:
-+    case VIR_DOMAIN_VIRT_LAST:
-+        break;
-+    }
-+
-+    virCommandAddArgBuffer(cmd, &buf);
-+}
-+
-+
-+static void
-+qemuBuildTSEGCommandLine(virCommand *cmd,
-                          const virDomainDef *def)
- {
-     if (!def->tseg_specified)
-@@ -9988,6 +10000,8 @@ qemuBuildCommandLine(virQEMUDriverPtr driver,
-     if (qemuBuildMachineCommandLine(cmd, cfg, def, qemuCaps, priv) < 0)
-         return NULL;
- 
-+    qemuBuildAccelCommandLine(cmd, def);
-+
-     qemuBuildTSEGCommandLine(cmd, def);
- 
-     if (qemuBuildCpuCommandLine(cmd, driver, def, qemuCaps) < 0)
-diff --git a/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args b/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args
-index 41a1dd185d..c4102fccd3 100644
---- a/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args
-+++ b/tests/qemuxml2argvdata/aarch64-aavmf-virtio-mmio.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-aarch64 \
- -name aarch64test \
- -S \
---machine virt,accel=tcg,usb=off,dump-guest-core=off \
-+-machine virt,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu cortex-a53 \
- -m 1024 \
- -realtime mlock=off \
-diff --git a/tests/qemuxml2argvdata/aarch64-acpi-uefi.args b/tests/qemuxml2argvdata/aarch64-acpi-uefi.args
-index 0f74e87bd4..b77b4e9705 100644
---- a/tests/qemuxml2argvdata/aarch64-acpi-uefi.args
-+++ b/tests/qemuxml2argvdata/aarch64-acpi-uefi.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-aarch64 \
- -name guest \
- -S \
---machine virt,accel=tcg,usb=off,dump-guest-core=off \
-+-machine virt,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu cortex-a57 \
- -drive file=/usr/share/AAVMF/AAVMF_CODE.fd,if=pflash,format=raw,unit=0,\
- readonly=on \
-diff --git a/tests/qemuxml2argvdata/aarch64-cpu-passthrough.args b/tests/qemuxml2argvdata/aarch64-cpu-passthrough.args
-index ae92ab0dea..d088fae5d1 100644
---- a/tests/qemuxml2argvdata/aarch64-cpu-passthrough.args
-+++ b/tests/qemuxml2argvdata/aarch64-cpu-passthrough.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-aarch64 \
- -name aarch64test \
- -S \
---machine virt,accel=kvm,usb=off,dump-guest-core=off \
-+-machine virt,usb=off,dump-guest-core=off \
-+-accel kvm \
- -cpu host \
- -m 1024 \
- -realtime mlock=off \
-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 e8da16897f..f67255db06 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
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-guest/master-key.aes \
---machine virt-4.2,accel=kvm,usb=off,dump-guest-core=off,gic-version=3 \
-+-machine virt-4.2,usb=off,dump-guest-core=off,gic-version=3 \
-+-accel kvm \
- -m 4096 \
- -overcommit mem-lock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-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 1b41743107..30178b5a6a 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
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-guest/master-key.aes \
---machine virt-4.2,accel=tcg,usb=off,dump-guest-core=off,gic-version=2 \
-+-machine virt-4.2,usb=off,dump-guest-core=off,gic-version=2 \
-+-accel tcg \
- -cpu cortex-a15 \
- -m 4096 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/aarch64-features-sve.aarch64-latest.args b/tests/qemuxml2argvdata/aarch64-features-sve.aarch64-latest.args
-index 6852f5d54d..8461f65cdf 100644
---- a/tests/qemuxml2argvdata/aarch64-features-sve.aarch64-latest.args
-+++ b/tests/qemuxml2argvdata/aarch64-features-sve.aarch64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-guest/master-key.aes \
---machine virt,accel=kvm,usb=off,dump-guest-core=off,gic-version=3 \
-+-machine virt,usb=off,dump-guest-core=off,gic-version=3 \
-+-accel kvm \
- -cpu host,sve512=on,sve384=off,sve256=on,sve128=on,sve=on \
- -m 1024 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/aarch64-gic-host.args b/tests/qemuxml2argvdata/aarch64-gic-host.args
-index 2baf4b9d78..9afeafef31 100644
---- a/tests/qemuxml2argvdata/aarch64-gic-host.args
-+++ b/tests/qemuxml2argvdata/aarch64-gic-host.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-aarch64 \
- -name aarch64test \
- -S \
---machine virt,accel=kvm,usb=off,dump-guest-core=off,gic-version=host \
-+-machine virt,usb=off,dump-guest-core=off,gic-version=host \
-+-accel kvm \
- -cpu host \
- -m 1024 \
- -realtime mlock=off \
-diff --git a/tests/qemuxml2argvdata/aarch64-gic-none-tcg.args b/tests/qemuxml2argvdata/aarch64-gic-none-tcg.args
-index 18a0ac2df3..eb523624f2 100644
---- a/tests/qemuxml2argvdata/aarch64-gic-none-tcg.args
-+++ b/tests/qemuxml2argvdata/aarch64-gic-none-tcg.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-aarch64 \
- -name guest \
- -S \
---machine virt,accel=tcg,usb=off,dump-guest-core=off,gic-version=2 \
-+-machine virt,usb=off,dump-guest-core=off,gic-version=2 \
-+-accel tcg \
- -cpu cortex-a57 \
- -m 1024 \
- -realtime mlock=off \
-diff --git a/tests/qemuxml2argvdata/aarch64-gic-v2.args b/tests/qemuxml2argvdata/aarch64-gic-v2.args
-index 6cf583935d..9d6f2dece4 100644
---- a/tests/qemuxml2argvdata/aarch64-gic-v2.args
-+++ b/tests/qemuxml2argvdata/aarch64-gic-v2.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-aarch64 \
- -name aarch64test \
- -S \
---machine virt,accel=kvm,usb=off,dump-guest-core=off,gic-version=2 \
-+-machine virt,usb=off,dump-guest-core=off,gic-version=2 \
-+-accel kvm \
- -cpu host \
- -m 1024 \
- -realtime mlock=off \
-diff --git a/tests/qemuxml2argvdata/aarch64-gic-v3.args b/tests/qemuxml2argvdata/aarch64-gic-v3.args
-index 2049250b07..9d287646c6 100644
---- a/tests/qemuxml2argvdata/aarch64-gic-v3.args
-+++ b/tests/qemuxml2argvdata/aarch64-gic-v3.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-aarch64 \
- -name aarch64test \
- -S \
---machine virt,accel=kvm,usb=off,dump-guest-core=off,gic-version=3 \
-+-machine virt,usb=off,dump-guest-core=off,gic-version=3 \
-+-accel kvm \
- -cpu host \
- -m 1024 \
- -realtime mlock=off \
-diff --git a/tests/qemuxml2argvdata/aarch64-kvm-32-on-64.args b/tests/qemuxml2argvdata/aarch64-kvm-32-on-64.args
-index e660b78397..d23c0b6485 100644
---- a/tests/qemuxml2argvdata/aarch64-kvm-32-on-64.args
-+++ b/tests/qemuxml2argvdata/aarch64-kvm-32-on-64.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-arm \
- -name armtest \
- -S \
---machine virt,accel=kvm,usb=off,dump-guest-core=off \
-+-machine virt,usb=off,dump-guest-core=off \
-+-accel kvm \
- -cpu host,aarch64=off \
- -m 1024 \
- -realtime mlock=off \
-diff --git a/tests/qemuxml2argvdata/aarch64-noacpi-nouefi.args b/tests/qemuxml2argvdata/aarch64-noacpi-nouefi.args
-index cab7600693..99e557552f 100644
---- a/tests/qemuxml2argvdata/aarch64-noacpi-nouefi.args
-+++ b/tests/qemuxml2argvdata/aarch64-noacpi-nouefi.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-aarch64 \
- -name guest \
- -S \
---machine virt,accel=tcg,usb=off,dump-guest-core=off \
-+-machine virt,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu cortex-a57 \
- -m 1024 \
- -realtime mlock=off \
-diff --git a/tests/qemuxml2argvdata/aarch64-noacpi-uefi.args b/tests/qemuxml2argvdata/aarch64-noacpi-uefi.args
-index 51669190db..4e88739168 100644
---- a/tests/qemuxml2argvdata/aarch64-noacpi-uefi.args
-+++ b/tests/qemuxml2argvdata/aarch64-noacpi-uefi.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-aarch64 \
- -name guest \
- -S \
---machine virt,accel=tcg,usb=off,dump-guest-core=off \
-+-machine virt,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu cortex-a57 \
- -drive file=/usr/share/AAVMF/AAVMF_CODE.fd,if=pflash,format=raw,unit=0,\
- readonly=on \
-diff --git a/tests/qemuxml2argvdata/aarch64-os-firmware-efi.aarch64-latest.args b/tests/qemuxml2argvdata/aarch64-os-firmware-efi.aarch64-latest.args
-index ed6e513f3c..f3c5f034ae 100644
---- a/tests/qemuxml2argvdata/aarch64-os-firmware-efi.aarch64-latest.args
-+++ b/tests/qemuxml2argvdata/aarch64-os-firmware-efi.aarch64-latest.args
-@@ -23,8 +23,9 @@ file=/tmp/lib/domain--1-aarch64test/master-key.aes \
- "discard":"unmap"}' \
- -blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,\
- "driver":"raw","file":"libvirt-pflash1-storage"}' \
---machine virt-4.0,accel=tcg,usb=off,dump-guest-core=off,gic-version=2,\
-+-machine virt-4.0,usb=off,dump-guest-core=off,gic-version=2,\
- pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format \
-+-accel tcg \
- -cpu cortex-a53 \
- -m 1024 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/aarch64-pci-serial.args b/tests/qemuxml2argvdata/aarch64-pci-serial.args
-index 3d89ab0b7e..045e582e38 100644
---- a/tests/qemuxml2argvdata/aarch64-pci-serial.args
-+++ b/tests/qemuxml2argvdata/aarch64-pci-serial.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-aarch64 \
- -name aarch64test \
- -S \
---machine virt,accel=tcg,usb=off,dump-guest-core=off \
-+-machine virt,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 1024 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/aarch64-tpm.aarch64-latest.args b/tests/qemuxml2argvdata/aarch64-tpm.aarch64-latest.args
-index 4ca09a1fb0..bb67a470cf 100644
---- a/tests/qemuxml2argvdata/aarch64-tpm.aarch64-latest.args
-+++ b/tests/qemuxml2argvdata/aarch64-tpm.aarch64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-aarch64test/master-key.aes \
---machine virt,accel=tcg,usb=off,dump-guest-core=off,gic-version=2 \
-+-machine virt,usb=off,dump-guest-core=off,gic-version=2 \
-+-accel tcg \
- -cpu cortex-a15 \
- -m 1024 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/aarch64-traditional-pci.args b/tests/qemuxml2argvdata/aarch64-traditional-pci.args
-index 853723f4de..9e01ef4148 100644
---- a/tests/qemuxml2argvdata/aarch64-traditional-pci.args
-+++ b/tests/qemuxml2argvdata/aarch64-traditional-pci.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-aarch64 \
- -name guest \
- -S \
---machine virt,accel=tcg,usb=off,dump-guest-core=off \
-+-machine virt,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 1024 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/aarch64-usb-controller-nec-xhci.args b/tests/qemuxml2argvdata/aarch64-usb-controller-nec-xhci.args
-index 4c5ea313e4..0d87e41f34 100644
---- a/tests/qemuxml2argvdata/aarch64-usb-controller-nec-xhci.args
-+++ b/tests/qemuxml2argvdata/aarch64-usb-controller-nec-xhci.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-aarch64 \
- -name QEMUGuest1 \
- -S \
---machine virt,accel=tcg,usb=off,dump-guest-core=off \
-+-machine virt,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/aarch64-usb-controller-qemu-xhci.args b/tests/qemuxml2argvdata/aarch64-usb-controller-qemu-xhci.args
-index 56c66fc399..828ab81dba 100644
---- a/tests/qemuxml2argvdata/aarch64-usb-controller-qemu-xhci.args
-+++ b/tests/qemuxml2argvdata/aarch64-usb-controller-qemu-xhci.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-aarch64 \
- -name QEMUGuest1 \
- -S \
---machine virt,accel=tcg,usb=off,dump-guest-core=off \
-+-machine virt,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/aarch64-video-default.args b/tests/qemuxml2argvdata/aarch64-video-default.args
-index 8cf06402ed..5cb426f2c9 100644
---- a/tests/qemuxml2argvdata/aarch64-video-default.args
-+++ b/tests/qemuxml2argvdata/aarch64-video-default.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-aarch64 \
- -name aarch64-vgpu \
- -S \
---machine virt,accel=tcg,usb=off,dump-guest-core=off \
-+-machine virt,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu cortex-a57 \
- -m 1024 \
- -realtime mlock=off \
-diff --git a/tests/qemuxml2argvdata/aarch64-video-virtio-gpu-pci.args b/tests/qemuxml2argvdata/aarch64-video-virtio-gpu-pci.args
-index 95a6b5154f..83ef8d03c0 100644
---- a/tests/qemuxml2argvdata/aarch64-video-virtio-gpu-pci.args
-+++ b/tests/qemuxml2argvdata/aarch64-video-virtio-gpu-pci.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-aarch64 \
- -name aarch64-vgpu \
- -S \
---machine virt,accel=tcg,usb=off,dump-guest-core=off \
-+-machine virt,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu cortex-a57 \
- -m 1024 \
- -realtime mlock=off \
-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 6c997100da..ae4851e653 100644
---- a/tests/qemuxml2argvdata/aarch64-virt-2.6-virtio-pci-default.args
-+++ b/tests/qemuxml2argvdata/aarch64-virt-2.6-virtio-pci-default.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-aarch64 \
- -name aarch64test \
- -S \
---machine virt-2.6,accel=tcg,usb=off,dump-guest-core=off \
-+-machine virt-2.6,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu cortex-a53 \
- -m 1024 \
- -realtime mlock=off \
-diff --git a/tests/qemuxml2argvdata/aarch64-virt-default-nic.args b/tests/qemuxml2argvdata/aarch64-virt-default-nic.args
-index 0d423783e6..685dc8e3df 100644
---- a/tests/qemuxml2argvdata/aarch64-virt-default-nic.args
-+++ b/tests/qemuxml2argvdata/aarch64-virt-default-nic.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-aarch64 \
- -name aarch64-virt-default-nic \
- -S \
---machine virt,accel=tcg,usb=off,dump-guest-core=off \
-+-machine virt,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu cortex-a53 \
- -m 1024 \
- -realtime mlock=off \
-diff --git a/tests/qemuxml2argvdata/aarch64-virt-graphics.aarch64-latest.args b/tests/qemuxml2argvdata/aarch64-virt-graphics.aarch64-latest.args
-index 058c528e8a..ecf2645e3a 100644
---- a/tests/qemuxml2argvdata/aarch64-virt-graphics.aarch64-latest.args
-+++ b/tests/qemuxml2argvdata/aarch64-virt-graphics.aarch64-latest.args
-@@ -23,8 +23,9 @@ file=/tmp/lib/domain--1-guest/master-key.aes \
- "discard":"unmap"}' \
- -blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,\
- "driver":"raw","file":"libvirt-pflash1-storage"}' \
---machine virt,accel=tcg,usb=off,dump-guest-core=off,gic-version=2,\
-+-machine virt,usb=off,dump-guest-core=off,gic-version=2,\
- pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format \
-+-accel tcg \
- -cpu cortex-a15 \
- -m 4096 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/aarch64-virt-headless.aarch64-latest.args b/tests/qemuxml2argvdata/aarch64-virt-headless.aarch64-latest.args
-index ddd0518bd5..b397308916 100644
---- a/tests/qemuxml2argvdata/aarch64-virt-headless.aarch64-latest.args
-+++ b/tests/qemuxml2argvdata/aarch64-virt-headless.aarch64-latest.args
-@@ -23,8 +23,9 @@ file=/tmp/lib/domain--1-guest/master-key.aes \
- "discard":"unmap"}' \
- -blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,\
- "driver":"raw","file":"libvirt-pflash1-storage"}' \
---machine virt,accel=tcg,usb=off,dump-guest-core=off,gic-version=2,\
-+-machine virt,usb=off,dump-guest-core=off,gic-version=2,\
- pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format \
-+-accel tcg \
- -cpu cortex-a15 \
- -m 4096 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/aarch64-virt-virtio.args b/tests/qemuxml2argvdata/aarch64-virt-virtio.args
-index 15fb5f319e..b6088cc2fc 100644
---- a/tests/qemuxml2argvdata/aarch64-virt-virtio.args
-+++ b/tests/qemuxml2argvdata/aarch64-virt-virtio.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-aarch64 \
- -name aarch64test \
- -S \
---machine virt,accel=tcg,usb=off,dump-guest-core=off \
-+-machine virt,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu cortex-a53 \
- -m 1024 \
- -realtime mlock=off \
-diff --git a/tests/qemuxml2argvdata/aarch64-virtio-pci-default.args b/tests/qemuxml2argvdata/aarch64-virtio-pci-default.args
-index cf39101b8d..561bd6b3c2 100644
---- a/tests/qemuxml2argvdata/aarch64-virtio-pci-default.args
-+++ b/tests/qemuxml2argvdata/aarch64-virtio-pci-default.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-aarch64 \
- -name aarch64test \
- -S \
---machine virt,accel=tcg,usb=off,dump-guest-core=off \
-+-machine virt,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu cortex-a53 \
- -m 1024 \
- -realtime mlock=off \
-diff --git a/tests/qemuxml2argvdata/aarch64-virtio-pci-manual-addresses.args b/tests/qemuxml2argvdata/aarch64-virtio-pci-manual-addresses.args
-index 7ed55510c4..09884b2a59 100644
---- a/tests/qemuxml2argvdata/aarch64-virtio-pci-manual-addresses.args
-+++ b/tests/qemuxml2argvdata/aarch64-virtio-pci-manual-addresses.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-aarch64 \
- -name aarch64test \
- -S \
---machine virt,accel=tcg,usb=off,dump-guest-core=off \
-+-machine virt,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu cortex-a53 \
- -m 1024 \
- -realtime mlock=off \
-diff --git a/tests/qemuxml2argvdata/acpi-table.args b/tests/qemuxml2argvdata/acpi-table.args
-index 13218881c3..34d1988e39 100644
---- a/tests/qemuxml2argvdata/acpi-table.args
-+++ b/tests/qemuxml2argvdata/acpi-table.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/arm-vexpressa9-basic.args b/tests/qemuxml2argvdata/arm-vexpressa9-basic.args
-index d6143c5e5d..bc62c47310 100644
---- a/tests/qemuxml2argvdata/arm-vexpressa9-basic.args
-+++ b/tests/qemuxml2argvdata/arm-vexpressa9-basic.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-arm \
- -name armtest \
- -S \
---machine vexpress-a9,accel=tcg,usb=off,dump-guest-core=off \
-+-machine vexpress-a9,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 1024 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/arm-vexpressa9-nodevs.args b/tests/qemuxml2argvdata/arm-vexpressa9-nodevs.args
-index c1a9fd84f3..11af70cfc3 100644
---- a/tests/qemuxml2argvdata/arm-vexpressa9-nodevs.args
-+++ b/tests/qemuxml2argvdata/arm-vexpressa9-nodevs.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-arm \
- -name armtest \
- -S \
---machine vexpress-a9,accel=tcg,usb=off,dump-guest-core=off \
-+-machine vexpress-a9,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 1024 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/arm-vexpressa9-virtio.args b/tests/qemuxml2argvdata/arm-vexpressa9-virtio.args
-index 0a9ff6b7d0..bc0f2ebae6 100644
---- a/tests/qemuxml2argvdata/arm-vexpressa9-virtio.args
-+++ b/tests/qemuxml2argvdata/arm-vexpressa9-virtio.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-arm \
- -name armtest \
- -S \
---machine vexpress-a9,accel=tcg,usb=off,dump-guest-core=off \
-+-machine vexpress-a9,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 1024 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/arm-virt-virtio.args b/tests/qemuxml2argvdata/arm-virt-virtio.args
-index 75ca00f779..28c3a72c17 100644
---- a/tests/qemuxml2argvdata/arm-virt-virtio.args
-+++ b/tests/qemuxml2argvdata/arm-virt-virtio.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-arm \
- -name armtest \
- -S \
---machine virt,accel=tcg,usb=off,dump-guest-core=off \
-+-machine virt,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 1024 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/autoindex.args b/tests/qemuxml2argvdata/autoindex.args
-index 7cdca083ce..fec775cf87 100644
---- a/tests/qemuxml2argvdata/autoindex.args
-+++ b/tests/qemuxml2argvdata/autoindex.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name q35-test \
- -S \
---machine q35,accel=tcg,usb=off,dump-guest-core=off \
-+-machine q35,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 2048 \
- -realtime mlock=off \
- -smp 2,sockets=2,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/balloon-ccw-deflate.args b/tests/qemuxml2argvdata/balloon-ccw-deflate.args
-index 2b4e280686..e6a9e40804 100644
---- a/tests/qemuxml2argvdata/balloon-ccw-deflate.args
-+++ b/tests/qemuxml2argvdata/balloon-ccw-deflate.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-s390x \
- -name QEMUGuest1 \
- -S \
---machine s390-ccw,accel=tcg,usb=off,dump-guest-core=off \
-+-machine s390-ccw,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/balloon-device-auto.args b/tests/qemuxml2argvdata/balloon-device-auto.args
-index 60253f43ec..d57fa14fad 100644
---- a/tests/qemuxml2argvdata/balloon-device-auto.args
-+++ b/tests/qemuxml2argvdata/balloon-device-auto.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/balloon-device-deflate-off.args b/tests/qemuxml2argvdata/balloon-device-deflate-off.args
-index e81db15972..4e9bf67a92 100644
---- a/tests/qemuxml2argvdata/balloon-device-deflate-off.args
-+++ b/tests/qemuxml2argvdata/balloon-device-deflate-off.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/balloon-device-deflate.args b/tests/qemuxml2argvdata/balloon-device-deflate.args
-index 3aa255187b..f35ee59a56 100644
---- a/tests/qemuxml2argvdata/balloon-device-deflate.args
-+++ b/tests/qemuxml2argvdata/balloon-device-deflate.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/balloon-device-period.args b/tests/qemuxml2argvdata/balloon-device-period.args
-index 8a6cc8dec5..7f7b3262ab 100644
---- a/tests/qemuxml2argvdata/balloon-device-period.args
-+++ b/tests/qemuxml2argvdata/balloon-device-period.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/balloon-device.args b/tests/qemuxml2argvdata/balloon-device.args
-index 8a6cc8dec5..7f7b3262ab 100644
---- a/tests/qemuxml2argvdata/balloon-device.args
-+++ b/tests/qemuxml2argvdata/balloon-device.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/balloon-mmio-deflate.args b/tests/qemuxml2argvdata/balloon-mmio-deflate.args
-index 33f480e2a4..e784a89125 100644
---- a/tests/qemuxml2argvdata/balloon-mmio-deflate.args
-+++ b/tests/qemuxml2argvdata/balloon-mmio-deflate.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-aarch64 \
- -name aarch64test \
- -S \
---machine virt,accel=tcg,usb=off,dump-guest-core=off \
-+-machine virt,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu cortex-a53 \
- -m 1024 \
- -realtime mlock=off \
-diff --git a/tests/qemuxml2argvdata/bios-nvram-secure.args b/tests/qemuxml2argvdata/bios-nvram-secure.args
-index 6627d90bf7..8a184700bd 100644
---- a/tests/qemuxml2argvdata/bios-nvram-secure.args
-+++ b/tests/qemuxml2argvdata/bios-nvram-secure.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name test-bios \
- -S \
---machine pc-q35-2.5,accel=tcg,usb=off,smm=on,dump-guest-core=off \
-+-machine pc-q35-2.5,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/bios-nvram.args b/tests/qemuxml2argvdata/bios-nvram.args
-index 45e2a7a5a5..2f1741094e 100644
---- a/tests/qemuxml2argvdata/bios-nvram.args
-+++ b/tests/qemuxml2argvdata/bios-nvram.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name test-bios \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -drive file=/usr/share/OVMF/OVMF_CODE.fd,if=pflash,format=raw,unit=0,\
- readonly=on \
- -drive file=/usr/share/OVMF/OVMF_VARS.fd,if=pflash,format=raw,unit=1 \
-diff --git a/tests/qemuxml2argvdata/bios.args b/tests/qemuxml2argvdata/bios.args
-index 6b636575b1..245f9f45c2 100644
---- a/tests/qemuxml2argvdata/bios.args
-+++ b/tests/qemuxml2argvdata/bios.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name test-bios \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -bios /usr/share/seabios/bios.bin \
- -m 1024 \
- -realtime mlock=off \
-diff --git a/tests/qemuxml2argvdata/blkdeviotune-group-num.args b/tests/qemuxml2argvdata/blkdeviotune-group-num.args
-index dfa7155b1e..a10c89b8f0 100644
---- a/tests/qemuxml2argvdata/blkdeviotune-group-num.args
-+++ b/tests/qemuxml2argvdata/blkdeviotune-group-num.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/blkdeviotune-max-length.args b/tests/qemuxml2argvdata/blkdeviotune-max-length.args
-index 5d301a465d..aa870ccdd5 100644
---- a/tests/qemuxml2argvdata/blkdeviotune-max-length.args
-+++ b/tests/qemuxml2argvdata/blkdeviotune-max-length.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/blkdeviotune-max.args b/tests/qemuxml2argvdata/blkdeviotune-max.args
-index 4548443377..a831355b4b 100644
---- a/tests/qemuxml2argvdata/blkdeviotune-max.args
-+++ b/tests/qemuxml2argvdata/blkdeviotune-max.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/blkiotune-device.args b/tests/qemuxml2argvdata/blkiotune-device.args
-index 60253f43ec..d57fa14fad 100644
---- a/tests/qemuxml2argvdata/blkiotune-device.args
-+++ b/tests/qemuxml2argvdata/blkiotune-device.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/blkiotune.args b/tests/qemuxml2argvdata/blkiotune.args
-index 60253f43ec..d57fa14fad 100644
---- a/tests/qemuxml2argvdata/blkiotune.args
-+++ b/tests/qemuxml2argvdata/blkiotune.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/boot-cdrom.args b/tests/qemuxml2argvdata/boot-cdrom.args
-index c5d66e7b82..ea315175ce 100644
---- a/tests/qemuxml2argvdata/boot-cdrom.args
-+++ b/tests/qemuxml2argvdata/boot-cdrom.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/boot-complex.args b/tests/qemuxml2argvdata/boot-complex.args
-index 0fbfc3c242..593b059e49 100644
---- a/tests/qemuxml2argvdata/boot-complex.args
-+++ b/tests/qemuxml2argvdata/boot-complex.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/boot-floppy-q35.args b/tests/qemuxml2argvdata/boot-floppy-q35.args
-index cfc396cba6..aecaa24951 100644
---- a/tests/qemuxml2argvdata/boot-floppy-q35.args
-+++ b/tests/qemuxml2argvdata/boot-floppy-q35.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name QEMUGuest1 \
- -S \
---machine pc-q35-2.4,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc-q35-2.4,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/boot-floppy.args b/tests/qemuxml2argvdata/boot-floppy.args
-index a2b70dc96a..c48dbeaf7e 100644
---- a/tests/qemuxml2argvdata/boot-floppy.args
-+++ b/tests/qemuxml2argvdata/boot-floppy.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/boot-menu-disable-drive.args b/tests/qemuxml2argvdata/boot-menu-disable-drive.args
-index f3e2c97537..be579a6d6b 100644
---- a/tests/qemuxml2argvdata/boot-menu-disable-drive.args
-+++ b/tests/qemuxml2argvdata/boot-menu-disable-drive.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/boot-menu-disable.args b/tests/qemuxml2argvdata/boot-menu-disable.args
-index f3e2c97537..be579a6d6b 100644
---- a/tests/qemuxml2argvdata/boot-menu-disable.args
-+++ b/tests/qemuxml2argvdata/boot-menu-disable.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/boot-menu-enable-with-timeout.args b/tests/qemuxml2argvdata/boot-menu-enable-with-timeout.args
-index 4df0ae4624..23b6db48b9 100644
---- a/tests/qemuxml2argvdata/boot-menu-enable-with-timeout.args
-+++ b/tests/qemuxml2argvdata/boot-menu-enable-with-timeout.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/boot-menu-enable.args b/tests/qemuxml2argvdata/boot-menu-enable.args
-index 83b4fbde44..06e4886286 100644
---- a/tests/qemuxml2argvdata/boot-menu-enable.args
-+++ b/tests/qemuxml2argvdata/boot-menu-enable.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/boot-multi.args b/tests/qemuxml2argvdata/boot-multi.args
-index 83b4fbde44..06e4886286 100644
---- a/tests/qemuxml2argvdata/boot-multi.args
-+++ b/tests/qemuxml2argvdata/boot-multi.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/boot-network.args b/tests/qemuxml2argvdata/boot-network.args
-index 9ca3f75df3..cce973b364 100644
---- a/tests/qemuxml2argvdata/boot-network.args
-+++ b/tests/qemuxml2argvdata/boot-network.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/boot-order.args b/tests/qemuxml2argvdata/boot-order.args
-index 57d4b88989..3dc3eb41ff 100644
---- a/tests/qemuxml2argvdata/boot-order.args
-+++ b/tests/qemuxml2argvdata/boot-order.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/boot-strict.args b/tests/qemuxml2argvdata/boot-strict.args
-index 827814cbb9..606aa3de78 100644
---- a/tests/qemuxml2argvdata/boot-strict.args
-+++ b/tests/qemuxml2argvdata/boot-strict.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/channel-guestfwd.args b/tests/qemuxml2argvdata/channel-guestfwd.args
-index 0338d0c5e3..a8212bc2ab 100644
---- a/tests/qemuxml2argvdata/channel-guestfwd.args
-+++ b/tests/qemuxml2argvdata/channel-guestfwd.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/channel-spicevmc.args b/tests/qemuxml2argvdata/channel-spicevmc.args
-index adb7707270..ab8ff36774 100644
---- a/tests/qemuxml2argvdata/channel-spicevmc.args
-+++ b/tests/qemuxml2argvdata/channel-spicevmc.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=spice \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/channel-unix-guestfwd.x86_64-2.5.0.args b/tests/qemuxml2argvdata/channel-unix-guestfwd.x86_64-2.5.0.args
-index bbaa384ff2..d27a4a6116 100644
---- a/tests/qemuxml2argvdata/channel-unix-guestfwd.x86_64-2.5.0.args
-+++ b/tests/qemuxml2argvdata/channel-unix-guestfwd.x86_64-2.5.0.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name guest=QEMUGuest1,debug-threads=on \
- -S \
---machine pc-i440fx-2.5,accel=kvm,usb=off,dump-guest-core=off \
-+-machine pc-i440fx-2.5,usb=off,dump-guest-core=off \
-+-accel kvm \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/channel-unix-guestfwd.x86_64-latest.args b/tests/qemuxml2argvdata/channel-unix-guestfwd.x86_64-latest.args
-index 95ac94ab7d..649273fb99 100644
---- a/tests/qemuxml2argvdata/channel-unix-guestfwd.x86_64-latest.args
-+++ b/tests/qemuxml2argvdata/channel-unix-guestfwd.x86_64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc,accel=kvm,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel kvm \
- -cpu qemu64 \
- -m 214 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/channel-virtio-auto.args b/tests/qemuxml2argvdata/channel-virtio-auto.args
-index e7d6531021..f79d099f99 100644
---- a/tests/qemuxml2argvdata/channel-virtio-auto.args
-+++ b/tests/qemuxml2argvdata/channel-virtio-auto.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/channel-virtio-autoadd.args b/tests/qemuxml2argvdata/channel-virtio-autoadd.args
-index 9daac162d0..e070849121 100644
---- a/tests/qemuxml2argvdata/channel-virtio-autoadd.args
-+++ b/tests/qemuxml2argvdata/channel-virtio-autoadd.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/channel-virtio-autoassign.args b/tests/qemuxml2argvdata/channel-virtio-autoassign.args
-index 67d1662096..623d81e5fb 100644
---- a/tests/qemuxml2argvdata/channel-virtio-autoassign.args
-+++ b/tests/qemuxml2argvdata/channel-virtio-autoassign.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/channel-virtio-default.args b/tests/qemuxml2argvdata/channel-virtio-default.args
-index f3e0f591be..40ceb05691 100644
---- a/tests/qemuxml2argvdata/channel-virtio-default.args
-+++ b/tests/qemuxml2argvdata/channel-virtio-default.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/channel-virtio-state.args b/tests/qemuxml2argvdata/channel-virtio-state.args
-index 38a9f41b1e..df14860470 100644
---- a/tests/qemuxml2argvdata/channel-virtio-state.args
-+++ b/tests/qemuxml2argvdata/channel-virtio-state.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/channel-virtio-unix.args b/tests/qemuxml2argvdata/channel-virtio-unix.args
-index fd42b897fd..c213eba653 100644
---- a/tests/qemuxml2argvdata/channel-virtio-unix.args
-+++ b/tests/qemuxml2argvdata/channel-virtio-unix.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/channel-virtio.args b/tests/qemuxml2argvdata/channel-virtio.args
-index 1d22c3633f..98ef2af9f1 100644
---- a/tests/qemuxml2argvdata/channel-virtio.args
-+++ b/tests/qemuxml2argvdata/channel-virtio.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/chardev-reconnect.args b/tests/qemuxml2argvdata/chardev-reconnect.args
-index 851052d5a5..af9cc92d30 100644
---- a/tests/qemuxml2argvdata/chardev-reconnect.args
-+++ b/tests/qemuxml2argvdata/chardev-reconnect.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/clock-catchup.args b/tests/qemuxml2argvdata/clock-catchup.args
-index 4cf109a0e8..2aa3a029da 100644
---- a/tests/qemuxml2argvdata/clock-catchup.args
-+++ b/tests/qemuxml2argvdata/clock-catchup.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/clock-france.args b/tests/qemuxml2argvdata/clock-france.args
-index f814906c01..61eb6da458 100644
---- a/tests/qemuxml2argvdata/clock-france.args
-+++ b/tests/qemuxml2argvdata/clock-france.args
-@@ -11,7 +11,8 @@ TZ=Europe/Paris \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/clock-hpet-off.args b/tests/qemuxml2argvdata/clock-hpet-off.args
-index 89e510e977..8f532327ed 100644
---- a/tests/qemuxml2argvdata/clock-hpet-off.args
-+++ b/tests/qemuxml2argvdata/clock-hpet-off.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/clock-localtime-basis-localtime.args b/tests/qemuxml2argvdata/clock-localtime-basis-localtime.args
-index 4b78d2ac23..9171880e32 100644
---- a/tests/qemuxml2argvdata/clock-localtime-basis-localtime.args
-+++ b/tests/qemuxml2argvdata/clock-localtime-basis-localtime.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/clock-localtime.args b/tests/qemuxml2argvdata/clock-localtime.args
-index e6f80f0085..ec62e88cf0 100644
---- a/tests/qemuxml2argvdata/clock-localtime.args
-+++ b/tests/qemuxml2argvdata/clock-localtime.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/clock-timer-armvtimer.aarch64-latest.args b/tests/qemuxml2argvdata/clock-timer-armvtimer.aarch64-latest.args
-index a1faa97b9f..10202e0775 100644
---- a/tests/qemuxml2argvdata/clock-timer-armvtimer.aarch64-latest.args
-+++ b/tests/qemuxml2argvdata/clock-timer-armvtimer.aarch64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-guest/master-key.aes \
---machine virt,accel=kvm,usb=off,dump-guest-core=off,gic-version=3 \
-+-machine virt,usb=off,dump-guest-core=off,gic-version=3 \
-+-accel kvm \
- -cpu host,kvm-no-adjvtime=on \
- -m 4096 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args b/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args
-index cb96ffbef3..b86bfa0ad8 100644
---- a/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args
-+++ b/tests/qemuxml2argvdata/clock-timer-hyperv-rtc.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=kvm,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel kvm \
- -cpu qemu32,hv-time \
- -m 214 \
- -realtime mlock=off \
-diff --git a/tests/qemuxml2argvdata/clock-utc.args b/tests/qemuxml2argvdata/clock-utc.args
-index e38898e335..048cdaada1 100644
---- a/tests/qemuxml2argvdata/clock-utc.args
-+++ b/tests/qemuxml2argvdata/clock-utc.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/clock-variable.args b/tests/qemuxml2argvdata/clock-variable.args
-index 9fd990da1f..46ce015dc7 100644
---- a/tests/qemuxml2argvdata/clock-variable.args
-+++ b/tests/qemuxml2argvdata/clock-variable.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/console-compat-auto.args b/tests/qemuxml2argvdata/console-compat-auto.args
-index 4d6d6e376c..2be9165af0 100644
---- a/tests/qemuxml2argvdata/console-compat-auto.args
-+++ b/tests/qemuxml2argvdata/console-compat-auto.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/console-compat-chardev.args b/tests/qemuxml2argvdata/console-compat-chardev.args
-index 4d6d6e376c..2be9165af0 100644
---- a/tests/qemuxml2argvdata/console-compat-chardev.args
-+++ b/tests/qemuxml2argvdata/console-compat-chardev.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/console-compat.args b/tests/qemuxml2argvdata/console-compat.args
-index 8a6d72fb6e..38bff38870 100644
---- a/tests/qemuxml2argvdata/console-compat.args
-+++ b/tests/qemuxml2argvdata/console-compat.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/console-sclp.args b/tests/qemuxml2argvdata/console-sclp.args
-index 73965531fd..bda818cc51 100644
---- a/tests/qemuxml2argvdata/console-sclp.args
-+++ b/tests/qemuxml2argvdata/console-sclp.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-s390x \
- -name QEMUGuest1 \
- -S \
---machine s390-virtio,accel=tcg,usb=off,dump-guest-core=off \
-+-machine s390-virtio,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/console-virtio-ccw.args b/tests/qemuxml2argvdata/console-virtio-ccw.args
-index ab9e1c187e..728206275c 100644
---- a/tests/qemuxml2argvdata/console-virtio-ccw.args
-+++ b/tests/qemuxml2argvdata/console-virtio-ccw.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-s390x \
- -name QEMUGuest1 \
- -S \
---machine s390-ccw,accel=tcg,usb=off,dump-guest-core=off \
-+-machine s390-ccw,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/console-virtio-many.args b/tests/qemuxml2argvdata/console-virtio-many.args
-index ec81652e20..07bc1ed957 100644
---- a/tests/qemuxml2argvdata/console-virtio-many.args
-+++ b/tests/qemuxml2argvdata/console-virtio-many.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/console-virtio-s390.args b/tests/qemuxml2argvdata/console-virtio-s390.args
-index 7357923e37..d511c2593d 100644
---- a/tests/qemuxml2argvdata/console-virtio-s390.args
-+++ b/tests/qemuxml2argvdata/console-virtio-s390.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-s390x \
- -name QEMUGuest1 \
- -S \
---machine s390-virtio,accel=tcg,usb=off,dump-guest-core=off \
-+-machine s390-virtio,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/console-virtio-unix.x86_64-2.5.0.args b/tests/qemuxml2argvdata/console-virtio-unix.x86_64-2.5.0.args
-index 648dc7493e..4f731981eb 100644
---- a/tests/qemuxml2argvdata/console-virtio-unix.x86_64-2.5.0.args
-+++ b/tests/qemuxml2argvdata/console-virtio-unix.x86_64-2.5.0.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name guest=QEMUGuest1,debug-threads=on \
- -S \
---machine pc-i440fx-2.5,accel=kvm,usb=off,dump-guest-core=off \
-+-machine pc-i440fx-2.5,usb=off,dump-guest-core=off \
-+-accel kvm \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/console-virtio-unix.x86_64-latest.args b/tests/qemuxml2argvdata/console-virtio-unix.x86_64-latest.args
-index dbad074eb3..faf3502ac1 100644
---- a/tests/qemuxml2argvdata/console-virtio-unix.x86_64-latest.args
-+++ b/tests/qemuxml2argvdata/console-virtio-unix.x86_64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc,accel=kvm,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel kvm \
- -cpu qemu64 \
- -m 214 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/console-virtio.args b/tests/qemuxml2argvdata/console-virtio.args
-index 30a47a915b..e120d84315 100644
---- a/tests/qemuxml2argvdata/console-virtio.args
-+++ b/tests/qemuxml2argvdata/console-virtio.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/controller-order.args b/tests/qemuxml2argvdata/controller-order.args
-index ff88df04d8..b605394b77 100644
---- a/tests/qemuxml2argvdata/controller-order.args
-+++ b/tests/qemuxml2argvdata/controller-order.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=spice \
- /usr/bin/qemu-system-x86_64 \
- -name fdr \
- -S \
---machine pc,accel=kvm,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel kvm \
- -m 4096 \
- -realtime mlock=off \
- -smp 4,sockets=4,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/controller-virtio-scsi.x86_64-latest.args b/tests/qemuxml2argvdata/controller-virtio-scsi.x86_64-latest.args
-index 454da17e2c..748d7956e1 100644
---- a/tests/qemuxml2argvdata/controller-virtio-scsi.x86_64-latest.args
-+++ b/tests/qemuxml2argvdata/controller-virtio-scsi.x86_64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu qemu64 \
- -m 214 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/cpu-Haswell-noTSX.args b/tests/qemuxml2argvdata/cpu-Haswell-noTSX.args
-index 3cb634d0c7..4f72d206cd 100644
---- a/tests/qemuxml2argvdata/cpu-Haswell-noTSX.args
-+++ b/tests/qemuxml2argvdata/cpu-Haswell-noTSX.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=kvm,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel kvm \
- -cpu Haswell-noTSX \
- -m 214 \
- -realtime mlock=off \
-diff --git a/tests/qemuxml2argvdata/cpu-Haswell.args b/tests/qemuxml2argvdata/cpu-Haswell.args
-index a33b16f7ce..3aa9a6cd84 100644
---- a/tests/qemuxml2argvdata/cpu-Haswell.args
-+++ b/tests/qemuxml2argvdata/cpu-Haswell.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=kvm,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel kvm \
- -cpu Haswell \
- -m 214 \
- -realtime mlock=off \
-diff --git a/tests/qemuxml2argvdata/cpu-Haswell2.args b/tests/qemuxml2argvdata/cpu-Haswell2.args
-index 4e989ed2f5..895f8478c3 100644
---- a/tests/qemuxml2argvdata/cpu-Haswell2.args
-+++ b/tests/qemuxml2argvdata/cpu-Haswell2.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=kvm,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel kvm \
- -cpu Haswell,-hle,-rtm \
- -m 214 \
- -realtime mlock=off \
-diff --git a/tests/qemuxml2argvdata/cpu-Haswell3.args b/tests/qemuxml2argvdata/cpu-Haswell3.args
-index d35de5ea58..0c4627b90a 100644
---- a/tests/qemuxml2argvdata/cpu-Haswell3.args
-+++ b/tests/qemuxml2argvdata/cpu-Haswell3.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=kvm,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel kvm \
- -cpu Haswell,+rtm,+hle \
- -m 214 \
- -realtime mlock=off \
-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
-index 96d4306238..9235d35fe2 100644
---- 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
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-test/master-key.aes \
---machine pc-i440fx-3.1,accel=kvm,usb=off,dump-guest-core=off \
-+-machine pc-i440fx-3.1,usb=off,dump-guest-core=off \
-+-accel kvm \
- -cpu Icelake-Server,pconfig=off \
- -m 214 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.x86_64-latest.args b/tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.x86_64-latest.args
-index 88d05a482a..0aa9db7137 100644
---- a/tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.x86_64-latest.args
-+++ b/tests/qemuxml2argvdata/cpu-Icelake-Server-pconfig.x86_64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-test/master-key.aes \
---machine pc,accel=kvm,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel kvm \
- -cpu Icelake-Server \
- -m 214 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/cpu-cache-disable.args b/tests/qemuxml2argvdata/cpu-cache-disable.args
-index 03347b66cc..9fe9eecc55 100644
---- a/tests/qemuxml2argvdata/cpu-cache-disable.args
-+++ b/tests/qemuxml2argvdata/cpu-cache-disable.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name foo \
- -S \
---machine pc,accel=kvm,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel kvm \
- -cpu host,host-cache-info=off,l3-cache=off \
- -m 214 \
- -realtime mlock=off \
-diff --git a/tests/qemuxml2argvdata/cpu-cache-disable2.args b/tests/qemuxml2argvdata/cpu-cache-disable2.args
-index 375b00cc67..756a9ff812 100644
---- a/tests/qemuxml2argvdata/cpu-cache-disable2.args
-+++ b/tests/qemuxml2argvdata/cpu-cache-disable2.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name foo \
- -S \
---machine pc,accel=kvm,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel kvm \
- -cpu host \
- -m 214 \
- -realtime mlock=off \
-diff --git a/tests/qemuxml2argvdata/cpu-cache-disable3.args b/tests/qemuxml2argvdata/cpu-cache-disable3.args
-index b597da4d6f..5b3dc9a474 100644
---- a/tests/qemuxml2argvdata/cpu-cache-disable3.args
-+++ b/tests/qemuxml2argvdata/cpu-cache-disable3.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name foo \
- -S \
---machine pc,accel=kvm,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel kvm \
- -cpu core2duo,+ds,+acpi,+ss,+ht,+tm,+pbe,+ds_cpl,+vmx,+est,+tm2,+cx16,+xtpr,\
- +lahf_lm,l3-cache=off \
- -m 214 \
-diff --git a/tests/qemuxml2argvdata/cpu-cache-emulate-l3.args b/tests/qemuxml2argvdata/cpu-cache-emulate-l3.args
-index 3d2a4baa51..804cc221de 100644
---- a/tests/qemuxml2argvdata/cpu-cache-emulate-l3.args
-+++ b/tests/qemuxml2argvdata/cpu-cache-emulate-l3.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name foo \
- -S \
---machine pc,accel=kvm,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel kvm \
- -cpu host,l3-cache=on,host-cache-info=off \
- -m 214 \
- -realtime mlock=off \
-diff --git a/tests/qemuxml2argvdata/cpu-cache-passthrough.args b/tests/qemuxml2argvdata/cpu-cache-passthrough.args
-index 5bb2269b34..c5501afbee 100644
---- a/tests/qemuxml2argvdata/cpu-cache-passthrough.args
-+++ b/tests/qemuxml2argvdata/cpu-cache-passthrough.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name foo \
- -S \
---machine pc,accel=kvm,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel kvm \
- -cpu host,host-cache-info=on,l3-cache=off \
- -m 214 \
- -realtime mlock=off \
-diff --git a/tests/qemuxml2argvdata/cpu-cache-passthrough2.args b/tests/qemuxml2argvdata/cpu-cache-passthrough2.args
-index 9ddad45b9f..45ccec3fb2 100644
---- a/tests/qemuxml2argvdata/cpu-cache-passthrough2.args
-+++ b/tests/qemuxml2argvdata/cpu-cache-passthrough2.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name foo \
- -S \
---machine pc,accel=kvm,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel kvm \
- -cpu host,host-cache-info=on \
- -m 214 \
- -realtime mlock=off \
-diff --git a/tests/qemuxml2argvdata/cpu-check-default-none.args b/tests/qemuxml2argvdata/cpu-check-default-none.args
-index 14b02d5dbd..3b142a75a3 100644
---- a/tests/qemuxml2argvdata/cpu-check-default-none.args
-+++ b/tests/qemuxml2argvdata/cpu-check-default-none.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=kvm,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel kvm \
- -cpu host \
- -m 214 \
- -realtime mlock=off \
-diff --git a/tests/qemuxml2argvdata/cpu-check-default-none2.args b/tests/qemuxml2argvdata/cpu-check-default-none2.args
-index b24a74e54c..0c5a47220b 100644
---- a/tests/qemuxml2argvdata/cpu-check-default-none2.args
-+++ b/tests/qemuxml2argvdata/cpu-check-default-none2.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu core2duo \
- -m 214 \
- -realtime mlock=off \
-diff --git a/tests/qemuxml2argvdata/cpu-check-default-partial.args b/tests/qemuxml2argvdata/cpu-check-default-partial.args
-index f215c45fad..7915d1f0cf 100644
---- a/tests/qemuxml2argvdata/cpu-check-default-partial.args
-+++ b/tests/qemuxml2argvdata/cpu-check-default-partial.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=kvm,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel kvm \
- -cpu core2duo,+ds,+acpi,+ss,+ht,+tm,+pbe,+ds_cpl,+vmx,+est,+tm2,+cx16,+xtpr,\
- +lahf_lm \
- -m 214 \
-diff --git a/tests/qemuxml2argvdata/cpu-check-default-partial2.args b/tests/qemuxml2argvdata/cpu-check-default-partial2.args
-index 1e4af63dc3..71891fd324 100644
---- a/tests/qemuxml2argvdata/cpu-check-default-partial2.args
-+++ b/tests/qemuxml2argvdata/cpu-check-default-partial2.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=kvm,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel kvm \
- -cpu core2duo \
- -m 214 \
- -realtime mlock=off \
-diff --git a/tests/qemuxml2argvdata/cpu-check-none.args b/tests/qemuxml2argvdata/cpu-check-none.args
-index 1e4af63dc3..71891fd324 100644
---- a/tests/qemuxml2argvdata/cpu-check-none.args
-+++ b/tests/qemuxml2argvdata/cpu-check-none.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=kvm,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel kvm \
- -cpu core2duo \
- -m 214 \
- -realtime mlock=off \
-diff --git a/tests/qemuxml2argvdata/cpu-eoi-disabled.args b/tests/qemuxml2argvdata/cpu-eoi-disabled.args
-index 786f9b693c..1e98cdbdc5 100644
---- a/tests/qemuxml2argvdata/cpu-eoi-disabled.args
-+++ b/tests/qemuxml2argvdata/cpu-eoi-disabled.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu qemu32,-kvm_pv_eoi \
- -m 214 \
- -realtime mlock=off \
-diff --git a/tests/qemuxml2argvdata/cpu-eoi-enabled.args b/tests/qemuxml2argvdata/cpu-eoi-enabled.args
-index 90bacb0224..853eea9ac7 100644
---- a/tests/qemuxml2argvdata/cpu-eoi-enabled.args
-+++ b/tests/qemuxml2argvdata/cpu-eoi-enabled.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu qemu32,+kvm_pv_eoi \
- -m 214 \
- -realtime mlock=off \
-diff --git a/tests/qemuxml2argvdata/cpu-exact1.args b/tests/qemuxml2argvdata/cpu-exact1.args
-index a2e4dcaf91..3f12c1a288 100644
---- a/tests/qemuxml2argvdata/cpu-exact1.args
-+++ b/tests/qemuxml2argvdata/cpu-exact1.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=kvm,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel kvm \
- -cpu qemu64,-mca,-pse36,-clflush,-syscall,-nx,-lm,-svm \
- -m 214 \
- -realtime mlock=off \
-diff --git a/tests/qemuxml2argvdata/cpu-exact2-nofallback.args b/tests/qemuxml2argvdata/cpu-exact2-nofallback.args
-index 93f178751b..28d332eeb4 100644
---- a/tests/qemuxml2argvdata/cpu-exact2-nofallback.args
-+++ b/tests/qemuxml2argvdata/cpu-exact2-nofallback.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=kvm,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel kvm \
- -cpu core2duo,+ds,+ht,+tm,+ds_cpl,+xtpr,+3dnowext,+lahf_lm,-nx,-cx16,-tm2,-pbe,\
- -ss,-sse4a,-wdt \
- -m 214 \
-diff --git a/tests/qemuxml2argvdata/cpu-exact2.args b/tests/qemuxml2argvdata/cpu-exact2.args
-index 93f178751b..28d332eeb4 100644
---- a/tests/qemuxml2argvdata/cpu-exact2.args
-+++ b/tests/qemuxml2argvdata/cpu-exact2.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=kvm,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel kvm \
- -cpu core2duo,+ds,+ht,+tm,+ds_cpl,+xtpr,+3dnowext,+lahf_lm,-nx,-cx16,-tm2,-pbe,\
- -ss,-sse4a,-wdt \
- -m 214 \
-diff --git a/tests/qemuxml2argvdata/cpu-fallback.args b/tests/qemuxml2argvdata/cpu-fallback.args
-index 40e0246031..89187236b7 100644
---- a/tests/qemuxml2argvdata/cpu-fallback.args
-+++ b/tests/qemuxml2argvdata/cpu-fallback.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=kvm,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel kvm \
- -cpu Penryn,-sse4.1,-sse4.2,-popcnt,-aes \
- -m 214 \
- -realtime mlock=off \
-diff --git a/tests/qemuxml2argvdata/cpu-host-kvmclock.args b/tests/qemuxml2argvdata/cpu-host-kvmclock.args
-index 23cb82113a..8c394c8fdb 100644
---- a/tests/qemuxml2argvdata/cpu-host-kvmclock.args
-+++ b/tests/qemuxml2argvdata/cpu-host-kvmclock.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=kvm,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel kvm \
- -cpu host,-kvmclock \
- -m 214 \
- -realtime mlock=off \
-diff --git a/tests/qemuxml2argvdata/cpu-host-model-cmt.args b/tests/qemuxml2argvdata/cpu-host-model-cmt.args
-index 42f969fd62..fea068f3f8 100644
---- a/tests/qemuxml2argvdata/cpu-host-model-cmt.args
-+++ b/tests/qemuxml2argvdata/cpu-host-model-cmt.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu Haswell,+vme,+ds,+acpi,+ss,+ht,+tm,+pbe,+dtes64,+monitor,+ds_cpl,+vmx,\
- +smx,+est,+tm2,+xtpr,+pdcm,+f16c,+rdrand,+pdpe1gb,+abm,+lahf_lm \
- -m 214 \
-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
-index b44dc2ec48..871b725a26 100644
---- 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
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc-i440fx-4.0,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc-i440fx-4.0,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu EPYC,acpi=on,ss=on,hypervisor=on,erms=on,mpx=on,pcommit=on,clwb=on,pku=on,\
- la57=on,3dnowext=on,3dnow=on,vme=off,fma=off,avx=off,f16c=off,rdrand=off,\
- avx2=off,rdseed=off,sha-ni=off,xsavec=off,fxsr_opt=off,misalignsse=off,\
-diff --git a/tests/qemuxml2argvdata/cpu-host-model-fallback.args b/tests/qemuxml2argvdata/cpu-host-model-fallback.args
-index 5f38b72f92..1ad6738fe7 100644
---- a/tests/qemuxml2argvdata/cpu-host-model-fallback.args
-+++ b/tests/qemuxml2argvdata/cpu-host-model-fallback.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu Penryn,+vme,+ds,+acpi,+ss,+ht,+tm,+pbe,+monitor,+ds_cpl,+vmx,+est,+tm2,\
- +xtpr,-sse4.1,+cx16,+lahf_lm \
- -m 214 \
-diff --git a/tests/qemuxml2argvdata/cpu-host-model-vendor.args b/tests/qemuxml2argvdata/cpu-host-model-vendor.args
-index 8ba238de3c..e3298894e5 100644
---- a/tests/qemuxml2argvdata/cpu-host-model-vendor.args
-+++ b/tests/qemuxml2argvdata/cpu-host-model-vendor.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu 'core2duo,vendor=Libvirt QEMU,+ds,+acpi,+ss,+ht,+tm,+pbe,+ds_cpl,+vmx,\
- +est,+tm2,+cx16,+xtpr,+lahf_lm' \
- -m 214 \
-diff --git a/tests/qemuxml2argvdata/cpu-host-model.args b/tests/qemuxml2argvdata/cpu-host-model.args
-index 32e192421f..349f98489c 100644
---- a/tests/qemuxml2argvdata/cpu-host-model.args
-+++ b/tests/qemuxml2argvdata/cpu-host-model.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu core2duo,+ds,+acpi,+ss,+ht,+tm,+pbe,+ds_cpl,+vmx,+est,+tm2,+cx16,+xtpr,\
- +lahf_lm \
- -m 214 \
-diff --git a/tests/qemuxml2argvdata/cpu-host-passthrough-features.args b/tests/qemuxml2argvdata/cpu-host-passthrough-features.args
-index a4de9d3de9..53b76fa78d 100644
---- a/tests/qemuxml2argvdata/cpu-host-passthrough-features.args
-+++ b/tests/qemuxml2argvdata/cpu-host-passthrough-features.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=kvm,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel kvm \
- -cpu host,+abm,+ds,-invtsc \
- -m 214 \
- -realtime mlock=off \
-diff --git a/tests/qemuxml2argvdata/cpu-host-passthrough.args b/tests/qemuxml2argvdata/cpu-host-passthrough.args
-index 14b02d5dbd..3b142a75a3 100644
---- a/tests/qemuxml2argvdata/cpu-host-passthrough.args
-+++ b/tests/qemuxml2argvdata/cpu-host-passthrough.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=kvm,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel kvm \
- -cpu host \
- -m 214 \
- -realtime mlock=off \
-diff --git a/tests/qemuxml2argvdata/cpu-hotplug-startup.args b/tests/qemuxml2argvdata/cpu-hotplug-startup.args
-index 78c03cfad5..9b7025f7e6 100644
---- a/tests/qemuxml2argvdata/cpu-hotplug-startup.args
-+++ b/tests/qemuxml2argvdata/cpu-hotplug-startup.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,maxcpus=6,sockets=3,cores=2,threads=1 \
-diff --git a/tests/qemuxml2argvdata/cpu-kvmclock.args b/tests/qemuxml2argvdata/cpu-kvmclock.args
-index 39d368a359..94bd87022f 100644
---- a/tests/qemuxml2argvdata/cpu-kvmclock.args
-+++ b/tests/qemuxml2argvdata/cpu-kvmclock.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=kvm,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel kvm \
- -cpu core2duo,-kvmclock \
- -m 214 \
- -realtime mlock=off \
-diff --git a/tests/qemuxml2argvdata/cpu-minimum1.args b/tests/qemuxml2argvdata/cpu-minimum1.args
-index 8246efd563..4dc0769cf5 100644
---- a/tests/qemuxml2argvdata/cpu-minimum1.args
-+++ b/tests/qemuxml2argvdata/cpu-minimum1.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=kvm,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel kvm \
- -cpu core2duo,+ds,+acpi,+ss,+ht,+tm,+pbe,+ds_cpl,+vmx,+est,+tm2,+cx16,+xtpr,\
- +lahf_lm \
- -m 214 \
-diff --git a/tests/qemuxml2argvdata/cpu-minimum2.args b/tests/qemuxml2argvdata/cpu-minimum2.args
-index 900d7486a6..db1026d95c 100644
---- a/tests/qemuxml2argvdata/cpu-minimum2.args
-+++ b/tests/qemuxml2argvdata/cpu-minimum2.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=kvm,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel kvm \
- -cpu core2duo,+ds,+acpi,+ss,+ht,+tm,+pbe,+ds_cpl,+vmx,+est,+tm2,+cx16,+xtpr,\
- +lahf_lm,-syscall,-nx,-lm,-svm \
- -m 214 \
-diff --git a/tests/qemuxml2argvdata/cpu-no-removed-features.args b/tests/qemuxml2argvdata/cpu-no-removed-features.args
-index 1e4af63dc3..71891fd324 100644
---- a/tests/qemuxml2argvdata/cpu-no-removed-features.args
-+++ b/tests/qemuxml2argvdata/cpu-no-removed-features.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=kvm,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel kvm \
- -cpu core2duo \
- -m 214 \
- -realtime mlock=off \
-diff --git a/tests/qemuxml2argvdata/cpu-numa-disjoint.args b/tests/qemuxml2argvdata/cpu-numa-disjoint.args
-index 79ee747184..e22b2978c3 100644
---- a/tests/qemuxml2argvdata/cpu-numa-disjoint.args
-+++ b/tests/qemuxml2argvdata/cpu-numa-disjoint.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 16,sockets=2,cores=4,threads=2 \
-diff --git a/tests/qemuxml2argvdata/cpu-numa-memshared.args b/tests/qemuxml2argvdata/cpu-numa-memshared.args
-index 752eed8d13..364934db4c 100644
---- a/tests/qemuxml2argvdata/cpu-numa-memshared.args
-+++ b/tests/qemuxml2argvdata/cpu-numa-memshared.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 16,sockets=2,cores=4,threads=2 \
-diff --git a/tests/qemuxml2argvdata/cpu-numa-no-memory-element.args b/tests/qemuxml2argvdata/cpu-numa-no-memory-element.args
-index c7e403441f..5b1aa84235 100644
---- a/tests/qemuxml2argvdata/cpu-numa-no-memory-element.args
-+++ b/tests/qemuxml2argvdata/cpu-numa-no-memory-element.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 16,sockets=2,cores=4,threads=2 \
-diff --git a/tests/qemuxml2argvdata/cpu-numa1.args b/tests/qemuxml2argvdata/cpu-numa1.args
-index c7e403441f..5b1aa84235 100644
---- a/tests/qemuxml2argvdata/cpu-numa1.args
-+++ b/tests/qemuxml2argvdata/cpu-numa1.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 16,sockets=2,cores=4,threads=2 \
-diff --git a/tests/qemuxml2argvdata/cpu-numa2.args b/tests/qemuxml2argvdata/cpu-numa2.args
-index c7e403441f..5b1aa84235 100644
---- a/tests/qemuxml2argvdata/cpu-numa2.args
-+++ b/tests/qemuxml2argvdata/cpu-numa2.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 16,sockets=2,cores=4,threads=2 \
-diff --git a/tests/qemuxml2argvdata/cpu-s390-features.args b/tests/qemuxml2argvdata/cpu-s390-features.args
-index 97ad063a52..e184082900 100644
---- a/tests/qemuxml2argvdata/cpu-s390-features.args
-+++ b/tests/qemuxml2argvdata/cpu-s390-features.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-s390x \
- -name guest1 \
- -S \
---machine s390-ccw-virtio,accel=kvm,usb=off,dump-guest-core=off \
-+-machine s390-ccw-virtio,usb=off,dump-guest-core=off \
-+-accel kvm \
- -cpu zEC12,dfppc=on,stckf=off \
- -m 214 \
- -realtime mlock=off \
-diff --git a/tests/qemuxml2argvdata/cpu-s390-zEC12.args b/tests/qemuxml2argvdata/cpu-s390-zEC12.args
-index 3f035da711..a6e44f59ec 100644
---- a/tests/qemuxml2argvdata/cpu-s390-zEC12.args
-+++ b/tests/qemuxml2argvdata/cpu-s390-zEC12.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-s390x \
- -name guest1 \
- -S \
---machine s390-ccw-virtio,accel=kvm,usb=off,dump-guest-core=off \
-+-machine s390-ccw-virtio,usb=off,dump-guest-core=off \
-+-accel kvm \
- -cpu zEC12 \
- -m 214 \
- -realtime mlock=off \
-diff --git a/tests/qemuxml2argvdata/cpu-strict1.args b/tests/qemuxml2argvdata/cpu-strict1.args
-index ac174e8f51..4c840db2c4 100644
---- a/tests/qemuxml2argvdata/cpu-strict1.args
-+++ b/tests/qemuxml2argvdata/cpu-strict1.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=kvm,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel kvm \
- -cpu core2duo,+ds,+acpi,+ht,+tm,+ds_cpl,+vmx,+est,+xtpr,+3dnowext,+lahf_lm,-nx,\
- -cx16,-tm2,-pbe,-ss,-sse4a,-wdt \
- -m 214 \
-diff --git a/tests/qemuxml2argvdata/cpu-topology1.args b/tests/qemuxml2argvdata/cpu-topology1.args
-index 56e4e8ee40..4663b60c8d 100644
---- a/tests/qemuxml2argvdata/cpu-topology1.args
-+++ b/tests/qemuxml2argvdata/cpu-topology1.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 6,sockets=3,cores=2,threads=1 \
-diff --git a/tests/qemuxml2argvdata/cpu-topology2.args b/tests/qemuxml2argvdata/cpu-topology2.args
-index ac99ae3f58..c17fa92996 100644
---- a/tests/qemuxml2argvdata/cpu-topology2.args
-+++ b/tests/qemuxml2argvdata/cpu-topology2.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu core2duo \
- -m 214 \
- -realtime mlock=off \
-diff --git a/tests/qemuxml2argvdata/cpu-topology3.args b/tests/qemuxml2argvdata/cpu-topology3.args
-index 56e4e8ee40..4663b60c8d 100644
---- a/tests/qemuxml2argvdata/cpu-topology3.args
-+++ b/tests/qemuxml2argvdata/cpu-topology3.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 6,sockets=3,cores=2,threads=1 \
-diff --git a/tests/qemuxml2argvdata/cpu-translation.x86_64-4.0.0.args b/tests/qemuxml2argvdata/cpu-translation.x86_64-4.0.0.args
-index f8e19fca24..4e30fed044 100644
---- a/tests/qemuxml2argvdata/cpu-translation.x86_64-4.0.0.args
-+++ b/tests/qemuxml2argvdata/cpu-translation.x86_64-4.0.0.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc-i440fx-4.0,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc-i440fx-4.0,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu Haswell,pclmuldq=on,ds_cpl=on,tsc_adjust=on,fxsr_opt=on,lahf_lm=on,\
- cmp_legacy=on,nodeid_msr=on,perfctr_core=on,perfctr_nb=on,kvm_pv_eoi=on,\
- kvm_pv_unhalt=on \
-diff --git a/tests/qemuxml2argvdata/cpu-translation.x86_64-latest.args b/tests/qemuxml2argvdata/cpu-translation.x86_64-latest.args
-index 9322b826f4..dc8f97ac7a 100644
---- a/tests/qemuxml2argvdata/cpu-translation.x86_64-latest.args
-+++ b/tests/qemuxml2argvdata/cpu-translation.x86_64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,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 \
-diff --git a/tests/qemuxml2argvdata/cpu-tsc-frequency.args b/tests/qemuxml2argvdata/cpu-tsc-frequency.args
-index 55b72b4404..bb68c039bf 100644
---- a/tests/qemuxml2argvdata/cpu-tsc-frequency.args
-+++ b/tests/qemuxml2argvdata/cpu-tsc-frequency.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=kvm,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel kvm \
- -cpu Haswell,+vme,+ds,+acpi,+ss,+ht,+tm,+pbe,+dtes64,+monitor,+ds_cpl,+vmx,\
- +smx,+est,+tm2,+xtpr,+pdcm,+f16c,+rdrand,+pdpe1gb,+abm,+lahf_lm,+invtsc,\
- tsc-frequency=3504000000 \
-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
-index b0e6d05b6c..c10e5eb361 100644
---- a/tests/qemuxml2argvdata/cpu-tsc-frequency.x86_64-4.0.0.args
-+++ b/tests/qemuxml2argvdata/cpu-tsc-frequency.x86_64-4.0.0.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc-i440fx-4.0,accel=kvm,usb=off,dump-guest-core=off \
-+-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=3504000000 \
-diff --git a/tests/qemuxml2argvdata/cputune-numatune.args b/tests/qemuxml2argvdata/cputune-numatune.args
-index 787d5879b5..fe296a7911 100644
---- a/tests/qemuxml2argvdata/cputune-numatune.args
-+++ b/tests/qemuxml2argvdata/cputune-numatune.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name dummy2 \
- -S \
---machine pc,accel=kvm,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel kvm \
- -m 128 \
- -realtime mlock=off \
- -smp 2,maxcpus=6,sockets=6,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/cputune-zero-shares.args b/tests/qemuxml2argvdata/cputune-zero-shares.args
-index 7270aafeb7..75c73b54d2 100644
---- a/tests/qemuxml2argvdata/cputune-zero-shares.args
-+++ b/tests/qemuxml2argvdata/cputune-zero-shares.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 2,sockets=2,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/cputune.args b/tests/qemuxml2argvdata/cputune.args
-index 7270aafeb7..75c73b54d2 100644
---- a/tests/qemuxml2argvdata/cputune.args
-+++ b/tests/qemuxml2argvdata/cputune.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 2,sockets=2,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/debug-threads.args b/tests/qemuxml2argvdata/debug-threads.args
-index d73625e94e..333f87da95 100644
---- a/tests/qemuxml2argvdata/debug-threads.args
-+++ b/tests/qemuxml2argvdata/debug-threads.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1,debug-threads=on \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/default-kvm-host-arch.args b/tests/qemuxml2argvdata/default-kvm-host-arch.args
-index 2a4fc70f67..f697a799fb 100644
---- a/tests/qemuxml2argvdata/default-kvm-host-arch.args
-+++ b/tests/qemuxml2argvdata/default-kvm-host-arch.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name kvm \
- -S \
---machine pc,accel=kvm,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel kvm \
- -m 4096 \
- -realtime mlock=off \
- -smp 4,sockets=4,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/default-qemu-host-arch.args b/tests/qemuxml2argvdata/default-qemu-host-arch.args
-index f9e7398a12..706dcac244 100644
---- a/tests/qemuxml2argvdata/default-qemu-host-arch.args
-+++ b/tests/qemuxml2argvdata/default-qemu-host-arch.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name qemu-host \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 4096 \
- -realtime mlock=off \
- -smp 4,sockets=4,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/default-video-type-aarch64.aarch64-latest.args b/tests/qemuxml2argvdata/default-video-type-aarch64.aarch64-latest.args
-index 4eaeaa5436..2ceec30c8f 100644
---- a/tests/qemuxml2argvdata/default-video-type-aarch64.aarch64-latest.args
-+++ b/tests/qemuxml2argvdata/default-video-type-aarch64.aarch64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-default-video-type-a/master-key.aes \
---machine virt,accel=kvm,usb=off,dump-guest-core=off,gic-version=3 \
-+-machine virt,usb=off,dump-guest-core=off,gic-version=3 \
-+-accel kvm \
- -m 1024 \
- -overcommit mem-lock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/default-video-type-ppc64.ppc64-latest.args b/tests/qemuxml2argvdata/default-video-type-ppc64.ppc64-latest.args
-index 5fadd1b61f..6256bc3e43 100644
---- a/tests/qemuxml2argvdata/default-video-type-ppc64.ppc64-latest.args
-+++ b/tests/qemuxml2argvdata/default-video-type-ppc64.ppc64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-default-video-type-p/master-key.aes \
---machine pseries,accel=kvm,usb=off,dump-guest-core=off \
-+-machine pseries,usb=off,dump-guest-core=off \
-+-accel kvm \
- -cpu host \
- -m 1024 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/default-video-type-riscv64.riscv64-latest.args b/tests/qemuxml2argvdata/default-video-type-riscv64.riscv64-latest.args
-index c4acaaff0f..345710e795 100644
---- a/tests/qemuxml2argvdata/default-video-type-riscv64.riscv64-latest.args
-+++ b/tests/qemuxml2argvdata/default-video-type-riscv64.riscv64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=spice \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-default-video-type-r/master-key.aes \
---machine virt,accel=tcg,usb=off,dump-guest-core=off \
-+-machine virt,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 1024 \
- -overcommit mem-lock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/default-video-type-s390x.s390x-latest.args b/tests/qemuxml2argvdata/default-video-type-s390x.s390x-latest.args
-index 934c5d598b..e994918032 100644
---- a/tests/qemuxml2argvdata/default-video-type-s390x.s390x-latest.args
-+++ b/tests/qemuxml2argvdata/default-video-type-s390x.s390x-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-default-video-type-s/master-key.aes \
---machine s390-ccw-virtio,accel=kvm,usb=off,dump-guest-core=off \
-+-machine s390-ccw-virtio,usb=off,dump-guest-core=off \
-+-accel kvm \
- -cpu z13.2-base,aen=on,aefsi=on,msa5=on,msa4=on,msa3=on,msa2=on,msa1=on,\
- sthyi=on,edat=on,ri=on,edat2=on,vx=on,ipter=on,ap=on,esop=on,apft=on,apqci=on,\
- cte=on,bpb=on,ppa15=on,zpci=on,sea_esop2=on,te=on,cmm=on \
-diff --git a/tests/qemuxml2argvdata/disk-aio.args b/tests/qemuxml2argvdata/disk-aio.args
-index 1b4dffc84c..eb04c26bdd 100644
---- a/tests/qemuxml2argvdata/disk-aio.args
-+++ b/tests/qemuxml2argvdata/disk-aio.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/disk-aio.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-aio.x86_64-2.12.0.args
-index f8a89493f6..dd88aabf7c 100644
---- a/tests/qemuxml2argvdata/disk-aio.x86_64-2.12.0.args
-+++ b/tests/qemuxml2argvdata/disk-aio.x86_64-2.12.0.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc-i440fx-2.12,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc-i440fx-2.12,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/disk-aio.x86_64-latest.args b/tests/qemuxml2argvdata/disk-aio.x86_64-latest.args
-index 487018cf3e..a60ac6f736 100644
---- a/tests/qemuxml2argvdata/disk-aio.x86_64-latest.args
-+++ b/tests/qemuxml2argvdata/disk-aio.x86_64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu qemu64 \
- -m 214 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-2.12.0.args
-index 47691339d6..bd87945e66 100644
---- a/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-2.12.0.args
-+++ b/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-2.12.0.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc-i440fx-2.12,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc-i440fx-2.12,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-latest.args b/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-latest.args
-index 6c19da970f..914886466e 100644
---- a/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-latest.args
-+++ b/tests/qemuxml2argvdata/disk-backing-chains-noindex.x86_64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu qemu64 \
- -m 214 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/disk-blockio.args b/tests/qemuxml2argvdata/disk-blockio.args
-index 72aa592fef..422c8e199d 100644
---- a/tests/qemuxml2argvdata/disk-blockio.args
-+++ b/tests/qemuxml2argvdata/disk-blockio.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/disk-boot-cdrom.args b/tests/qemuxml2argvdata/disk-boot-cdrom.args
-index c574cb02e6..7c54db4f14 100644
---- a/tests/qemuxml2argvdata/disk-boot-cdrom.args
-+++ b/tests/qemuxml2argvdata/disk-boot-cdrom.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/disk-boot-disk.args b/tests/qemuxml2argvdata/disk-boot-disk.args
-index 435ddd6194..80e8bedddf 100644
---- a/tests/qemuxml2argvdata/disk-boot-disk.args
-+++ b/tests/qemuxml2argvdata/disk-boot-disk.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/disk-cache.x86_64-1.5.3.args b/tests/qemuxml2argvdata/disk-cache.x86_64-1.5.3.args
-index 25360071e3..bbae923759 100644
---- a/tests/qemuxml2argvdata/disk-cache.x86_64-1.5.3.args
-+++ b/tests/qemuxml2argvdata/disk-cache.x86_64-1.5.3.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name QEMUGuest1 \
- -S \
---machine pc-i440fx-1.5,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc-i440fx-1.5,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/disk-cache.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-cache.x86_64-2.12.0.args
-index aa7a230583..bf009d22bf 100644
---- a/tests/qemuxml2argvdata/disk-cache.x86_64-2.12.0.args
-+++ b/tests/qemuxml2argvdata/disk-cache.x86_64-2.12.0.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc-i440fx-1.5,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc-i440fx-1.5,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/disk-cache.x86_64-2.6.0.args b/tests/qemuxml2argvdata/disk-cache.x86_64-2.6.0.args
-index 64fd4308e4..06d6e6b964 100644
---- a/tests/qemuxml2argvdata/disk-cache.x86_64-2.6.0.args
-+++ b/tests/qemuxml2argvdata/disk-cache.x86_64-2.6.0.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc-i440fx-1.5,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc-i440fx-1.5,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/disk-cache.x86_64-2.7.0.args b/tests/qemuxml2argvdata/disk-cache.x86_64-2.7.0.args
-index a6a448999b..2d64fd0ede 100644
---- a/tests/qemuxml2argvdata/disk-cache.x86_64-2.7.0.args
-+++ b/tests/qemuxml2argvdata/disk-cache.x86_64-2.7.0.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc-i440fx-1.5,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc-i440fx-1.5,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/disk-cache.x86_64-latest.args b/tests/qemuxml2argvdata/disk-cache.x86_64-latest.args
-index 4b70cb634c..3b6798d67e 100644
---- a/tests/qemuxml2argvdata/disk-cache.x86_64-latest.args
-+++ b/tests/qemuxml2argvdata/disk-cache.x86_64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc-i440fx-1.5,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc-i440fx-1.5,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu qemu64 \
- -m 214 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/disk-cdrom-bus-other.x86_64-latest.args b/tests/qemuxml2argvdata/disk-cdrom-bus-other.x86_64-latest.args
-index b1c30dd4d8..caee68fc62 100644
---- a/tests/qemuxml2argvdata/disk-cdrom-bus-other.x86_64-latest.args
-+++ b/tests/qemuxml2argvdata/disk-cdrom-bus-other.x86_64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu qemu64 \
- -m 214 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/disk-cdrom-empty-network-invalid.x86_64-latest.args b/tests/qemuxml2argvdata/disk-cdrom-empty-network-invalid.x86_64-latest.args
-index 81f250600e..3f887da8ca 100644
---- a/tests/qemuxml2argvdata/disk-cdrom-empty-network-invalid.x86_64-latest.args
-+++ b/tests/qemuxml2argvdata/disk-cdrom-empty-network-invalid.x86_64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu qemu64 \
- -m 214 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/disk-cdrom-network.args b/tests/qemuxml2argvdata/disk-cdrom-network.args
-index 81ff324a0f..90f142993c 100644
---- a/tests/qemuxml2argvdata/disk-cdrom-network.args
-+++ b/tests/qemuxml2argvdata/disk-cdrom-network.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name QEMUGuest1 \
- -S \
---machine pc-1.2,accel=kvm,usb=off,dump-guest-core=off \
-+-machine pc-1.2,usb=off,dump-guest-core=off \
-+-accel kvm \
- -m 1024 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/disk-cdrom-network.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-cdrom-network.x86_64-2.12.0.args
-index 81f6b400aa..6a2b59e3ab 100644
---- a/tests/qemuxml2argvdata/disk-cdrom-network.x86_64-2.12.0.args
-+++ b/tests/qemuxml2argvdata/disk-cdrom-network.x86_64-2.12.0.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc-1.2,accel=kvm,usb=off,dump-guest-core=off \
-+-machine pc-1.2,usb=off,dump-guest-core=off \
-+-accel kvm \
- -m 1024 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/disk-cdrom-network.x86_64-latest.args b/tests/qemuxml2argvdata/disk-cdrom-network.x86_64-latest.args
-index 2515b256d0..c8fb6a760d 100644
---- a/tests/qemuxml2argvdata/disk-cdrom-network.x86_64-latest.args
-+++ b/tests/qemuxml2argvdata/disk-cdrom-network.x86_64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc-1.2,accel=kvm,usb=off,dump-guest-core=off \
-+-machine pc-1.2,usb=off,dump-guest-core=off \
-+-accel kvm \
- -cpu qemu64 \
- -m 1024 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/disk-cdrom-tray.args b/tests/qemuxml2argvdata/disk-cdrom-tray.args
-index ff3f77962e..776813c6f4 100644
---- a/tests/qemuxml2argvdata/disk-cdrom-tray.args
-+++ b/tests/qemuxml2argvdata/disk-cdrom-tray.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name test \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 1024 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-2.12.0.args
-index 7952c42d07..58e1c7b8cd 100644
---- a/tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-2.12.0.args
-+++ b/tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-2.12.0.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-test/master-key.aes \
---machine pc-i440fx-2.12,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc-i440fx-2.12,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 1024 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-latest.args b/tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-latest.args
-index 120aa5b53b..acc3753a6a 100644
---- a/tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-latest.args
-+++ b/tests/qemuxml2argvdata/disk-cdrom-tray.x86_64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-test/master-key.aes \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu qemu64 \
- -m 1024 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/disk-cdrom.args b/tests/qemuxml2argvdata/disk-cdrom.args
-index cbac368129..0fe4ff94d0 100644
---- a/tests/qemuxml2argvdata/disk-cdrom.args
-+++ b/tests/qemuxml2argvdata/disk-cdrom.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/disk-cdrom.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-cdrom.x86_64-2.12.0.args
-index 2440acc78a..138d723d1e 100644
---- a/tests/qemuxml2argvdata/disk-cdrom.x86_64-2.12.0.args
-+++ b/tests/qemuxml2argvdata/disk-cdrom.x86_64-2.12.0.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc-i440fx-2.12,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc-i440fx-2.12,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/disk-cdrom.x86_64-latest.args b/tests/qemuxml2argvdata/disk-cdrom.x86_64-latest.args
-index 9c8097c4a6..378b9bd1fa 100644
---- a/tests/qemuxml2argvdata/disk-cdrom.x86_64-latest.args
-+++ b/tests/qemuxml2argvdata/disk-cdrom.x86_64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu qemu64 \
- -m 214 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/disk-copy_on_read.args b/tests/qemuxml2argvdata/disk-copy_on_read.args
-index ca44c59816..699505c0bc 100644
---- a/tests/qemuxml2argvdata/disk-copy_on_read.args
-+++ b/tests/qemuxml2argvdata/disk-copy_on_read.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name test \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 1024 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/disk-copy_on_read.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-copy_on_read.x86_64-2.12.0.args
-index 00d5f45def..d294483a50 100644
---- a/tests/qemuxml2argvdata/disk-copy_on_read.x86_64-2.12.0.args
-+++ b/tests/qemuxml2argvdata/disk-copy_on_read.x86_64-2.12.0.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-test/master-key.aes \
---machine pc-i440fx-2.12,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc-i440fx-2.12,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 1024 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/disk-copy_on_read.x86_64-latest.args b/tests/qemuxml2argvdata/disk-copy_on_read.x86_64-latest.args
-index 82d44ba0bb..e89558a05b 100644
---- a/tests/qemuxml2argvdata/disk-copy_on_read.x86_64-latest.args
-+++ b/tests/qemuxml2argvdata/disk-copy_on_read.x86_64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-test/master-key.aes \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu qemu64 \
- -m 1024 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/disk-detect-zeroes.args b/tests/qemuxml2argvdata/disk-detect-zeroes.args
-index 400a1b4957..2ad648db46 100644
---- a/tests/qemuxml2argvdata/disk-detect-zeroes.args
-+++ b/tests/qemuxml2argvdata/disk-detect-zeroes.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name test \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 1024 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-2.12.0.args
-index 1da46d8987..124f330cd7 100644
---- a/tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-2.12.0.args
-+++ b/tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-2.12.0.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-test/master-key.aes \
---machine pc-i440fx-2.12,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc-i440fx-2.12,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 1024 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-latest.args b/tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-latest.args
-index 1a6a02a3be..248bc93d28 100644
---- a/tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-latest.args
-+++ b/tests/qemuxml2argvdata/disk-detect-zeroes.x86_64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-test/master-key.aes \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu qemu64 \
- -m 1024 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/disk-discard.args b/tests/qemuxml2argvdata/disk-discard.args
-index 163b1b0df2..01b9b16da1 100644
---- a/tests/qemuxml2argvdata/disk-discard.args
-+++ b/tests/qemuxml2argvdata/disk-discard.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name test \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 1024 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-2.12.0.args b/tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-2.12.0.args
-index 6b93b74ec1..7c3bb65826 100644
---- a/tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-2.12.0.args
-+++ b/tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-2.12.0.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-guest/master-key.aes \
---machine s390-ccw-virtio-2.12,accel=tcg,usb=off,dump-guest-core=off \
-+-machine s390-ccw-virtio-2.12,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-latest.args b/tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-latest.args
-index 0d9254e1ae..8f498af524 100644
---- a/tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-latest.args
-+++ b/tests/qemuxml2argvdata/disk-error-policy-s390x.s390x-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-guest/master-key.aes \
---machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off \
-+-machine s390-ccw-virtio,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu qemu \
- -m 214 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/disk-error-policy.args b/tests/qemuxml2argvdata/disk-error-policy.args
-index c339203e2e..572becf378 100644
---- a/tests/qemuxml2argvdata/disk-error-policy.args
-+++ b/tests/qemuxml2argvdata/disk-error-policy.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/disk-error-policy.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-error-policy.x86_64-2.12.0.args
-index 26e8f56e58..16195e49b9 100644
---- a/tests/qemuxml2argvdata/disk-error-policy.x86_64-2.12.0.args
-+++ b/tests/qemuxml2argvdata/disk-error-policy.x86_64-2.12.0.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc-i440fx-2.12,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc-i440fx-2.12,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/disk-error-policy.x86_64-latest.args b/tests/qemuxml2argvdata/disk-error-policy.x86_64-latest.args
-index e8f5ea10df..22328b12d8 100644
---- a/tests/qemuxml2argvdata/disk-error-policy.x86_64-latest.args
-+++ b/tests/qemuxml2argvdata/disk-error-policy.x86_64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu qemu64 \
- -m 214 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/disk-floppy-q35-2_11.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-floppy-q35-2_11.x86_64-2.12.0.args
-index b221718e29..18d7b68b78 100644
---- a/tests/qemuxml2argvdata/disk-floppy-q35-2_11.x86_64-2.12.0.args
-+++ b/tests/qemuxml2argvdata/disk-floppy-q35-2_11.x86_64-2.12.0.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc-q35-2.11,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc-q35-2.11,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/disk-floppy-q35-2_11.x86_64-latest.args b/tests/qemuxml2argvdata/disk-floppy-q35-2_11.x86_64-latest.args
-index a624998480..0144203f21 100644
---- a/tests/qemuxml2argvdata/disk-floppy-q35-2_11.x86_64-latest.args
-+++ b/tests/qemuxml2argvdata/disk-floppy-q35-2_11.x86_64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc-q35-2.11,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc-q35-2.11,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu qemu64 \
- -m 214 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/disk-floppy-q35-2_9.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-floppy-q35-2_9.x86_64-2.12.0.args
-index 51be45465e..8bdca7b28a 100644
---- a/tests/qemuxml2argvdata/disk-floppy-q35-2_9.x86_64-2.12.0.args
-+++ b/tests/qemuxml2argvdata/disk-floppy-q35-2_9.x86_64-2.12.0.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc-q35-2.9,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc-q35-2.9,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/disk-floppy-q35-2_9.x86_64-latest.args b/tests/qemuxml2argvdata/disk-floppy-q35-2_9.x86_64-latest.args
-index ec3210cdc8..debeacd06d 100644
---- a/tests/qemuxml2argvdata/disk-floppy-q35-2_9.x86_64-latest.args
-+++ b/tests/qemuxml2argvdata/disk-floppy-q35-2_9.x86_64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc-q35-2.9,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc-q35-2.9,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu qemu64 \
- -m 214 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/disk-floppy-tray.args b/tests/qemuxml2argvdata/disk-floppy-tray.args
-index e8a4472ebc..4da037e24f 100644
---- a/tests/qemuxml2argvdata/disk-floppy-tray.args
-+++ b/tests/qemuxml2argvdata/disk-floppy-tray.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/disk-floppy.args b/tests/qemuxml2argvdata/disk-floppy.args
-index 83ec46bb9d..361357fc7f 100644
---- a/tests/qemuxml2argvdata/disk-floppy.args
-+++ b/tests/qemuxml2argvdata/disk-floppy.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/disk-floppy.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-floppy.x86_64-2.12.0.args
-index d4f11f8ca0..566591cdee 100644
---- a/tests/qemuxml2argvdata/disk-floppy.x86_64-2.12.0.args
-+++ b/tests/qemuxml2argvdata/disk-floppy.x86_64-2.12.0.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc-i440fx-2.12,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc-i440fx-2.12,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/disk-floppy.x86_64-latest.args b/tests/qemuxml2argvdata/disk-floppy.x86_64-latest.args
-index fbca6c90ec..2829de1d8a 100644
---- a/tests/qemuxml2argvdata/disk-floppy.x86_64-latest.args
-+++ b/tests/qemuxml2argvdata/disk-floppy.x86_64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu qemu64 \
- -m 214 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/disk-fmt-qcow.args b/tests/qemuxml2argvdata/disk-fmt-qcow.args
-index 9c24ce384f..13b962f0ff 100644
---- a/tests/qemuxml2argvdata/disk-fmt-qcow.args
-+++ b/tests/qemuxml2argvdata/disk-fmt-qcow.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/disk-geometry.args b/tests/qemuxml2argvdata/disk-geometry.args
-index eefa7dc24e..412e6e2bee 100644
---- a/tests/qemuxml2argvdata/disk-geometry.args
-+++ b/tests/qemuxml2argvdata/disk-geometry.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/disk-hostdev-scsi-virtio-iscsi-auth-AES.args b/tests/qemuxml2argvdata/disk-hostdev-scsi-virtio-iscsi-auth-AES.args
-index 47b014aacc..0ede653e67 100644
---- a/tests/qemuxml2argvdata/disk-hostdev-scsi-virtio-iscsi-auth-AES.args
-+++ b/tests/qemuxml2argvdata/disk-hostdev-scsi-virtio-iscsi-auth-AES.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest2/master-key.aes \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/disk-ide-split.args b/tests/qemuxml2argvdata/disk-ide-split.args
-index c1a0cc7bfc..514483778c 100644
---- a/tests/qemuxml2argvdata/disk-ide-split.args
-+++ b/tests/qemuxml2argvdata/disk-ide-split.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/disk-ide-wwn.args b/tests/qemuxml2argvdata/disk-ide-wwn.args
-index 939daad00d..26ff069aa9 100644
---- a/tests/qemuxml2argvdata/disk-ide-wwn.args
-+++ b/tests/qemuxml2argvdata/disk-ide-wwn.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/disk-ioeventfd.args b/tests/qemuxml2argvdata/disk-ioeventfd.args
-index 2fc3562b16..29d6ad2e00 100644
---- a/tests/qemuxml2argvdata/disk-ioeventfd.args
-+++ b/tests/qemuxml2argvdata/disk-ioeventfd.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name test \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 1024 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/disk-iscsi.args b/tests/qemuxml2argvdata/disk-iscsi.args
-index 9297e95127..462e5bd218 100644
---- a/tests/qemuxml2argvdata/disk-iscsi.args
-+++ b/tests/qemuxml2argvdata/disk-iscsi.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/disk-network-gluster.args b/tests/qemuxml2argvdata/disk-network-gluster.args
-index 7664284f7c..3bc62a88dc 100644
---- a/tests/qemuxml2argvdata/disk-network-gluster.args
-+++ b/tests/qemuxml2argvdata/disk-network-gluster.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/disk-network-gluster.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-network-gluster.x86_64-2.12.0.args
-index 2721147b3a..d77ec1a5d2 100644
---- a/tests/qemuxml2argvdata/disk-network-gluster.x86_64-2.12.0.args
-+++ b/tests/qemuxml2argvdata/disk-network-gluster.x86_64-2.12.0.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc-i440fx-2.12,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc-i440fx-2.12,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/disk-network-gluster.x86_64-latest.args b/tests/qemuxml2argvdata/disk-network-gluster.x86_64-latest.args
-index 2cd59992ca..7ce5eea77b 100644
---- a/tests/qemuxml2argvdata/disk-network-gluster.x86_64-latest.args
-+++ b/tests/qemuxml2argvdata/disk-network-gluster.x86_64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu qemu64 \
- -m 214 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/disk-network-http.x86_64-latest.args b/tests/qemuxml2argvdata/disk-network-http.x86_64-latest.args
-index 7b4674a588..6fc81f38d2 100644
---- a/tests/qemuxml2argvdata/disk-network-http.x86_64-latest.args
-+++ b/tests/qemuxml2argvdata/disk-network-http.x86_64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc,accel=kvm,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel kvm \
- -cpu qemu64 \
- -m 214 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/disk-network-iscsi-modern.args b/tests/qemuxml2argvdata/disk-network-iscsi-modern.args
-index 57eaeb40ee..a9eaa88c13 100644
---- a/tests/qemuxml2argvdata/disk-network-iscsi-modern.args
-+++ b/tests/qemuxml2argvdata/disk-network-iscsi-modern.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/disk-network-iscsi.args b/tests/qemuxml2argvdata/disk-network-iscsi.args
-index 53b3821ea7..80410ba330 100644
---- a/tests/qemuxml2argvdata/disk-network-iscsi.args
-+++ b/tests/qemuxml2argvdata/disk-network-iscsi.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-2.12.0.args
-index 930d8d5db2..38d94f1b36 100644
---- a/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-2.12.0.args
-+++ b/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-2.12.0.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc-i440fx-2.12,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc-i440fx-2.12,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-latest.args b/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-latest.args
-index 3f61f6dc2c..47c52c5ad2 100644
---- a/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-latest.args
-+++ b/tests/qemuxml2argvdata/disk-network-iscsi.x86_64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu qemu64 \
- -m 214 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/disk-network-nbd.args b/tests/qemuxml2argvdata/disk-network-nbd.args
-index 17576fe932..2f99d71c0e 100644
---- a/tests/qemuxml2argvdata/disk-network-nbd.args
-+++ b/tests/qemuxml2argvdata/disk-network-nbd.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/disk-network-nbd.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-network-nbd.x86_64-2.12.0.args
-index 1742f01e25..2af0a90df0 100644
---- a/tests/qemuxml2argvdata/disk-network-nbd.x86_64-2.12.0.args
-+++ b/tests/qemuxml2argvdata/disk-network-nbd.x86_64-2.12.0.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc-i440fx-2.12,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc-i440fx-2.12,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/disk-network-nbd.x86_64-latest.args b/tests/qemuxml2argvdata/disk-network-nbd.x86_64-latest.args
-index 5453440ac8..519ed91e11 100644
---- a/tests/qemuxml2argvdata/disk-network-nbd.x86_64-latest.args
-+++ b/tests/qemuxml2argvdata/disk-network-nbd.x86_64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu qemu64 \
- -m 214 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/disk-network-rbd.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-network-rbd.x86_64-2.12.0.args
-index 21d1c2deba..383cfcbfa8 100644
---- a/tests/qemuxml2argvdata/disk-network-rbd.x86_64-2.12.0.args
-+++ b/tests/qemuxml2argvdata/disk-network-rbd.x86_64-2.12.0.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc-i440fx-2.12,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc-i440fx-2.12,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/disk-network-rbd.x86_64-2.5.0.args b/tests/qemuxml2argvdata/disk-network-rbd.x86_64-2.5.0.args
-index 50af3eb653..c999964b8e 100644
---- a/tests/qemuxml2argvdata/disk-network-rbd.x86_64-2.5.0.args
-+++ b/tests/qemuxml2argvdata/disk-network-rbd.x86_64-2.5.0.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name guest=QEMUGuest1,debug-threads=on \
- -S \
---machine pc-i440fx-2.5,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc-i440fx-2.5,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/disk-network-rbd.x86_64-latest.args b/tests/qemuxml2argvdata/disk-network-rbd.x86_64-latest.args
-index fb8fc988e8..41b59aa6a9 100644
---- a/tests/qemuxml2argvdata/disk-network-rbd.x86_64-latest.args
-+++ b/tests/qemuxml2argvdata/disk-network-rbd.x86_64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu qemu64 \
- -m 214 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/disk-network-sheepdog.args b/tests/qemuxml2argvdata/disk-network-sheepdog.args
-index cf832062bb..7cdcd81fea 100644
---- a/tests/qemuxml2argvdata/disk-network-sheepdog.args
-+++ b/tests/qemuxml2argvdata/disk-network-sheepdog.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-2.12.0.args
-index 653fa1af40..adff0abba6 100644
---- a/tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-2.12.0.args
-+++ b/tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-2.12.0.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc-i440fx-2.12,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc-i440fx-2.12,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-latest.args b/tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-latest.args
-index 302ec9b9fd..f917918b4e 100644
---- a/tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-latest.args
-+++ b/tests/qemuxml2argvdata/disk-network-sheepdog.x86_64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu qemu64 \
- -m 214 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/disk-network-source-auth.args b/tests/qemuxml2argvdata/disk-network-source-auth.args
-index e68b81fde0..3b277cc9c2 100644
---- a/tests/qemuxml2argvdata/disk-network-source-auth.args
-+++ b/tests/qemuxml2argvdata/disk-network-source-auth.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-2.12.0.args
-index 279d5c73ec..db96ce0fb8 100644
---- a/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-2.12.0.args
-+++ b/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-2.12.0.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc-i440fx-2.12,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc-i440fx-2.12,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-latest.args b/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-latest.args
-index 7a504d49be..427c8645ab 100644
---- a/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-latest.args
-+++ b/tests/qemuxml2argvdata/disk-network-source-auth.x86_64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu qemu64 \
- -m 214 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/disk-network-tlsx509.args b/tests/qemuxml2argvdata/disk-network-tlsx509.args
-index e06582032e..4787c3c0ae 100644
---- a/tests/qemuxml2argvdata/disk-network-tlsx509.args
-+++ b/tests/qemuxml2argvdata/disk-network-tlsx509.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu qemu32 \
- -m 214 \
- -realtime mlock=off \
-diff --git a/tests/qemuxml2argvdata/disk-network-tlsx509.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-network-tlsx509.x86_64-2.12.0.args
-index 06686f801d..176d98a891 100644
---- a/tests/qemuxml2argvdata/disk-network-tlsx509.x86_64-2.12.0.args
-+++ b/tests/qemuxml2argvdata/disk-network-tlsx509.x86_64-2.12.0.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc-i440fx-2.12,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc-i440fx-2.12,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu qemu32 \
- -m 214 \
- -realtime mlock=off \
-diff --git a/tests/qemuxml2argvdata/disk-network-tlsx509.x86_64-latest.args b/tests/qemuxml2argvdata/disk-network-tlsx509.x86_64-latest.args
-index a2aeb91958..0a5ba79427 100644
---- a/tests/qemuxml2argvdata/disk-network-tlsx509.x86_64-latest.args
-+++ b/tests/qemuxml2argvdata/disk-network-tlsx509.x86_64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu qemu64 \
- -m 214 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/disk-network-vxhs.args b/tests/qemuxml2argvdata/disk-network-vxhs.args
-index e59a760b96..da1e0aa609 100644
---- a/tests/qemuxml2argvdata/disk-network-vxhs.args
-+++ b/tests/qemuxml2argvdata/disk-network-vxhs.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu qemu32 \
- -m 214 \
- -realtime mlock=off \
-diff --git a/tests/qemuxml2argvdata/disk-no-boot.args b/tests/qemuxml2argvdata/disk-no-boot.args
-index 190129ea97..587d962bdc 100644
---- a/tests/qemuxml2argvdata/disk-no-boot.args
-+++ b/tests/qemuxml2argvdata/disk-no-boot.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/disk-nvme.x86_64-latest.args b/tests/qemuxml2argvdata/disk-nvme.x86_64-latest.args
-index 5334882c0b..f82e4d269e 100644
---- a/tests/qemuxml2argvdata/disk-nvme.x86_64-latest.args
-+++ b/tests/qemuxml2argvdata/disk-nvme.x86_64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu qemu64 \
- -m 214 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/disk-order.args b/tests/qemuxml2argvdata/disk-order.args
-index d85c4017ed..5eadfe8063 100644
---- a/tests/qemuxml2argvdata/disk-order.args
-+++ b/tests/qemuxml2argvdata/disk-order.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/disk-readonly-disk.args b/tests/qemuxml2argvdata/disk-readonly-disk.args
-index 6e25779ce0..2bfcedaca8 100644
---- a/tests/qemuxml2argvdata/disk-readonly-disk.args
-+++ b/tests/qemuxml2argvdata/disk-readonly-disk.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/disk-readonly-disk.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-readonly-disk.x86_64-2.12.0.args
-index 34ef204632..ae56287059 100644
---- a/tests/qemuxml2argvdata/disk-readonly-disk.x86_64-2.12.0.args
-+++ b/tests/qemuxml2argvdata/disk-readonly-disk.x86_64-2.12.0.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc-i440fx-2.12,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc-i440fx-2.12,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/disk-readonly-disk.x86_64-latest.args b/tests/qemuxml2argvdata/disk-readonly-disk.x86_64-latest.args
-index f67ebf0069..307423e63b 100644
---- a/tests/qemuxml2argvdata/disk-readonly-disk.x86_64-latest.args
-+++ b/tests/qemuxml2argvdata/disk-readonly-disk.x86_64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu qemu64 \
- -m 214 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/disk-sata-device.args b/tests/qemuxml2argvdata/disk-sata-device.args
-index 572ca20eb2..7885f8e1f5 100644
---- a/tests/qemuxml2argvdata/disk-sata-device.args
-+++ b/tests/qemuxml2argvdata/disk-sata-device.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/disk-scsi-device-auto.x86_64-1.5.3.args b/tests/qemuxml2argvdata/disk-scsi-device-auto.x86_64-1.5.3.args
-index b3cf61b112..fa5e5987b8 100644
---- a/tests/qemuxml2argvdata/disk-scsi-device-auto.x86_64-1.5.3.args
-+++ b/tests/qemuxml2argvdata/disk-scsi-device-auto.x86_64-1.5.3.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc-i440fx-1.5,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc-i440fx-1.5,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/disk-scsi-device-auto.x86_64-latest.args b/tests/qemuxml2argvdata/disk-scsi-device-auto.x86_64-latest.args
-index 634d929a01..c97c0e720a 100644
---- a/tests/qemuxml2argvdata/disk-scsi-device-auto.x86_64-latest.args
-+++ b/tests/qemuxml2argvdata/disk-scsi-device-auto.x86_64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu qemu64 \
- -m 214 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/disk-scsi-disk-split.args b/tests/qemuxml2argvdata/disk-scsi-disk-split.args
-index a0ef28d777..80b8281fb2 100644
---- a/tests/qemuxml2argvdata/disk-scsi-disk-split.args
-+++ b/tests/qemuxml2argvdata/disk-scsi-disk-split.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/disk-scsi-disk-vpd.args b/tests/qemuxml2argvdata/disk-scsi-disk-vpd.args
-index 8cc1057613..48964a0d52 100644
---- a/tests/qemuxml2argvdata/disk-scsi-disk-vpd.args
-+++ b/tests/qemuxml2argvdata/disk-scsi-disk-vpd.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/disk-scsi-disk-wwn.args b/tests/qemuxml2argvdata/disk-scsi-disk-wwn.args
-index 7c92f85f43..bb6b8b9b58 100644
---- a/tests/qemuxml2argvdata/disk-scsi-disk-wwn.args
-+++ b/tests/qemuxml2argvdata/disk-scsi-disk-wwn.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/disk-scsi-lun-passthrough.args b/tests/qemuxml2argvdata/disk-scsi-lun-passthrough.args
-index 9f51c6d906..431ad3cc1b 100644
---- a/tests/qemuxml2argvdata/disk-scsi-lun-passthrough.args
-+++ b/tests/qemuxml2argvdata/disk-scsi-lun-passthrough.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/disk-scsi.x86_64-latest.args b/tests/qemuxml2argvdata/disk-scsi.x86_64-latest.args
-index 06c71cbab6..3cbe54c154 100644
---- a/tests/qemuxml2argvdata/disk-scsi.x86_64-latest.args
-+++ b/tests/qemuxml2argvdata/disk-scsi.x86_64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu qemu64 \
- -m 214 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/disk-serial.args b/tests/qemuxml2argvdata/disk-serial.args
-index bbd10a106a..19edbbc2d7 100644
---- a/tests/qemuxml2argvdata/disk-serial.args
-+++ b/tests/qemuxml2argvdata/disk-serial.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=kvm,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel kvm \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/disk-shared.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-shared.x86_64-2.12.0.args
-index d35e7a5f6e..906be277bc 100644
---- a/tests/qemuxml2argvdata/disk-shared.x86_64-2.12.0.args
-+++ b/tests/qemuxml2argvdata/disk-shared.x86_64-2.12.0.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc-i440fx-2.12,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc-i440fx-2.12,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/disk-shared.x86_64-latest.args b/tests/qemuxml2argvdata/disk-shared.x86_64-latest.args
-index 224414e15c..1d01dc3065 100644
---- a/tests/qemuxml2argvdata/disk-shared.x86_64-latest.args
-+++ b/tests/qemuxml2argvdata/disk-shared.x86_64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu qemu64 \
- -m 214 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/disk-slices.x86_64-latest.args b/tests/qemuxml2argvdata/disk-slices.x86_64-latest.args
-index 869b4c0af0..bd0902c116 100644
---- a/tests/qemuxml2argvdata/disk-slices.x86_64-latest.args
-+++ b/tests/qemuxml2argvdata/disk-slices.x86_64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu qemu64 \
- -m 214 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/disk-snapshot.args b/tests/qemuxml2argvdata/disk-snapshot.args
-index 9098536356..38311f7b99 100644
---- a/tests/qemuxml2argvdata/disk-snapshot.args
-+++ b/tests/qemuxml2argvdata/disk-snapshot.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/disk-source-pool-mode.args b/tests/qemuxml2argvdata/disk-source-pool-mode.args
-index d55fcf0ff4..3c458d09e5 100644
---- a/tests/qemuxml2argvdata/disk-source-pool-mode.args
-+++ b/tests/qemuxml2argvdata/disk-source-pool-mode.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/disk-source-pool.args b/tests/qemuxml2argvdata/disk-source-pool.args
-index f37a7b3b67..e31a8488f3 100644
---- a/tests/qemuxml2argvdata/disk-source-pool.args
-+++ b/tests/qemuxml2argvdata/disk-source-pool.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/disk-usb-device-removable.args b/tests/qemuxml2argvdata/disk-usb-device-removable.args
-index 61ca1589a2..9bcd05655c 100644
---- a/tests/qemuxml2argvdata/disk-usb-device-removable.args
-+++ b/tests/qemuxml2argvdata/disk-usb-device-removable.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/disk-usb-device.args b/tests/qemuxml2argvdata/disk-usb-device.args
-index 515be277cf..bd50d3b642 100644
---- a/tests/qemuxml2argvdata/disk-usb-device.args
-+++ b/tests/qemuxml2argvdata/disk-usb-device.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/disk-virtio-ccw-many.args b/tests/qemuxml2argvdata/disk-virtio-ccw-many.args
-index 2e881ec314..59ac19b320 100644
---- a/tests/qemuxml2argvdata/disk-virtio-ccw-many.args
-+++ b/tests/qemuxml2argvdata/disk-virtio-ccw-many.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-s390x \
- -name QEMUGuest1 \
- -S \
---machine s390-ccw,accel=tcg,usb=off,dump-guest-core=off \
-+-machine s390-ccw,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/disk-virtio-ccw.args b/tests/qemuxml2argvdata/disk-virtio-ccw.args
-index 27bd47166d..ded32e1d2b 100644
---- a/tests/qemuxml2argvdata/disk-virtio-ccw.args
-+++ b/tests/qemuxml2argvdata/disk-virtio-ccw.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-s390x \
- -name QEMUGuest1 \
- -S \
---machine s390-ccw,accel=tcg,usb=off,dump-guest-core=off \
-+-machine s390-ccw,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/disk-virtio-queues.args b/tests/qemuxml2argvdata/disk-virtio-queues.args
-index bd3a1a9135..0ad0cc684d 100644
---- a/tests/qemuxml2argvdata/disk-virtio-queues.args
-+++ b/tests/qemuxml2argvdata/disk-virtio-queues.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/disk-virtio-s390-zpci.args b/tests/qemuxml2argvdata/disk-virtio-s390-zpci.args
-index 34a07bb31b..0bfc79ad18 100644
---- a/tests/qemuxml2argvdata/disk-virtio-s390-zpci.args
-+++ b/tests/qemuxml2argvdata/disk-virtio-s390-zpci.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-s390x \
- -name QEMUGuest1 \
- -S \
---machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off \
-+-machine s390-ccw-virtio,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/disk-virtio-s390.args b/tests/qemuxml2argvdata/disk-virtio-s390.args
-index a37b8a55cd..eaf6545031 100644
---- a/tests/qemuxml2argvdata/disk-virtio-s390.args
-+++ b/tests/qemuxml2argvdata/disk-virtio-s390.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-s390x \
- -name QEMUGuest1 \
- -S \
---machine s390-virtio,accel=tcg,usb=off,dump-guest-core=off \
-+-machine s390-virtio,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-2.12.0.args
-index 21b267f176..a7e19f5214 100644
---- a/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-2.12.0.args
-+++ b/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-2.12.0.args
-@@ -14,7 +14,8 @@ QEMU_AUDIO_DRV=none \
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
- -object pr-manager-helper,id=pr-helper0,\
- path=/tmp/lib/domain--1-QEMUGuest1/pr-helper0.sock \
---machine pc-i440fx-2.12,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc-i440fx-2.12,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 8,sockets=8,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-latest.args b/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-latest.args
-index bfd7a92530..929d2528f4 100644
---- a/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-latest.args
-+++ b/tests/qemuxml2argvdata/disk-virtio-scsi-reservations.x86_64-latest.args
-@@ -14,7 +14,8 @@ QEMU_AUDIO_DRV=none \
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
- -object pr-manager-helper,id=pr-helper0,\
- path=/tmp/lib/domain--1-QEMUGuest1/pr-helper0.sock \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu qemu64 \
- -m 214 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/disk-virtio.args b/tests/qemuxml2argvdata/disk-virtio.args
-index 7c217255c2..8e16deb0b1 100644
---- a/tests/qemuxml2argvdata/disk-virtio.args
-+++ b/tests/qemuxml2argvdata/disk-virtio.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/encrypted-disk-usage.args b/tests/qemuxml2argvdata/encrypted-disk-usage.args
-index 8641701293..5ba59fd7f7 100644
---- a/tests/qemuxml2argvdata/encrypted-disk-usage.args
-+++ b/tests/qemuxml2argvdata/encrypted-disk-usage.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-encryptdisk/master-key.aes \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 1024 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/encrypted-disk.args b/tests/qemuxml2argvdata/encrypted-disk.args
-index 8641701293..5ba59fd7f7 100644
---- a/tests/qemuxml2argvdata/encrypted-disk.args
-+++ b/tests/qemuxml2argvdata/encrypted-disk.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-encryptdisk/master-key.aes \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 1024 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/eoi-disabled.x86_64-2.7.0.args b/tests/qemuxml2argvdata/eoi-disabled.x86_64-2.7.0.args
-index fb12878f2e..ef23e1ce7e 100644
---- a/tests/qemuxml2argvdata/eoi-disabled.x86_64-2.7.0.args
-+++ b/tests/qemuxml2argvdata/eoi-disabled.x86_64-2.7.0.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc-i440fx-2.7,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc-i440fx-2.7,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu qemu32,-kvm_pv_eoi \
- -m 214 \
- -realtime mlock=off \
-diff --git a/tests/qemuxml2argvdata/eoi-disabled.x86_64-4.0.0.args b/tests/qemuxml2argvdata/eoi-disabled.x86_64-4.0.0.args
-index b0a004f316..f3334fff5d 100644
---- a/tests/qemuxml2argvdata/eoi-disabled.x86_64-4.0.0.args
-+++ b/tests/qemuxml2argvdata/eoi-disabled.x86_64-4.0.0.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc-i440fx-4.0,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc-i440fx-4.0,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu qemu32,kvm_pv_eoi=off \
- -m 214 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/eoi-disabled.x86_64-latest.args b/tests/qemuxml2argvdata/eoi-disabled.x86_64-latest.args
-index c34f2e78c2..dbd86af31f 100644
---- a/tests/qemuxml2argvdata/eoi-disabled.x86_64-latest.args
-+++ b/tests/qemuxml2argvdata/eoi-disabled.x86_64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu qemu64,kvm-pv-eoi=off \
- -m 214 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/eoi-enabled.x86_64-2.7.0.args b/tests/qemuxml2argvdata/eoi-enabled.x86_64-2.7.0.args
-index 96bfba2dac..ccf27b7ccd 100644
---- a/tests/qemuxml2argvdata/eoi-enabled.x86_64-2.7.0.args
-+++ b/tests/qemuxml2argvdata/eoi-enabled.x86_64-2.7.0.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc-i440fx-2.7,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc-i440fx-2.7,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu qemu32,+kvm_pv_eoi \
- -m 214 \
- -realtime mlock=off \
-diff --git a/tests/qemuxml2argvdata/eoi-enabled.x86_64-4.0.0.args b/tests/qemuxml2argvdata/eoi-enabled.x86_64-4.0.0.args
-index b008c779fa..35d25d449c 100644
---- a/tests/qemuxml2argvdata/eoi-enabled.x86_64-4.0.0.args
-+++ b/tests/qemuxml2argvdata/eoi-enabled.x86_64-4.0.0.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc-i440fx-4.0,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc-i440fx-4.0,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu qemu32,kvm_pv_eoi=on \
- -m 214 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/eoi-enabled.x86_64-latest.args b/tests/qemuxml2argvdata/eoi-enabled.x86_64-latest.args
-index 2ee3ef5031..f19ab543ce 100644
---- a/tests/qemuxml2argvdata/eoi-enabled.x86_64-latest.args
-+++ b/tests/qemuxml2argvdata/eoi-enabled.x86_64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu qemu64,kvm-pv-eoi=on \
- -m 214 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/event_idx.args b/tests/qemuxml2argvdata/event_idx.args
-index bfeeffd939..ec908167e5 100644
---- a/tests/qemuxml2argvdata/event_idx.args
-+++ b/tests/qemuxml2argvdata/event_idx.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name test \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 1024 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/fd-memory-no-numa-topology.args b/tests/qemuxml2argvdata/fd-memory-no-numa-topology.args
-index d23c575553..a9ca623383 100644
---- a/tests/qemuxml2argvdata/fd-memory-no-numa-topology.args
-+++ b/tests/qemuxml2argvdata/fd-memory-no-numa-topology.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name instance-00000092 \
- -S \
---machine pc-i440fx-2.3,accel=kvm,usb=off,dump-guest-core=off \
-+-machine pc-i440fx-2.3,usb=off,dump-guest-core=off \
-+-accel kvm \
- -m 14336 \
- -mem-prealloc \
- -mem-path /var/lib/libvirt/qemu/ram/libvirt/qemu/-1-instance-00000092/ram \
-diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology.args b/tests/qemuxml2argvdata/fd-memory-numa-topology.args
-index 4fbbc8185b..87e17f9868 100644
---- a/tests/qemuxml2argvdata/fd-memory-numa-topology.args
-+++ b/tests/qemuxml2argvdata/fd-memory-numa-topology.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name instance-00000092 \
- -S \
---machine pc-i440fx-2.3,accel=kvm,usb=off,dump-guest-core=off \
-+-machine pc-i440fx-2.3,usb=off,dump-guest-core=off \
-+-accel kvm \
- -m 14336 \
- -mem-prealloc \
- -realtime mlock=off \
-diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology2.args b/tests/qemuxml2argvdata/fd-memory-numa-topology2.args
-index 1eeeaec0ce..c1f6aa8b05 100644
---- a/tests/qemuxml2argvdata/fd-memory-numa-topology2.args
-+++ b/tests/qemuxml2argvdata/fd-memory-numa-topology2.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name instance-00000092 \
- -S \
---machine pc-i440fx-2.3,accel=kvm,usb=off,dump-guest-core=off \
-+-machine pc-i440fx-2.3,usb=off,dump-guest-core=off \
-+-accel kvm \
- -m 28672 \
- -mem-prealloc \
- -realtime mlock=off \
-diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology3.args b/tests/qemuxml2argvdata/fd-memory-numa-topology3.args
-index d75b67916c..c130b1d60e 100644
---- a/tests/qemuxml2argvdata/fd-memory-numa-topology3.args
-+++ b/tests/qemuxml2argvdata/fd-memory-numa-topology3.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name instance-00000092 \
- -S \
---machine pc-i440fx-2.3,accel=kvm,usb=off,dump-guest-core=off \
-+-machine pc-i440fx-2.3,usb=off,dump-guest-core=off \
-+-accel kvm \
- -m 43008 \
- -mem-prealloc \
- -realtime mlock=off \
-diff --git a/tests/qemuxml2argvdata/fips-enabled.args b/tests/qemuxml2argvdata/fips-enabled.args
-index 91b32bd96c..8fd70d9d48 100644
---- a/tests/qemuxml2argvdata/fips-enabled.args
-+++ b/tests/qemuxml2argvdata/fips-enabled.args
-@@ -11,7 +11,8 @@ QEMU_AUDIO_DRV=none \
- -name QEMUGuest1 \
- -S \
- -enable-fips \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/floppy-drive-fat.args b/tests/qemuxml2argvdata/floppy-drive-fat.args
-index c654ae598a..11dad13ceb 100644
---- a/tests/qemuxml2argvdata/floppy-drive-fat.args
-+++ b/tests/qemuxml2argvdata/floppy-drive-fat.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/floppy-drive-fat.x86_64-2.12.0.args b/tests/qemuxml2argvdata/floppy-drive-fat.x86_64-2.12.0.args
-index 90ab4214d9..b0d590b6f5 100644
---- a/tests/qemuxml2argvdata/floppy-drive-fat.x86_64-2.12.0.args
-+++ b/tests/qemuxml2argvdata/floppy-drive-fat.x86_64-2.12.0.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc-i440fx-2.12,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc-i440fx-2.12,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/floppy-drive-fat.x86_64-latest.args b/tests/qemuxml2argvdata/floppy-drive-fat.x86_64-latest.args
-index c47f2ea717..2c0976d4cf 100644
---- a/tests/qemuxml2argvdata/floppy-drive-fat.x86_64-latest.args
-+++ b/tests/qemuxml2argvdata/floppy-drive-fat.x86_64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu qemu64 \
- -m 214 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/fs9p-ccw.args b/tests/qemuxml2argvdata/fs9p-ccw.args
-index d83f6048b1..30e4e1f747 100644
---- a/tests/qemuxml2argvdata/fs9p-ccw.args
-+++ b/tests/qemuxml2argvdata/fs9p-ccw.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-s390x \
- -name QEMUGuest1 \
- -S \
---machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off \
-+-machine s390-ccw-virtio,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/fs9p-ccw.s390x-latest.args b/tests/qemuxml2argvdata/fs9p-ccw.s390x-latest.args
-index 4a93ee37cb..ea58c84119 100644
---- a/tests/qemuxml2argvdata/fs9p-ccw.s390x-latest.args
-+++ b/tests/qemuxml2argvdata/fs9p-ccw.s390x-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off \
-+-machine s390-ccw-virtio,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu qemu \
- -m 214 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/fs9p.args b/tests/qemuxml2argvdata/fs9p.args
-index 87bdf4da77..1b55b8d911 100644
---- a/tests/qemuxml2argvdata/fs9p.args
-+++ b/tests/qemuxml2argvdata/fs9p.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/fs9p.x86_64-latest.args b/tests/qemuxml2argvdata/fs9p.x86_64-latest.args
-index 700ae69203..7e08f5c5a7 100644
---- a/tests/qemuxml2argvdata/fs9p.x86_64-latest.args
-+++ b/tests/qemuxml2argvdata/fs9p.x86_64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu qemu64 \
- -m 214 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/genid-auto.x86_64-latest.args b/tests/qemuxml2argvdata/genid-auto.x86_64-latest.args
-index 7c39132ff8..267a2df49c 100644
---- a/tests/qemuxml2argvdata/genid-auto.x86_64-latest.args
-+++ b/tests/qemuxml2argvdata/genid-auto.x86_64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu qemu64 \
- -m 214 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/genid.x86_64-latest.args b/tests/qemuxml2argvdata/genid.x86_64-latest.args
-index 5bfb8db9f9..171d25d230 100644
---- a/tests/qemuxml2argvdata/genid.x86_64-latest.args
-+++ b/tests/qemuxml2argvdata/genid.x86_64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu qemu64 \
- -m 214 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/graphics-egl-headless-rendernode.x86_64-latest.args b/tests/qemuxml2argvdata/graphics-egl-headless-rendernode.x86_64-latest.args
-index 390a8d16b7..8c5a729335 100644
---- a/tests/qemuxml2argvdata/graphics-egl-headless-rendernode.x86_64-latest.args
-+++ b/tests/qemuxml2argvdata/graphics-egl-headless-rendernode.x86_64-latest.args
-@@ -11,7 +11,8 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu qemu64 \
- -m 214 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/graphics-egl-headless.args b/tests/qemuxml2argvdata/graphics-egl-headless.args
-index 76d7583462..5fda347e15 100644
---- a/tests/qemuxml2argvdata/graphics-egl-headless.args
-+++ b/tests/qemuxml2argvdata/graphics-egl-headless.args
-@@ -9,7 +9,8 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/graphics-egl-headless.x86_64-latest.args b/tests/qemuxml2argvdata/graphics-egl-headless.x86_64-latest.args
-index 390a8d16b7..8c5a729335 100644
---- a/tests/qemuxml2argvdata/graphics-egl-headless.x86_64-latest.args
-+++ b/tests/qemuxml2argvdata/graphics-egl-headless.x86_64-latest.args
-@@ -11,7 +11,8 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu qemu64 \
- -m 214 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/graphics-sdl-fullscreen.args b/tests/qemuxml2argvdata/graphics-sdl-fullscreen.args
-index a34f9d43c7..496701d5de 100644
---- a/tests/qemuxml2argvdata/graphics-sdl-fullscreen.args
-+++ b/tests/qemuxml2argvdata/graphics-sdl-fullscreen.args
-@@ -11,7 +11,8 @@ DISPLAY=:0.1 \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/graphics-sdl.args b/tests/qemuxml2argvdata/graphics-sdl.args
-index c0c354b824..83f40f847a 100644
---- a/tests/qemuxml2argvdata/graphics-sdl.args
-+++ b/tests/qemuxml2argvdata/graphics-sdl.args
-@@ -11,7 +11,8 @@ DISPLAY=:0.1 \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.args b/tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.args
-index abcebd1774..b88b6f010e 100644
---- a/tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.args
-+++ b/tests/qemuxml2argvdata/graphics-spice-agent-file-xfer.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=spice \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/graphics-spice-agentmouse.args b/tests/qemuxml2argvdata/graphics-spice-agentmouse.args
-index 9bed352312..a255cd3561 100644
---- a/tests/qemuxml2argvdata/graphics-spice-agentmouse.args
-+++ b/tests/qemuxml2argvdata/graphics-spice-agentmouse.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=spice \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/graphics-spice-auto-socket-cfg.args b/tests/qemuxml2argvdata/graphics-spice-auto-socket-cfg.args
-index 843e82935e..fe909610c1 100644
---- a/tests/qemuxml2argvdata/graphics-spice-auto-socket-cfg.args
-+++ b/tests/qemuxml2argvdata/graphics-spice-auto-socket-cfg.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=spice \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/graphics-spice-auto-socket.args b/tests/qemuxml2argvdata/graphics-spice-auto-socket.args
-index 843e82935e..fe909610c1 100644
---- a/tests/qemuxml2argvdata/graphics-spice-auto-socket.args
-+++ b/tests/qemuxml2argvdata/graphics-spice-auto-socket.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=spice \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/graphics-spice-compression.args b/tests/qemuxml2argvdata/graphics-spice-compression.args
-index 1f06d88e04..e2a6794382 100644
---- a/tests/qemuxml2argvdata/graphics-spice-compression.args
-+++ b/tests/qemuxml2argvdata/graphics-spice-compression.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=spice \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/graphics-spice-egl-headless.args b/tests/qemuxml2argvdata/graphics-spice-egl-headless.args
-index 54b7184376..11f6215525 100644
---- a/tests/qemuxml2argvdata/graphics-spice-egl-headless.args
-+++ b/tests/qemuxml2argvdata/graphics-spice-egl-headless.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=spice \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/graphics-spice-gl-auto-rendernode.x86_64-latest.args b/tests/qemuxml2argvdata/graphics-spice-gl-auto-rendernode.x86_64-latest.args
-index c0d08964d6..799749ecc6 100644
---- a/tests/qemuxml2argvdata/graphics-spice-gl-auto-rendernode.x86_64-latest.args
-+++ b/tests/qemuxml2argvdata/graphics-spice-gl-auto-rendernode.x86_64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=spice \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu qemu64 \
- -m 214 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/graphics-spice-no-args.args b/tests/qemuxml2argvdata/graphics-spice-no-args.args
-index 76f74c0fc5..962c1d77b9 100644
---- a/tests/qemuxml2argvdata/graphics-spice-no-args.args
-+++ b/tests/qemuxml2argvdata/graphics-spice-no-args.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=spice \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/graphics-spice-qxl-vga.args b/tests/qemuxml2argvdata/graphics-spice-qxl-vga.args
-index 630e620186..66a3c1d6af 100644
---- a/tests/qemuxml2argvdata/graphics-spice-qxl-vga.args
-+++ b/tests/qemuxml2argvdata/graphics-spice-qxl-vga.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=spice \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/graphics-spice-sasl.args b/tests/qemuxml2argvdata/graphics-spice-sasl.args
-index bc2293d6a0..074ea5e27a 100644
---- a/tests/qemuxml2argvdata/graphics-spice-sasl.args
-+++ b/tests/qemuxml2argvdata/graphics-spice-sasl.args
-@@ -11,7 +11,8 @@ QEMU_AUDIO_DRV=spice \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/graphics-spice-socket.args b/tests/qemuxml2argvdata/graphics-spice-socket.args
-index e781357277..2ca561a8c4 100644
---- a/tests/qemuxml2argvdata/graphics-spice-socket.args
-+++ b/tests/qemuxml2argvdata/graphics-spice-socket.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=spice \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/graphics-spice-timeout.args b/tests/qemuxml2argvdata/graphics-spice-timeout.args
-index 3f6cf4a8e2..6dd8c8f364 100644
---- a/tests/qemuxml2argvdata/graphics-spice-timeout.args
-+++ b/tests/qemuxml2argvdata/graphics-spice-timeout.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=spice \
- /usr/bin/qemu-system-i386 \
- -name f14 \
- -S \
---machine pc,accel=kvm,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel kvm \
- -cpu core2duo,+ds,+acpi,+ss,+ht,+tm,+pbe,+ds_cpl,+vmx,+est,+tm2,+cx16,+xtpr,\
- +lahf_lm \
- -m 1024 \
-diff --git a/tests/qemuxml2argvdata/graphics-spice-usb-redir.args b/tests/qemuxml2argvdata/graphics-spice-usb-redir.args
-index c46bddf617..18f6973b99 100644
---- a/tests/qemuxml2argvdata/graphics-spice-usb-redir.args
-+++ b/tests/qemuxml2argvdata/graphics-spice-usb-redir.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=spice \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/graphics-spice.args b/tests/qemuxml2argvdata/graphics-spice.args
-index 4c38960b72..c958f02e01 100644
---- a/tests/qemuxml2argvdata/graphics-spice.args
-+++ b/tests/qemuxml2argvdata/graphics-spice.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=spice \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/graphics-vnc-auto-socket-cfg.args b/tests/qemuxml2argvdata/graphics-vnc-auto-socket-cfg.args
-index 5e3bb6e0b5..20f49768c4 100644
---- a/tests/qemuxml2argvdata/graphics-vnc-auto-socket-cfg.args
-+++ b/tests/qemuxml2argvdata/graphics-vnc-auto-socket-cfg.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/graphics-vnc-auto-socket.args b/tests/qemuxml2argvdata/graphics-vnc-auto-socket.args
-index 12697fc206..baded26feb 100644
---- a/tests/qemuxml2argvdata/graphics-vnc-auto-socket.args
-+++ b/tests/qemuxml2argvdata/graphics-vnc-auto-socket.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/graphics-vnc-egl-headless.args b/tests/qemuxml2argvdata/graphics-vnc-egl-headless.args
-index 3c0901d1a5..66f25687ee 100644
---- a/tests/qemuxml2argvdata/graphics-vnc-egl-headless.args
-+++ b/tests/qemuxml2argvdata/graphics-vnc-egl-headless.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/graphics-vnc-no-listen-attr.args b/tests/qemuxml2argvdata/graphics-vnc-no-listen-attr.args
-index 82a77778c2..5bc6e4943c 100644
---- a/tests/qemuxml2argvdata/graphics-vnc-no-listen-attr.args
-+++ b/tests/qemuxml2argvdata/graphics-vnc-no-listen-attr.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/graphics-vnc-none.args b/tests/qemuxml2argvdata/graphics-vnc-none.args
-index f9259c7fe7..ed7f016c94 100644
---- a/tests/qemuxml2argvdata/graphics-vnc-none.args
-+++ b/tests/qemuxml2argvdata/graphics-vnc-none.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/graphics-vnc-policy.args b/tests/qemuxml2argvdata/graphics-vnc-policy.args
-index 17fde4e5a1..58e7b77728 100644
---- a/tests/qemuxml2argvdata/graphics-vnc-policy.args
-+++ b/tests/qemuxml2argvdata/graphics-vnc-policy.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/graphics-vnc-remove-generated-socket.args b/tests/qemuxml2argvdata/graphics-vnc-remove-generated-socket.args
-index 7ee7a3777c..9bef206b32 100644
---- a/tests/qemuxml2argvdata/graphics-vnc-remove-generated-socket.args
-+++ b/tests/qemuxml2argvdata/graphics-vnc-remove-generated-socket.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/graphics-vnc-sasl.args b/tests/qemuxml2argvdata/graphics-vnc-sasl.args
-index 32972582e7..2cdcf4f62c 100644
---- a/tests/qemuxml2argvdata/graphics-vnc-sasl.args
-+++ b/tests/qemuxml2argvdata/graphics-vnc-sasl.args
-@@ -11,7 +11,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/graphics-vnc-socket-new-cmdline.args b/tests/qemuxml2argvdata/graphics-vnc-socket-new-cmdline.args
-index 7b845de69b..7782159e56 100644
---- a/tests/qemuxml2argvdata/graphics-vnc-socket-new-cmdline.args
-+++ b/tests/qemuxml2argvdata/graphics-vnc-socket-new-cmdline.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/graphics-vnc-socket.args b/tests/qemuxml2argvdata/graphics-vnc-socket.args
-index 8fe87adde8..ea9d18450e 100644
---- a/tests/qemuxml2argvdata/graphics-vnc-socket.args
-+++ b/tests/qemuxml2argvdata/graphics-vnc-socket.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args b/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args
-index 5a73408bf9..32dc7082b1 100644
---- a/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args
-+++ b/tests/qemuxml2argvdata/graphics-vnc-tls-secret.x86_64-latest.args
-@@ -13,7 +13,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu qemu64 \
- -m 214 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/graphics-vnc-tls.args b/tests/qemuxml2argvdata/graphics-vnc-tls.args
-index 7d89329aa2..fd82eab964 100644
---- a/tests/qemuxml2argvdata/graphics-vnc-tls.args
-+++ b/tests/qemuxml2argvdata/graphics-vnc-tls.args
-@@ -11,7 +11,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args b/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args
-index 3ec25996c9..3866aa2b8b 100644
---- a/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args
-+++ b/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-2.4.0.args
-@@ -11,7 +11,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name guest=QEMUGuest1,debug-threads=on \
- -S \
---machine pc-i440fx-2.4,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc-i440fx-2.4,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args b/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args
-index f435b9a152..a52763688f 100644
---- a/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args
-+++ b/tests/qemuxml2argvdata/graphics-vnc-tls.x86_64-latest.args
-@@ -13,7 +13,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu qemu64 \
- -m 214 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/graphics-vnc-websocket.args b/tests/qemuxml2argvdata/graphics-vnc-websocket.args
-index c094c0d0f0..ca822a2b45 100644
---- a/tests/qemuxml2argvdata/graphics-vnc-websocket.args
-+++ b/tests/qemuxml2argvdata/graphics-vnc-websocket.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/graphics-vnc.args b/tests/qemuxml2argvdata/graphics-vnc.args
-index 82a77778c2..5bc6e4943c 100644
---- a/tests/qemuxml2argvdata/graphics-vnc.args
-+++ b/tests/qemuxml2argvdata/graphics-vnc.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/hostdev-mdev-display-ramfb.x86_64-latest.args b/tests/qemuxml2argvdata/hostdev-mdev-display-ramfb.x86_64-latest.args
-index bb12d314b9..a4d33562d8 100644
---- a/tests/qemuxml2argvdata/hostdev-mdev-display-ramfb.x86_64-latest.args
-+++ b/tests/qemuxml2argvdata/hostdev-mdev-display-ramfb.x86_64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest2/master-key.aes \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu qemu64 \
- -m 214 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/hostdev-mdev-display-spice-egl-headless.x86_64-latest.args b/tests/qemuxml2argvdata/hostdev-mdev-display-spice-egl-headless.x86_64-latest.args
-index 090b644abb..e6af046390 100644
---- a/tests/qemuxml2argvdata/hostdev-mdev-display-spice-egl-headless.x86_64-latest.args
-+++ b/tests/qemuxml2argvdata/hostdev-mdev-display-spice-egl-headless.x86_64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=spice \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest2/master-key.aes \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu qemu64 \
- -m 214 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/hostdev-mdev-display-spice-opengl.x86_64-latest.args b/tests/qemuxml2argvdata/hostdev-mdev-display-spice-opengl.x86_64-latest.args
-index 201ccccc7f..bd0a8286df 100644
---- a/tests/qemuxml2argvdata/hostdev-mdev-display-spice-opengl.x86_64-latest.args
-+++ b/tests/qemuxml2argvdata/hostdev-mdev-display-spice-opengl.x86_64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=spice \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest2/master-key.aes \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu qemu64 \
- -m 214 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/hostdev-mdev-display-vnc-egl-headless.x86_64-latest.args b/tests/qemuxml2argvdata/hostdev-mdev-display-vnc-egl-headless.x86_64-latest.args
-index 0809fdce45..0b63ff5b24 100644
---- a/tests/qemuxml2argvdata/hostdev-mdev-display-vnc-egl-headless.x86_64-latest.args
-+++ b/tests/qemuxml2argvdata/hostdev-mdev-display-vnc-egl-headless.x86_64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest2/master-key.aes \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu qemu64 \
- -m 214 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/hostdev-mdev-display-vnc.x86_64-latest.args b/tests/qemuxml2argvdata/hostdev-mdev-display-vnc.x86_64-latest.args
-index 58a7549935..3e8add8625 100644
---- a/tests/qemuxml2argvdata/hostdev-mdev-display-vnc.x86_64-latest.args
-+++ b/tests/qemuxml2argvdata/hostdev-mdev-display-vnc.x86_64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest2/master-key.aes \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu qemu64 \
- -m 214 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/hostdev-mdev-precreated.args b/tests/qemuxml2argvdata/hostdev-mdev-precreated.args
-index 207ac5740b..fd1cbe8b52 100644
---- a/tests/qemuxml2argvdata/hostdev-mdev-precreated.args
-+++ b/tests/qemuxml2argvdata/hostdev-mdev-precreated.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest2 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/hostdev-pci-address-device.args b/tests/qemuxml2argvdata/hostdev-pci-address-device.args
-index 98d4a62c18..ceba02cc26 100644
---- a/tests/qemuxml2argvdata/hostdev-pci-address-device.args
-+++ b/tests/qemuxml2argvdata/hostdev-pci-address-device.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest2 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/hostdev-pci-address-unassigned.args b/tests/qemuxml2argvdata/hostdev-pci-address-unassigned.args
-index 42fae17444..882d5839f6 100644
---- a/tests/qemuxml2argvdata/hostdev-pci-address-unassigned.args
-+++ b/tests/qemuxml2argvdata/hostdev-pci-address-unassigned.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name delete \
- -S \
---machine pc,accel=kvm,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel kvm \
- -m 256 \
- -realtime mlock=off \
- -smp 4,sockets=4,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/hostdev-pci-address.args b/tests/qemuxml2argvdata/hostdev-pci-address.args
-index edec271444..f8a95d05fc 100644
---- a/tests/qemuxml2argvdata/hostdev-pci-address.args
-+++ b/tests/qemuxml2argvdata/hostdev-pci-address.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest2 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/hostdev-pci-multifunction.args b/tests/qemuxml2argvdata/hostdev-pci-multifunction.args
-index d8690c010b..fc8b9fda0b 100644
---- a/tests/qemuxml2argvdata/hostdev-pci-multifunction.args
-+++ b/tests/qemuxml2argvdata/hostdev-pci-multifunction.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name delete \
- -S \
---machine pc,accel=kvm,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel kvm \
- -m 256 \
- -realtime mlock=off \
- -smp 4,sockets=4,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/hostdev-scsi-lsi-iscsi-auth.args b/tests/qemuxml2argvdata/hostdev-scsi-lsi-iscsi-auth.args
-index 03e77517b4..e2d65da7f5 100644
---- a/tests/qemuxml2argvdata/hostdev-scsi-lsi-iscsi-auth.args
-+++ b/tests/qemuxml2argvdata/hostdev-scsi-lsi-iscsi-auth.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest2 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/hostdev-scsi-lsi-iscsi.args b/tests/qemuxml2argvdata/hostdev-scsi-lsi-iscsi.args
-index f215fba066..de7af2a61a 100644
---- a/tests/qemuxml2argvdata/hostdev-scsi-lsi-iscsi.args
-+++ b/tests/qemuxml2argvdata/hostdev-scsi-lsi-iscsi.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest2 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/hostdev-scsi-lsi.args b/tests/qemuxml2argvdata/hostdev-scsi-lsi.args
-index cf90224e9a..b8bcb6e78e 100644
---- a/tests/qemuxml2argvdata/hostdev-scsi-lsi.args
-+++ b/tests/qemuxml2argvdata/hostdev-scsi-lsi.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest2 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/hostdev-scsi-readonly.args b/tests/qemuxml2argvdata/hostdev-scsi-readonly.args
-index 0e481e7464..678cfc74cb 100644
---- a/tests/qemuxml2argvdata/hostdev-scsi-readonly.args
-+++ b/tests/qemuxml2argvdata/hostdev-scsi-readonly.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest2 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-ccw.args b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-ccw.args
-index 0e9fdd7c31..c0fbdaf86f 100644
---- a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-ccw.args
-+++ b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-ccw.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-s390x \
- -name QEMUGuest2 \
- -S \
---machine s390-ccw,accel=tcg,usb=off,dump-guest-core=off \
-+-machine s390-ccw,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args
-index 3e8b590ea0..c2f05c028f 100644
---- a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args
-+++ b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pci.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest2 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.args b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.args
-index 0bda46c4e1..299996666a 100644
---- a/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.args
-+++ b/tests/qemuxml2argvdata/hostdev-scsi-vhost-scsi-pcie.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name QEMUGuest2 \
- -S \
---machine pc-q35-2.7,accel=kvm,usb=off,dump-guest-core=off \
-+-machine pc-q35-2.7,usb=off,dump-guest-core=off \
-+-accel kvm \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi-auth.args b/tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi-auth.args
-index 4ce2029adb..1a066d9170 100644
---- a/tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi-auth.args
-+++ b/tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi-auth.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest2 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi.args b/tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi.args
-index 050e74a449..34bc6f44c1 100644
---- a/tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi.args
-+++ b/tests/qemuxml2argvdata/hostdev-scsi-virtio-iscsi.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest2 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.args b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.args
-index 364c4a10a5..7dc984d951 100644
---- a/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.args
-+++ b/tests/qemuxml2argvdata/hostdev-scsi-virtio-scsi.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest2 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ap.s390x-latest.args b/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ap.s390x-latest.args
-index 12bdf84afc..cc87bda8e9 100644
---- a/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ap.s390x-latest.args
-+++ b/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ap.s390x-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off \
-+-machine s390-ccw-virtio,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu qemu \
- -m 512 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw-boot.s390x-latest.args b/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw-boot.s390x-latest.args
-index ed6d92aba7..6813bcde2d 100644
---- a/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw-boot.s390x-latest.args
-+++ b/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw-boot.s390x-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off \
-+-machine s390-ccw-virtio,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu qemu \
- -m 512 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw.args b/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw.args
-index 1402b23b8c..a65bf208ef 100644
---- a/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw.args
-+++ b/tests/qemuxml2argvdata/hostdev-subsys-mdev-vfio-ccw.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-s390x \
- -name QEMUGuest1 \
- -S \
---machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off \
-+-machine s390-ccw-virtio,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 512 \
- -realtime mlock=off \
- -smp 2,sockets=2,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/hostdev-usb-address-device-boot.args b/tests/qemuxml2argvdata/hostdev-usb-address-device-boot.args
-index 6a24db3aea..dac85307b9 100644
---- a/tests/qemuxml2argvdata/hostdev-usb-address-device-boot.args
-+++ b/tests/qemuxml2argvdata/hostdev-usb-address-device-boot.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/hostdev-usb-address-device.args b/tests/qemuxml2argvdata/hostdev-usb-address-device.args
-index 5a10d45b3b..c02167660e 100644
---- a/tests/qemuxml2argvdata/hostdev-usb-address-device.args
-+++ b/tests/qemuxml2argvdata/hostdev-usb-address-device.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/hostdev-usb-address.args b/tests/qemuxml2argvdata/hostdev-usb-address.args
-index eb17911423..911d9c2382 100644
---- a/tests/qemuxml2argvdata/hostdev-usb-address.args
-+++ b/tests/qemuxml2argvdata/hostdev-usb-address.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/hostdev-vfio-multidomain.args b/tests/qemuxml2argvdata/hostdev-vfio-multidomain.args
-index 6bf3ef8021..7521d110e4 100644
---- a/tests/qemuxml2argvdata/hostdev-vfio-multidomain.args
-+++ b/tests/qemuxml2argvdata/hostdev-vfio-multidomain.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest2 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate.args b/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate.args
-index 963d508066..84bca82631 100644
---- a/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate.args
-+++ b/tests/qemuxml2argvdata/hostdev-vfio-zpci-autogenerate.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-s390x \
- -name QEMUGuest1 \
- -S \
---machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off \
-+-machine s390-ccw-virtio,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-boundaries.args b/tests/qemuxml2argvdata/hostdev-vfio-zpci-boundaries.args
-index 2fc4200c23..eb7831b61e 100644
---- a/tests/qemuxml2argvdata/hostdev-vfio-zpci-boundaries.args
-+++ b/tests/qemuxml2argvdata/hostdev-vfio-zpci-boundaries.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-s390x \
- -name QEMUGuest1 \
- -S \
---machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off \
-+-machine s390-ccw-virtio,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci-multidomain-many.args b/tests/qemuxml2argvdata/hostdev-vfio-zpci-multidomain-many.args
-index 3dd9a25fd5..c687392091 100644
---- a/tests/qemuxml2argvdata/hostdev-vfio-zpci-multidomain-many.args
-+++ b/tests/qemuxml2argvdata/hostdev-vfio-zpci-multidomain-many.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-s390x \
- -name QEMUGuest1 \
- -S \
---machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off \
-+-machine s390-ccw-virtio,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/hostdev-vfio-zpci.args b/tests/qemuxml2argvdata/hostdev-vfio-zpci.args
-index d3a762e5d4..2d590a7a0d 100644
---- a/tests/qemuxml2argvdata/hostdev-vfio-zpci.args
-+++ b/tests/qemuxml2argvdata/hostdev-vfio-zpci.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-s390x \
- -name QEMUGuest1 \
- -S \
---machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off \
-+-machine s390-ccw-virtio,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/hostdev-vfio.args b/tests/qemuxml2argvdata/hostdev-vfio.args
-index d7eaa774ca..adb95f4064 100644
---- a/tests/qemuxml2argvdata/hostdev-vfio.args
-+++ b/tests/qemuxml2argvdata/hostdev-vfio.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest2 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/hotplug-base.args b/tests/qemuxml2argvdata/hotplug-base.args
-index b2bd39e5a5..6054f78a17 100644
---- a/tests/qemuxml2argvdata/hotplug-base.args
-+++ b/tests/qemuxml2argvdata/hotplug-base.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name hotplug \
- -S \
---machine pc,accel=kvm,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel kvm \
- -m 4096 \
- -realtime mlock=off \
- -smp 4,sockets=4,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/hugepages-default-2M.args b/tests/qemuxml2argvdata/hugepages-default-2M.args
-index 014d71c9ec..5977533305 100644
---- a/tests/qemuxml2argvdata/hugepages-default-2M.args
-+++ b/tests/qemuxml2argvdata/hugepages-default-2M.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name SomeDummyHugepagesGuest \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 1024 \
- -mem-prealloc \
- -mem-path /dev/hugepages2M/libvirt/qemu/-1-SomeDummyHugepagesGu \
-diff --git a/tests/qemuxml2argvdata/hugepages-default-system-size.args b/tests/qemuxml2argvdata/hugepages-default-system-size.args
-index bcf6e6bf0e..644ed1f633 100644
---- a/tests/qemuxml2argvdata/hugepages-default-system-size.args
-+++ b/tests/qemuxml2argvdata/hugepages-default-system-size.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name SomeDummyHugepagesGuest \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 1024 \
- -realtime mlock=off \
- -smp 2,sockets=2,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/hugepages-default.args b/tests/qemuxml2argvdata/hugepages-default.args
-index 3184e4ea07..8386164091 100644
---- a/tests/qemuxml2argvdata/hugepages-default.args
-+++ b/tests/qemuxml2argvdata/hugepages-default.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -mem-prealloc \
- -mem-path /dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1 \
-diff --git a/tests/qemuxml2argvdata/hugepages-memaccess.args b/tests/qemuxml2argvdata/hugepages-memaccess.args
-index 7cfbce7c7c..d4ab245672 100644
---- a/tests/qemuxml2argvdata/hugepages-memaccess.args
-+++ b/tests/qemuxml2argvdata/hugepages-memaccess.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m size=4194304k,slots=16,maxmem=8388608k \
- -realtime mlock=off \
- -smp 4,sockets=4,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/hugepages-memaccess2.args b/tests/qemuxml2argvdata/hugepages-memaccess2.args
-index 654baebf9f..1c4c08478a 100644
---- a/tests/qemuxml2argvdata/hugepages-memaccess2.args
-+++ b/tests/qemuxml2argvdata/hugepages-memaccess2.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m size=4194304k,slots=16,maxmem=8388608k \
- -realtime mlock=off \
- -smp 4,sockets=4,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/hugepages-nodeset.args b/tests/qemuxml2argvdata/hugepages-nodeset.args
-index 014d71c9ec..5977533305 100644
---- a/tests/qemuxml2argvdata/hugepages-nodeset.args
-+++ b/tests/qemuxml2argvdata/hugepages-nodeset.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name SomeDummyHugepagesGuest \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 1024 \
- -mem-prealloc \
- -mem-path /dev/hugepages2M/libvirt/qemu/-1-SomeDummyHugepagesGu \
-diff --git a/tests/qemuxml2argvdata/hugepages-numa-default-2M.args b/tests/qemuxml2argvdata/hugepages-numa-default-2M.args
-index bbf3c9f67a..1ccc8bd08b 100644
---- a/tests/qemuxml2argvdata/hugepages-numa-default-2M.args
-+++ b/tests/qemuxml2argvdata/hugepages-numa-default-2M.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name SomeDummyHugepagesGuest \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 1024 \
- -realtime mlock=off \
- -smp 2,sockets=2,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/hugepages-numa-default-dimm.args b/tests/qemuxml2argvdata/hugepages-numa-default-dimm.args
-index e219914bc3..51aaafa508 100644
---- a/tests/qemuxml2argvdata/hugepages-numa-default-dimm.args
-+++ b/tests/qemuxml2argvdata/hugepages-numa-default-dimm.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name fedora \
- -S \
---machine pc-i440fx-2.3,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc-i440fx-2.3,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m size=1048576k,slots=16,maxmem=1099511627776k \
- -realtime mlock=off \
- -smp 2,sockets=2,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/hugepages-numa-default.args b/tests/qemuxml2argvdata/hugepages-numa-default.args
-index 674bb517d1..4238c0ff34 100644
---- a/tests/qemuxml2argvdata/hugepages-numa-default.args
-+++ b/tests/qemuxml2argvdata/hugepages-numa-default.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name fedora \
- -S \
---machine pc-i440fx-2.3,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc-i440fx-2.3,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 1024 \
- -realtime mlock=off \
- -smp 2,sockets=2,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/hugepages-numa-nodeset-part.args b/tests/qemuxml2argvdata/hugepages-numa-nodeset-part.args
-index 7849143e69..9d20de0ba1 100644
---- a/tests/qemuxml2argvdata/hugepages-numa-nodeset-part.args
-+++ b/tests/qemuxml2argvdata/hugepages-numa-nodeset-part.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name SomeDummyHugepagesGuest \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 1024 \
- -realtime mlock=off \
- -smp 2,sockets=2,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/hugepages-numa-nodeset.args b/tests/qemuxml2argvdata/hugepages-numa-nodeset.args
-index 7b510be6b3..9b0902860d 100644
---- a/tests/qemuxml2argvdata/hugepages-numa-nodeset.args
-+++ b/tests/qemuxml2argvdata/hugepages-numa-nodeset.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 4096 \
- -realtime mlock=off \
- -smp 4,sockets=4,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/hugepages-nvdimm.x86_64-latest.args b/tests/qemuxml2argvdata/hugepages-nvdimm.x86_64-latest.args
-index e80a95c84b..eb7cea1049 100644
---- a/tests/qemuxml2argvdata/hugepages-nvdimm.x86_64-latest.args
-+++ b/tests/qemuxml2argvdata/hugepages-nvdimm.x86_64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc,accel=tcg,usb=off,dump-guest-core=off,nvdimm=on \
-+-machine pc,usb=off,dump-guest-core=off,nvdimm=on \
-+-accel tcg \
- -cpu qemu64 \
- -m size=1048576k,slots=16,maxmem=1099511627776k \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/hugepages-shared.args b/tests/qemuxml2argvdata/hugepages-shared.args
-index 545b86b223..41a1a4b84c 100644
---- a/tests/qemuxml2argvdata/hugepages-shared.args
-+++ b/tests/qemuxml2argvdata/hugepages-shared.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 4096 \
- -realtime mlock=off \
- -smp 4,sockets=4,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/hyperv-off.x86_64-4.0.0.args b/tests/qemuxml2argvdata/hyperv-off.x86_64-4.0.0.args
-index 6909b71d52..2d7b9e1699 100644
---- a/tests/qemuxml2argvdata/hyperv-off.x86_64-4.0.0.args
-+++ b/tests/qemuxml2argvdata/hyperv-off.x86_64-4.0.0.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc-i440fx-4.0,accel=tcg,usb=off,dump-guest-core=off \
-+-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 \
-diff --git a/tests/qemuxml2argvdata/hyperv-off.x86_64-latest.args b/tests/qemuxml2argvdata/hyperv-off.x86_64-latest.args
-index ea3fc775bb..e5d3a98794 100644
---- a/tests/qemuxml2argvdata/hyperv-off.x86_64-latest.args
-+++ b/tests/qemuxml2argvdata/hyperv-off.x86_64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu qemu64 \
- -m 214 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/hyperv-panic.x86_64-4.0.0.args b/tests/qemuxml2argvdata/hyperv-panic.x86_64-4.0.0.args
-index 55e5099717..5671a9bea0 100644
---- a/tests/qemuxml2argvdata/hyperv-panic.x86_64-4.0.0.args
-+++ b/tests/qemuxml2argvdata/hyperv-panic.x86_64-4.0.0.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc-i440fx-4.0,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc-i440fx-4.0,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu qemu32,hv-crash \
- -m 214 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/hyperv-panic.x86_64-latest.args b/tests/qemuxml2argvdata/hyperv-panic.x86_64-latest.args
-index 41527208ab..9031fa23e1 100644
---- a/tests/qemuxml2argvdata/hyperv-panic.x86_64-latest.args
-+++ b/tests/qemuxml2argvdata/hyperv-panic.x86_64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu qemu64,hv-crash \
- -m 214 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/hyperv-stimer-direct.x86_64-latest.args b/tests/qemuxml2argvdata/hyperv-stimer-direct.x86_64-latest.args
-index bdcf33c1bf..e3fc58e1ef 100644
---- a/tests/qemuxml2argvdata/hyperv-stimer-direct.x86_64-latest.args
-+++ b/tests/qemuxml2argvdata/hyperv-stimer-direct.x86_64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu qemu64,hv-vpindex,hv-synic,hv-stimer,hv-stimer-direct \
- -m 214 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/hyperv.x86_64-4.0.0.args b/tests/qemuxml2argvdata/hyperv.x86_64-4.0.0.args
-index b9d9542892..fc4051d6b9 100644
---- a/tests/qemuxml2argvdata/hyperv.x86_64-4.0.0.args
-+++ b/tests/qemuxml2argvdata/hyperv.x86_64-4.0.0.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc-i440fx-4.0,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc-i440fx-4.0,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu 'qemu32,hv_relaxed,hv_vapic,hv-spinlocks=0x2fff,hv_vpindex,hv_runtime,\
- hv_synic,hv_stimer,hv_reset,hv-vendor-id=KVM Hv,hv_frequencies,\
- hv_reenlightenment,hv_tlbflush,hv_ipi,hv_evmcs' \
-diff --git a/tests/qemuxml2argvdata/hyperv.x86_64-latest.args b/tests/qemuxml2argvdata/hyperv.x86_64-latest.args
-index 7382553860..f044b27704 100644
---- a/tests/qemuxml2argvdata/hyperv.x86_64-latest.args
-+++ b/tests/qemuxml2argvdata/hyperv.x86_64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu 'qemu64,hv-relaxed,hv-vapic,hv-spinlocks=0x2fff,hv-vpindex,hv-runtime,\
- hv-synic,hv-stimer,hv-reset,hv-vendor-id=KVM Hv,hv-frequencies,\
- hv-reenlightenment,hv-tlbflush,hv-ipi,hv-evmcs' \
-diff --git a/tests/qemuxml2argvdata/input-usbmouse-addr.args b/tests/qemuxml2argvdata/input-usbmouse-addr.args
-index 36d9fc4f90..2529d9acfb 100644
---- a/tests/qemuxml2argvdata/input-usbmouse-addr.args
-+++ b/tests/qemuxml2argvdata/input-usbmouse-addr.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/input-usbmouse.args b/tests/qemuxml2argvdata/input-usbmouse.args
-index fc83eef3aa..8bbaa77e3d 100644
---- a/tests/qemuxml2argvdata/input-usbmouse.args
-+++ b/tests/qemuxml2argvdata/input-usbmouse.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/input-usbtablet.args b/tests/qemuxml2argvdata/input-usbtablet.args
-index 8a96f66411..ed4441c612 100644
---- a/tests/qemuxml2argvdata/input-usbtablet.args
-+++ b/tests/qemuxml2argvdata/input-usbtablet.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/input-virtio-ccw.args b/tests/qemuxml2argvdata/input-virtio-ccw.args
-index 108a8470cb..66e1a56668 100644
---- a/tests/qemuxml2argvdata/input-virtio-ccw.args
-+++ b/tests/qemuxml2argvdata/input-virtio-ccw.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-s390x \
- -name QEMUGuest1 \
- -S \
---machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off \
-+-machine s390-ccw-virtio,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-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 c232121595..83037cacfa 100644
---- a/tests/qemuxml2argvdata/intel-iommu-caching-mode.x86_64-latest.args
-+++ b/tests/qemuxml2argvdata/intel-iommu-caching-mode.x86_64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine q35,accel=kvm,usb=off,dump-guest-core=off,kernel_irqchip=split \
-+-machine q35,usb=off,dump-guest-core=off,kernel_irqchip=split \
-+-accel kvm \
- -cpu qemu64 \
- -m 214 \
- -overcommit mem-lock=off \
-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 addb45a0b3..30b61456b1 100644
---- a/tests/qemuxml2argvdata/intel-iommu-device-iotlb.x86_64-latest.args
-+++ b/tests/qemuxml2argvdata/intel-iommu-device-iotlb.x86_64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine q35,accel=kvm,usb=off,dump-guest-core=off,kernel_irqchip=split \
-+-machine q35,usb=off,dump-guest-core=off,kernel_irqchip=split \
-+-accel kvm \
- -cpu qemu64 \
- -m 214 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/intel-iommu-eim.x86_64-latest.args b/tests/qemuxml2argvdata/intel-iommu-eim.x86_64-latest.args
-index 98650baaaa..f92e788824 100644
---- a/tests/qemuxml2argvdata/intel-iommu-eim.x86_64-latest.args
-+++ b/tests/qemuxml2argvdata/intel-iommu-eim.x86_64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine q35,accel=kvm,usb=off,dump-guest-core=off,kernel_irqchip=split \
-+-machine q35,usb=off,dump-guest-core=off,kernel_irqchip=split \
-+-accel kvm \
- -cpu qemu64 \
- -m 214 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/intel-iommu.x86_64-2.6.0.args b/tests/qemuxml2argvdata/intel-iommu.x86_64-2.6.0.args
-index eb491e17b4..0120c219df 100644
---- a/tests/qemuxml2argvdata/intel-iommu.x86_64-2.6.0.args
-+++ b/tests/qemuxml2argvdata/intel-iommu.x86_64-2.6.0.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc-q35-2.6,accel=tcg,usb=off,dump-guest-core=off,iommu=on \
-+-machine pc-q35-2.6,usb=off,dump-guest-core=off,iommu=on \
-+-accel tcg \
- -cpu qemu64 \
- -m 214 \
- -realtime mlock=off \
-diff --git a/tests/qemuxml2argvdata/intel-iommu.x86_64-latest.args b/tests/qemuxml2argvdata/intel-iommu.x86_64-latest.args
-index 92d25f6d41..91b1c1c757 100644
---- a/tests/qemuxml2argvdata/intel-iommu.x86_64-latest.args
-+++ b/tests/qemuxml2argvdata/intel-iommu.x86_64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine q35,accel=tcg,usb=off,dump-guest-core=off \
-+-machine q35,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu qemu64 \
- -m 214 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/iommu-smmuv3.aarch64-latest.args b/tests/qemuxml2argvdata/iommu-smmuv3.aarch64-latest.args
-index 940a5d1f91..46be250fc5 100644
---- a/tests/qemuxml2argvdata/iommu-smmuv3.aarch64-latest.args
-+++ b/tests/qemuxml2argvdata/iommu-smmuv3.aarch64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-guest/master-key.aes \
---machine virt,accel=tcg,usb=off,dump-guest-core=off,gic-version=2,iommu=smmuv3 \
-+-machine virt,usb=off,dump-guest-core=off,gic-version=2,iommu=smmuv3 \
-+-accel tcg \
- -cpu cortex-a15 \
- -m 1024 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/iothreads-disk-virtio-ccw.args b/tests/qemuxml2argvdata/iothreads-disk-virtio-ccw.args
-index 402f653dfc..3d115232e5 100644
---- a/tests/qemuxml2argvdata/iothreads-disk-virtio-ccw.args
-+++ b/tests/qemuxml2argvdata/iothreads-disk-virtio-ccw.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-s390x \
- -name QEMUGuest1 \
- -S \
---machine s390-ccw,accel=tcg,usb=off,dump-guest-core=off \
-+-machine s390-ccw,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/iothreads-disk.args b/tests/qemuxml2argvdata/iothreads-disk.args
-index e3dcb1d1b3..1c06690b4a 100644
---- a/tests/qemuxml2argvdata/iothreads-disk.args
-+++ b/tests/qemuxml2argvdata/iothreads-disk.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 2,sockets=2,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/iothreads-ids-partial.args b/tests/qemuxml2argvdata/iothreads-ids-partial.args
-index 58e764d78a..08d67ab03f 100644
---- a/tests/qemuxml2argvdata/iothreads-ids-partial.args
-+++ b/tests/qemuxml2argvdata/iothreads-ids-partial.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 2,sockets=2,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/iothreads-ids.args b/tests/qemuxml2argvdata/iothreads-ids.args
-index 009dcc9d72..b364263c55 100644
---- a/tests/qemuxml2argvdata/iothreads-ids.args
-+++ b/tests/qemuxml2argvdata/iothreads-ids.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 2,sockets=2,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/iothreads-virtio-scsi-ccw.s390x-latest.args b/tests/qemuxml2argvdata/iothreads-virtio-scsi-ccw.s390x-latest.args
-index bdc060aaa2..0897bf2db0 100644
---- a/tests/qemuxml2argvdata/iothreads-virtio-scsi-ccw.s390x-latest.args
-+++ b/tests/qemuxml2argvdata/iothreads-virtio-scsi-ccw.s390x-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off \
-+-machine s390-ccw-virtio,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu qemu \
- -m 214 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/iothreads-virtio-scsi-pci.x86_64-latest.args b/tests/qemuxml2argvdata/iothreads-virtio-scsi-pci.x86_64-latest.args
-index c366520e09..2b0105ccc4 100644
---- a/tests/qemuxml2argvdata/iothreads-virtio-scsi-pci.x86_64-latest.args
-+++ b/tests/qemuxml2argvdata/iothreads-virtio-scsi-pci.x86_64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu qemu64 \
- -m 214 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/iothreads.args b/tests/qemuxml2argvdata/iothreads.args
-index 5bc2350741..29edfc6fd4 100644
---- a/tests/qemuxml2argvdata/iothreads.args
-+++ b/tests/qemuxml2argvdata/iothreads.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 2,sockets=2,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/kvm-features-off.args b/tests/qemuxml2argvdata/kvm-features-off.args
-index 54d166912e..0ac2aba4f5 100644
---- a/tests/qemuxml2argvdata/kvm-features-off.args
-+++ b/tests/qemuxml2argvdata/kvm-features-off.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 6,sockets=6,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/kvm-features.args b/tests/qemuxml2argvdata/kvm-features.args
-index 5753a3eb3f..07ab9d5224 100644
---- a/tests/qemuxml2argvdata/kvm-features.args
-+++ b/tests/qemuxml2argvdata/kvm-features.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=kvm,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel kvm \
- -cpu host,kvm=off,kvm-hint-dedicated=on \
- -m 214 \
- -realtime mlock=off \
-diff --git a/tests/qemuxml2argvdata/kvm-pit-delay.args b/tests/qemuxml2argvdata/kvm-pit-delay.args
-index f51fb19f85..a708bf9aef 100644
---- a/tests/qemuxml2argvdata/kvm-pit-delay.args
-+++ b/tests/qemuxml2argvdata/kvm-pit-delay.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 2,sockets=2,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/kvm-pit-discard.args b/tests/qemuxml2argvdata/kvm-pit-discard.args
-index a71d9d68b8..1fb76e52d1 100644
---- a/tests/qemuxml2argvdata/kvm-pit-discard.args
-+++ b/tests/qemuxml2argvdata/kvm-pit-discard.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 2,sockets=2,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-2.7.0.args b/tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-2.7.0.args
-index cb2eba75ff..8ad951e2c7 100644
---- a/tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-2.7.0.args
-+++ b/tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-2.7.0.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc-i440fx-2.7,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc-i440fx-2.7,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu qemu32,-kvmclock,-kvm_pv_eoi \
- -m 214 \
- -realtime mlock=off \
-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
-index c67e253746..2b4244c9bb 100644
---- a/tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-4.0.0.args
-+++ b/tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-4.0.0.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc-i440fx-4.0,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc-i440fx-4.0,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu qemu32,kvmclock=off,kvm_pv_eoi=off \
- -m 214 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-latest.args b/tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-latest.args
-index c4cd5f5beb..3499509d54 100644
---- a/tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-latest.args
-+++ b/tests/qemuxml2argvdata/kvmclock+eoi-disabled.x86_64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu qemu64,kvmclock=off,kvm-pv-eoi=off \
- -m 214 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/kvmclock.args b/tests/qemuxml2argvdata/kvmclock.args
-index 65bea1d0b0..a884e5fde6 100644
---- a/tests/qemuxml2argvdata/kvmclock.args
-+++ b/tests/qemuxml2argvdata/kvmclock.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=kvm,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel kvm \
- -cpu qemu32,-kvmclock \
- -m 214 \
- -realtime mlock=off \
-diff --git a/tests/qemuxml2argvdata/launch-security-sev.x86_64-2.12.0.args b/tests/qemuxml2argvdata/launch-security-sev.x86_64-2.12.0.args
-index 9fad85737a..1f795db2ea 100644
---- a/tests/qemuxml2argvdata/launch-security-sev.x86_64-2.12.0.args
-+++ b/tests/qemuxml2argvdata/launch-security-sev.x86_64-2.12.0.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc-1.0,accel=kvm,usb=off,dump-guest-core=off,memory-encryption=sev0 \
-+-machine pc-1.0,usb=off,dump-guest-core=off,memory-encryption=sev0 \
-+-accel kvm \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/luks-disks-source-qcow2.args b/tests/qemuxml2argvdata/luks-disks-source-qcow2.args
-index e7a29b2e03..087e78106d 100644
---- a/tests/qemuxml2argvdata/luks-disks-source-qcow2.args
-+++ b/tests/qemuxml2argvdata/luks-disks-source-qcow2.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-encryptdisk/master-key.aes \
---machine pc-i440fx-2.1,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc-i440fx-2.1,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 1024 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/luks-disks-source-qcow2.x86_64-latest.args b/tests/qemuxml2argvdata/luks-disks-source-qcow2.x86_64-latest.args
-index 44e4c5698d..7f85cbb8a2 100644
---- a/tests/qemuxml2argvdata/luks-disks-source-qcow2.x86_64-latest.args
-+++ b/tests/qemuxml2argvdata/luks-disks-source-qcow2.x86_64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-encryptdisk/master-key.aes \
---machine pc-i440fx-2.1,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc-i440fx-2.1,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu qemu64 \
- -m 1024 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/luks-disks-source.args b/tests/qemuxml2argvdata/luks-disks-source.args
-index e2bd559212..c8976845f5 100644
---- a/tests/qemuxml2argvdata/luks-disks-source.args
-+++ b/tests/qemuxml2argvdata/luks-disks-source.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-encryptdisk/master-key.aes \
---machine pc-i440fx-2.1,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc-i440fx-2.1,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 1024 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/luks-disks.args b/tests/qemuxml2argvdata/luks-disks.args
-index 47626966f2..1fea806669 100644
---- a/tests/qemuxml2argvdata/luks-disks.args
-+++ b/tests/qemuxml2argvdata/luks-disks.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-encryptdisk/master-key.aes \
---machine pc-i440fx-2.1,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc-i440fx-2.1,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 1024 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/mach-virt-console-virtio.args b/tests/qemuxml2argvdata/mach-virt-console-virtio.args
-index 36fe539012..e2c0f1ab47 100644
---- a/tests/qemuxml2argvdata/mach-virt-console-virtio.args
-+++ b/tests/qemuxml2argvdata/mach-virt-console-virtio.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-aarch64 \
- -name guest \
- -S \
---machine virt,accel=tcg,usb=off,dump-guest-core=off \
-+-machine virt,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 512 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/mach-virt-serial-native.args b/tests/qemuxml2argvdata/mach-virt-serial-native.args
-index 8d25e49db5..cd27ffef4b 100644
---- a/tests/qemuxml2argvdata/mach-virt-serial-native.args
-+++ b/tests/qemuxml2argvdata/mach-virt-serial-native.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-aarch64 \
- -name guest \
- -S \
---machine virt,accel=tcg,usb=off,dump-guest-core=off \
-+-machine virt,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 512 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/mach-virt-serial-pci.args b/tests/qemuxml2argvdata/mach-virt-serial-pci.args
-index 2f4dd08c1a..3485b8bb5d 100644
---- a/tests/qemuxml2argvdata/mach-virt-serial-pci.args
-+++ b/tests/qemuxml2argvdata/mach-virt-serial-pci.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-aarch64 \
- -name guest \
- -S \
---machine virt,accel=tcg,usb=off,dump-guest-core=off \
-+-machine virt,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 512 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/mach-virt-serial-usb.args b/tests/qemuxml2argvdata/mach-virt-serial-usb.args
-index d96b2c0262..9469f4e0a3 100644
---- a/tests/qemuxml2argvdata/mach-virt-serial-usb.args
-+++ b/tests/qemuxml2argvdata/mach-virt-serial-usb.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-aarch64 \
- -name guest \
- -S \
---machine virt,accel=tcg,usb=off,dump-guest-core=off \
-+-machine virt,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 512 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/machine-aeskeywrap-off-cap.args b/tests/qemuxml2argvdata/machine-aeskeywrap-off-cap.args
-index a9577c13d8..dca842f16c 100644
---- a/tests/qemuxml2argvdata/machine-aeskeywrap-off-cap.args
-+++ b/tests/qemuxml2argvdata/machine-aeskeywrap-off-cap.args
-@@ -10,8 +10,9 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-s390x \
- -name QEMUGuest1 \
- -S \
---machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off,\
-+-machine s390-ccw-virtio,usb=off,dump-guest-core=off,\
- aes-key-wrap=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/machine-aeskeywrap-off-caps.args b/tests/qemuxml2argvdata/machine-aeskeywrap-off-caps.args
-index a9577c13d8..dca842f16c 100644
---- a/tests/qemuxml2argvdata/machine-aeskeywrap-off-caps.args
-+++ b/tests/qemuxml2argvdata/machine-aeskeywrap-off-caps.args
-@@ -10,8 +10,9 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-s390x \
- -name QEMUGuest1 \
- -S \
---machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off,\
-+-machine s390-ccw-virtio,usb=off,dump-guest-core=off,\
- aes-key-wrap=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/machine-aeskeywrap-on-cap.args b/tests/qemuxml2argvdata/machine-aeskeywrap-on-cap.args
-index 7fbbe4e6bf..7db11afd2f 100644
---- a/tests/qemuxml2argvdata/machine-aeskeywrap-on-cap.args
-+++ b/tests/qemuxml2argvdata/machine-aeskeywrap-on-cap.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-s390x \
- -name QEMUGuest1 \
- -S \
---machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off,aes-key-wrap=on \
-+-machine s390-ccw-virtio,usb=off,dump-guest-core=off,aes-key-wrap=on \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/machine-aeskeywrap-on-caps.args b/tests/qemuxml2argvdata/machine-aeskeywrap-on-caps.args
-index 7fbbe4e6bf..7db11afd2f 100644
---- a/tests/qemuxml2argvdata/machine-aeskeywrap-on-caps.args
-+++ b/tests/qemuxml2argvdata/machine-aeskeywrap-on-caps.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-s390x \
- -name QEMUGuest1 \
- -S \
---machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off,aes-key-wrap=on \
-+-machine s390-ccw-virtio,usb=off,dump-guest-core=off,aes-key-wrap=on \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/machine-aliases1.args b/tests/qemuxml2argvdata/machine-aliases1.args
-index fa3ccefc35..1ddf4fc6d9 100644
---- a/tests/qemuxml2argvdata/machine-aliases1.args
-+++ b/tests/qemuxml2argvdata/machine-aliases1.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/machine-aliases2.args b/tests/qemuxml2argvdata/machine-aliases2.args
-index 6e480fceef..44701f1d64 100644
---- a/tests/qemuxml2argvdata/machine-aliases2.args
-+++ b/tests/qemuxml2argvdata/machine-aliases2.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=kvm,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel kvm \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/machine-core-off.args b/tests/qemuxml2argvdata/machine-core-off.args
-index e38898e335..048cdaada1 100644
---- a/tests/qemuxml2argvdata/machine-core-off.args
-+++ b/tests/qemuxml2argvdata/machine-core-off.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/machine-core-on.args b/tests/qemuxml2argvdata/machine-core-on.args
-index b3d271e161..8e5a21ce7e 100644
---- a/tests/qemuxml2argvdata/machine-core-on.args
-+++ b/tests/qemuxml2argvdata/machine-core-on.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=on \
-+-machine pc,usb=off,dump-guest-core=on \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/machine-deakeywrap-off-cap.args b/tests/qemuxml2argvdata/machine-deakeywrap-off-cap.args
-index 40d6616940..b1ef8b0742 100644
---- a/tests/qemuxml2argvdata/machine-deakeywrap-off-cap.args
-+++ b/tests/qemuxml2argvdata/machine-deakeywrap-off-cap.args
-@@ -10,8 +10,9 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-s390x \
- -name QEMUGuest1 \
- -S \
---machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off,\
-+-machine s390-ccw-virtio,usb=off,dump-guest-core=off,\
- dea-key-wrap=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/machine-deakeywrap-off-caps.args b/tests/qemuxml2argvdata/machine-deakeywrap-off-caps.args
-index 40d6616940..b1ef8b0742 100644
---- a/tests/qemuxml2argvdata/machine-deakeywrap-off-caps.args
-+++ b/tests/qemuxml2argvdata/machine-deakeywrap-off-caps.args
-@@ -10,8 +10,9 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-s390x \
- -name QEMUGuest1 \
- -S \
---machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off,\
-+-machine s390-ccw-virtio,usb=off,dump-guest-core=off,\
- dea-key-wrap=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/machine-deakeywrap-on-cap.args b/tests/qemuxml2argvdata/machine-deakeywrap-on-cap.args
-index 4fbb224904..2d8ad62c08 100644
---- a/tests/qemuxml2argvdata/machine-deakeywrap-on-cap.args
-+++ b/tests/qemuxml2argvdata/machine-deakeywrap-on-cap.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-s390x \
- -name QEMUGuest1 \
- -S \
---machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off,dea-key-wrap=on \
-+-machine s390-ccw-virtio,usb=off,dump-guest-core=off,dea-key-wrap=on \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/machine-deakeywrap-on-caps.args b/tests/qemuxml2argvdata/machine-deakeywrap-on-caps.args
-index 4fbb224904..2d8ad62c08 100644
---- a/tests/qemuxml2argvdata/machine-deakeywrap-on-caps.args
-+++ b/tests/qemuxml2argvdata/machine-deakeywrap-on-caps.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-s390x \
- -name QEMUGuest1 \
- -S \
---machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off,dea-key-wrap=on \
-+-machine s390-ccw-virtio,usb=off,dump-guest-core=off,dea-key-wrap=on \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/machine-keywrap-none-caps.args b/tests/qemuxml2argvdata/machine-keywrap-none-caps.args
-index 056bf815e8..5001b75450 100644
---- a/tests/qemuxml2argvdata/machine-keywrap-none-caps.args
-+++ b/tests/qemuxml2argvdata/machine-keywrap-none-caps.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-s390x \
- -name QEMUGuest1 \
- -S \
---machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off \
-+-machine s390-ccw-virtio,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/machine-keywrap-none.args b/tests/qemuxml2argvdata/machine-keywrap-none.args
-index 056bf815e8..5001b75450 100644
---- a/tests/qemuxml2argvdata/machine-keywrap-none.args
-+++ b/tests/qemuxml2argvdata/machine-keywrap-none.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-s390x \
- -name QEMUGuest1 \
- -S \
---machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off \
-+-machine s390-ccw-virtio,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/machine-loadparm-multiple-disks-nets-s390.args b/tests/qemuxml2argvdata/machine-loadparm-multiple-disks-nets-s390.args
-index f5b822e55c..ee4e24fe8f 100644
---- a/tests/qemuxml2argvdata/machine-loadparm-multiple-disks-nets-s390.args
-+++ b/tests/qemuxml2argvdata/machine-loadparm-multiple-disks-nets-s390.args
-@@ -10,8 +10,9 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-s390x \
- -name QEMUGuest1 \
- -S \
---machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off,\
-+-machine s390-ccw-virtio,usb=off,dump-guest-core=off,\
- loadparm=SYSTEM1 \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/machine-loadparm-net-s390.args b/tests/qemuxml2argvdata/machine-loadparm-net-s390.args
-index 2c401d9bad..711a2acf06 100644
---- a/tests/qemuxml2argvdata/machine-loadparm-net-s390.args
-+++ b/tests/qemuxml2argvdata/machine-loadparm-net-s390.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-s390x \
- -name QEMUGuest1 \
- -S \
---machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off,loadparm=2 \
-+-machine s390-ccw-virtio,usb=off,dump-guest-core=off,loadparm=2 \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/machine-loadparm-s390.args b/tests/qemuxml2argvdata/machine-loadparm-s390.args
-index 0326bea31c..7445f42caa 100644
---- a/tests/qemuxml2argvdata/machine-loadparm-s390.args
-+++ b/tests/qemuxml2argvdata/machine-loadparm-s390.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-s390x \
- -name QEMUGuest1 \
- -S \
---machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off,loadparm=2 \
-+-machine s390-ccw-virtio,usb=off,dump-guest-core=off,loadparm=2 \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/machine-smm-opt.args b/tests/qemuxml2argvdata/machine-smm-opt.args
-index 8f1f041a5f..1f63cc5b03 100644
---- a/tests/qemuxml2argvdata/machine-smm-opt.args
-+++ b/tests/qemuxml2argvdata/machine-smm-opt.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name QEMUGuest1 \
- -S \
---machine q35,accel=tcg,usb=off,smm=on,dump-guest-core=off \
-+-machine q35,usb=off,smm=on,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/machine-vmport-opt.args b/tests/qemuxml2argvdata/machine-vmport-opt.args
-index f3f5ddff1d..01d31dc59b 100644
---- a/tests/qemuxml2argvdata/machine-vmport-opt.args
-+++ b/tests/qemuxml2argvdata/machine-vmport-opt.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,vmport=off,dump-guest-core=off \
-+-machine pc,usb=off,vmport=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/master-key.args b/tests/qemuxml2argvdata/master-key.args
-index 9e91135f31..0331772122 100644
---- a/tests/qemuxml2argvdata/master-key.args
-+++ b/tests/qemuxml2argvdata/master-key.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 2,sockets=2,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/memfd-memory-default-hugepage.x86_64-latest.args b/tests/qemuxml2argvdata/memfd-memory-default-hugepage.x86_64-latest.args
-index 5d256c42bc..48daa17f7e 100644
---- a/tests/qemuxml2argvdata/memfd-memory-default-hugepage.x86_64-latest.args
-+++ b/tests/qemuxml2argvdata/memfd-memory-default-hugepage.x86_64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-instance-00000092/master-key.aes \
---machine pc-i440fx-2.3,accel=kvm,usb=off,dump-guest-core=off \
-+-machine pc-i440fx-2.3,usb=off,dump-guest-core=off \
-+-accel kvm \
- -cpu qemu64 \
- -m 14336 \
- -mem-prealloc \
-diff --git a/tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args b/tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args
-index 5d256c42bc..48daa17f7e 100644
---- a/tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args
-+++ b/tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-instance-00000092/master-key.aes \
---machine pc-i440fx-2.3,accel=kvm,usb=off,dump-guest-core=off \
-+-machine pc-i440fx-2.3,usb=off,dump-guest-core=off \
-+-accel kvm \
- -cpu qemu64 \
- -m 14336 \
- -mem-prealloc \
-diff --git a/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.args b/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.args
-index 9ba3f8b7a0..5145416b9d 100644
---- a/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.args
-+++ b/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m size=219136k,slots=16,maxmem=1099511627776k \
- -realtime mlock=off \
- -smp 2,sockets=2,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/memory-hotplug-dimm.args b/tests/qemuxml2argvdata/memory-hotplug-dimm.args
-index 0ac48db399..4c786747fa 100644
---- a/tests/qemuxml2argvdata/memory-hotplug-dimm.args
-+++ b/tests/qemuxml2argvdata/memory-hotplug-dimm.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m size=219136k,slots=16,maxmem=1099511627776k \
- -realtime mlock=off \
- -smp 2,sockets=2,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.x86_64-latest.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.x86_64-latest.args
-index 89138f46c4..a0fa03e67e 100644
---- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.x86_64-latest.args
-+++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.x86_64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc,accel=tcg,usb=off,dump-guest-core=off,nvdimm=on \
-+-machine pc,usb=off,dump-guest-core=off,nvdimm=on \
-+-accel tcg \
- -cpu qemu64 \
- -m size=219136k,slots=16,maxmem=1099511627776k \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.x86_64-latest.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.x86_64-latest.args
-index 1a8e7932dc..b0ad0b8ce6 100644
---- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.x86_64-latest.args
-+++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.x86_64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc,accel=tcg,usb=off,dump-guest-core=off,nvdimm=on \
-+-machine pc,usb=off,dump-guest-core=off,nvdimm=on \
-+-accel tcg \
- -cpu qemu64 \
- -m size=219136k,slots=16,maxmem=1099511627776k \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.x86_64-latest.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.x86_64-latest.args
-index ef32c663de..c78fec1972 100644
---- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.x86_64-latest.args
-+++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.x86_64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc,accel=tcg,usb=off,dump-guest-core=off,nvdimm=on \
-+-machine pc,usb=off,dump-guest-core=off,nvdimm=on \
-+-accel tcg \
- -cpu qemu64 \
- -m size=219136k,slots=16,maxmem=1099511627776k \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-latest.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-latest.args
-index 00a78baa92..8966b85095 100644
---- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-latest.args
-+++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc,accel=tcg,usb=off,dump-guest-core=off,nvdimm=on \
-+-machine pc,usb=off,dump-guest-core=off,nvdimm=on \
-+-accel tcg \
- -cpu qemu64 \
- -m size=219136k,slots=16,maxmem=1099511627776k \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64.args
-index 92e6c538fb..f5340f7f59 100644
---- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64.args
-+++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-ppc64 \
- -name QEMUGuest1 \
- -S \
---machine pseries,accel=tcg,usb=off,dump-guest-core=off,nvdimm=on \
-+-machine pseries,usb=off,dump-guest-core=off,nvdimm=on \
-+-accel tcg \
- -m size=1048576k,slots=16,maxmem=1099511627776k \
- -realtime mlock=off \
- -smp 2,sockets=2,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64.ppc64-latest.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64.ppc64-latest.args
-index 7f556a6668..549ec0b9d5 100644
---- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64.ppc64-latest.args
-+++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64.ppc64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pseries,accel=tcg,usb=off,dump-guest-core=off,nvdimm=on \
-+-machine pseries,usb=off,dump-guest-core=off,nvdimm=on \
-+-accel tcg \
- -cpu POWER9 \
- -m size=1048576k,slots=16,maxmem=1099511627776k \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.x86_64-latest.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.x86_64-latest.args
-index 7088a4f054..b9dce63f40 100644
---- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.x86_64-latest.args
-+++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.x86_64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc,accel=tcg,usb=off,dump-guest-core=off,nvdimm=on \
-+-machine pc,usb=off,dump-guest-core=off,nvdimm=on \
-+-accel tcg \
- -cpu qemu64 \
- -m size=219136k,slots=16,maxmem=1099511627776k \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm.x86_64-latest.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm.x86_64-latest.args
-index 60d6d207c5..764c4e64aa 100644
---- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm.x86_64-latest.args
-+++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm.x86_64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc,accel=tcg,usb=off,dump-guest-core=off,nvdimm=on \
-+-machine pc,usb=off,dump-guest-core=off,nvdimm=on \
-+-accel tcg \
- -cpu qemu64 \
- -m size=1048576k,slots=16,maxmem=1099511627776k \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma.args b/tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma.args
-index 91cea9d8bf..f3d6550776 100644
---- a/tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma.args
-+++ b/tests/qemuxml2argvdata/memory-hotplug-ppc64-nonuma.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-ppc64 \
- -name QEMUGuest1 \
- -S \
---machine pseries,accel=kvm,usb=off,dump-guest-core=off \
-+-machine pseries,usb=off,dump-guest-core=off \
-+-accel kvm \
- -m size=1310720k,slots=16,maxmem=4194304k \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/memory-hotplug.args b/tests/qemuxml2argvdata/memory-hotplug.args
-index c2c80ecf00..008d0b90a5 100644
---- a/tests/qemuxml2argvdata/memory-hotplug.args
-+++ b/tests/qemuxml2argvdata/memory-hotplug.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m size=219136k,slots=16,maxmem=1099511627776k \
- -realtime mlock=off \
- -smp 2,sockets=2,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/memtune-unlimited.args b/tests/qemuxml2argvdata/memtune-unlimited.args
-index 60253f43ec..d57fa14fad 100644
---- a/tests/qemuxml2argvdata/memtune-unlimited.args
-+++ b/tests/qemuxml2argvdata/memtune-unlimited.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/memtune.args b/tests/qemuxml2argvdata/memtune.args
-index 60253f43ec..d57fa14fad 100644
---- a/tests/qemuxml2argvdata/memtune.args
-+++ b/tests/qemuxml2argvdata/memtune.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/migrate-numa-unaligned.args b/tests/qemuxml2argvdata/migrate-numa-unaligned.args
-index 7f0edb240e..be82a56bd8 100644
---- a/tests/qemuxml2argvdata/migrate-numa-unaligned.args
-+++ b/tests/qemuxml2argvdata/migrate-numa-unaligned.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name QEMUGuest \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 14338 \
- -realtime mlock=off \
- -smp 32,sockets=32,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/migrate.args b/tests/qemuxml2argvdata/migrate.args
-index c977c62ab4..f288778f5c 100644
---- a/tests/qemuxml2argvdata/migrate.args
-+++ b/tests/qemuxml2argvdata/migrate.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/minimal-msg-timestamp.args b/tests/qemuxml2argvdata/minimal-msg-timestamp.args
-index 42ca3cbf38..e6a5e4cefd 100644
---- a/tests/qemuxml2argvdata/minimal-msg-timestamp.args
-+++ b/tests/qemuxml2argvdata/minimal-msg-timestamp.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/minimal-sandbox.args b/tests/qemuxml2argvdata/minimal-sandbox.args
-index 3f7078605c..cf6a8bc38a 100644
---- a/tests/qemuxml2argvdata/minimal-sandbox.args
-+++ b/tests/qemuxml2argvdata/minimal-sandbox.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/minimal.args b/tests/qemuxml2argvdata/minimal.args
-index 60253f43ec..d57fa14fad 100644
---- a/tests/qemuxml2argvdata/minimal.args
-+++ b/tests/qemuxml2argvdata/minimal.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/misc-acpi.args b/tests/qemuxml2argvdata/misc-acpi.args
-index 5ddfded151..535f6fcf9b 100644
---- a/tests/qemuxml2argvdata/misc-acpi.args
-+++ b/tests/qemuxml2argvdata/misc-acpi.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/misc-disable-s3.args b/tests/qemuxml2argvdata/misc-disable-s3.args
-index a327c45a8f..66e8de1092 100644
---- a/tests/qemuxml2argvdata/misc-disable-s3.args
-+++ b/tests/qemuxml2argvdata/misc-disable-s3.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/misc-disable-suspends.args b/tests/qemuxml2argvdata/misc-disable-suspends.args
-index b36dfe8512..ef1fe463dd 100644
---- a/tests/qemuxml2argvdata/misc-disable-suspends.args
-+++ b/tests/qemuxml2argvdata/misc-disable-suspends.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/misc-enable-s4.args b/tests/qemuxml2argvdata/misc-enable-s4.args
-index 4b99bdd51c..1faca0f398 100644
---- a/tests/qemuxml2argvdata/misc-enable-s4.args
-+++ b/tests/qemuxml2argvdata/misc-enable-s4.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/misc-no-reboot.args b/tests/qemuxml2argvdata/misc-no-reboot.args
-index 057568bbe0..f8c2d28070 100644
---- a/tests/qemuxml2argvdata/misc-no-reboot.args
-+++ b/tests/qemuxml2argvdata/misc-no-reboot.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/misc-uuid.args b/tests/qemuxml2argvdata/misc-uuid.args
-index 5ddfded151..535f6fcf9b 100644
---- a/tests/qemuxml2argvdata/misc-uuid.args
-+++ b/tests/qemuxml2argvdata/misc-uuid.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/mlock-off.x86_64-3.0.0.args b/tests/qemuxml2argvdata/mlock-off.x86_64-3.0.0.args
-index 8f3725ebd5..3314c4d94e 100644
---- a/tests/qemuxml2argvdata/mlock-off.x86_64-3.0.0.args
-+++ b/tests/qemuxml2argvdata/mlock-off.x86_64-3.0.0.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc-i440fx-3.0,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc-i440fx-3.0,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/mlock-off.x86_64-latest.args b/tests/qemuxml2argvdata/mlock-off.x86_64-latest.args
-index 967fe4c826..05902c5937 100644
---- a/tests/qemuxml2argvdata/mlock-off.x86_64-latest.args
-+++ b/tests/qemuxml2argvdata/mlock-off.x86_64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu qemu64 \
- -m 214 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/mlock-on.x86_64-3.0.0.args b/tests/qemuxml2argvdata/mlock-on.x86_64-3.0.0.args
-index 46e63a287f..191ace725e 100644
---- a/tests/qemuxml2argvdata/mlock-on.x86_64-3.0.0.args
-+++ b/tests/qemuxml2argvdata/mlock-on.x86_64-3.0.0.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc-i440fx-3.0,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc-i440fx-3.0,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=on \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/mlock-on.x86_64-latest.args b/tests/qemuxml2argvdata/mlock-on.x86_64-latest.args
-index 167214fd64..4b542b3422 100644
---- a/tests/qemuxml2argvdata/mlock-on.x86_64-latest.args
-+++ b/tests/qemuxml2argvdata/mlock-on.x86_64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu qemu64 \
- -m 214 \
- -overcommit mem-lock=on \
-diff --git a/tests/qemuxml2argvdata/monitor-json.args b/tests/qemuxml2argvdata/monitor-json.args
-index 50bbb36f27..acc986541e 100644
---- a/tests/qemuxml2argvdata/monitor-json.args
-+++ b/tests/qemuxml2argvdata/monitor-json.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name encryptdisk \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/multifunction-pci-device.args b/tests/qemuxml2argvdata/multifunction-pci-device.args
-index abf230fbac..6681a75307 100644
---- a/tests/qemuxml2argvdata/multifunction-pci-device.args
-+++ b/tests/qemuxml2argvdata/multifunction-pci-device.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/name-escape.args b/tests/qemuxml2argvdata/name-escape.args
-index 1ba2dfbf83..8edd4b31bd 100644
---- a/tests/qemuxml2argvdata/name-escape.args
-+++ b/tests/qemuxml2argvdata/name-escape.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=spice \
- -S \
- -object secret,id=masterKey0,format=raw,file=/tmp/lib/domain--1-foo=1,,\
- bar=2/master-key.aes \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/net-client.args b/tests/qemuxml2argvdata/net-client.args
-index 0aa6645c4d..3fec63927e 100644
---- a/tests/qemuxml2argvdata/net-client.args
-+++ b/tests/qemuxml2argvdata/net-client.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/net-eth-hostip.args b/tests/qemuxml2argvdata/net-eth-hostip.args
-index ff136626a7..38ae4e9a05 100644
---- a/tests/qemuxml2argvdata/net-eth-hostip.args
-+++ b/tests/qemuxml2argvdata/net-eth-hostip.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/net-eth-ifname.args b/tests/qemuxml2argvdata/net-eth-ifname.args
-index ff136626a7..38ae4e9a05 100644
---- a/tests/qemuxml2argvdata/net-eth-ifname.args
-+++ b/tests/qemuxml2argvdata/net-eth-ifname.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/net-eth-names.args b/tests/qemuxml2argvdata/net-eth-names.args
-index a79edee524..aae85bb60a 100644
---- a/tests/qemuxml2argvdata/net-eth-names.args
-+++ b/tests/qemuxml2argvdata/net-eth-names.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/net-eth-unmanaged-tap.args b/tests/qemuxml2argvdata/net-eth-unmanaged-tap.args
-index 435843bc27..34cc4b529e 100644
---- a/tests/qemuxml2argvdata/net-eth-unmanaged-tap.args
-+++ b/tests/qemuxml2argvdata/net-eth-unmanaged-tap.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/net-eth.args b/tests/qemuxml2argvdata/net-eth.args
-index ff136626a7..38ae4e9a05 100644
---- a/tests/qemuxml2argvdata/net-eth.args
-+++ b/tests/qemuxml2argvdata/net-eth.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/net-hostdev-bootorder.args b/tests/qemuxml2argvdata/net-hostdev-bootorder.args
-index 7c7e5bc3a2..de55ff982b 100644
---- a/tests/qemuxml2argvdata/net-hostdev-bootorder.args
-+++ b/tests/qemuxml2argvdata/net-hostdev-bootorder.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/net-hostdev-multidomain.args b/tests/qemuxml2argvdata/net-hostdev-multidomain.args
-index 46f28022fd..5de18777e9 100644
---- a/tests/qemuxml2argvdata/net-hostdev-multidomain.args
-+++ b/tests/qemuxml2argvdata/net-hostdev-multidomain.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.args b/tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.args
-index ed8332ddfe..778c882338 100644
---- a/tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.args
-+++ b/tests/qemuxml2argvdata/net-hostdev-vfio-multidomain.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/net-hostdev-vfio.args b/tests/qemuxml2argvdata/net-hostdev-vfio.args
-index cd875f60c9..a10f302cbd 100644
---- a/tests/qemuxml2argvdata/net-hostdev-vfio.args
-+++ b/tests/qemuxml2argvdata/net-hostdev-vfio.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/net-hostdev.args b/tests/qemuxml2argvdata/net-hostdev.args
-index bd49544de6..6b56e06e13 100644
---- a/tests/qemuxml2argvdata/net-hostdev.args
-+++ b/tests/qemuxml2argvdata/net-hostdev.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/net-many-models.args b/tests/qemuxml2argvdata/net-many-models.args
-index 36b057131f..2382be9bac 100644
---- a/tests/qemuxml2argvdata/net-many-models.args
-+++ b/tests/qemuxml2argvdata/net-many-models.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/net-mcast.args b/tests/qemuxml2argvdata/net-mcast.args
-index e8b71a3ded..929db1d6b5 100644
---- a/tests/qemuxml2argvdata/net-mcast.args
-+++ b/tests/qemuxml2argvdata/net-mcast.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/net-server.args b/tests/qemuxml2argvdata/net-server.args
-index b92e520820..500f79c7e9 100644
---- a/tests/qemuxml2argvdata/net-server.args
-+++ b/tests/qemuxml2argvdata/net-server.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/net-udp.args b/tests/qemuxml2argvdata/net-udp.args
-index 1390298e2e..31b0fbf7a9 100644
---- a/tests/qemuxml2argvdata/net-udp.args
-+++ b/tests/qemuxml2argvdata/net-udp.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/net-user-addr.args b/tests/qemuxml2argvdata/net-user-addr.args
-index 5f1de305e0..1c3bb5b6f0 100644
---- a/tests/qemuxml2argvdata/net-user-addr.args
-+++ b/tests/qemuxml2argvdata/net-user-addr.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/net-user.args b/tests/qemuxml2argvdata/net-user.args
-index a8d43b0684..1dc1d1bf0e 100644
---- a/tests/qemuxml2argvdata/net-user.args
-+++ b/tests/qemuxml2argvdata/net-user.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/net-user.x86_64-4.0.0.args b/tests/qemuxml2argvdata/net-user.x86_64-4.0.0.args
-index 190b068191..b8f011a0d7 100644
---- a/tests/qemuxml2argvdata/net-user.x86_64-4.0.0.args
-+++ b/tests/qemuxml2argvdata/net-user.x86_64-4.0.0.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc-i440fx-4.0,accel=tcg,usb=off,dump-guest-core=off \
-+-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 \
-diff --git a/tests/qemuxml2argvdata/net-vhostuser-multiq.args b/tests/qemuxml2argvdata/net-vhostuser-multiq.args
-index 691ef39edd..b544e1778d 100644
---- a/tests/qemuxml2argvdata/net-vhostuser-multiq.args
-+++ b/tests/qemuxml2argvdata/net-vhostuser-multiq.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/net-vhostuser.args b/tests/qemuxml2argvdata/net-vhostuser.args
-index 1acc910ad1..3e649e01b5 100644
---- a/tests/qemuxml2argvdata/net-vhostuser.args
-+++ b/tests/qemuxml2argvdata/net-vhostuser.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/net-vhostuser.x86_64-2.5.0.args b/tests/qemuxml2argvdata/net-vhostuser.x86_64-2.5.0.args
-index 58dcbb510b..89bfb9214d 100644
---- a/tests/qemuxml2argvdata/net-vhostuser.x86_64-2.5.0.args
-+++ b/tests/qemuxml2argvdata/net-vhostuser.x86_64-2.5.0.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name guest=QEMUGuest1,debug-threads=on \
- -S \
---machine pc-i440fx-2.5,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc-i440fx-2.5,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/net-vhostuser.x86_64-latest.args b/tests/qemuxml2argvdata/net-vhostuser.x86_64-latest.args
-index 27fa24a64f..07f56ff1f8 100644
---- a/tests/qemuxml2argvdata/net-vhostuser.x86_64-latest.args
-+++ b/tests/qemuxml2argvdata/net-vhostuser.x86_64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu qemu64 \
- -m 214 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/net-virtio-ccw.args b/tests/qemuxml2argvdata/net-virtio-ccw.args
-index ed8eb9089c..5c5f000fd9 100644
---- a/tests/qemuxml2argvdata/net-virtio-ccw.args
-+++ b/tests/qemuxml2argvdata/net-virtio-ccw.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-s390x \
- -name QEMUGuest1 \
- -S \
---machine s390-ccw,accel=tcg,usb=off,dump-guest-core=off \
-+-machine s390-ccw,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/net-virtio-device.args b/tests/qemuxml2argvdata/net-virtio-device.args
-index 67b0592fab..f785d0b2d4 100644
---- a/tests/qemuxml2argvdata/net-virtio-device.args
-+++ b/tests/qemuxml2argvdata/net-virtio-device.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/net-virtio-disable-offloads.args b/tests/qemuxml2argvdata/net-virtio-disable-offloads.args
-index a9ac9687db..23d280e22f 100644
---- a/tests/qemuxml2argvdata/net-virtio-disable-offloads.args
-+++ b/tests/qemuxml2argvdata/net-virtio-disable-offloads.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/net-virtio-netdev.args b/tests/qemuxml2argvdata/net-virtio-netdev.args
-index 32d3b6b541..a1669a177c 100644
---- a/tests/qemuxml2argvdata/net-virtio-netdev.args
-+++ b/tests/qemuxml2argvdata/net-virtio-netdev.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.args b/tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.args
-index 758da237dd..2dd0877cd7 100644
---- a/tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.args
-+++ b/tests/qemuxml2argvdata/net-virtio-rxtxqueuesize.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/net-virtio-s390.args b/tests/qemuxml2argvdata/net-virtio-s390.args
-index b863943067..38212b3e87 100644
---- a/tests/qemuxml2argvdata/net-virtio-s390.args
-+++ b/tests/qemuxml2argvdata/net-virtio-s390.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-s390x \
- -name QEMUGuest1 \
- -S \
---machine s390-virtio,accel=tcg,usb=off,dump-guest-core=off \
-+-machine s390-virtio,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/net-virtio-teaming.args b/tests/qemuxml2argvdata/net-virtio-teaming.args
-index 19e7260843..79138f0315 100644
---- a/tests/qemuxml2argvdata/net-virtio-teaming.args
-+++ b/tests/qemuxml2argvdata/net-virtio-teaming.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/net-virtio.args b/tests/qemuxml2argvdata/net-virtio.args
-index 4beb5ca75f..c008cfdd17 100644
---- a/tests/qemuxml2argvdata/net-virtio.args
-+++ b/tests/qemuxml2argvdata/net-virtio.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/nosharepages.args b/tests/qemuxml2argvdata/nosharepages.args
-index 3993edfc4b..30ef1043fa 100644
---- a/tests/qemuxml2argvdata/nosharepages.args
-+++ b/tests/qemuxml2argvdata/nosharepages.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off,mem-merge=off \
-+-machine pc,usb=off,dump-guest-core=off,mem-merge=off \
-+-accel tcg \
- -m 215 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args
-index 7270aafeb7..75c73b54d2 100644
---- a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args
-+++ b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 2,sockets=2,cores=1,threads=1 \
-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 7270aafeb7..75c73b54d2 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
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 2,sockets=2,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args b/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args
-index 7270aafeb7..75c73b54d2 100644
---- a/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args
-+++ b/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 2,sockets=2,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args b/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args
-index 7270aafeb7..75c73b54d2 100644
---- a/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args
-+++ b/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 2,sockets=2,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/numad.args b/tests/qemuxml2argvdata/numad.args
-index 7270aafeb7..75c73b54d2 100644
---- a/tests/qemuxml2argvdata/numad.args
-+++ b/tests/qemuxml2argvdata/numad.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 2,sockets=2,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.args b/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.args
-index 7270aafeb7..75c73b54d2 100644
---- a/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.args
-+++ b/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 2,sockets=2,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/numatune-auto-prefer.args b/tests/qemuxml2argvdata/numatune-auto-prefer.args
-index babb23b938..0ef138d788 100644
---- a/tests/qemuxml2argvdata/numatune-auto-prefer.args
-+++ b/tests/qemuxml2argvdata/numatune-auto-prefer.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name QEMUGuest \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 64 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/numatune-distances.args b/tests/qemuxml2argvdata/numatune-distances.args
-index a20b40b5c5..c93979deec 100644
---- a/tests/qemuxml2argvdata/numatune-distances.args
-+++ b/tests/qemuxml2argvdata/numatune-distances.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name QEMUGuest \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 12288 \
- -realtime mlock=off \
- -smp 12,sockets=12,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/numatune-memnode-no-memory.args b/tests/qemuxml2argvdata/numatune-memnode-no-memory.args
-index 213efe0663..b9a03f9e6a 100644
---- a/tests/qemuxml2argvdata/numatune-memnode-no-memory.args
-+++ b/tests/qemuxml2argvdata/numatune-memnode-no-memory.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name QEMUGuest \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 64 \
- -realtime mlock=off \
- -smp 2,sockets=2,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/numatune-memnode.args b/tests/qemuxml2argvdata/numatune-memnode.args
-index 64fdcd7bb1..2308589137 100644
---- a/tests/qemuxml2argvdata/numatune-memnode.args
-+++ b/tests/qemuxml2argvdata/numatune-memnode.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name QEMUGuest \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 24105 \
- -realtime mlock=off \
- -smp 32,sockets=32,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/numatune-memory.args b/tests/qemuxml2argvdata/numatune-memory.args
-index 7270aafeb7..75c73b54d2 100644
---- a/tests/qemuxml2argvdata/numatune-memory.args
-+++ b/tests/qemuxml2argvdata/numatune-memory.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 2,sockets=2,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/os-firmware-bios.x86_64-latest.args b/tests/qemuxml2argvdata/os-firmware-bios.x86_64-latest.args
-index 4391c6eda2..7989aea351 100644
---- a/tests/qemuxml2argvdata/os-firmware-bios.x86_64-latest.args
-+++ b/tests/qemuxml2argvdata/os-firmware-bios.x86_64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-fedora/master-key.aes \
---machine pc-q35-4.0,accel=kvm,usb=off,dump-guest-core=off \
-+-machine pc-q35-4.0,usb=off,dump-guest-core=off \
-+-accel kvm \
- -cpu qemu64 \
- -bios /usr/share/seabios/bios-256k.bin \
- -m 8 \
-diff --git a/tests/qemuxml2argvdata/os-firmware-efi-secboot.x86_64-latest.args b/tests/qemuxml2argvdata/os-firmware-efi-secboot.x86_64-latest.args
-index f8af2100ea..daa3e945ae 100644
---- a/tests/qemuxml2argvdata/os-firmware-efi-secboot.x86_64-latest.args
-+++ b/tests/qemuxml2argvdata/os-firmware-efi-secboot.x86_64-latest.args
-@@ -23,8 +23,9 @@ file=/tmp/lib/domain--1-fedora/master-key.aes \
- "discard":"unmap"}' \
- -blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,\
- "driver":"raw","file":"libvirt-pflash1-storage"}' \
---machine pc-q35-4.0,accel=kvm,usb=off,smm=on,dump-guest-core=off,\
-+-machine pc-q35-4.0,usb=off,smm=on,dump-guest-core=off,\
- pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format \
-+-accel kvm \
- -cpu qemu64 \
- -global driver=cfi.pflash01,property=secure,value=on \
- -m 8 \
-diff --git a/tests/qemuxml2argvdata/os-firmware-efi.x86_64-latest.args b/tests/qemuxml2argvdata/os-firmware-efi.x86_64-latest.args
-index a06213eb19..cc933c0ec4 100644
---- a/tests/qemuxml2argvdata/os-firmware-efi.x86_64-latest.args
-+++ b/tests/qemuxml2argvdata/os-firmware-efi.x86_64-latest.args
-@@ -23,8 +23,9 @@ file=/tmp/lib/domain--1-fedora/master-key.aes \
- "discard":"unmap"}' \
- -blockdev '{"node-name":"libvirt-pflash1-format","read-only":false,\
- "driver":"raw","file":"libvirt-pflash1-storage"}' \
---machine pc-q35-4.0,accel=kvm,usb=off,smm=on,dump-guest-core=off,\
-+-machine pc-q35-4.0,usb=off,smm=on,dump-guest-core=off,\
- pflash0=libvirt-pflash0-format,pflash1=libvirt-pflash1-format \
-+-accel kvm \
- -cpu qemu64 \
- -m 8 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/pages-dimm-discard.args b/tests/qemuxml2argvdata/pages-dimm-discard.args
-index fefa205597..8ee930c576 100644
---- a/tests/qemuxml2argvdata/pages-dimm-discard.args
-+++ b/tests/qemuxml2argvdata/pages-dimm-discard.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name fedora \
- -S \
---machine pc-i440fx-2.3,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc-i440fx-2.3,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m size=1048576k,slots=16,maxmem=1099511627776k \
- -realtime mlock=off \
- -smp 2,sockets=2,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/pages-discard-hugepages.args b/tests/qemuxml2argvdata/pages-discard-hugepages.args
-index bbf3c9f67a..1ccc8bd08b 100644
---- a/tests/qemuxml2argvdata/pages-discard-hugepages.args
-+++ b/tests/qemuxml2argvdata/pages-discard-hugepages.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name SomeDummyHugepagesGuest \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 1024 \
- -realtime mlock=off \
- -smp 2,sockets=2,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/pages-discard.args b/tests/qemuxml2argvdata/pages-discard.args
-index b2aed77ff9..4074d9e708 100644
---- a/tests/qemuxml2argvdata/pages-discard.args
-+++ b/tests/qemuxml2argvdata/pages-discard.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 4096 \
- -realtime mlock=off \
- -smp 4,sockets=4,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/panic-double.args b/tests/qemuxml2argvdata/panic-double.args
-index 745efc7cf2..864183e246 100644
---- a/tests/qemuxml2argvdata/panic-double.args
-+++ b/tests/qemuxml2argvdata/panic-double.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu qemu32,hv-crash \
- -m 214 \
- -realtime mlock=off \
-diff --git a/tests/qemuxml2argvdata/panic-no-address.args b/tests/qemuxml2argvdata/panic-no-address.args
-index b4adee02bc..7e63273a28 100644
---- a/tests/qemuxml2argvdata/panic-no-address.args
-+++ b/tests/qemuxml2argvdata/panic-no-address.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/panic.args b/tests/qemuxml2argvdata/panic.args
-index 51e107e1d0..7330c7c79f 100644
---- a/tests/qemuxml2argvdata/panic.args
-+++ b/tests/qemuxml2argvdata/panic.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/parallel-parport-chardev.args b/tests/qemuxml2argvdata/parallel-parport-chardev.args
-index c1b1852174..4037b92df0 100644
---- a/tests/qemuxml2argvdata/parallel-parport-chardev.args
-+++ b/tests/qemuxml2argvdata/parallel-parport-chardev.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/parallel-tcp-chardev.args b/tests/qemuxml2argvdata/parallel-tcp-chardev.args
-index 2ab87fb17a..dbbd13fffc 100644
---- a/tests/qemuxml2argvdata/parallel-tcp-chardev.args
-+++ b/tests/qemuxml2argvdata/parallel-tcp-chardev.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/parallel-unix-chardev.x86_64-2.5.0.args b/tests/qemuxml2argvdata/parallel-unix-chardev.x86_64-2.5.0.args
-index b1ea53a468..603164aa64 100644
---- a/tests/qemuxml2argvdata/parallel-unix-chardev.x86_64-2.5.0.args
-+++ b/tests/qemuxml2argvdata/parallel-unix-chardev.x86_64-2.5.0.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name guest=QEMUGuest1,debug-threads=on \
- -S \
---machine pc-i440fx-2.5,accel=kvm,usb=off,dump-guest-core=off \
-+-machine pc-i440fx-2.5,usb=off,dump-guest-core=off \
-+-accel kvm \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/parallel-unix-chardev.x86_64-latest.args b/tests/qemuxml2argvdata/parallel-unix-chardev.x86_64-latest.args
-index b3383da9a7..ed1f2a40c1 100644
---- a/tests/qemuxml2argvdata/parallel-unix-chardev.x86_64-latest.args
-+++ b/tests/qemuxml2argvdata/parallel-unix-chardev.x86_64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc,accel=kvm,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel kvm \
- -cpu qemu64 \
- -m 214 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/pci-autoadd-addr.args b/tests/qemuxml2argvdata/pci-autoadd-addr.args
-index 69826389f6..7a719328fc 100644
---- a/tests/qemuxml2argvdata/pci-autoadd-addr.args
-+++ b/tests/qemuxml2argvdata/pci-autoadd-addr.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name fdr-br \
- -S \
---machine pc-1.2,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc-1.2,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 2048 \
- -realtime mlock=off \
- -smp 2,sockets=2,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/pci-autoadd-idx.args b/tests/qemuxml2argvdata/pci-autoadd-idx.args
-index 2d22f96791..82c613b228 100644
---- a/tests/qemuxml2argvdata/pci-autoadd-idx.args
-+++ b/tests/qemuxml2argvdata/pci-autoadd-idx.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name fdr-br \
- -S \
---machine pc-1.2,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc-1.2,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 2048 \
- -realtime mlock=off \
- -smp 2,sockets=2,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/pci-autofill-addr.args b/tests/qemuxml2argvdata/pci-autofill-addr.args
-index 76d94144a6..14ed850a65 100644
---- a/tests/qemuxml2argvdata/pci-autofill-addr.args
-+++ b/tests/qemuxml2argvdata/pci-autofill-addr.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name fdr-br \
- -S \
---machine pc-1.2,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc-1.2,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 2048 \
- -realtime mlock=off \
- -smp 2,sockets=2,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/pci-bridge-many-disks.args b/tests/qemuxml2argvdata/pci-bridge-many-disks.args
-index 18cc4b9fb0..2e549f2fcb 100644
---- a/tests/qemuxml2argvdata/pci-bridge-many-disks.args
-+++ b/tests/qemuxml2argvdata/pci-bridge-many-disks.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name lots-of-disks \
- -S \
---machine pc-i440fx-1.4,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc-i440fx-1.4,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu qemu64,-kvmclock \
- -bios /usr/share/seabios/bios.bin \
- -m 3907 \
-diff --git a/tests/qemuxml2argvdata/pci-bridge.args b/tests/qemuxml2argvdata/pci-bridge.args
-index 4b26702ef3..1df4d1fcc7 100644
---- a/tests/qemuxml2argvdata/pci-bridge.args
-+++ b/tests/qemuxml2argvdata/pci-bridge.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name fdr-br \
- -S \
---machine pc-1.2,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc-1.2,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 2048 \
- -realtime mlock=off \
- -smp 2,sockets=2,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/pci-expander-bus.args b/tests/qemuxml2argvdata/pci-expander-bus.args
-index 64279760dd..804c5d7568 100644
---- a/tests/qemuxml2argvdata/pci-expander-bus.args
-+++ b/tests/qemuxml2argvdata/pci-expander-bus.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name expander-test \
- -S \
---machine pc-i440fx-2.5,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc-i440fx-2.5,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 16,sockets=2,cores=4,threads=2 \
-diff --git a/tests/qemuxml2argvdata/pci-many.args b/tests/qemuxml2argvdata/pci-many.args
-index 056c2a5340..f0a4e6e8d7 100644
---- a/tests/qemuxml2argvdata/pci-many.args
-+++ b/tests/qemuxml2argvdata/pci-many.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name fdr-br \
- -S \
---machine pc-1.2,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc-1.2,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 2048 \
- -realtime mlock=off \
- -smp 2,sockets=2,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/pci-rom-disabled.args b/tests/qemuxml2argvdata/pci-rom-disabled.args
-index 1dd1695707..b812421653 100644
---- a/tests/qemuxml2argvdata/pci-rom-disabled.args
-+++ b/tests/qemuxml2argvdata/pci-rom-disabled.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name guest \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/pci-rom.args b/tests/qemuxml2argvdata/pci-rom.args
-index d82e1d047b..7a7a34114f 100644
---- a/tests/qemuxml2argvdata/pci-rom.args
-+++ b/tests/qemuxml2argvdata/pci-rom.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest2 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/pci-serial-dev-chardev.args b/tests/qemuxml2argvdata/pci-serial-dev-chardev.args
-index 92858a2167..51d2d4194e 100644
---- a/tests/qemuxml2argvdata/pci-serial-dev-chardev.args
-+++ b/tests/qemuxml2argvdata/pci-serial-dev-chardev.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/pcie-expander-bus.args b/tests/qemuxml2argvdata/pcie-expander-bus.args
-index a241324def..e07346ee67 100644
---- a/tests/qemuxml2argvdata/pcie-expander-bus.args
-+++ b/tests/qemuxml2argvdata/pcie-expander-bus.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name pcie-expander-bus-test \
- -S \
---machine q35,accel=tcg,usb=off,dump-guest-core=off \
-+-machine q35,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 16,sockets=2,cores=4,threads=2 \
-diff --git a/tests/qemuxml2argvdata/pcie-root-port-model-generic.args b/tests/qemuxml2argvdata/pcie-root-port-model-generic.args
-index 9438366bc5..b198390bc5 100644
---- a/tests/qemuxml2argvdata/pcie-root-port-model-generic.args
-+++ b/tests/qemuxml2argvdata/pcie-root-port-model-generic.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name guest \
- -S \
---machine q35,accel=tcg,usb=off,dump-guest-core=off \
-+-machine q35,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 2048 \
- -realtime mlock=off \
- -smp 2,sockets=2,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/pcie-root-port-model-ioh3420.args b/tests/qemuxml2argvdata/pcie-root-port-model-ioh3420.args
-index 134be6bcd0..031b91385c 100644
---- a/tests/qemuxml2argvdata/pcie-root-port-model-ioh3420.args
-+++ b/tests/qemuxml2argvdata/pcie-root-port-model-ioh3420.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name guest \
- -S \
---machine q35,accel=tcg,usb=off,dump-guest-core=off \
-+-machine q35,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 2048 \
- -realtime mlock=off \
- -smp 2,sockets=2,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/pcie-root-port.args b/tests/qemuxml2argvdata/pcie-root-port.args
-index 004010069b..c496dd24c3 100644
---- a/tests/qemuxml2argvdata/pcie-root-port.args
-+++ b/tests/qemuxml2argvdata/pcie-root-port.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name q35-test \
- -S \
---machine q35,accel=tcg,usb=off,dump-guest-core=off \
-+-machine q35,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 2048 \
- -realtime mlock=off \
- -smp 2,sockets=2,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/pcie-root.args b/tests/qemuxml2argvdata/pcie-root.args
-index 18d26b4a8e..c072b4e82e 100644
---- a/tests/qemuxml2argvdata/pcie-root.args
-+++ b/tests/qemuxml2argvdata/pcie-root.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name q35-test \
- -S \
---machine q35,accel=tcg,usb=off,dump-guest-core=off \
-+-machine q35,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 2048 \
- -realtime mlock=off \
- -smp 2,sockets=2,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/pcie-switch-downstream-port.args b/tests/qemuxml2argvdata/pcie-switch-downstream-port.args
-index a15c7d4573..58bcc78619 100644
---- a/tests/qemuxml2argvdata/pcie-switch-downstream-port.args
-+++ b/tests/qemuxml2argvdata/pcie-switch-downstream-port.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name q35-test \
- -S \
---machine q35,accel=tcg,usb=off,dump-guest-core=off \
-+-machine q35,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 2048 \
- -realtime mlock=off \
- -smp 2,sockets=2,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/pcie-switch-upstream-port.args b/tests/qemuxml2argvdata/pcie-switch-upstream-port.args
-index a479b1494d..2df6c6eb1b 100644
---- a/tests/qemuxml2argvdata/pcie-switch-upstream-port.args
-+++ b/tests/qemuxml2argvdata/pcie-switch-upstream-port.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name q35-test \
- -S \
---machine q35,accel=tcg,usb=off,dump-guest-core=off \
-+-machine q35,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 2048 \
- -realtime mlock=off \
- -smp 2,sockets=2,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/pcihole64-q35.args b/tests/qemuxml2argvdata/pcihole64-q35.args
-index 9831ee388c..dfa82ae74c 100644
---- a/tests/qemuxml2argvdata/pcihole64-q35.args
-+++ b/tests/qemuxml2argvdata/pcihole64-q35.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name q35-test \
- -S \
---machine q35,accel=tcg,usb=off,dump-guest-core=off \
-+-machine q35,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 2048 \
- -realtime mlock=off \
- -smp 2,sockets=2,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/pcihole64.args b/tests/qemuxml2argvdata/pcihole64.args
-index 4557dc2419..5494d65b0d 100644
---- a/tests/qemuxml2argvdata/pcihole64.args
-+++ b/tests/qemuxml2argvdata/pcihole64.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name foo \
- -S \
---machine pc-1.2,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc-1.2,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 2048 \
- -realtime mlock=off \
- -smp 2,sockets=2,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/pmu-feature-off.args b/tests/qemuxml2argvdata/pmu-feature-off.args
-index 37ab3eacb1..d7224c010c 100644
---- a/tests/qemuxml2argvdata/pmu-feature-off.args
-+++ b/tests/qemuxml2argvdata/pmu-feature-off.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu qemu32,pmu=off \
- -m 214 \
- -realtime mlock=off \
-diff --git a/tests/qemuxml2argvdata/pmu-feature.args b/tests/qemuxml2argvdata/pmu-feature.args
-index b0ac523678..f1feeb0e17 100644
---- a/tests/qemuxml2argvdata/pmu-feature.args
-+++ b/tests/qemuxml2argvdata/pmu-feature.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu qemu32,pmu=on \
- -m 214 \
- -realtime mlock=off \
-diff --git a/tests/qemuxml2argvdata/ppc-dtb.args b/tests/qemuxml2argvdata/ppc-dtb.args
-index f3ac10bea2..9a2255ac49 100644
---- a/tests/qemuxml2argvdata/ppc-dtb.args
-+++ b/tests/qemuxml2argvdata/ppc-dtb.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-ppc \
- -name QEMUGuest1 \
- -S \
---machine ppce500,accel=kvm,usb=off,dump-guest-core=off \
-+-machine ppce500,usb=off,dump-guest-core=off \
-+-accel kvm \
- -m 256 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-2.7.ppc64-latest.args b/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-2.7.ppc64-latest.args
-index c34821c7e8..71bcbe715b 100644
---- a/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-2.7.ppc64-latest.args
-+++ b/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-2.7.ppc64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-guest/master-key.aes \
---machine pseries-2.7,accel=kvm,usb=off,dump-guest-core=off \
-+-machine pseries-2.7,usb=off,dump-guest-core=off \
-+-accel kvm \
- -cpu POWER8 \
- -m 4096 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-3.1.ppc64-latest.args b/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-3.1.ppc64-latest.args
-index 3d02221d3f..cb6da510f7 100644
---- a/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-3.1.ppc64-latest.args
-+++ b/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-3.1.ppc64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-guest/master-key.aes \
---machine pseries-3.1,accel=kvm,usb=off,dump-guest-core=off \
-+-machine pseries-3.1,usb=off,dump-guest-core=off \
-+-accel kvm \
- -cpu POWER8 \
- -m 4096 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-4.2.ppc64-latest.args b/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-4.2.ppc64-latest.args
-index fac43e4cc1..3dcc3875d2 100644
---- a/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-4.2.ppc64-latest.args
-+++ b/tests/qemuxml2argvdata/ppc64-default-cpu-kvm-pseries-4.2.ppc64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-guest/master-key.aes \
---machine pseries-4.2,accel=kvm,usb=off,dump-guest-core=off \
-+-machine pseries-4.2,usb=off,dump-guest-core=off \
-+-accel kvm \
- -cpu POWER8 \
- -m 4096 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-2.7.ppc64-latest.args b/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-2.7.ppc64-latest.args
-index a2ffca1d30..e5596ac7ce 100644
---- a/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-2.7.ppc64-latest.args
-+++ b/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-2.7.ppc64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-guest/master-key.aes \
---machine pseries-2.7,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pseries-2.7,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu POWER7 \
- -m 4096 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-3.1.ppc64-latest.args b/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-3.1.ppc64-latest.args
-index 01f84fde88..c871d750e8 100644
---- a/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-3.1.ppc64-latest.args
-+++ b/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-3.1.ppc64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-guest/master-key.aes \
---machine pseries-3.1,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pseries-3.1,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu POWER8 \
- -m 4096 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-4.2.ppc64-latest.args b/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-4.2.ppc64-latest.args
-index 3738ac7386..37e94ce090 100644
---- a/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-4.2.ppc64-latest.args
-+++ b/tests/qemuxml2argvdata/ppc64-default-cpu-tcg-pseries-4.2.ppc64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-guest/master-key.aes \
---machine pseries-4.2,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pseries-4.2,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu POWER9 \
- -m 4096 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/ppc64-pseries-graphics.ppc64-latest.args b/tests/qemuxml2argvdata/ppc64-pseries-graphics.ppc64-latest.args
-index ba508ca79d..f339e99fd4 100644
---- a/tests/qemuxml2argvdata/ppc64-pseries-graphics.ppc64-latest.args
-+++ b/tests/qemuxml2argvdata/ppc64-pseries-graphics.ppc64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-guest/master-key.aes \
---machine pseries,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pseries,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu POWER9 \
- -m 4096 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/ppc64-pseries-headless.ppc64-latest.args b/tests/qemuxml2argvdata/ppc64-pseries-headless.ppc64-latest.args
-index 072f81da60..34c8b32788 100644
---- a/tests/qemuxml2argvdata/ppc64-pseries-headless.ppc64-latest.args
-+++ b/tests/qemuxml2argvdata/ppc64-pseries-headless.ppc64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-guest/master-key.aes \
---machine pseries,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pseries,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu POWER9 \
- -m 4096 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/ppc64-usb-controller-legacy.args b/tests/qemuxml2argvdata/ppc64-usb-controller-legacy.args
-index 49349449cf..3202af2da1 100644
---- a/tests/qemuxml2argvdata/ppc64-usb-controller-legacy.args
-+++ b/tests/qemuxml2argvdata/ppc64-usb-controller-legacy.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-ppc64 \
- -name QEMUGuest1 \
- -S \
---machine pseries,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pseries,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 256 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/ppc64-usb-controller-qemu-xhci.args b/tests/qemuxml2argvdata/ppc64-usb-controller-qemu-xhci.args
-index d40f8cf201..1c3e3481dc 100644
---- a/tests/qemuxml2argvdata/ppc64-usb-controller-qemu-xhci.args
-+++ b/tests/qemuxml2argvdata/ppc64-usb-controller-qemu-xhci.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-ppc64 \
- -name QEMUGuest1 \
- -S \
---machine pseries,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pseries,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 256 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/ppc64-usb-controller.args b/tests/qemuxml2argvdata/ppc64-usb-controller.args
-index 7d6ba64fb8..adc21bcb78 100644
---- a/tests/qemuxml2argvdata/ppc64-usb-controller.args
-+++ b/tests/qemuxml2argvdata/ppc64-usb-controller.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-ppc64 \
- -name QEMUGuest1 \
- -S \
---machine pseries,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pseries,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 256 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/ppce500-serial.args b/tests/qemuxml2argvdata/ppce500-serial.args
-index 3728b4dc22..da53502ab2 100644
---- a/tests/qemuxml2argvdata/ppce500-serial.args
-+++ b/tests/qemuxml2argvdata/ppce500-serial.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-ppc \
- -name QEMUGuest1 \
- -S \
---machine ppce500,accel=kvm,usb=off,dump-guest-core=off \
-+-machine ppce500,usb=off,dump-guest-core=off \
-+-accel kvm \
- -m 256 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/pseries-basic.args b/tests/qemuxml2argvdata/pseries-basic.args
-index 574e3b164e..13aa5872f2 100644
---- a/tests/qemuxml2argvdata/pseries-basic.args
-+++ b/tests/qemuxml2argvdata/pseries-basic.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-ppc64 \
- -name QEMUGuest1 \
- -S \
---machine pseries,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pseries,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 512 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/pseries-console-virtio.args b/tests/qemuxml2argvdata/pseries-console-virtio.args
-index 7c853216b6..6a8301da35 100644
---- a/tests/qemuxml2argvdata/pseries-console-virtio.args
-+++ b/tests/qemuxml2argvdata/pseries-console-virtio.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-ppc64 \
- -name guest \
- -S \
---machine pseries,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pseries,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 512 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/pseries-cpu-compat-power9.args b/tests/qemuxml2argvdata/pseries-cpu-compat-power9.args
-index ece96ee52f..2f90782f81 100644
---- a/tests/qemuxml2argvdata/pseries-cpu-compat-power9.args
-+++ b/tests/qemuxml2argvdata/pseries-cpu-compat-power9.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-ppc64 \
- -name QEMUGuest1 \
- -S \
---machine pseries,accel=kvm,usb=off,dump-guest-core=off \
-+-machine pseries,usb=off,dump-guest-core=off \
-+-accel kvm \
- -cpu host,compat=power9 \
- -m 256 \
- -realtime mlock=off \
-diff --git a/tests/qemuxml2argvdata/pseries-cpu-compat.args b/tests/qemuxml2argvdata/pseries-cpu-compat.args
-index 1c643449b5..b623250e5e 100644
---- a/tests/qemuxml2argvdata/pseries-cpu-compat.args
-+++ b/tests/qemuxml2argvdata/pseries-cpu-compat.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-ppc64 \
- -name QEMUGuest1 \
- -S \
---machine pseries,accel=kvm,usb=off,dump-guest-core=off \
-+-machine pseries,usb=off,dump-guest-core=off \
-+-accel kvm \
- -cpu host,compat=power7 \
- -m 256 \
- -realtime mlock=off \
-diff --git a/tests/qemuxml2argvdata/pseries-cpu-exact.args b/tests/qemuxml2argvdata/pseries-cpu-exact.args
-index 5949d95113..06805bd1fc 100644
---- a/tests/qemuxml2argvdata/pseries-cpu-exact.args
-+++ b/tests/qemuxml2argvdata/pseries-cpu-exact.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-ppc64 \
- -name QEMUGuest1 \
- -S \
---machine pseries,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pseries,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu POWER7 \
- -m 512 \
- -realtime mlock=off \
-diff --git a/tests/qemuxml2argvdata/pseries-cpu-le.args b/tests/qemuxml2argvdata/pseries-cpu-le.args
-index 9645918e61..60ad5a6c31 100644
---- a/tests/qemuxml2argvdata/pseries-cpu-le.args
-+++ b/tests/qemuxml2argvdata/pseries-cpu-le.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-ppc64 \
- -name QEMUGuest1 \
- -S \
---machine pseries,accel=kvm,usb=off,dump-guest-core=off \
-+-machine pseries,usb=off,dump-guest-core=off \
-+-accel kvm \
- -m 512 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/pseries-features.args b/tests/qemuxml2argvdata/pseries-features.args
-index 7aa357a54e..2eaf27a9ad 100644
---- a/tests/qemuxml2argvdata/pseries-features.args
-+++ b/tests/qemuxml2argvdata/pseries-features.args
-@@ -10,8 +10,9 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-ppc64 \
- -name guest \
- -S \
---machine pseries,accel=tcg,usb=off,dump-guest-core=off,resize-hpt=required,\
-+-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 \
-+-accel tcg \
- -m 512 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/pseries-hostdevs-1.args b/tests/qemuxml2argvdata/pseries-hostdevs-1.args
-index 51ec025dce..4df23489dd 100644
---- a/tests/qemuxml2argvdata/pseries-hostdevs-1.args
-+++ b/tests/qemuxml2argvdata/pseries-hostdevs-1.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-ppc64 \
- -name guest \
- -S \
---machine pseries,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pseries,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 512 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/pseries-hostdevs-2.args b/tests/qemuxml2argvdata/pseries-hostdevs-2.args
-index 87b6d928be..8c2520a791 100644
---- a/tests/qemuxml2argvdata/pseries-hostdevs-2.args
-+++ b/tests/qemuxml2argvdata/pseries-hostdevs-2.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-ppc64 \
- -name guest \
- -S \
---machine pseries,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pseries,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 512 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/pseries-hostdevs-3.args b/tests/qemuxml2argvdata/pseries-hostdevs-3.args
-index 5820140065..9fa0a34c41 100644
---- a/tests/qemuxml2argvdata/pseries-hostdevs-3.args
-+++ b/tests/qemuxml2argvdata/pseries-hostdevs-3.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-ppc64 \
- -name guest \
- -S \
---machine pseries,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pseries,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 512 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/pseries-machine-max-cpu-compat.args b/tests/qemuxml2argvdata/pseries-machine-max-cpu-compat.args
-index 1d9a7b1987..640bffeb81 100644
---- a/tests/qemuxml2argvdata/pseries-machine-max-cpu-compat.args
-+++ b/tests/qemuxml2argvdata/pseries-machine-max-cpu-compat.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-ppc64 \
- -name QEMUGuest1 \
- -S \
---machine pseries,accel=kvm,usb=off,dump-guest-core=off,max-cpu-compat=power7 \
-+-machine pseries,usb=off,dump-guest-core=off,max-cpu-compat=power7 \
-+-accel kvm \
- -cpu host \
- -m 256 \
- -realtime mlock=off \
-diff --git a/tests/qemuxml2argvdata/pseries-many-buses-1.args b/tests/qemuxml2argvdata/pseries-many-buses-1.args
-index 6290a5fe24..4ea01ba664 100644
---- a/tests/qemuxml2argvdata/pseries-many-buses-1.args
-+++ b/tests/qemuxml2argvdata/pseries-many-buses-1.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-ppc64 \
- -name guest \
- -S \
---machine pseries,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pseries,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 512 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/pseries-many-buses-2.args b/tests/qemuxml2argvdata/pseries-many-buses-2.args
-index 0e8a269ab2..0ef5643052 100644
---- a/tests/qemuxml2argvdata/pseries-many-buses-2.args
-+++ b/tests/qemuxml2argvdata/pseries-many-buses-2.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-ppc64 \
- -name guest \
- -S \
---machine pseries,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pseries,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 512 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/pseries-many-devices.args b/tests/qemuxml2argvdata/pseries-many-devices.args
-index e5e1d94231..b5e88839c2 100644
---- a/tests/qemuxml2argvdata/pseries-many-devices.args
-+++ b/tests/qemuxml2argvdata/pseries-many-devices.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-ppc64 \
- -name guest \
- -S \
---machine pseries,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pseries,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 512 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/pseries-nvram.args b/tests/qemuxml2argvdata/pseries-nvram.args
-index aabd97c087..740ccca6dc 100644
---- a/tests/qemuxml2argvdata/pseries-nvram.args
-+++ b/tests/qemuxml2argvdata/pseries-nvram.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-ppc64 \
- -name QEMUGuest1 \
- -S \
---machine pseries,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pseries,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 512 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/pseries-panic-missing.args b/tests/qemuxml2argvdata/pseries-panic-missing.args
-index 574e3b164e..13aa5872f2 100644
---- a/tests/qemuxml2argvdata/pseries-panic-missing.args
-+++ b/tests/qemuxml2argvdata/pseries-panic-missing.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-ppc64 \
- -name QEMUGuest1 \
- -S \
---machine pseries,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pseries,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 512 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/pseries-panic-no-address.args b/tests/qemuxml2argvdata/pseries-panic-no-address.args
-index 574e3b164e..13aa5872f2 100644
---- a/tests/qemuxml2argvdata/pseries-panic-no-address.args
-+++ b/tests/qemuxml2argvdata/pseries-panic-no-address.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-ppc64 \
- -name QEMUGuest1 \
- -S \
---machine pseries,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pseries,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 512 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/pseries-phb-default-missing.args b/tests/qemuxml2argvdata/pseries-phb-default-missing.args
-index c0725bfce4..3c415951d0 100644
---- a/tests/qemuxml2argvdata/pseries-phb-default-missing.args
-+++ b/tests/qemuxml2argvdata/pseries-phb-default-missing.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-ppc64 \
- -name QEMUGuest1 \
- -S \
---machine pseries,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pseries,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 512 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/pseries-phb-numa-node.args b/tests/qemuxml2argvdata/pseries-phb-numa-node.args
-index ca25e84d0e..e295045eab 100644
---- a/tests/qemuxml2argvdata/pseries-phb-numa-node.args
-+++ b/tests/qemuxml2argvdata/pseries-phb-numa-node.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-ppc64 \
- -name QEMUGuest1 \
- -S \
---machine pseries,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pseries,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 2048 \
- -realtime mlock=off \
- -smp 8,sockets=2,cores=1,threads=4 \
-diff --git a/tests/qemuxml2argvdata/pseries-phb-simple.args b/tests/qemuxml2argvdata/pseries-phb-simple.args
-index c0725bfce4..3c415951d0 100644
---- a/tests/qemuxml2argvdata/pseries-phb-simple.args
-+++ b/tests/qemuxml2argvdata/pseries-phb-simple.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-ppc64 \
- -name QEMUGuest1 \
- -S \
---machine pseries,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pseries,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 512 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/pseries-serial-native.args b/tests/qemuxml2argvdata/pseries-serial-native.args
-index 9a5f8c8300..c8295f7065 100644
---- a/tests/qemuxml2argvdata/pseries-serial-native.args
-+++ b/tests/qemuxml2argvdata/pseries-serial-native.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-ppc64 \
- -name guest \
- -S \
---machine pseries,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pseries,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 512 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/pseries-serial-pci.args b/tests/qemuxml2argvdata/pseries-serial-pci.args
-index 930532527f..d91c38e08c 100644
---- a/tests/qemuxml2argvdata/pseries-serial-pci.args
-+++ b/tests/qemuxml2argvdata/pseries-serial-pci.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-ppc64 \
- -name guest \
- -S \
---machine pseries,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pseries,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 512 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/pseries-serial-usb.args b/tests/qemuxml2argvdata/pseries-serial-usb.args
-index 104f0d5491..d18cafe703 100644
---- a/tests/qemuxml2argvdata/pseries-serial-usb.args
-+++ b/tests/qemuxml2argvdata/pseries-serial-usb.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-ppc64 \
- -name guest \
- -S \
---machine pseries,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pseries,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 512 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/pseries-usb-default.args b/tests/qemuxml2argvdata/pseries-usb-default.args
-index 5de177780a..26dfe86909 100644
---- a/tests/qemuxml2argvdata/pseries-usb-default.args
-+++ b/tests/qemuxml2argvdata/pseries-usb-default.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-ppc64 \
- -name QEMUGuest1 \
- -S \
---machine pseries,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pseries,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 512 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/pseries-usb-kbd.args b/tests/qemuxml2argvdata/pseries-usb-kbd.args
-index 61246e4672..cc3d0a4916 100644
---- a/tests/qemuxml2argvdata/pseries-usb-kbd.args
-+++ b/tests/qemuxml2argvdata/pseries-usb-kbd.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-ppc64 \
- -name QEMUGuest1 \
- -S \
---machine pseries,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pseries,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 512 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/pseries-usb-multi.args b/tests/qemuxml2argvdata/pseries-usb-multi.args
-index b811c024e8..2fa76dd90d 100644
---- a/tests/qemuxml2argvdata/pseries-usb-multi.args
-+++ b/tests/qemuxml2argvdata/pseries-usb-multi.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-ppc64 \
- -name QEMUGuest1 \
- -S \
---machine pseries,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pseries,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 512 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/pseries-vio-user-assigned.args b/tests/qemuxml2argvdata/pseries-vio-user-assigned.args
-index a412593c9a..c62801935d 100644
---- a/tests/qemuxml2argvdata/pseries-vio-user-assigned.args
-+++ b/tests/qemuxml2argvdata/pseries-vio-user-assigned.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-ppc64 \
- -name QEMUGuest1 \
- -S \
---machine pseries,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pseries,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 512 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/pseries-vio.args b/tests/qemuxml2argvdata/pseries-vio.args
-index a500e9b4b9..b707cfc0bd 100644
---- a/tests/qemuxml2argvdata/pseries-vio.args
-+++ b/tests/qemuxml2argvdata/pseries-vio.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-ppc64 \
- -name QEMUGuest1 \
- -S \
---machine pseries,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pseries,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 512 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-2.7.0.args b/tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-2.7.0.args
-index 7e3c90e467..b9a04ae5f0 100644
---- a/tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-2.7.0.args
-+++ b/tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-2.7.0.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc-i440fx-2.7,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc-i440fx-2.7,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu qemu32,-kvm_pv_unhalt \
- -m 214 \
- -realtime mlock=off \
-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
-index 76e439c2b4..4bb2b4381f 100644
---- a/tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-4.0.0.args
-+++ b/tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-4.0.0.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc-i440fx-4.0,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc-i440fx-4.0,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu qemu32,kvm_pv_unhalt=off \
- -m 214 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-latest.args b/tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-latest.args
-index eb449837bf..bb5d26ae0d 100644
---- a/tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-latest.args
-+++ b/tests/qemuxml2argvdata/pv-spinlock-disabled.x86_64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu qemu64,kvm-pv-unhalt=off \
- -m 214 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-2.7.0.args b/tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-2.7.0.args
-index c5d0095242..2e55d11719 100644
---- a/tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-2.7.0.args
-+++ b/tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-2.7.0.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc-i440fx-2.7,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc-i440fx-2.7,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu qemu32,+kvm_pv_unhalt \
- -m 214 \
- -realtime mlock=off \
-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
-index e19ebfda0b..637865519d 100644
---- a/tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-4.0.0.args
-+++ b/tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-4.0.0.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc-i440fx-4.0,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc-i440fx-4.0,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu qemu32,kvm_pv_unhalt=on \
- -m 214 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-latest.args b/tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-latest.args
-index af14fa05a9..6bda16dc49 100644
---- a/tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-latest.args
-+++ b/tests/qemuxml2argvdata/pv-spinlock-enabled.x86_64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu qemu64,kvm-pv-unhalt=on \
- -m 214 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/q35-acpi-nouefi.args b/tests/qemuxml2argvdata/q35-acpi-nouefi.args
-index 09e06c96ea..708fa85f27 100644
---- a/tests/qemuxml2argvdata/q35-acpi-nouefi.args
-+++ b/tests/qemuxml2argvdata/q35-acpi-nouefi.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name guest \
- -S \
---machine q35,accel=tcg,usb=off,dump-guest-core=off \
-+-machine q35,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu Haswell \
- -m 1024 \
- -realtime mlock=off \
-diff --git a/tests/qemuxml2argvdata/q35-acpi-uefi.args b/tests/qemuxml2argvdata/q35-acpi-uefi.args
-index d00fe5bc1d..92956dea5f 100644
---- a/tests/qemuxml2argvdata/q35-acpi-uefi.args
-+++ b/tests/qemuxml2argvdata/q35-acpi-uefi.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name guest \
- -S \
---machine q35,accel=tcg,usb=off,dump-guest-core=off \
-+-machine q35,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu Haswell \
- -drive file=/usr/share/OVMF/OVMF_CODE.fd,if=pflash,format=raw,unit=0,\
- readonly=on \
-diff --git a/tests/qemuxml2argvdata/q35-default-devices-only.args b/tests/qemuxml2argvdata/q35-default-devices-only.args
-index 90f41509df..522e0ac050 100644
---- a/tests/qemuxml2argvdata/q35-default-devices-only.args
-+++ b/tests/qemuxml2argvdata/q35-default-devices-only.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name q35-test \
- -S \
---machine q35,accel=tcg,usb=off,dump-guest-core=off \
-+-machine q35,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 2048 \
- -realtime mlock=off \
- -smp 2,sockets=2,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/q35-multifunction.args b/tests/qemuxml2argvdata/q35-multifunction.args
-index b720a6c3da..fb259b6b59 100644
---- a/tests/qemuxml2argvdata/q35-multifunction.args
-+++ b/tests/qemuxml2argvdata/q35-multifunction.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name q35-test \
- -S \
---machine q35,accel=tcg,usb=off,dump-guest-core=off \
-+-machine q35,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 2048 \
- -realtime mlock=off \
- -smp 2,sockets=2,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/q35-noacpi-nouefi.args b/tests/qemuxml2argvdata/q35-noacpi-nouefi.args
-index de34dff1cf..184e2d9009 100644
---- a/tests/qemuxml2argvdata/q35-noacpi-nouefi.args
-+++ b/tests/qemuxml2argvdata/q35-noacpi-nouefi.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name guest \
- -S \
---machine q35,accel=tcg,usb=off,dump-guest-core=off \
-+-machine q35,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu Haswell \
- -m 1024 \
- -realtime mlock=off \
-diff --git a/tests/qemuxml2argvdata/q35-pci-force-address.args b/tests/qemuxml2argvdata/q35-pci-force-address.args
-index b3be5171be..1dba0bdf6c 100644
---- a/tests/qemuxml2argvdata/q35-pci-force-address.args
-+++ b/tests/qemuxml2argvdata/q35-pci-force-address.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name q35-test \
- -S \
---machine q35,accel=tcg,usb=off,dump-guest-core=off \
-+-machine q35,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 2048 \
- -realtime mlock=off \
- -smp 2,sockets=2,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/q35-pcie-autoadd.args b/tests/qemuxml2argvdata/q35-pcie-autoadd.args
-index 4e173501a9..7d07ad91fb 100644
---- a/tests/qemuxml2argvdata/q35-pcie-autoadd.args
-+++ b/tests/qemuxml2argvdata/q35-pcie-autoadd.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name q35-test \
- -S \
---machine q35,accel=tcg,usb=off,dump-guest-core=off \
-+-machine q35,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 2048 \
- -realtime mlock=off \
- -smp 2,sockets=2,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/q35-pcie.args b/tests/qemuxml2argvdata/q35-pcie.args
-index e741e849f0..471636eb41 100644
---- a/tests/qemuxml2argvdata/q35-pcie.args
-+++ b/tests/qemuxml2argvdata/q35-pcie.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name q35-test \
- -S \
---machine q35,accel=tcg,usb=off,dump-guest-core=off \
-+-machine q35,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 2048 \
- -realtime mlock=off \
- -smp 2,sockets=2,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/q35-pm-disable-fallback.args b/tests/qemuxml2argvdata/q35-pm-disable-fallback.args
-index ccde17059b..33246239fb 100644
---- a/tests/qemuxml2argvdata/q35-pm-disable-fallback.args
-+++ b/tests/qemuxml2argvdata/q35-pm-disable-fallback.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name q35 \
- -S \
---machine pc-q35-2.5,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc-q35-2.5,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 1024 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/q35-pm-disable.args b/tests/qemuxml2argvdata/q35-pm-disable.args
-index 86340d3318..567ec9e1e1 100644
---- a/tests/qemuxml2argvdata/q35-pm-disable.args
-+++ b/tests/qemuxml2argvdata/q35-pm-disable.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name q35 \
- -S \
---machine pc-q35-2.5,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc-q35-2.5,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 1024 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/q35-usb2-multi.args b/tests/qemuxml2argvdata/q35-usb2-multi.args
-index 82e54d1121..acf9ff8068 100644
---- a/tests/qemuxml2argvdata/q35-usb2-multi.args
-+++ b/tests/qemuxml2argvdata/q35-usb2-multi.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name q35-test \
- -S \
---machine q35,accel=tcg,usb=off,dump-guest-core=off \
-+-machine q35,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 2048 \
- -realtime mlock=off \
- -smp 2,sockets=2,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/q35-usb2-reorder.args b/tests/qemuxml2argvdata/q35-usb2-reorder.args
-index 23629eaa79..b88e7ad121 100644
---- a/tests/qemuxml2argvdata/q35-usb2-reorder.args
-+++ b/tests/qemuxml2argvdata/q35-usb2-reorder.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name q35-test \
- -S \
---machine q35,accel=tcg,usb=off,dump-guest-core=off \
-+-machine q35,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 2048 \
- -realtime mlock=off \
- -smp 2,sockets=2,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/q35-usb2.args b/tests/qemuxml2argvdata/q35-usb2.args
-index ab393428e5..4783cef143 100644
---- a/tests/qemuxml2argvdata/q35-usb2.args
-+++ b/tests/qemuxml2argvdata/q35-usb2.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name q35-test \
- -S \
---machine q35,accel=tcg,usb=off,dump-guest-core=off \
-+-machine q35,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 2048 \
- -realtime mlock=off \
- -smp 2,sockets=2,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/q35-virt-manager-basic.args b/tests/qemuxml2argvdata/q35-virt-manager-basic.args
-index dbe9cf9478..10dd8001e4 100644
---- a/tests/qemuxml2argvdata/q35-virt-manager-basic.args
-+++ b/tests/qemuxml2argvdata/q35-virt-manager-basic.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=spice \
- /usr/bin/qemu-system-x86_64 \
- -name virt-manager-basic \
- -S \
---machine pc-q35-2.7,accel=kvm,usb=off,vmport=off,dump-guest-core=off \
-+-machine pc-q35-2.7,usb=off,vmport=off,dump-guest-core=off \
-+-accel kvm \
- -m 4096 \
- -realtime mlock=off \
- -smp 2,sockets=2,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/q35-virtio-pci.args b/tests/qemuxml2argvdata/q35-virtio-pci.args
-index ca4ed91da7..fd3d6c03d7 100644
---- a/tests/qemuxml2argvdata/q35-virtio-pci.args
-+++ b/tests/qemuxml2argvdata/q35-virtio-pci.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name q35-test \
- -S \
---machine q35,accel=tcg,usb=off,dump-guest-core=off \
-+-machine q35,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 2048 \
- -realtime mlock=off \
- -smp 2,sockets=2,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/q35.args b/tests/qemuxml2argvdata/q35.args
-index 5ca5917fc0..f9fd451397 100644
---- a/tests/qemuxml2argvdata/q35.args
-+++ b/tests/qemuxml2argvdata/q35.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name q35-test \
- -S \
---machine q35,accel=tcg,usb=off,dump-guest-core=off \
-+-machine q35,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 2048 \
- -realtime mlock=off \
- -smp 2,sockets=2,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/qemu-ns-alt.args b/tests/qemuxml2argvdata/qemu-ns-alt.args
-index 7e4cffa4d0..a289816790 100644
---- a/tests/qemuxml2argvdata/qemu-ns-alt.args
-+++ b/tests/qemuxml2argvdata/qemu-ns-alt.args
-@@ -12,7 +12,8 @@ BAR='' \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args b/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args
-index fc1592f168..94d622c1fb 100644
---- a/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args
-+++ b/tests/qemuxml2argvdata/qemu-ns-commandline-ns0.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args b/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args
-index fc1592f168..94d622c1fb 100644
---- a/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args
-+++ b/tests/qemuxml2argvdata/qemu-ns-commandline-ns1.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/qemu-ns-commandline.args b/tests/qemuxml2argvdata/qemu-ns-commandline.args
-index fc1592f168..94d622c1fb 100644
---- a/tests/qemuxml2argvdata/qemu-ns-commandline.args
-+++ b/tests/qemuxml2argvdata/qemu-ns-commandline.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args b/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args
-index fc1592f168..94d622c1fb 100644
---- a/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args
-+++ b/tests/qemuxml2argvdata/qemu-ns-domain-commandline-ns0.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/qemu-ns-domain-commandline.args b/tests/qemuxml2argvdata/qemu-ns-domain-commandline.args
-index fc1592f168..94d622c1fb 100644
---- a/tests/qemuxml2argvdata/qemu-ns-domain-commandline.args
-+++ b/tests/qemuxml2argvdata/qemu-ns-domain-commandline.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/qemu-ns-domain-ns0.args b/tests/qemuxml2argvdata/qemu-ns-domain-ns0.args
-index fc1592f168..94d622c1fb 100644
---- a/tests/qemuxml2argvdata/qemu-ns-domain-ns0.args
-+++ b/tests/qemuxml2argvdata/qemu-ns-domain-ns0.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/qemu-ns-no-env.args b/tests/qemuxml2argvdata/qemu-ns-no-env.args
-index 74f7b88761..c3da15c1bf 100644
---- a/tests/qemuxml2argvdata/qemu-ns-no-env.args
-+++ b/tests/qemuxml2argvdata/qemu-ns-no-env.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/qemu-ns.x86_64-4.0.0.args b/tests/qemuxml2argvdata/qemu-ns.x86_64-4.0.0.args
-index 0f3253f831..b2ee2314ed 100644
---- a/tests/qemuxml2argvdata/qemu-ns.x86_64-4.0.0.args
-+++ b/tests/qemuxml2argvdata/qemu-ns.x86_64-4.0.0.args
-@@ -14,7 +14,8 @@ BAR='' \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc-i440fx-4.0,accel=tcg,usb=off,dump-guest-core=off \
-+-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 \
-diff --git a/tests/qemuxml2argvdata/qemu-ns.x86_64-latest.args b/tests/qemuxml2argvdata/qemu-ns.x86_64-latest.args
-index 7864f90402..2c4b7ee7ee 100644
---- a/tests/qemuxml2argvdata/qemu-ns.x86_64-latest.args
-+++ b/tests/qemuxml2argvdata/qemu-ns.x86_64-latest.args
-@@ -14,7 +14,8 @@ BAR='' \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu qemu64 \
- -m 214 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/reboot-timeout-disabled.args b/tests/qemuxml2argvdata/reboot-timeout-disabled.args
-index 1ddc18b7c5..f3153ddd49 100644
---- a/tests/qemuxml2argvdata/reboot-timeout-disabled.args
-+++ b/tests/qemuxml2argvdata/reboot-timeout-disabled.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 6,sockets=6,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/reboot-timeout-enabled.args b/tests/qemuxml2argvdata/reboot-timeout-enabled.args
-index e31f37e112..3990dcbddf 100644
---- a/tests/qemuxml2argvdata/reboot-timeout-enabled.args
-+++ b/tests/qemuxml2argvdata/reboot-timeout-enabled.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 6,sockets=6,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/restore-v2-fd.args b/tests/qemuxml2argvdata/restore-v2-fd.args
-index cc0a751483..98f302fabd 100644
---- a/tests/qemuxml2argvdata/restore-v2-fd.args
-+++ b/tests/qemuxml2argvdata/restore-v2-fd.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/restore-v2.args b/tests/qemuxml2argvdata/restore-v2.args
-index ac3d16f3c3..ff43c7e2c4 100644
---- a/tests/qemuxml2argvdata/restore-v2.args
-+++ b/tests/qemuxml2argvdata/restore-v2.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/riscv64-virt-graphics.riscv64-latest.args b/tests/qemuxml2argvdata/riscv64-virt-graphics.riscv64-latest.args
-index f8e2154f8f..7140a6c79c 100644
---- a/tests/qemuxml2argvdata/riscv64-virt-graphics.riscv64-latest.args
-+++ b/tests/qemuxml2argvdata/riscv64-virt-graphics.riscv64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-guest/master-key.aes \
---machine virt,accel=tcg,usb=off,dump-guest-core=off \
-+-machine virt,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 4096 \
- -overcommit mem-lock=off \
- -smp 4,sockets=4,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/riscv64-virt-headless.riscv64-latest.args b/tests/qemuxml2argvdata/riscv64-virt-headless.riscv64-latest.args
-index 9a595dc4ee..4758f0ca2b 100644
---- a/tests/qemuxml2argvdata/riscv64-virt-headless.riscv64-latest.args
-+++ b/tests/qemuxml2argvdata/riscv64-virt-headless.riscv64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-guest/master-key.aes \
---machine virt,accel=tcg,usb=off,dump-guest-core=off \
-+-machine virt,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 4096 \
- -overcommit mem-lock=off \
- -smp 4,sockets=4,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/riscv64-virt-pci.args b/tests/qemuxml2argvdata/riscv64-virt-pci.args
-index 0b91972149..274c6e2e29 100644
---- a/tests/qemuxml2argvdata/riscv64-virt-pci.args
-+++ b/tests/qemuxml2argvdata/riscv64-virt-pci.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-riscv64 \
- -name riscv64 \
- -S \
---machine virt,accel=tcg,usb=off,dump-guest-core=off \
-+-machine virt,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 2048 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/riscv64-virt.args b/tests/qemuxml2argvdata/riscv64-virt.args
-index 1631e46b1c..8b153e0274 100644
---- a/tests/qemuxml2argvdata/riscv64-virt.args
-+++ b/tests/qemuxml2argvdata/riscv64-virt.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-riscv64 \
- -name riscv64 \
- -S \
---machine virt,accel=tcg,usb=off,dump-guest-core=off \
-+-machine virt,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 2048 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/s390-allow-bogus-usb-controller.args b/tests/qemuxml2argvdata/s390-allow-bogus-usb-controller.args
-index 573d953602..966163108f 100644
---- a/tests/qemuxml2argvdata/s390-allow-bogus-usb-controller.args
-+++ b/tests/qemuxml2argvdata/s390-allow-bogus-usb-controller.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-s390x \
- -name test \
- -S \
---machine s390-virtio,accel=tcg,usb=off,dump-guest-core=off \
-+-machine s390-virtio,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/s390-allow-bogus-usb-none.args b/tests/qemuxml2argvdata/s390-allow-bogus-usb-none.args
-index 573d953602..966163108f 100644
---- a/tests/qemuxml2argvdata/s390-allow-bogus-usb-none.args
-+++ b/tests/qemuxml2argvdata/s390-allow-bogus-usb-none.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-s390x \
- -name test \
- -S \
---machine s390-virtio,accel=tcg,usb=off,dump-guest-core=off \
-+-machine s390-virtio,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/s390-default-cpu-kvm-ccw-virtio-2.7.s390x-latest.args b/tests/qemuxml2argvdata/s390-default-cpu-kvm-ccw-virtio-2.7.s390x-latest.args
-index 0c2567df6c..6662ec6fa5 100644
---- a/tests/qemuxml2argvdata/s390-default-cpu-kvm-ccw-virtio-2.7.s390x-latest.args
-+++ b/tests/qemuxml2argvdata/s390-default-cpu-kvm-ccw-virtio-2.7.s390x-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-test/master-key.aes \
---machine s390-ccw-virtio-2.7,accel=kvm,usb=off,dump-guest-core=off \
-+-machine s390-ccw-virtio-2.7,usb=off,dump-guest-core=off \
-+-accel kvm \
- -cpu host \
- -m 256 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/s390-default-cpu-kvm-ccw-virtio-4.2.s390x-latest.args b/tests/qemuxml2argvdata/s390-default-cpu-kvm-ccw-virtio-4.2.s390x-latest.args
-index 0386019418..5613501342 100644
---- a/tests/qemuxml2argvdata/s390-default-cpu-kvm-ccw-virtio-4.2.s390x-latest.args
-+++ b/tests/qemuxml2argvdata/s390-default-cpu-kvm-ccw-virtio-4.2.s390x-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-test/master-key.aes \
---machine s390-ccw-virtio-4.2,accel=kvm,usb=off,dump-guest-core=off \
-+-machine s390-ccw-virtio-4.2,usb=off,dump-guest-core=off \
-+-accel kvm \
- -cpu z13.2-base,aen=on,aefsi=on,msa5=on,msa4=on,msa3=on,msa2=on,msa1=on,\
- sthyi=on,edat=on,ri=on,edat2=on,vx=on,ipter=on,ap=on,esop=on,apft=on,apqci=on,\
- cte=on,bpb=on,ppa15=on,zpci=on,sea_esop2=on,te=on,cmm=on \
-diff --git a/tests/qemuxml2argvdata/s390-default-cpu-tcg-ccw-virtio-2.7.s390x-latest.args b/tests/qemuxml2argvdata/s390-default-cpu-tcg-ccw-virtio-2.7.s390x-latest.args
-index d30c30f648..e6db9da9b5 100644
---- a/tests/qemuxml2argvdata/s390-default-cpu-tcg-ccw-virtio-2.7.s390x-latest.args
-+++ b/tests/qemuxml2argvdata/s390-default-cpu-tcg-ccw-virtio-2.7.s390x-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-test/master-key.aes \
---machine s390-ccw-virtio-2.7,accel=tcg,usb=off,dump-guest-core=off \
-+-machine s390-ccw-virtio-2.7,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu qemu \
- -m 256 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/s390-default-cpu-tcg-ccw-virtio-4.2.s390x-latest.args b/tests/qemuxml2argvdata/s390-default-cpu-tcg-ccw-virtio-4.2.s390x-latest.args
-index c7bd0c3840..bcbd565350 100644
---- a/tests/qemuxml2argvdata/s390-default-cpu-tcg-ccw-virtio-4.2.s390x-latest.args
-+++ b/tests/qemuxml2argvdata/s390-default-cpu-tcg-ccw-virtio-4.2.s390x-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-test/master-key.aes \
---machine s390-ccw-virtio-4.2,accel=tcg,usb=off,dump-guest-core=off \
-+-machine s390-ccw-virtio-4.2,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu qemu \
- -m 256 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/s390-panic-missing.args b/tests/qemuxml2argvdata/s390-panic-missing.args
-index ef24f8f90c..6f5a8616f9 100644
---- a/tests/qemuxml2argvdata/s390-panic-missing.args
-+++ b/tests/qemuxml2argvdata/s390-panic-missing.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-s390x \
- -name QEMUGuest1 \
- -S \
---machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off \
-+-machine s390-ccw-virtio,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 256 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/s390-panic-no-address.args b/tests/qemuxml2argvdata/s390-panic-no-address.args
-index 60ddab9e1d..b623b601c7 100644
---- a/tests/qemuxml2argvdata/s390-panic-no-address.args
-+++ b/tests/qemuxml2argvdata/s390-panic-no-address.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-s390x \
- -name QEMUGuest1 \
- -S \
---machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off \
-+-machine s390-ccw-virtio,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 256 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/s390-serial-2.args b/tests/qemuxml2argvdata/s390-serial-2.args
-index e6103ced32..3642983f03 100644
---- a/tests/qemuxml2argvdata/s390-serial-2.args
-+++ b/tests/qemuxml2argvdata/s390-serial-2.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-s390x \
- -name QEMUGuest1 \
- -S \
---machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off \
-+-machine s390-ccw-virtio,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/s390-serial-console.args b/tests/qemuxml2argvdata/s390-serial-console.args
-index cb454ef47c..89c59a0c53 100644
---- a/tests/qemuxml2argvdata/s390-serial-console.args
-+++ b/tests/qemuxml2argvdata/s390-serial-console.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-s390x \
- -name QEMUGuest1 \
- -S \
---machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off \
-+-machine s390-ccw-virtio,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/s390-serial.args b/tests/qemuxml2argvdata/s390-serial.args
-index cb454ef47c..89c59a0c53 100644
---- a/tests/qemuxml2argvdata/s390-serial.args
-+++ b/tests/qemuxml2argvdata/s390-serial.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-s390x \
- -name QEMUGuest1 \
- -S \
---machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off \
-+-machine s390-ccw-virtio,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/s390x-ccw-graphics.s390x-latest.args b/tests/qemuxml2argvdata/s390x-ccw-graphics.s390x-latest.args
-index 8f72b20b0b..4c2b8b29c9 100644
---- a/tests/qemuxml2argvdata/s390x-ccw-graphics.s390x-latest.args
-+++ b/tests/qemuxml2argvdata/s390x-ccw-graphics.s390x-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-guest/master-key.aes \
---machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off \
-+-machine s390-ccw-virtio,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu qemu \
- -m 4096 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/s390x-ccw-headless.s390x-latest.args b/tests/qemuxml2argvdata/s390x-ccw-headless.s390x-latest.args
-index 95caf9e9ed..127cfe9e70 100644
---- a/tests/qemuxml2argvdata/s390x-ccw-headless.s390x-latest.args
-+++ b/tests/qemuxml2argvdata/s390x-ccw-headless.s390x-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-guest/master-key.aes \
---machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off \
-+-machine s390-ccw-virtio,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu qemu \
- -m 4096 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/seclabel-dac-none.args b/tests/qemuxml2argvdata/seclabel-dac-none.args
-index 60253f43ec..d57fa14fad 100644
---- a/tests/qemuxml2argvdata/seclabel-dac-none.args
-+++ b/tests/qemuxml2argvdata/seclabel-dac-none.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args b/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args
-index 60253f43ec..d57fa14fad 100644
---- a/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args
-+++ b/tests/qemuxml2argvdata/seclabel-dynamic-baselabel.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args b/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args
-index 60253f43ec..d57fa14fad 100644
---- a/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args
-+++ b/tests/qemuxml2argvdata/seclabel-dynamic-labelskip.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-override.args b/tests/qemuxml2argvdata/seclabel-dynamic-override.args
-index b561a77139..70c5718515 100644
---- a/tests/qemuxml2argvdata/seclabel-dynamic-override.args
-+++ b/tests/qemuxml2argvdata/seclabel-dynamic-override.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/seclabel-dynamic-relabel.args b/tests/qemuxml2argvdata/seclabel-dynamic-relabel.args
-index 60253f43ec..d57fa14fad 100644
---- a/tests/qemuxml2argvdata/seclabel-dynamic-relabel.args
-+++ b/tests/qemuxml2argvdata/seclabel-dynamic-relabel.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/seclabel-dynamic.args b/tests/qemuxml2argvdata/seclabel-dynamic.args
-index 60253f43ec..d57fa14fad 100644
---- a/tests/qemuxml2argvdata/seclabel-dynamic.args
-+++ b/tests/qemuxml2argvdata/seclabel-dynamic.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/seclabel-none.args b/tests/qemuxml2argvdata/seclabel-none.args
-index 60253f43ec..d57fa14fad 100644
---- a/tests/qemuxml2argvdata/seclabel-none.args
-+++ b/tests/qemuxml2argvdata/seclabel-none.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/seclabel-static-labelskip.args b/tests/qemuxml2argvdata/seclabel-static-labelskip.args
-index 60253f43ec..d57fa14fad 100644
---- a/tests/qemuxml2argvdata/seclabel-static-labelskip.args
-+++ b/tests/qemuxml2argvdata/seclabel-static-labelskip.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/seclabel-static-relabel.args b/tests/qemuxml2argvdata/seclabel-static-relabel.args
-index 60253f43ec..d57fa14fad 100644
---- a/tests/qemuxml2argvdata/seclabel-static-relabel.args
-+++ b/tests/qemuxml2argvdata/seclabel-static-relabel.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/seclabel-static.args b/tests/qemuxml2argvdata/seclabel-static.args
-index 60253f43ec..d57fa14fad 100644
---- a/tests/qemuxml2argvdata/seclabel-static.args
-+++ b/tests/qemuxml2argvdata/seclabel-static.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/serial-dev-chardev-iobase.args b/tests/qemuxml2argvdata/serial-dev-chardev-iobase.args
-index 239c13167d..b0710273a3 100644
---- a/tests/qemuxml2argvdata/serial-dev-chardev-iobase.args
-+++ b/tests/qemuxml2argvdata/serial-dev-chardev-iobase.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/serial-dev-chardev.args b/tests/qemuxml2argvdata/serial-dev-chardev.args
-index 96053f22c3..61c8564a9e 100644
---- a/tests/qemuxml2argvdata/serial-dev-chardev.args
-+++ b/tests/qemuxml2argvdata/serial-dev-chardev.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/serial-file-chardev.args b/tests/qemuxml2argvdata/serial-file-chardev.args
-index 435b9eb689..865c34017a 100644
---- a/tests/qemuxml2argvdata/serial-file-chardev.args
-+++ b/tests/qemuxml2argvdata/serial-file-chardev.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/serial-file-log.args b/tests/qemuxml2argvdata/serial-file-log.args
-index 35334297ff..76f5e4ab94 100644
---- a/tests/qemuxml2argvdata/serial-file-log.args
-+++ b/tests/qemuxml2argvdata/serial-file-log.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/serial-many-chardev.args b/tests/qemuxml2argvdata/serial-many-chardev.args
-index 31800b30ff..d2848ad0f4 100644
---- a/tests/qemuxml2argvdata/serial-many-chardev.args
-+++ b/tests/qemuxml2argvdata/serial-many-chardev.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/serial-pty-chardev.args b/tests/qemuxml2argvdata/serial-pty-chardev.args
-index 4d6d6e376c..2be9165af0 100644
---- a/tests/qemuxml2argvdata/serial-pty-chardev.args
-+++ b/tests/qemuxml2argvdata/serial-pty-chardev.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/serial-spiceport-nospice.args b/tests/qemuxml2argvdata/serial-spiceport-nospice.args
-index 60253f43ec..d57fa14fad 100644
---- a/tests/qemuxml2argvdata/serial-spiceport-nospice.args
-+++ b/tests/qemuxml2argvdata/serial-spiceport-nospice.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/serial-spiceport.args b/tests/qemuxml2argvdata/serial-spiceport.args
-index 6e3d4e4ea0..8245e61a1a 100644
---- a/tests/qemuxml2argvdata/serial-spiceport.args
-+++ b/tests/qemuxml2argvdata/serial-spiceport.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=spice \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/serial-tcp-chardev.args b/tests/qemuxml2argvdata/serial-tcp-chardev.args
-index dd91391343..fb77881703 100644
---- a/tests/qemuxml2argvdata/serial-tcp-chardev.args
-+++ b/tests/qemuxml2argvdata/serial-tcp-chardev.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/serial-tcp-telnet-chardev.args b/tests/qemuxml2argvdata/serial-tcp-telnet-chardev.args
-index a372863fa7..e6417b42a4 100644
---- a/tests/qemuxml2argvdata/serial-tcp-telnet-chardev.args
-+++ b/tests/qemuxml2argvdata/serial-tcp-telnet-chardev.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.args b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.args
-index c08869bd49..da268de274 100644
---- a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.args
-+++ b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-notls.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.args b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.args
-index c84e58eef3..c4470a68a5 100644
---- a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.args
-+++ b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev-verify.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.args b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.args
-index c84e58eef3..c4470a68a5 100644
---- a/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.args
-+++ b/tests/qemuxml2argvdata/serial-tcp-tlsx509-chardev.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.args b/tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.args
-index 051c8abc14..adc0dcc64c 100644
---- a/tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.args
-+++ b/tests/qemuxml2argvdata/serial-tcp-tlsx509-secret-chardev.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/serial-udp-chardev.args b/tests/qemuxml2argvdata/serial-udp-chardev.args
-index 27fda92418..b586186596 100644
---- a/tests/qemuxml2argvdata/serial-udp-chardev.args
-+++ b/tests/qemuxml2argvdata/serial-udp-chardev.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/serial-unix-chardev.args b/tests/qemuxml2argvdata/serial-unix-chardev.args
-index 26998323ff..019d87fd20 100644
---- a/tests/qemuxml2argvdata/serial-unix-chardev.args
-+++ b/tests/qemuxml2argvdata/serial-unix-chardev.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/serial-unix-chardev.x86_64-latest.args b/tests/qemuxml2argvdata/serial-unix-chardev.x86_64-latest.args
-index 05d42adda1..1d8b72d1e7 100644
---- a/tests/qemuxml2argvdata/serial-unix-chardev.x86_64-latest.args
-+++ b/tests/qemuxml2argvdata/serial-unix-chardev.x86_64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu qemu64 \
- -m 214 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/serial-vc-chardev.args b/tests/qemuxml2argvdata/serial-vc-chardev.args
-index f5a5bab576..24cf2c305c 100644
---- a/tests/qemuxml2argvdata/serial-vc-chardev.args
-+++ b/tests/qemuxml2argvdata/serial-vc-chardev.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/shmem-plain-doorbell.args b/tests/qemuxml2argvdata/shmem-plain-doorbell.args
-index 6ed86b7448..a25d2bf456 100644
---- a/tests/qemuxml2argvdata/shmem-plain-doorbell.args
-+++ b/tests/qemuxml2argvdata/shmem-plain-doorbell.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/shmem.args b/tests/qemuxml2argvdata/shmem.args
-index f2f3c3e95d..9fd8d78a51 100644
---- a/tests/qemuxml2argvdata/shmem.args
-+++ b/tests/qemuxml2argvdata/shmem.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/smartcard-controller.args b/tests/qemuxml2argvdata/smartcard-controller.args
-index 7e9442045d..1bc304beb3 100644
---- a/tests/qemuxml2argvdata/smartcard-controller.args
-+++ b/tests/qemuxml2argvdata/smartcard-controller.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/smartcard-host-certificates-database.args b/tests/qemuxml2argvdata/smartcard-host-certificates-database.args
-index 9381649668..d3db94180b 100644
---- a/tests/qemuxml2argvdata/smartcard-host-certificates-database.args
-+++ b/tests/qemuxml2argvdata/smartcard-host-certificates-database.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/smartcard-host-certificates.args b/tests/qemuxml2argvdata/smartcard-host-certificates.args
-index eecc454343..5a3f74c5d5 100644
---- a/tests/qemuxml2argvdata/smartcard-host-certificates.args
-+++ b/tests/qemuxml2argvdata/smartcard-host-certificates.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/smartcard-host.args b/tests/qemuxml2argvdata/smartcard-host.args
-index 7e9442045d..1bc304beb3 100644
---- a/tests/qemuxml2argvdata/smartcard-host.args
-+++ b/tests/qemuxml2argvdata/smartcard-host.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.args b/tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.args
-index 983648a21f..145ad8447a 100644
---- a/tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.args
-+++ b/tests/qemuxml2argvdata/smartcard-passthrough-spicevmc.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/smartcard-passthrough-tcp.args b/tests/qemuxml2argvdata/smartcard-passthrough-tcp.args
-index bac4418803..fc919b5d88 100644
---- a/tests/qemuxml2argvdata/smartcard-passthrough-tcp.args
-+++ b/tests/qemuxml2argvdata/smartcard-passthrough-tcp.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/smartcard-passthrough-unix.x86_64-2.5.0.args b/tests/qemuxml2argvdata/smartcard-passthrough-unix.x86_64-2.5.0.args
-index 7eb54497ef..13de57bcca 100644
---- a/tests/qemuxml2argvdata/smartcard-passthrough-unix.x86_64-2.5.0.args
-+++ b/tests/qemuxml2argvdata/smartcard-passthrough-unix.x86_64-2.5.0.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name guest=QEMUGuest1,debug-threads=on \
- -S \
---machine pc-i440fx-2.5,accel=kvm,usb=off,dump-guest-core=off \
-+-machine pc-i440fx-2.5,usb=off,dump-guest-core=off \
-+-accel kvm \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/smartcard-passthrough-unix.x86_64-latest.args b/tests/qemuxml2argvdata/smartcard-passthrough-unix.x86_64-latest.args
-index 4f1e3242ed..fef42efd3e 100644
---- a/tests/qemuxml2argvdata/smartcard-passthrough-unix.x86_64-latest.args
-+++ b/tests/qemuxml2argvdata/smartcard-passthrough-unix.x86_64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc,accel=kvm,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel kvm \
- -cpu qemu64 \
- -m 214 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/smbios.args b/tests/qemuxml2argvdata/smbios.args
-index 8ded1cb085..ab4e1a11da 100644
---- a/tests/qemuxml2argvdata/smbios.args
-+++ b/tests/qemuxml2argvdata/smbios.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/smp-dies.args b/tests/qemuxml2argvdata/smp-dies.args
-index 632e9d8e34..636f5a9f67 100644
---- a/tests/qemuxml2argvdata/smp-dies.args
-+++ b/tests/qemuxml2argvdata/smp-dies.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,maxcpus=4,sockets=2,dies=2,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/smp.args b/tests/qemuxml2argvdata/smp.args
-index dbf714c976..73297766d7 100644
---- a/tests/qemuxml2argvdata/smp.args
-+++ b/tests/qemuxml2argvdata/smp.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,maxcpus=2,sockets=2,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/sound-device.args b/tests/qemuxml2argvdata/sound-device.args
-index ce159a7054..7fdd798125 100644
---- a/tests/qemuxml2argvdata/sound-device.args
-+++ b/tests/qemuxml2argvdata/sound-device.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/sound.args b/tests/qemuxml2argvdata/sound.args
-index 7ed0c1e507..60d21b56c7 100644
---- a/tests/qemuxml2argvdata/sound.args
-+++ b/tests/qemuxml2argvdata/sound.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/tpm-emulator-spapr.ppc64-latest.args b/tests/qemuxml2argvdata/tpm-emulator-spapr.ppc64-latest.args
-index 00018e579f..8ed45647dd 100644
---- a/tests/qemuxml2argvdata/tpm-emulator-spapr.ppc64-latest.args
-+++ b/tests/qemuxml2argvdata/tpm-emulator-spapr.ppc64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-TPM-VM/master-key.aes \
---machine pseries-5.0,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pseries-5.0,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu POWER9 \
- -m 2048 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/tpm-emulator-tpm2-enc.x86_64-latest.args b/tests/qemuxml2argvdata/tpm-emulator-tpm2-enc.x86_64-latest.args
-index 2455e14cfe..709fe016eb 100644
---- a/tests/qemuxml2argvdata/tpm-emulator-tpm2-enc.x86_64-latest.args
-+++ b/tests/qemuxml2argvdata/tpm-emulator-tpm2-enc.x86_64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-TPM-VM/master-key.aes \
---machine pc-i440fx-2.12,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc-i440fx-2.12,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu qemu64 \
- -m 2048 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/tpm-emulator-tpm2.x86_64-latest.args b/tests/qemuxml2argvdata/tpm-emulator-tpm2.x86_64-latest.args
-index 2455e14cfe..709fe016eb 100644
---- a/tests/qemuxml2argvdata/tpm-emulator-tpm2.x86_64-latest.args
-+++ b/tests/qemuxml2argvdata/tpm-emulator-tpm2.x86_64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-TPM-VM/master-key.aes \
---machine pc-i440fx-2.12,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc-i440fx-2.12,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu qemu64 \
- -m 2048 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/tpm-emulator.x86_64-latest.args b/tests/qemuxml2argvdata/tpm-emulator.x86_64-latest.args
-index 2455e14cfe..709fe016eb 100644
---- a/tests/qemuxml2argvdata/tpm-emulator.x86_64-latest.args
-+++ b/tests/qemuxml2argvdata/tpm-emulator.x86_64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-TPM-VM/master-key.aes \
---machine pc-i440fx-2.12,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc-i440fx-2.12,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu qemu64 \
- -m 2048 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/tpm-passthrough-crb.x86_64-latest.args b/tests/qemuxml2argvdata/tpm-passthrough-crb.x86_64-latest.args
-index 5508e4defb..6a2a23995d 100644
---- a/tests/qemuxml2argvdata/tpm-passthrough-crb.x86_64-latest.args
-+++ b/tests/qemuxml2argvdata/tpm-passthrough-crb.x86_64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-TPM-VM/master-key.aes \
---machine pc-i440fx-2.12,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc-i440fx-2.12,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu qemu64 \
- -m 2048 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/tpm-passthrough.x86_64-latest.args b/tests/qemuxml2argvdata/tpm-passthrough.x86_64-latest.args
-index 60edf86dbd..9b17deec9b 100644
---- a/tests/qemuxml2argvdata/tpm-passthrough.x86_64-latest.args
-+++ b/tests/qemuxml2argvdata/tpm-passthrough.x86_64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-TPM-VM/master-key.aes \
---machine pc-i440fx-2.12,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc-i440fx-2.12,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu qemu64 \
- -m 2048 \
- -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 53dab283cc..d2f56b591c 100644
---- a/tests/qemuxml2argvdata/tseg-explicit-size.x86_64-latest.args
-+++ b/tests/qemuxml2argvdata/tseg-explicit-size.x86_64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc-q35-2.10,accel=tcg,usb=off,smm=on,dump-guest-core=off \
-+-machine pc-q35-2.10,usb=off,smm=on,dump-guest-core=off \
-+-accel tcg \
- -global mch.extended-tseg-mbytes=48 \
- -cpu qemu64 \
- -m 214 \
-diff --git a/tests/qemuxml2argvdata/usb-controller-default-q35.args b/tests/qemuxml2argvdata/usb-controller-default-q35.args
-index 9b4f99c042..192feedb6a 100644
---- a/tests/qemuxml2argvdata/usb-controller-default-q35.args
-+++ b/tests/qemuxml2argvdata/usb-controller-default-q35.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name q35-test \
- -S \
---machine q35,accel=tcg,usb=off,dump-guest-core=off \
-+-machine q35,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 2048 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/usb-controller-explicit-q35.args b/tests/qemuxml2argvdata/usb-controller-explicit-q35.args
-index ef7a60a7d6..eb86c4aa86 100644
---- a/tests/qemuxml2argvdata/usb-controller-explicit-q35.args
-+++ b/tests/qemuxml2argvdata/usb-controller-explicit-q35.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name q35-test \
- -S \
---machine q35,accel=tcg,usb=off,dump-guest-core=off \
-+-machine q35,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 2048 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/usb-controller-qemu-xhci.args b/tests/qemuxml2argvdata/usb-controller-qemu-xhci.args
-index d93bd4f1ad..b87275f9bb 100644
---- a/tests/qemuxml2argvdata/usb-controller-qemu-xhci.args
-+++ b/tests/qemuxml2argvdata/usb-controller-qemu-xhci.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/usb-controller-xhci.args b/tests/qemuxml2argvdata/usb-controller-xhci.args
-index a23d0c4710..0a8ac4f8bc 100644
---- a/tests/qemuxml2argvdata/usb-controller-xhci.args
-+++ b/tests/qemuxml2argvdata/usb-controller-xhci.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/usb-controller.args b/tests/qemuxml2argvdata/usb-controller.args
-index 4aa1388409..94f63a270e 100644
---- a/tests/qemuxml2argvdata/usb-controller.args
-+++ b/tests/qemuxml2argvdata/usb-controller.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.args b/tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.args
-index b944dcb78e..2877a247c3 100644
---- a/tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.args
-+++ b/tests/qemuxml2argvdata/usb-hub-autoadd-deluxe.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/usb-hub-autoadd.args b/tests/qemuxml2argvdata/usb-hub-autoadd.args
-index fbfc88bede..6328ed3835 100644
---- a/tests/qemuxml2argvdata/usb-hub-autoadd.args
-+++ b/tests/qemuxml2argvdata/usb-hub-autoadd.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/usb-hub.args b/tests/qemuxml2argvdata/usb-hub.args
-index 24b5217455..f3aa614565 100644
---- a/tests/qemuxml2argvdata/usb-hub.args
-+++ b/tests/qemuxml2argvdata/usb-hub.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/usb-ich9-autoassign.args b/tests/qemuxml2argvdata/usb-ich9-autoassign.args
-index dee4c843be..7c09765a6a 100644
---- a/tests/qemuxml2argvdata/usb-ich9-autoassign.args
-+++ b/tests/qemuxml2argvdata/usb-ich9-autoassign.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/usb-ich9-companion.args b/tests/qemuxml2argvdata/usb-ich9-companion.args
-index b1f2478e72..b625b0937e 100644
---- a/tests/qemuxml2argvdata/usb-ich9-companion.args
-+++ b/tests/qemuxml2argvdata/usb-ich9-companion.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/usb-ich9-ehci-addr.args b/tests/qemuxml2argvdata/usb-ich9-ehci-addr.args
-index a2c46c00f7..a8470ed394 100644
---- a/tests/qemuxml2argvdata/usb-ich9-ehci-addr.args
-+++ b/tests/qemuxml2argvdata/usb-ich9-ehci-addr.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/usb-long-port-path.args b/tests/qemuxml2argvdata/usb-long-port-path.args
-index caddab712d..fe3c7cdd68 100644
---- a/tests/qemuxml2argvdata/usb-long-port-path.args
-+++ b/tests/qemuxml2argvdata/usb-long-port-path.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/usb-none.args b/tests/qemuxml2argvdata/usb-none.args
-index a3a01b7e74..471abf3a9b 100644
---- a/tests/qemuxml2argvdata/usb-none.args
-+++ b/tests/qemuxml2argvdata/usb-none.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/usb-piix3-controller.args b/tests/qemuxml2argvdata/usb-piix3-controller.args
-index 6000e89bbf..59a985969b 100644
---- a/tests/qemuxml2argvdata/usb-piix3-controller.args
-+++ b/tests/qemuxml2argvdata/usb-piix3-controller.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/usb-port-autoassign.args b/tests/qemuxml2argvdata/usb-port-autoassign.args
-index bd3c573a86..05b814f269 100644
---- a/tests/qemuxml2argvdata/usb-port-autoassign.args
-+++ b/tests/qemuxml2argvdata/usb-port-autoassign.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/usb-port-missing.args b/tests/qemuxml2argvdata/usb-port-missing.args
-index 480968883d..4cf2b358fc 100644
---- a/tests/qemuxml2argvdata/usb-port-missing.args
-+++ b/tests/qemuxml2argvdata/usb-port-missing.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/usb-ports.args b/tests/qemuxml2argvdata/usb-ports.args
-index 5f04bf088d..b2af594919 100644
---- a/tests/qemuxml2argvdata/usb-ports.args
-+++ b/tests/qemuxml2argvdata/usb-ports.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/usb-redir-boot.args b/tests/qemuxml2argvdata/usb-redir-boot.args
-index 9f6b49310d..ea22cb685d 100644
---- a/tests/qemuxml2argvdata/usb-redir-boot.args
-+++ b/tests/qemuxml2argvdata/usb-redir-boot.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/usb-redir-filter-version.args b/tests/qemuxml2argvdata/usb-redir-filter-version.args
-index 89dcbfaaa1..af09b4e9d2 100644
---- a/tests/qemuxml2argvdata/usb-redir-filter-version.args
-+++ b/tests/qemuxml2argvdata/usb-redir-filter-version.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/usb-redir-filter.args b/tests/qemuxml2argvdata/usb-redir-filter.args
-index d801505f98..96bfdd814c 100644
---- a/tests/qemuxml2argvdata/usb-redir-filter.args
-+++ b/tests/qemuxml2argvdata/usb-redir-filter.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/usb-redir-unix.x86_64-2.5.0.args b/tests/qemuxml2argvdata/usb-redir-unix.x86_64-2.5.0.args
-index a8a90a81cb..0b1f851f4e 100644
---- a/tests/qemuxml2argvdata/usb-redir-unix.x86_64-2.5.0.args
-+++ b/tests/qemuxml2argvdata/usb-redir-unix.x86_64-2.5.0.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name guest=QEMUGuest1,debug-threads=on \
- -S \
---machine pc-i440fx-2.5,accel=kvm,usb=off,dump-guest-core=off \
-+-machine pc-i440fx-2.5,usb=off,dump-guest-core=off \
-+-accel kvm \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/usb-redir-unix.x86_64-latest.args b/tests/qemuxml2argvdata/usb-redir-unix.x86_64-latest.args
-index d6abba6817..c95510a1f9 100644
---- a/tests/qemuxml2argvdata/usb-redir-unix.x86_64-latest.args
-+++ b/tests/qemuxml2argvdata/usb-redir-unix.x86_64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc,accel=kvm,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel kvm \
- -cpu qemu64 \
- -m 214 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/usb-redir.args b/tests/qemuxml2argvdata/usb-redir.args
-index d4f1e0dd0e..3685ab5828 100644
---- a/tests/qemuxml2argvdata/usb-redir.args
-+++ b/tests/qemuxml2argvdata/usb-redir.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/usb-xhci-autoassign.args b/tests/qemuxml2argvdata/usb-xhci-autoassign.args
-index d68ff5f90f..498f0fd5fa 100644
---- a/tests/qemuxml2argvdata/usb-xhci-autoassign.args
-+++ b/tests/qemuxml2argvdata/usb-xhci-autoassign.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/usb1-usb2.args b/tests/qemuxml2argvdata/usb1-usb2.args
-index 9098cc6d9a..92d3246aaf 100644
---- a/tests/qemuxml2argvdata/usb1-usb2.args
-+++ b/tests/qemuxml2argvdata/usb1-usb2.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/user-aliases-usb.args b/tests/qemuxml2argvdata/user-aliases-usb.args
-index abaf54cef3..60b67814f5 100644
---- a/tests/qemuxml2argvdata/user-aliases-usb.args
-+++ b/tests/qemuxml2argvdata/user-aliases-usb.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name gentoo \
- -S \
---machine pc-i440fx-1.4,accel=kvm,usb=off,dump-guest-core=off \
-+-machine pc-i440fx-1.4,usb=off,dump-guest-core=off \
-+-accel kvm \
- -m 4096 \
- -realtime mlock=off \
- -smp 4,sockets=4,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/user-aliases.args b/tests/qemuxml2argvdata/user-aliases.args
-index 88e540bc3c..10d937f553 100644
---- a/tests/qemuxml2argvdata/user-aliases.args
-+++ b/tests/qemuxml2argvdata/user-aliases.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-gentoo/master-key.aes \
---machine pc-i440fx-1.4,accel=kvm,usb=off,dump-guest-core=off \
-+-machine pc-i440fx-1.4,usb=off,dump-guest-core=off \
-+-accel kvm \
- -m 4096 \
- -realtime mlock=off \
- -smp 4,sockets=4,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/vcpu-placement-static.args b/tests/qemuxml2argvdata/vcpu-placement-static.args
-index 7ceb679646..27e0d337a1 100644
---- a/tests/qemuxml2argvdata/vcpu-placement-static.args
-+++ b/tests/qemuxml2argvdata/vcpu-placement-static.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name dummy2 \
- -S \
---machine pc-q35-2.3,accel=kvm,usb=off,dump-guest-core=off \
-+-machine pc-q35-2.3,usb=off,dump-guest-core=off \
-+-accel kvm \
- -m 128 \
- -realtime mlock=off \
- -smp 2,maxcpus=6,sockets=6,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/vhost-user-fs-fd-memory.x86_64-latest.args b/tests/qemuxml2argvdata/vhost-user-fs-fd-memory.x86_64-latest.args
-index a7df45a7f0..e24c2ae46c 100644
---- a/tests/qemuxml2argvdata/vhost-user-fs-fd-memory.x86_64-latest.args
-+++ b/tests/qemuxml2argvdata/vhost-user-fs-fd-memory.x86_64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-guest/master-key.aes \
---machine pc,accel=kvm,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel kvm \
- -cpu qemu64 \
- -m 14336 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/vhost-user-fs-hugepages.x86_64-latest.args b/tests/qemuxml2argvdata/vhost-user-fs-hugepages.x86_64-latest.args
-index 39190b8d3e..9d52e96785 100644
---- a/tests/qemuxml2argvdata/vhost-user-fs-hugepages.x86_64-latest.args
-+++ b/tests/qemuxml2argvdata/vhost-user-fs-hugepages.x86_64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-guest/master-key.aes \
---machine q35,accel=tcg,usb=off,dump-guest-core=off \
-+-machine q35,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu qemu64 \
- -m 2048 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/vhost-user-gpu-secondary.x86_64-latest.args b/tests/qemuxml2argvdata/vhost-user-gpu-secondary.x86_64-latest.args
-index e99a5342dc..d758318421 100644
---- a/tests/qemuxml2argvdata/vhost-user-gpu-secondary.x86_64-latest.args
-+++ b/tests/qemuxml2argvdata/vhost-user-gpu-secondary.x86_64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu qemu64 \
- -m 214 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/vhost-user-vga.x86_64-latest.args b/tests/qemuxml2argvdata/vhost-user-vga.x86_64-latest.args
-index 277bf8c646..f39b9004ae 100644
---- a/tests/qemuxml2argvdata/vhost-user-vga.x86_64-latest.args
-+++ b/tests/qemuxml2argvdata/vhost-user-vga.x86_64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu qemu64 \
- -m 214 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/vhost-vsock-auto.x86_64-latest.args b/tests/qemuxml2argvdata/vhost-vsock-auto.x86_64-latest.args
-index e083b872c5..cda34fafb7 100644
---- a/tests/qemuxml2argvdata/vhost-vsock-auto.x86_64-latest.args
-+++ b/tests/qemuxml2argvdata/vhost-vsock-auto.x86_64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-test/master-key.aes \
---machine pc-i440fx-2.9,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc-i440fx-2.9,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu qemu64 \
- -m 1024 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/vhost-vsock-ccw-auto.s390x-latest.args b/tests/qemuxml2argvdata/vhost-vsock-ccw-auto.s390x-latest.args
-index 17b5ded6b8..4d60936a26 100644
---- a/tests/qemuxml2argvdata/vhost-vsock-ccw-auto.s390x-latest.args
-+++ b/tests/qemuxml2argvdata/vhost-vsock-ccw-auto.s390x-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off \
-+-machine s390-ccw-virtio,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu qemu \
- -m 214 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/vhost-vsock-ccw.s390x-latest.args b/tests/qemuxml2argvdata/vhost-vsock-ccw.s390x-latest.args
-index 81a6b8cb42..4a847f91c2 100644
---- a/tests/qemuxml2argvdata/vhost-vsock-ccw.s390x-latest.args
-+++ b/tests/qemuxml2argvdata/vhost-vsock-ccw.s390x-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off \
-+-machine s390-ccw-virtio,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu qemu \
- -m 214 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/vhost-vsock.x86_64-latest.args b/tests/qemuxml2argvdata/vhost-vsock.x86_64-latest.args
-index 8b3538a56a..a231af44b2 100644
---- a/tests/qemuxml2argvdata/vhost-vsock.x86_64-latest.args
-+++ b/tests/qemuxml2argvdata/vhost-vsock.x86_64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-test/master-key.aes \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu qemu64 \
- -m 1024 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/video-bochs-display-device.x86_64-latest.args b/tests/qemuxml2argvdata/video-bochs-display-device.x86_64-latest.args
-index b7fef1fe08..0837e6322b 100644
---- a/tests/qemuxml2argvdata/video-bochs-display-device.x86_64-latest.args
-+++ b/tests/qemuxml2argvdata/video-bochs-display-device.x86_64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu qemu64 \
- -m 1024 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/video-device-pciaddr-default.args b/tests/qemuxml2argvdata/video-device-pciaddr-default.args
-index 4ffc2295d0..01c7158d6e 100644
---- a/tests/qemuxml2argvdata/video-device-pciaddr-default.args
-+++ b/tests/qemuxml2argvdata/video-device-pciaddr-default.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=kvm,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel kvm \
- -m 1024 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/video-none-device.args b/tests/qemuxml2argvdata/video-none-device.args
-index 193ff21414..f8f5205895 100644
---- a/tests/qemuxml2argvdata/video-none-device.args
-+++ b/tests/qemuxml2argvdata/video-none-device.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/video-qxl-device-vgamem.args b/tests/qemuxml2argvdata/video-qxl-device-vgamem.args
-index aef42cc1c8..4208aed8b2 100644
---- a/tests/qemuxml2argvdata/video-qxl-device-vgamem.args
-+++ b/tests/qemuxml2argvdata/video-qxl-device-vgamem.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 1024 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/video-qxl-device-vram64.x86_64-latest.args b/tests/qemuxml2argvdata/video-qxl-device-vram64.x86_64-latest.args
-index f12cef8549..03342d7cd0 100644
---- a/tests/qemuxml2argvdata/video-qxl-device-vram64.x86_64-latest.args
-+++ b/tests/qemuxml2argvdata/video-qxl-device-vram64.x86_64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu qemu64 \
- -m 1024 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/video-qxl-device.args b/tests/qemuxml2argvdata/video-qxl-device.args
-index 575a6d4cfd..a59b886550 100644
---- a/tests/qemuxml2argvdata/video-qxl-device.args
-+++ b/tests/qemuxml2argvdata/video-qxl-device.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 1024 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/video-qxl-heads.args b/tests/qemuxml2argvdata/video-qxl-heads.args
-index 74cab50ba5..b68698579d 100644
---- a/tests/qemuxml2argvdata/video-qxl-heads.args
-+++ b/tests/qemuxml2argvdata/video-qxl-heads.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/video-qxl-nodevice.args b/tests/qemuxml2argvdata/video-qxl-nodevice.args
-index 830b5f9c3e..e3a117cb91 100644
---- a/tests/qemuxml2argvdata/video-qxl-nodevice.args
-+++ b/tests/qemuxml2argvdata/video-qxl-nodevice.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 1024 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/video-qxl-noheads.args b/tests/qemuxml2argvdata/video-qxl-noheads.args
-index 8c38697fe7..15f032c9ec 100644
---- a/tests/qemuxml2argvdata/video-qxl-noheads.args
-+++ b/tests/qemuxml2argvdata/video-qxl-noheads.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/video-qxl-resolution.args b/tests/qemuxml2argvdata/video-qxl-resolution.args
-index 1fdaf7e02e..8031eebac9 100644
---- a/tests/qemuxml2argvdata/video-qxl-resolution.args
-+++ b/tests/qemuxml2argvdata/video-qxl-resolution.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.args b/tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.args
-index 3c47329c8d..d6b7270bd6 100644
---- a/tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.args
-+++ b/tests/qemuxml2argvdata/video-qxl-sec-device-vgamem.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 1024 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/video-qxl-sec-device-vram64.x86_64-latest.args b/tests/qemuxml2argvdata/video-qxl-sec-device-vram64.x86_64-latest.args
-index d651b69902..f701f9f1a8 100644
---- a/tests/qemuxml2argvdata/video-qxl-sec-device-vram64.x86_64-latest.args
-+++ b/tests/qemuxml2argvdata/video-qxl-sec-device-vram64.x86_64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu qemu64 \
- -m 1024 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/video-qxl-sec-device.args b/tests/qemuxml2argvdata/video-qxl-sec-device.args
-index 6fb728658a..c4a04d900e 100644
---- a/tests/qemuxml2argvdata/video-qxl-sec-device.args
-+++ b/tests/qemuxml2argvdata/video-qxl-sec-device.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 1024 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/video-ramfb-display-device.x86_64-latest.args b/tests/qemuxml2argvdata/video-ramfb-display-device.x86_64-latest.args
-index 6fe792f46d..1fc280f9a8 100644
---- a/tests/qemuxml2argvdata/video-ramfb-display-device.x86_64-latest.args
-+++ b/tests/qemuxml2argvdata/video-ramfb-display-device.x86_64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu qemu64 \
- -m 1024 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/video-vga-device-vgamem.args b/tests/qemuxml2argvdata/video-vga-device-vgamem.args
-index c267f4bf67..5056cbacb1 100644
---- a/tests/qemuxml2argvdata/video-vga-device-vgamem.args
-+++ b/tests/qemuxml2argvdata/video-vga-device-vgamem.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 1024 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/video-vga-device.args b/tests/qemuxml2argvdata/video-vga-device.args
-index 132d67ed89..d1ef8d0656 100644
---- a/tests/qemuxml2argvdata/video-vga-device.args
-+++ b/tests/qemuxml2argvdata/video-vga-device.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 1024 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/video-vga-nodevice.args b/tests/qemuxml2argvdata/video-vga-nodevice.args
-index cf21cafcef..91e3341727 100644
---- a/tests/qemuxml2argvdata/video-vga-nodevice.args
-+++ b/tests/qemuxml2argvdata/video-vga-nodevice.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 1024 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/video-vga-qxl-heads.args b/tests/qemuxml2argvdata/video-vga-qxl-heads.args
-index 154bc1c2b7..13c76aafdc 100644
---- a/tests/qemuxml2argvdata/video-vga-qxl-heads.args
-+++ b/tests/qemuxml2argvdata/video-vga-qxl-heads.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-ccw.args b/tests/qemuxml2argvdata/video-virtio-gpu-ccw.args
-index 45c7701ac1..c6b4a0edb3 100644
---- a/tests/qemuxml2argvdata/video-virtio-gpu-ccw.args
-+++ b/tests/qemuxml2argvdata/video-virtio-gpu-ccw.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-s390x \
- -name QEMUGuest1 \
- -S \
---machine s390-ccw-virtio,accel=tcg,usb=off,dump-guest-core=off \
-+-machine s390-ccw-virtio,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-device.args b/tests/qemuxml2argvdata/video-virtio-gpu-device.args
-index 050d989bad..5591c893c4 100644
---- a/tests/qemuxml2argvdata/video-virtio-gpu-device.args
-+++ b/tests/qemuxml2argvdata/video-virtio-gpu-device.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 1024 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.args b/tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.args
-index 7a5df40546..ab8bbf5487 100644
---- a/tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.args
-+++ b/tests/qemuxml2argvdata/video-virtio-gpu-sdl-gl.args
-@@ -9,7 +9,8 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 1024 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-secondary.args b/tests/qemuxml2argvdata/video-virtio-gpu-secondary.args
-index 860eaf0e6b..a011f4495e 100644
---- a/tests/qemuxml2argvdata/video-virtio-gpu-secondary.args
-+++ b/tests/qemuxml2argvdata/video-virtio-gpu-secondary.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 1024 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.args b/tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.args
-index 8852351ef0..229acadcd1 100644
---- a/tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.args
-+++ b/tests/qemuxml2argvdata/video-virtio-gpu-spice-gl.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=spice \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 1024 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/video-virtio-gpu-virgl.args b/tests/qemuxml2argvdata/video-virtio-gpu-virgl.args
-index 42760eba60..87252656b3 100644
---- a/tests/qemuxml2argvdata/video-virtio-gpu-virgl.args
-+++ b/tests/qemuxml2argvdata/video-virtio-gpu-virgl.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 1024 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/video-virtio-vga.args b/tests/qemuxml2argvdata/video-virtio-vga.args
-index cb87552342..e8d8595525 100644
---- a/tests/qemuxml2argvdata/video-virtio-vga.args
-+++ b/tests/qemuxml2argvdata/video-virtio-vga.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 1024 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/virtio-input-passthrough.args b/tests/qemuxml2argvdata/virtio-input-passthrough.args
-index d26952c181..f221c8d4d1 100644
---- a/tests/qemuxml2argvdata/virtio-input-passthrough.args
-+++ b/tests/qemuxml2argvdata/virtio-input-passthrough.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/virtio-input.args b/tests/qemuxml2argvdata/virtio-input.args
-index c89997af6b..6a612f17cd 100644
---- a/tests/qemuxml2argvdata/virtio-input.args
-+++ b/tests/qemuxml2argvdata/virtio-input.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/virtio-lun.args b/tests/qemuxml2argvdata/virtio-lun.args
-index 7df1512b9b..813a8d312a 100644
---- a/tests/qemuxml2argvdata/virtio-lun.args
-+++ b/tests/qemuxml2argvdata/virtio-lun.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name test \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 1024 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-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
-index 82a977b731..d2bbac8e2e 100644
---- a/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-3.1.0.args
-+++ b/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-3.1.0.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc-q35-3.1,accel=tcg,usb=off,dump-guest-core=off \
-+-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 \
-diff --git a/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-latest.args
-index 0d751ea7ae..726720311e 100644
---- a/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-latest.args
-+++ b/tests/qemuxml2argvdata/virtio-non-transitional.x86_64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine q35,accel=tcg,usb=off,dump-guest-core=off \
-+-machine q35,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu qemu64 \
- -m 214 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/virtio-options.args b/tests/qemuxml2argvdata/virtio-options.args
-index 33ecd8f4e8..e5b74600b3 100644
---- a/tests/qemuxml2argvdata/virtio-options.args
-+++ b/tests/qemuxml2argvdata/virtio-options.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/virtio-rng-builtin.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-rng-builtin.x86_64-latest.args
-index fe01d661e0..a13907b94c 100644
---- a/tests/qemuxml2argvdata/virtio-rng-builtin.x86_64-latest.args
-+++ b/tests/qemuxml2argvdata/virtio-rng-builtin.x86_64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc,accel=kvm,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel kvm \
- -cpu qemu64 \
- -m 214 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/virtio-rng-ccw.args b/tests/qemuxml2argvdata/virtio-rng-ccw.args
-index 31e8b8ab31..8b03b0de77 100644
---- a/tests/qemuxml2argvdata/virtio-rng-ccw.args
-+++ b/tests/qemuxml2argvdata/virtio-rng-ccw.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-s390x \
- -name QEMUGuest1 \
- -S \
---machine s390-ccw,accel=tcg,usb=off,dump-guest-core=off \
-+-machine s390-ccw,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/virtio-rng-default.args b/tests/qemuxml2argvdata/virtio-rng-default.args
-index c21e0176e2..afbb59fab2 100644
---- a/tests/qemuxml2argvdata/virtio-rng-default.args
-+++ b/tests/qemuxml2argvdata/virtio-rng-default.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/virtio-rng-egd-unix.x86_64-2.5.0.args b/tests/qemuxml2argvdata/virtio-rng-egd-unix.x86_64-2.5.0.args
-index 842d18de6c..d266bc9529 100644
---- a/tests/qemuxml2argvdata/virtio-rng-egd-unix.x86_64-2.5.0.args
-+++ b/tests/qemuxml2argvdata/virtio-rng-egd-unix.x86_64-2.5.0.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name guest=QEMUGuest1,debug-threads=on \
- -S \
---machine pc-i440fx-2.5,accel=kvm,usb=off,dump-guest-core=off \
-+-machine pc-i440fx-2.5,usb=off,dump-guest-core=off \
-+-accel kvm \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/virtio-rng-egd-unix.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-rng-egd-unix.x86_64-latest.args
-index 37fb988b75..59055b384e 100644
---- a/tests/qemuxml2argvdata/virtio-rng-egd-unix.x86_64-latest.args
-+++ b/tests/qemuxml2argvdata/virtio-rng-egd-unix.x86_64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc,accel=kvm,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel kvm \
- -cpu qemu64 \
- -m 214 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/virtio-rng-egd.args b/tests/qemuxml2argvdata/virtio-rng-egd.args
-index b07549c4ec..23021833eb 100644
---- a/tests/qemuxml2argvdata/virtio-rng-egd.args
-+++ b/tests/qemuxml2argvdata/virtio-rng-egd.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/virtio-rng-multiple.args b/tests/qemuxml2argvdata/virtio-rng-multiple.args
-index c70eba02ed..e5781855f0 100644
---- a/tests/qemuxml2argvdata/virtio-rng-multiple.args
-+++ b/tests/qemuxml2argvdata/virtio-rng-multiple.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/virtio-rng-random.args b/tests/qemuxml2argvdata/virtio-rng-random.args
-index dbe014849d..a05a2a665d 100644
---- a/tests/qemuxml2argvdata/virtio-rng-random.args
-+++ b/tests/qemuxml2argvdata/virtio-rng-random.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/virtio-transitional.x86_64-3.1.0.args b/tests/qemuxml2argvdata/virtio-transitional.x86_64-3.1.0.args
-index ed810d5890..16125995f5 100644
---- a/tests/qemuxml2argvdata/virtio-transitional.x86_64-3.1.0.args
-+++ b/tests/qemuxml2argvdata/virtio-transitional.x86_64-3.1.0.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc-q35-3.1,accel=tcg,usb=off,dump-guest-core=off \
-+-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 \
-diff --git a/tests/qemuxml2argvdata/virtio-transitional.x86_64-latest.args b/tests/qemuxml2argvdata/virtio-transitional.x86_64-latest.args
-index 0bd0da05d0..bfbce56426 100644
---- a/tests/qemuxml2argvdata/virtio-transitional.x86_64-latest.args
-+++ b/tests/qemuxml2argvdata/virtio-transitional.x86_64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine q35,accel=tcg,usb=off,dump-guest-core=off \
-+-machine q35,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu qemu64 \
- -m 214 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/vmcoreinfo.args b/tests/qemuxml2argvdata/vmcoreinfo.args
-index e4b1bbeb5f..bb711a41fc 100644
---- a/tests/qemuxml2argvdata/vmcoreinfo.args
-+++ b/tests/qemuxml2argvdata/vmcoreinfo.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/watchdog-device.args b/tests/qemuxml2argvdata/watchdog-device.args
-index 5e5e33db7a..df6692006d 100644
---- a/tests/qemuxml2argvdata/watchdog-device.args
-+++ b/tests/qemuxml2argvdata/watchdog-device.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/watchdog-diag288.args b/tests/qemuxml2argvdata/watchdog-diag288.args
-index 0790e7d937..5db373d13e 100644
---- a/tests/qemuxml2argvdata/watchdog-diag288.args
-+++ b/tests/qemuxml2argvdata/watchdog-diag288.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-s390x \
- -name QEMUGuest1 \
- -S \
---machine s390-virtio,accel=tcg,usb=off,dump-guest-core=off \
-+-machine s390-virtio,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/watchdog-dump.args b/tests/qemuxml2argvdata/watchdog-dump.args
-index 9d69a49c73..ebd3f4b9b3 100644
---- a/tests/qemuxml2argvdata/watchdog-dump.args
-+++ b/tests/qemuxml2argvdata/watchdog-dump.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/watchdog-injectnmi.args b/tests/qemuxml2argvdata/watchdog-injectnmi.args
-index 9109a713e0..2f934aa868 100644
---- a/tests/qemuxml2argvdata/watchdog-injectnmi.args
-+++ b/tests/qemuxml2argvdata/watchdog-injectnmi.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/watchdog.args b/tests/qemuxml2argvdata/watchdog.args
-index bfd901929c..b7b3b971f9 100644
---- a/tests/qemuxml2argvdata/watchdog.args
-+++ b/tests/qemuxml2argvdata/watchdog.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-i386 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/x86-kvm-32-on-64.args b/tests/qemuxml2argvdata/x86-kvm-32-on-64.args
-index 871ac6f069..f078c45efb 100644
---- a/tests/qemuxml2argvdata/x86-kvm-32-on-64.args
-+++ b/tests/qemuxml2argvdata/x86-kvm-32-on-64.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name kvm \
- -S \
---machine pc,accel=kvm,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel kvm \
- -cpu qemu32 \
- -m 4096 \
- -realtime mlock=off \
-diff --git a/tests/qemuxml2argvdata/x86_64-default-cpu-kvm-pc-4.2.x86_64-latest.args b/tests/qemuxml2argvdata/x86_64-default-cpu-kvm-pc-4.2.x86_64-latest.args
-index 74715f9517..09d326d14a 100644
---- a/tests/qemuxml2argvdata/x86_64-default-cpu-kvm-pc-4.2.x86_64-latest.args
-+++ b/tests/qemuxml2argvdata/x86_64-default-cpu-kvm-pc-4.2.x86_64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-guest/master-key.aes \
---machine pc-i440fx-4.2,accel=kvm,usb=off,dump-guest-core=off \
-+-machine pc-i440fx-4.2,usb=off,dump-guest-core=off \
-+-accel kvm \
- -cpu qemu64 \
- -m 4096 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/x86_64-default-cpu-kvm-q35-4.2.x86_64-latest.args b/tests/qemuxml2argvdata/x86_64-default-cpu-kvm-q35-4.2.x86_64-latest.args
-index 145864b896..8ef93cd19f 100644
---- a/tests/qemuxml2argvdata/x86_64-default-cpu-kvm-q35-4.2.x86_64-latest.args
-+++ b/tests/qemuxml2argvdata/x86_64-default-cpu-kvm-q35-4.2.x86_64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-guest/master-key.aes \
---machine pc-q35-4.2,accel=kvm,usb=off,dump-guest-core=off \
-+-machine pc-q35-4.2,usb=off,dump-guest-core=off \
-+-accel kvm \
- -cpu qemu64 \
- -m 4096 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/x86_64-default-cpu-tcg-pc-4.2.x86_64-latest.args b/tests/qemuxml2argvdata/x86_64-default-cpu-tcg-pc-4.2.x86_64-latest.args
-index 21d5b358bc..623b91b28d 100644
---- a/tests/qemuxml2argvdata/x86_64-default-cpu-tcg-pc-4.2.x86_64-latest.args
-+++ b/tests/qemuxml2argvdata/x86_64-default-cpu-tcg-pc-4.2.x86_64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-guest/master-key.aes \
---machine pc-i440fx-4.2,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc-i440fx-4.2,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu qemu64 \
- -m 4096 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/x86_64-default-cpu-tcg-q35-4.2.x86_64-latest.args b/tests/qemuxml2argvdata/x86_64-default-cpu-tcg-q35-4.2.x86_64-latest.args
-index 9afac1778b..5495982da1 100644
---- a/tests/qemuxml2argvdata/x86_64-default-cpu-tcg-q35-4.2.x86_64-latest.args
-+++ b/tests/qemuxml2argvdata/x86_64-default-cpu-tcg-q35-4.2.x86_64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-guest/master-key.aes \
---machine pc-q35-4.2,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc-q35-4.2,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu qemu64 \
- -m 4096 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/x86_64-pc-graphics.x86_64-latest.args b/tests/qemuxml2argvdata/x86_64-pc-graphics.x86_64-latest.args
-index b6c06961d7..bdee3df0d2 100644
---- a/tests/qemuxml2argvdata/x86_64-pc-graphics.x86_64-latest.args
-+++ b/tests/qemuxml2argvdata/x86_64-pc-graphics.x86_64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-guest/master-key.aes \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu qemu64 \
- -m 4096 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/x86_64-pc-headless.x86_64-latest.args b/tests/qemuxml2argvdata/x86_64-pc-headless.x86_64-latest.args
-index 0fa7134198..89e12facc2 100644
---- a/tests/qemuxml2argvdata/x86_64-pc-headless.x86_64-latest.args
-+++ b/tests/qemuxml2argvdata/x86_64-pc-headless.x86_64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-guest/master-key.aes \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu qemu64 \
- -m 4096 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/x86_64-q35-graphics.x86_64-latest.args b/tests/qemuxml2argvdata/x86_64-q35-graphics.x86_64-latest.args
-index 5a6fbe65df..0ba598e58e 100644
---- a/tests/qemuxml2argvdata/x86_64-q35-graphics.x86_64-latest.args
-+++ b/tests/qemuxml2argvdata/x86_64-q35-graphics.x86_64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-guest/master-key.aes \
---machine q35,accel=tcg,usb=off,dump-guest-core=off \
-+-machine q35,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu qemu64 \
- -m 4096 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/x86_64-q35-headless.x86_64-latest.args b/tests/qemuxml2argvdata/x86_64-q35-headless.x86_64-latest.args
-index 8a8728e59c..a4a90ae592 100644
---- a/tests/qemuxml2argvdata/x86_64-q35-headless.x86_64-latest.args
-+++ b/tests/qemuxml2argvdata/x86_64-q35-headless.x86_64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-guest/master-key.aes \
---machine q35,accel=tcg,usb=off,dump-guest-core=off \
-+-machine q35,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu qemu64 \
- -m 4096 \
- -overcommit mem-lock=off \
--- 
-2.27.0
-
diff --git a/qemu-Track-numa-mem-supported-machine-attribute.patch b/qemu-Track-numa-mem-supported-machine-attribute.patch
deleted file mode 100644
index 5ea7c374cea0253b61af25bbf685723ad0f177c9..0000000000000000000000000000000000000000
--- a/qemu-Track-numa-mem-supported-machine-attribute.patch
+++ /dev/null
@@ -1,5669 +0,0 @@
-From 1e4b3c3a1e5777f43cb713c4370deb8ccb4a649b Mon Sep 17 00:00:00 2001
-From: xiaojin Yang <yangxiaojin2@huawei.com>
-Date: Fri, 11 Mar 2022 16:00:35 +0800
-Subject: [PATCH 6/8] qemu: Track numa-mem-supported machine attribute
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-There is 'numa-mem-supported' machine attribute which specifies
-whether '-numa mem=' is supported. Store it in our capabilities
-as it will be used in later commits when building the command
-line.
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-
-Signed-off-by: Xiaojin Yang <yangxiaojin2@huawei.com>
----
- src/qemu/qemu_capabilities.c                  |  41 ++-
- src/qemu/qemu_capabilities.h                  |   3 +
- src/qemu/qemu_capspriv.h                      |   3 +-
- src/qemu/qemu_monitor.h                       |   1 +
- src/qemu/qemu_monitor_json.c                  |  11 +
- .../caps_1.5.3.x86_64.xml                     |  60 ++--
- .../caps_1.6.0.x86_64.xml                     |  68 ++---
- .../caps_1.7.0.x86_64.xml                     |  76 ++---
- .../caps_2.1.1.x86_64.xml                     |  92 +++---
- .../caps_2.10.0.aarch64.xml                   | 204 +++++++-------
- .../caps_2.10.0.ppc64.xml                     |  84 +++---
- .../caps_2.10.0.s390x.xml                     |  28 +-
- .../caps_2.10.0.x86_64.xml                    | 140 +++++-----
- .../caps_2.11.0.s390x.xml                     |  32 +--
- .../caps_2.11.0.x86_64.xml                    | 140 +++++-----
- .../caps_2.12.0.aarch64.xml                   | 228 +++++++--------
- .../caps_2.12.0.ppc64.xml                     | 100 +++----
- .../caps_2.12.0.s390x.xml                     |  36 +--
- .../caps_2.12.0.x86_64.xml                    | 148 +++++-----
- .../caps_2.4.0.x86_64.xml                     | 116 ++++----
- .../caps_2.5.0.x86_64.xml                     | 124 ++++----
- .../caps_2.6.0.aarch64.xml                    | 164 +++++------
- .../qemucapabilitiesdata/caps_2.6.0.ppc64.xml |  60 ++--
- .../caps_2.6.0.x86_64.xml                     | 100 +++----
- .../qemucapabilitiesdata/caps_2.7.0.s390x.xml |  16 +-
- .../caps_2.7.0.x86_64.xml                     | 108 +++----
- .../qemucapabilitiesdata/caps_2.8.0.s390x.xml |  20 +-
- .../caps_2.8.0.x86_64.xml                     | 124 ++++----
- .../qemucapabilitiesdata/caps_2.9.0.ppc64.xml |  80 +++---
- .../qemucapabilitiesdata/caps_2.9.0.s390x.xml |  24 +-
- .../caps_2.9.0.x86_64.xml                     | 132 ++++-----
- .../qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 104 +++----
- .../caps_3.0.0.riscv32.xml                    |  10 +-
- .../caps_3.0.0.riscv64.xml                    |  10 +-
- .../qemucapabilitiesdata/caps_3.0.0.s390x.xml |  40 +--
- .../caps_3.0.0.x86_64.xml                     | 156 +++++------
- .../qemucapabilitiesdata/caps_3.1.0.ppc64.xml | 108 +++----
- .../caps_3.1.0.x86_64.xml                     | 164 +++++------
- .../caps_4.0.0.aarch64.xml                    | 264 +++++++++---------
- .../qemucapabilitiesdata/caps_4.0.0.ppc64.xml | 112 ++++----
- .../caps_4.0.0.riscv32.xml                    |  10 +-
- .../caps_4.0.0.riscv64.xml                    |  10 +-
- .../qemucapabilitiesdata/caps_4.0.0.s390x.xml |  48 ++--
- .../caps_4.0.0.x86_64.xml                     | 164 +++++------
- .../caps_4.1.0.x86_64.xml                     | 176 ++++++------
- .../caps_4.2.0.aarch64.xml                    |  52 ++--
- .../qemucapabilitiesdata/caps_4.2.0.ppc64.xml |  72 ++---
- .../caps_4.2.0.x86_64.xml                     | 184 ++++++------
- .../caps_5.0.0.aarch64.xml                    |  52 ++--
- .../qemucapabilitiesdata/caps_5.0.0.ppc64.xml |  76 ++---
- .../caps_5.0.0.x86_64.xml                     | 176 ++++++------
- tests/testutilsqemu.c                         |   6 +-
- 52 files changed, 2304 insertions(+), 2253 deletions(-)
-
-diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
-index fb7726235d..6013be9d05 100644
---- a/src/qemu/qemu_capabilities.c
-+++ b/src/qemu/qemu_capabilities.c
-@@ -586,6 +586,7 @@ struct _virQEMUCapsMachineType {
-     bool hotplugCpus;
-     bool qemuDefault;
-     char *defaultCPU;
-+    bool numaMemSupported;
- };
- 
- typedef struct _virQEMUCapsHostCPUData virQEMUCapsHostCPUData;
-@@ -1813,6 +1814,7 @@ virQEMUCapsAccelCopyMachineTypes(virQEMUCapsAccelPtr dst,
-         dst->machineTypes[i].maxCpus = src->machineTypes[i].maxCpus;
-         dst->machineTypes[i].hotplugCpus = src->machineTypes[i].hotplugCpus;
-         dst->machineTypes[i].qemuDefault = src->machineTypes[i].qemuDefault;
-+        dst->machineTypes[i].numaMemSupported = src->machineTypes[i].numaMemSupported;
-     }
- }
- 
-@@ -2453,6 +2455,25 @@ virQEMUCapsGetMachineDefaultCPU(virQEMUCapsPtr qemuCaps,
- }
- 
- 
-+bool
-+virQEMUCapsGetMachineNumaMemSupported(virQEMUCapsPtr qemuCaps,
-+                                      virDomainVirtType virtType,
-+                                      const char *name)
-+{
-+    virQEMUCapsAccelPtr accel;
-+    size_t i;
-+
-+    accel = virQEMUCapsGetAccel(qemuCaps, virtType);
-+
-+    for (i = 0; i < accel->nmachineTypes; i++) {
-+        if (STREQ(accel->machineTypes[i].name, name))
-+            return accel->machineTypes[i].numaMemSupported;
-+    }
-+
-+    return false;
-+}
-+
-+
- /**
-  * virQEMUCapsSetGICCapabilities:
-  * @qemuCaps: QEMU capabilities
-@@ -2665,7 +2686,8 @@ virQEMUCapsAddMachine(virQEMUCapsPtr qemuCaps,
-                       const char *defaultCPU,
-                       int maxCpus,
-                       bool hotplugCpus,
--                      bool isDefault)
-+                      bool isDefault,
-+                      bool numaMemSupported)
- {
-     virQEMUCapsAccelPtr accel = virQEMUCapsGetAccel(qemuCaps, virtType);
-     virQEMUCapsMachineTypePtr mach;
-@@ -2684,6 +2706,8 @@ virQEMUCapsAddMachine(virQEMUCapsPtr qemuCaps,
-     mach->hotplugCpus = hotplugCpus;
- 
-     mach->qemuDefault = isDefault;
-+
-+    mach->numaMemSupported = numaMemSupported;
- }
- 
- /**
-@@ -2729,7 +2753,8 @@ virQEMUCapsProbeQMPMachineTypes(virQEMUCapsPtr qemuCaps,
-                               machines[i]->defaultCPU,
-                               machines[i]->maxCpus,
-                               machines[i]->hotplugCpus,
--                              machines[i]->isDefault);
-+                              machines[i]->isDefault,
-+                              machines[i]->numaMemSupported);
- 
-         if (preferredMachine &&
-             (STREQ_NULLABLE(machines[i]->alias, preferredMachine) ||
-@@ -3949,6 +3974,11 @@ virQEMUCapsLoadMachines(virQEMUCapsAccelPtr caps,
-             caps->machineTypes[i].qemuDefault = true;
-         VIR_FREE(str);
- 
-+        str = virXMLPropString(nodes[i], "numaMemSupported");
-+        if (STREQ_NULLABLE(str, "yes"))
-+            caps->machineTypes[i].numaMemSupported = true;
-+        VIR_FREE(str);
-+
-         caps->machineTypes[i].defaultCPU = virXMLPropString(nodes[i], "defaultCPU");
-     }
- 
-@@ -4069,7 +4099,7 @@ virQEMUCapsParseSEVInfo(virQEMUCapsPtr qemuCaps, xmlXPathContextPtr ctxt)
-  *   ...
-  *   <cpu name="pentium3"/>
-  *   ...
-- *   <machine name="pc-1.0" alias="pc" hotplugCpus='yes' maxCpus="4" default="yes"/>
-+ *   <machine name='pc-1.0' alias='pc' hotplugCpus='yes' maxCpus='4' default='yes' numaMemSupported='yes'/>
-  *   ...
-  * </qemuCaps>
-  */
-@@ -4405,6 +4435,8 @@ virQEMUCapsFormatMachines(virQEMUCapsAccelPtr caps,
-             virBufferAddLit(buf, " default='yes'");
-         virBufferEscapeString(buf, " defaultCPU='%s'",
-                               caps->machineTypes[i].defaultCPU);
-+        if (caps->machineTypes[i].numaMemSupported)
-+            virBufferAddLit(buf, " numaMemSupported='yes'");
-         virBufferAddLit(buf, "/>\n");
-     }
- }
-@@ -6108,7 +6140,8 @@ virQEMUCapsStripMachineAliasesForVirtType(virQEMUCapsPtr qemuCaps,
- 
-         if (name) {
-             virQEMUCapsAddMachine(qemuCaps, virtType, name, NULL, mach->defaultCPU,
--                                  mach->maxCpus, mach->hotplugCpus, mach->qemuDefault);
-+                                  mach->maxCpus, mach->hotplugCpus, mach->qemuDefault,
-+                                  mach->numaMemSupported);
-         }
-     }
- }
-diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
-index 0ac92d77c3..5f28006b48 100644
---- a/src/qemu/qemu_capabilities.h
-+++ b/src/qemu/qemu_capabilities.h
-@@ -661,6 +661,9 @@ bool virQEMUCapsGetMachineHotplugCpus(virQEMUCapsPtr qemuCaps,
- const char *virQEMUCapsGetMachineDefaultCPU(virQEMUCapsPtr qemuCaps,
-                                             const char *name,
-                                             virDomainVirtType type);
-+bool virQEMUCapsGetMachineNumaMemSupported(virQEMUCapsPtr qemuCaps,
-+                                           virDomainVirtType virtType,
-+                                           const char *name);
- 
- void virQEMUCapsFilterByMachineType(virQEMUCapsPtr qemuCaps,
-                                     virDomainVirtType virtType,
-diff --git a/src/qemu/qemu_capspriv.h b/src/qemu/qemu_capspriv.h
-index 9c2be24ada..4c053af195 100644
---- a/src/qemu/qemu_capspriv.h
-+++ b/src/qemu/qemu_capspriv.h
-@@ -119,4 +119,5 @@ virQEMUCapsAddMachine(virQEMUCapsPtr qemuCaps,
-                       const char *defaultCPU,
-                       int maxCpus,
-                       bool hotplugCpus,
--                      bool isDefault);
-+                      bool isDefault,
-+                      bool numaMemSupported);
-diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
-index 7a3240f00a..83a33b5b0f 100644
---- a/src/qemu/qemu_monitor.h
-+++ b/src/qemu/qemu_monitor.h
-@@ -1095,6 +1095,7 @@ struct _qemuMonitorMachineInfo {
-     unsigned int maxCpus;
-     bool hotplugCpus;
-     char *defaultCPU;
-+    bool numaMemSupported;
- };
- 
- int qemuMonitorGetMachines(qemuMonitorPtr mon,
-diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
-index c1d92b2009..199b73eafe 100644
---- a/src/qemu/qemu_monitor_json.c
-+++ b/src/qemu/qemu_monitor_json.c
-@@ -5634,6 +5634,17 @@ int qemuMonitorJSONGetMachines(qemuMonitorPtr mon,
- 
-             info->defaultCPU = g_strdup(tmp);
-         }
-+
-+        if (virJSONValueObjectHasKey(child, "numa-mem-supported")) {
-+            if (virJSONValueObjectGetBoolean(child, "numa-mem-supported", &info->numaMemSupported) < 0) {
-+                virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-+                               _("qemu-machines reply has malformed "
-+                                 "'numa-mem-supported' data"));
-+                goto cleanup;
-+            }
-+        } else {
-+            info->numaMemSupported = true;
-+        }
-     }
- 
-     ret = n;
-diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
-index b57cb2ab59..63609dad86 100644
---- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
-+++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
-@@ -114,21 +114,21 @@
-   <cpu type='kvm' name='core2duo'/>
-   <cpu type='kvm' name='phenom'/>
-   <cpu type='kvm' name='qemu64'/>
--  <machine type='kvm' name='pc-i440fx-1.5' alias='pc' maxCpus='255' default='yes'/>
--  <machine type='kvm' name='pc-q35-1.4' maxCpus='255'/>
--  <machine type='kvm' name='pc-q35-1.5' alias='q35' maxCpus='255'/>
--  <machine type='kvm' name='isapc' maxCpus='1'/>
--  <machine type='kvm' name='pc-0.10' maxCpus='255'/>
--  <machine type='kvm' name='pc-0.11' maxCpus='255'/>
--  <machine type='kvm' name='pc-0.12' maxCpus='255'/>
--  <machine type='kvm' name='pc-0.13' maxCpus='255'/>
--  <machine type='kvm' name='pc-0.14' maxCpus='255'/>
--  <machine type='kvm' name='pc-0.15' maxCpus='255'/>
--  <machine type='kvm' name='pc-1.0' maxCpus='255'/>
--  <machine type='kvm' name='pc-1.1' maxCpus='255'/>
--  <machine type='kvm' name='pc-1.2' maxCpus='255'/>
--  <machine type='kvm' name='pc-1.3' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-1.4' maxCpus='255'/>
-+  <machine type='kvm' name='pc-i440fx-1.5' alias='pc' maxCpus='255' default='yes' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-1.4' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-1.5' alias='q35' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='isapc' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-0.10' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-0.11' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-0.12' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-0.13' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-0.14' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-0.15' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-1.0' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-1.1' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-1.2' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-1.3' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-1.4' maxCpus='255' numaMemSupported='yes'/>
-   <cpu type='tcg' name='Opteron_G5'/>
-   <cpu type='tcg' name='Opteron_G4'/>
-   <cpu type='tcg' name='Opteron_G3'/>
-@@ -153,19 +153,19 @@
-   <cpu type='tcg' name='core2duo'/>
-   <cpu type='tcg' name='phenom'/>
-   <cpu type='tcg' name='qemu64'/>
--  <machine type='tcg' name='pc-i440fx-1.5' alias='pc' maxCpus='255' default='yes'/>
--  <machine type='tcg' name='pc-q35-1.4' maxCpus='255'/>
--  <machine type='tcg' name='pc-q35-1.5' alias='q35' maxCpus='255'/>
--  <machine type='tcg' name='isapc' maxCpus='1'/>
--  <machine type='tcg' name='pc-0.10' maxCpus='255'/>
--  <machine type='tcg' name='pc-0.11' maxCpus='255'/>
--  <machine type='tcg' name='pc-0.12' maxCpus='255'/>
--  <machine type='tcg' name='pc-0.13' maxCpus='255'/>
--  <machine type='tcg' name='pc-0.14' maxCpus='255'/>
--  <machine type='tcg' name='pc-0.15' maxCpus='255'/>
--  <machine type='tcg' name='pc-1.0' maxCpus='255'/>
--  <machine type='tcg' name='pc-1.1' maxCpus='255'/>
--  <machine type='tcg' name='pc-1.2' maxCpus='255'/>
--  <machine type='tcg' name='pc-1.3' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-1.4' maxCpus='255'/>
-+  <machine type='tcg' name='pc-i440fx-1.5' alias='pc' maxCpus='255' default='yes' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-1.4' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-1.5' alias='q35' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='isapc' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-0.10' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-0.11' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-0.12' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-0.13' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-0.14' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-0.15' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-1.0' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-1.1' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-1.2' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-1.3' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-1.4' maxCpus='255' numaMemSupported='yes'/>
- </qemuCaps>
-diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
-index 5d0a14a5db..2287e37956 100644
---- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
-+++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
-@@ -119,23 +119,23 @@
-   <cpu type='kvm' name='core2duo'/>
-   <cpu type='kvm' name='phenom'/>
-   <cpu type='kvm' name='qemu64'/>
--  <machine type='kvm' name='pc-i440fx-1.6' alias='pc' maxCpus='255' default='yes'/>
--  <machine type='kvm' name='pc-q35-1.4' maxCpus='255'/>
--  <machine type='kvm' name='pc-q35-1.5' maxCpus='255'/>
--  <machine type='kvm' name='pc-q35-1.6' alias='q35' maxCpus='255'/>
--  <machine type='kvm' name='isapc' maxCpus='1'/>
--  <machine type='kvm' name='pc-0.10' maxCpus='255'/>
--  <machine type='kvm' name='pc-0.11' maxCpus='255'/>
--  <machine type='kvm' name='pc-0.12' maxCpus='255'/>
--  <machine type='kvm' name='pc-0.13' maxCpus='255'/>
--  <machine type='kvm' name='pc-0.14' maxCpus='255'/>
--  <machine type='kvm' name='pc-0.15' maxCpus='255'/>
--  <machine type='kvm' name='pc-1.0' maxCpus='255'/>
--  <machine type='kvm' name='pc-1.1' maxCpus='255'/>
--  <machine type='kvm' name='pc-1.2' maxCpus='255'/>
--  <machine type='kvm' name='pc-1.3' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-1.4' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-1.5' maxCpus='255'/>
-+  <machine type='kvm' name='pc-i440fx-1.6' alias='pc' maxCpus='255' default='yes' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-1.4' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-1.5' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-1.6' alias='q35' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='isapc' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-0.10' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-0.11' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-0.12' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-0.13' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-0.14' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-0.15' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-1.0' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-1.1' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-1.2' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-1.3' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-1.4' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-1.5' maxCpus='255' numaMemSupported='yes'/>
-   <cpu type='tcg' name='Opteron_G5'/>
-   <cpu type='tcg' name='Opteron_G4'/>
-   <cpu type='tcg' name='Opteron_G3'/>
-@@ -160,21 +160,21 @@
-   <cpu type='tcg' name='core2duo'/>
-   <cpu type='tcg' name='phenom'/>
-   <cpu type='tcg' name='qemu64'/>
--  <machine type='tcg' name='pc-i440fx-1.6' alias='pc' maxCpus='255' default='yes'/>
--  <machine type='tcg' name='pc-q35-1.4' maxCpus='255'/>
--  <machine type='tcg' name='pc-q35-1.5' maxCpus='255'/>
--  <machine type='tcg' name='pc-q35-1.6' alias='q35' maxCpus='255'/>
--  <machine type='tcg' name='isapc' maxCpus='1'/>
--  <machine type='tcg' name='pc-0.10' maxCpus='255'/>
--  <machine type='tcg' name='pc-0.11' maxCpus='255'/>
--  <machine type='tcg' name='pc-0.12' maxCpus='255'/>
--  <machine type='tcg' name='pc-0.13' maxCpus='255'/>
--  <machine type='tcg' name='pc-0.14' maxCpus='255'/>
--  <machine type='tcg' name='pc-0.15' maxCpus='255'/>
--  <machine type='tcg' name='pc-1.0' maxCpus='255'/>
--  <machine type='tcg' name='pc-1.1' maxCpus='255'/>
--  <machine type='tcg' name='pc-1.2' maxCpus='255'/>
--  <machine type='tcg' name='pc-1.3' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-1.4' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-1.5' maxCpus='255'/>
-+  <machine type='tcg' name='pc-i440fx-1.6' alias='pc' maxCpus='255' default='yes' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-1.4' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-1.5' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-1.6' alias='q35' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='isapc' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-0.10' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-0.11' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-0.12' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-0.13' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-0.14' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-0.15' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-1.0' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-1.1' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-1.2' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-1.3' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-1.4' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-1.5' maxCpus='255' numaMemSupported='yes'/>
- </qemuCaps>
-diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
-index c196fe5e45..48f9535486 100644
---- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
-+++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
-@@ -121,25 +121,25 @@
-   <cpu type='kvm' name='core2duo'/>
-   <cpu type='kvm' name='phenom'/>
-   <cpu type='kvm' name='qemu64'/>
--  <machine type='kvm' name='pc-i440fx-1.7' alias='pc' maxCpus='255' default='yes'/>
--  <machine type='kvm' name='pc-q35-1.4' maxCpus='255'/>
--  <machine type='kvm' name='pc-q35-1.5' maxCpus='255'/>
--  <machine type='kvm' name='pc-q35-1.6' maxCpus='255'/>
--  <machine type='kvm' name='pc-q35-1.7' alias='q35' maxCpus='255'/>
--  <machine type='kvm' name='isapc' maxCpus='1'/>
--  <machine type='kvm' name='pc-0.10' maxCpus='255'/>
--  <machine type='kvm' name='pc-0.11' maxCpus='255'/>
--  <machine type='kvm' name='pc-0.12' maxCpus='255'/>
--  <machine type='kvm' name='pc-0.13' maxCpus='255'/>
--  <machine type='kvm' name='pc-0.14' maxCpus='255'/>
--  <machine type='kvm' name='pc-0.15' maxCpus='255'/>
--  <machine type='kvm' name='pc-1.0' maxCpus='255'/>
--  <machine type='kvm' name='pc-1.1' maxCpus='255'/>
--  <machine type='kvm' name='pc-1.2' maxCpus='255'/>
--  <machine type='kvm' name='pc-1.3' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-1.4' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-1.5' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-1.6' maxCpus='255'/>
-+  <machine type='kvm' name='pc-i440fx-1.7' alias='pc' maxCpus='255' default='yes' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-1.4' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-1.5' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-1.6' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-1.7' alias='q35' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='isapc' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-0.10' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-0.11' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-0.12' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-0.13' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-0.14' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-0.15' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-1.0' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-1.1' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-1.2' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-1.3' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-1.4' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-1.5' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-1.6' maxCpus='255' numaMemSupported='yes'/>
-   <cpu type='tcg' name='Opteron_G5'/>
-   <cpu type='tcg' name='Opteron_G4'/>
-   <cpu type='tcg' name='Opteron_G3'/>
-@@ -164,23 +164,23 @@
-   <cpu type='tcg' name='core2duo'/>
-   <cpu type='tcg' name='phenom'/>
-   <cpu type='tcg' name='qemu64'/>
--  <machine type='tcg' name='pc-i440fx-1.7' alias='pc' maxCpus='255' default='yes'/>
--  <machine type='tcg' name='pc-q35-1.4' maxCpus='255'/>
--  <machine type='tcg' name='pc-q35-1.5' maxCpus='255'/>
--  <machine type='tcg' name='pc-q35-1.6' maxCpus='255'/>
--  <machine type='tcg' name='pc-q35-1.7' alias='q35' maxCpus='255'/>
--  <machine type='tcg' name='isapc' maxCpus='1'/>
--  <machine type='tcg' name='pc-0.10' maxCpus='255'/>
--  <machine type='tcg' name='pc-0.11' maxCpus='255'/>
--  <machine type='tcg' name='pc-0.12' maxCpus='255'/>
--  <machine type='tcg' name='pc-0.13' maxCpus='255'/>
--  <machine type='tcg' name='pc-0.14' maxCpus='255'/>
--  <machine type='tcg' name='pc-0.15' maxCpus='255'/>
--  <machine type='tcg' name='pc-1.0' maxCpus='255'/>
--  <machine type='tcg' name='pc-1.1' maxCpus='255'/>
--  <machine type='tcg' name='pc-1.2' maxCpus='255'/>
--  <machine type='tcg' name='pc-1.3' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-1.4' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-1.5' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-1.6' maxCpus='255'/>
-+  <machine type='tcg' name='pc-i440fx-1.7' alias='pc' maxCpus='255' default='yes' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-1.4' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-1.5' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-1.6' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-1.7' alias='q35' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='isapc' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-0.10' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-0.11' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-0.12' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-0.13' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-0.14' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-0.15' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-1.0' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-1.1' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-1.2' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-1.3' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-1.4' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-1.5' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-1.6' maxCpus='255' numaMemSupported='yes'/>
- </qemuCaps>
-diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
-index 1edcaa4657..e792506e8c 100644
---- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
-+++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
-@@ -138,29 +138,29 @@
-   <cpu type='kvm' name='core2duo'/>
-   <cpu type='kvm' name='phenom'/>
-   <cpu type='kvm' name='qemu64'/>
--  <machine type='kvm' name='pc-i440fx-2.1' alias='pc' maxCpus='255' default='yes'/>
--  <machine type='kvm' name='pc-1.3' maxCpus='255'/>
--  <machine type='kvm' name='pc-0.12' maxCpus='255'/>
--  <machine type='kvm' name='pc-q35-1.6' maxCpus='255'/>
--  <machine type='kvm' name='pc-q35-1.5' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-1.6' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-1.7' maxCpus='255'/>
--  <machine type='kvm' name='pc-q35-2.1' alias='q35' maxCpus='255'/>
--  <machine type='kvm' name='pc-0.11' maxCpus='255'/>
--  <machine type='kvm' name='pc-0.10' maxCpus='255'/>
--  <machine type='kvm' name='pc-1.2' maxCpus='255'/>
--  <machine type='kvm' name='isapc' maxCpus='1'/>
--  <machine type='kvm' name='pc-q35-1.4' maxCpus='255'/>
--  <machine type='kvm' name='pc-0.15' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-1.5' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-1.4' maxCpus='255'/>
--  <machine type='kvm' name='pc-q35-2.0' maxCpus='255'/>
--  <machine type='kvm' name='pc-0.14' maxCpus='255'/>
--  <machine type='kvm' name='pc-1.1' maxCpus='255'/>
--  <machine type='kvm' name='pc-q35-1.7' maxCpus='255'/>
--  <machine type='kvm' name='pc-1.0' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-2.0' maxCpus='255'/>
--  <machine type='kvm' name='pc-0.13' maxCpus='255'/>
-+  <machine type='kvm' name='pc-i440fx-2.1' alias='pc' maxCpus='255' default='yes' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-1.3' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-0.12' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-1.6' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-1.5' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-1.6' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-1.7' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-2.1' alias='q35' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-0.11' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-0.10' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-1.2' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='isapc' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-1.4' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-0.15' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-1.5' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-1.4' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-2.0' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-0.14' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-1.1' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-1.7' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-1.0' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.0' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-0.13' maxCpus='255' numaMemSupported='yes'/>
-   <cpu type='tcg' name='Opteron_G5'/>
-   <cpu type='tcg' name='Opteron_G4'/>
-   <cpu type='tcg' name='Opteron_G3'/>
-@@ -186,27 +186,27 @@
-   <cpu type='tcg' name='core2duo'/>
-   <cpu type='tcg' name='phenom'/>
-   <cpu type='tcg' name='qemu64'/>
--  <machine type='tcg' name='pc-i440fx-2.1' alias='pc' maxCpus='255' default='yes'/>
--  <machine type='tcg' name='pc-1.3' maxCpus='255'/>
--  <machine type='tcg' name='pc-0.12' maxCpus='255'/>
--  <machine type='tcg' name='pc-q35-1.6' maxCpus='255'/>
--  <machine type='tcg' name='pc-q35-1.5' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-1.6' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-1.7' maxCpus='255'/>
--  <machine type='tcg' name='pc-q35-2.1' alias='q35' maxCpus='255'/>
--  <machine type='tcg' name='pc-0.11' maxCpus='255'/>
--  <machine type='tcg' name='pc-0.10' maxCpus='255'/>
--  <machine type='tcg' name='pc-1.2' maxCpus='255'/>
--  <machine type='tcg' name='isapc' maxCpus='1'/>
--  <machine type='tcg' name='pc-q35-1.4' maxCpus='255'/>
--  <machine type='tcg' name='pc-0.15' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-1.5' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-1.4' maxCpus='255'/>
--  <machine type='tcg' name='pc-q35-2.0' maxCpus='255'/>
--  <machine type='tcg' name='pc-0.14' maxCpus='255'/>
--  <machine type='tcg' name='pc-1.1' maxCpus='255'/>
--  <machine type='tcg' name='pc-q35-1.7' maxCpus='255'/>
--  <machine type='tcg' name='pc-1.0' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-2.0' maxCpus='255'/>
--  <machine type='tcg' name='pc-0.13' maxCpus='255'/>
-+  <machine type='tcg' name='pc-i440fx-2.1' alias='pc' maxCpus='255' default='yes' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-1.3' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-0.12' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-1.6' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-1.5' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-1.6' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-1.7' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-2.1' alias='q35' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-0.11' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-0.10' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-1.2' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='isapc' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-1.4' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-0.15' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-1.5' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-1.4' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-2.0' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-0.14' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-1.1' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-1.7' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-1.0' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.0' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-0.13' maxCpus='255' numaMemSupported='yes'/>
- </qemuCaps>
-diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
-index e253df4077..af2787ed1b 100644
---- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
-+++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
-@@ -179,57 +179,57 @@
-   <cpu type='kvm' name='cortex-r5' typename='cortex-r5-arm-cpu'/>
-   <cpu type='kvm' name='pxa270-a1' typename='pxa270-a1-arm-cpu'/>
-   <cpu type='kvm' name='pxa270' typename='pxa270-arm-cpu'/>
--  <machine type='kvm' name='integratorcp' maxCpus='1'/>
--  <machine type='kvm' name='nuri' maxCpus='2'/>
--  <machine type='kvm' name='mps2-an511' maxCpus='1'/>
--  <machine type='kvm' name='verdex' maxCpus='1'/>
--  <machine type='kvm' name='ast2500-evb' maxCpus='1'/>
--  <machine type='kvm' name='smdkc210' maxCpus='2'/>
--  <machine type='kvm' name='collie' maxCpus='1'/>
--  <machine type='kvm' name='imx25-pdk' maxCpus='1'/>
--  <machine type='kvm' name='spitz' maxCpus='1'/>
--  <machine type='kvm' name='realview-pbx-a9' maxCpus='4'/>
--  <machine type='kvm' name='realview-eb' maxCpus='1'/>
--  <machine type='kvm' name='versatilepb' maxCpus='1'/>
--  <machine type='kvm' name='realview-pb-a8' maxCpus='1'/>
--  <machine type='kvm' name='virt-2.9' maxCpus='255'/>
--  <machine type='kvm' name='musicpal' maxCpus='1'/>
--  <machine type='kvm' name='z2' maxCpus='1'/>
--  <machine type='kvm' name='akita' maxCpus='1'/>
--  <machine type='kvm' name='virt-2.7' maxCpus='255'/>
--  <machine type='kvm' name='kzm' maxCpus='1'/>
--  <machine type='kvm' name='virt-2.8' maxCpus='255'/>
--  <machine type='kvm' name='realview-eb-mpcore' maxCpus='4'/>
--  <machine type='kvm' name='sx1' maxCpus='1'/>
--  <machine type='kvm' name='sx1-v1' maxCpus='1'/>
--  <machine type='kvm' name='virt-2.6' maxCpus='255'/>
--  <machine type='kvm' name='cubieboard' maxCpus='1'/>
--  <machine type='kvm' name='highbank' maxCpus='4'/>
--  <machine type='kvm' name='raspi2' maxCpus='4'/>
--  <machine type='kvm' name='netduino2' maxCpus='1'/>
--  <machine type='kvm' name='terrier' maxCpus='1'/>
--  <machine type='kvm' name='n810' maxCpus='1'/>
--  <machine type='kvm' name='mainstone' maxCpus='1'/>
--  <machine type='kvm' name='palmetto-bmc' maxCpus='1'/>
--  <machine type='kvm' name='sabrelite' maxCpus='4'/>
--  <machine type='kvm' name='midway' maxCpus='4'/>
--  <machine type='kvm' name='romulus-bmc' maxCpus='1'/>
--  <machine type='kvm' name='cheetah' maxCpus='1'/>
--  <machine type='kvm' name='tosa' maxCpus='1'/>
--  <machine type='kvm' name='borzoi' maxCpus='1'/>
--  <machine type='kvm' name='versatileab' maxCpus='1'/>
--  <machine type='kvm' name='lm3s6965evb' maxCpus='1'/>
--  <machine type='kvm' name='n800' maxCpus='1'/>
--  <machine type='kvm' name='virt-2.10' alias='virt' maxCpus='255'/>
--  <machine type='kvm' name='connex' maxCpus='1'/>
--  <machine type='kvm' name='xilinx-zynq-a9' maxCpus='1'/>
--  <machine type='kvm' name='xlnx-ep108' maxCpus='1'/>
--  <machine type='kvm' name='mps2-an385' maxCpus='1'/>
--  <machine type='kvm' name='vexpress-a9' maxCpus='4'/>
--  <machine type='kvm' name='vexpress-a15' maxCpus='4'/>
--  <machine type='kvm' name='xlnx-zcu102' maxCpus='1'/>
--  <machine type='kvm' name='canon-a1100' maxCpus='1'/>
--  <machine type='kvm' name='lm3s811evb' maxCpus='1'/>
-+  <machine type='kvm' name='integratorcp' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='nuri' maxCpus='2' numaMemSupported='yes'/>
-+  <machine type='kvm' name='mps2-an511' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='verdex' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='ast2500-evb' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='smdkc210' maxCpus='2' numaMemSupported='yes'/>
-+  <machine type='kvm' name='collie' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='imx25-pdk' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='spitz' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='realview-pbx-a9' maxCpus='4' numaMemSupported='yes'/>
-+  <machine type='kvm' name='realview-eb' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='versatilepb' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='realview-pb-a8' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='virt-2.9' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='musicpal' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='z2' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='akita' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='virt-2.7' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='kzm' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='virt-2.8' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='realview-eb-mpcore' maxCpus='4' numaMemSupported='yes'/>
-+  <machine type='kvm' name='sx1' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='sx1-v1' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='virt-2.6' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='cubieboard' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='highbank' maxCpus='4' numaMemSupported='yes'/>
-+  <machine type='kvm' name='raspi2' maxCpus='4' numaMemSupported='yes'/>
-+  <machine type='kvm' name='netduino2' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='terrier' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='n810' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='mainstone' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='palmetto-bmc' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='sabrelite' maxCpus='4' numaMemSupported='yes'/>
-+  <machine type='kvm' name='midway' maxCpus='4' numaMemSupported='yes'/>
-+  <machine type='kvm' name='romulus-bmc' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='cheetah' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='tosa' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='borzoi' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='versatileab' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='lm3s6965evb' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='n800' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='virt-2.10' alias='virt' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='connex' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='xilinx-zynq-a9' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='xlnx-ep108' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='mps2-an385' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='vexpress-a9' maxCpus='4' numaMemSupported='yes'/>
-+  <machine type='kvm' name='vexpress-a15' maxCpus='4' numaMemSupported='yes'/>
-+  <machine type='kvm' name='xlnx-zcu102' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='canon-a1100' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='lm3s811evb' maxCpus='1' numaMemSupported='yes'/>
-   <cpu type='tcg' name='pxa262' typename='pxa262-arm-cpu'/>
-   <cpu type='tcg' name='pxa270-a0' typename='pxa270-a0-arm-cpu'/>
-   <cpu type='tcg' name='arm1136' typename='arm1136-arm-cpu'/>
-@@ -261,57 +261,57 @@
-   <cpu type='tcg' name='cortex-r5' typename='cortex-r5-arm-cpu'/>
-   <cpu type='tcg' name='pxa270-a1' typename='pxa270-a1-arm-cpu'/>
-   <cpu type='tcg' name='pxa270' typename='pxa270-arm-cpu'/>
--  <machine type='tcg' name='integratorcp' maxCpus='1'/>
--  <machine type='tcg' name='nuri' maxCpus='2'/>
--  <machine type='tcg' name='mps2-an511' maxCpus='1'/>
--  <machine type='tcg' name='verdex' maxCpus='1'/>
--  <machine type='tcg' name='ast2500-evb' maxCpus='1'/>
--  <machine type='tcg' name='smdkc210' maxCpus='2'/>
--  <machine type='tcg' name='collie' maxCpus='1'/>
--  <machine type='tcg' name='imx25-pdk' maxCpus='1'/>
--  <machine type='tcg' name='spitz' maxCpus='1'/>
--  <machine type='tcg' name='realview-pbx-a9' maxCpus='4'/>
--  <machine type='tcg' name='realview-eb' maxCpus='1'/>
--  <machine type='tcg' name='versatilepb' maxCpus='1'/>
--  <machine type='tcg' name='realview-pb-a8' maxCpus='1'/>
--  <machine type='tcg' name='virt-2.9' maxCpus='255'/>
--  <machine type='tcg' name='musicpal' maxCpus='1'/>
--  <machine type='tcg' name='z2' maxCpus='1'/>
--  <machine type='tcg' name='akita' maxCpus='1'/>
--  <machine type='tcg' name='virt-2.7' maxCpus='255'/>
--  <machine type='tcg' name='kzm' maxCpus='1'/>
--  <machine type='tcg' name='virt-2.8' maxCpus='255'/>
--  <machine type='tcg' name='realview-eb-mpcore' maxCpus='4'/>
--  <machine type='tcg' name='sx1' maxCpus='1'/>
--  <machine type='tcg' name='sx1-v1' maxCpus='1'/>
--  <machine type='tcg' name='virt-2.6' maxCpus='255'/>
--  <machine type='tcg' name='cubieboard' maxCpus='1'/>
--  <machine type='tcg' name='highbank' maxCpus='4'/>
--  <machine type='tcg' name='raspi2' maxCpus='4'/>
--  <machine type='tcg' name='netduino2' maxCpus='1'/>
--  <machine type='tcg' name='terrier' maxCpus='1'/>
--  <machine type='tcg' name='n810' maxCpus='1'/>
--  <machine type='tcg' name='mainstone' maxCpus='1'/>
--  <machine type='tcg' name='palmetto-bmc' maxCpus='1'/>
--  <machine type='tcg' name='sabrelite' maxCpus='4'/>
--  <machine type='tcg' name='midway' maxCpus='4'/>
--  <machine type='tcg' name='romulus-bmc' maxCpus='1'/>
--  <machine type='tcg' name='cheetah' maxCpus='1'/>
--  <machine type='tcg' name='tosa' maxCpus='1'/>
--  <machine type='tcg' name='borzoi' maxCpus='1'/>
--  <machine type='tcg' name='versatileab' maxCpus='1'/>
--  <machine type='tcg' name='lm3s6965evb' maxCpus='1'/>
--  <machine type='tcg' name='n800' maxCpus='1'/>
--  <machine type='tcg' name='virt-2.10' alias='virt' maxCpus='255'/>
--  <machine type='tcg' name='connex' maxCpus='1'/>
--  <machine type='tcg' name='xilinx-zynq-a9' maxCpus='1'/>
--  <machine type='tcg' name='xlnx-ep108' maxCpus='1'/>
--  <machine type='tcg' name='mps2-an385' maxCpus='1'/>
--  <machine type='tcg' name='vexpress-a9' maxCpus='4'/>
--  <machine type='tcg' name='vexpress-a15' maxCpus='4'/>
--  <machine type='tcg' name='xlnx-zcu102' maxCpus='1'/>
--  <machine type='tcg' name='canon-a1100' maxCpus='1'/>
--  <machine type='tcg' name='lm3s811evb' maxCpus='1'/>
-+  <machine type='tcg' name='integratorcp' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='nuri' maxCpus='2' numaMemSupported='yes'/>
-+  <machine type='tcg' name='mps2-an511' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='verdex' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='ast2500-evb' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='smdkc210' maxCpus='2' numaMemSupported='yes'/>
-+  <machine type='tcg' name='collie' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='imx25-pdk' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='spitz' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='realview-pbx-a9' maxCpus='4' numaMemSupported='yes'/>
-+  <machine type='tcg' name='realview-eb' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='versatilepb' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='realview-pb-a8' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='virt-2.9' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='musicpal' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='z2' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='akita' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='virt-2.7' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='kzm' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='virt-2.8' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='realview-eb-mpcore' maxCpus='4' numaMemSupported='yes'/>
-+  <machine type='tcg' name='sx1' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='sx1-v1' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='virt-2.6' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='cubieboard' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='highbank' maxCpus='4' numaMemSupported='yes'/>
-+  <machine type='tcg' name='raspi2' maxCpus='4' numaMemSupported='yes'/>
-+  <machine type='tcg' name='netduino2' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='terrier' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='n810' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='mainstone' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='palmetto-bmc' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='sabrelite' maxCpus='4' numaMemSupported='yes'/>
-+  <machine type='tcg' name='midway' maxCpus='4' numaMemSupported='yes'/>
-+  <machine type='tcg' name='romulus-bmc' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='cheetah' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='tosa' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='borzoi' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='versatileab' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='lm3s6965evb' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='n800' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='virt-2.10' alias='virt' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='connex' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='xilinx-zynq-a9' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='xlnx-ep108' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='mps2-an385' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='vexpress-a9' maxCpus='4' numaMemSupported='yes'/>
-+  <machine type='tcg' name='vexpress-a15' maxCpus='4' numaMemSupported='yes'/>
-+  <machine type='tcg' name='xlnx-zcu102' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='canon-a1100' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='lm3s811evb' maxCpus='1' numaMemSupported='yes'/>
-   <gic version='3' kernel='no' emulated='yes'/>
-   <gic version='2' kernel='yes' emulated='yes'/>
- </qemuCaps>
-diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
-index 8df611353f..7afb2fa2c5 100644
---- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
-+++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
-@@ -581,27 +581,27 @@
-   <cpu type='kvm' name='MPC8544E_v11'/>
-   <cpu type='kvm' name='405GPb'/>
-   <cpu type='kvm' name='MPC8541E_v11'/>
--  <machine type='kvm' name='pseries-2.10' alias='pseries' hotplugCpus='yes' maxCpus='1024' default='yes'/>
--  <machine type='kvm' name='ref405ep' maxCpus='1'/>
--  <machine type='kvm' name='virtex-ml507' maxCpus='1'/>
--  <machine type='kvm' name='powernv' maxCpus='2048'/>
--  <machine type='kvm' name='ppce500' maxCpus='32'/>
--  <machine type='kvm' name='mpc8544ds' maxCpus='15'/>
--  <machine type='kvm' name='bamboo' maxCpus='1'/>
--  <machine type='kvm' name='g3beige' maxCpus='1'/>
--  <machine type='kvm' name='prep' maxCpus='1'/>
--  <machine type='kvm' name='pseries-2.9' hotplugCpus='yes' maxCpus='1024'/>
--  <machine type='kvm' name='mac99' maxCpus='1'/>
--  <machine type='kvm' name='pseries-2.6' maxCpus='1024'/>
--  <machine type='kvm' name='pseries-2.7' hotplugCpus='yes' maxCpus='1024'/>
--  <machine type='kvm' name='pseries-2.8' hotplugCpus='yes' maxCpus='1024'/>
--  <machine type='kvm' name='pseries-2.4' maxCpus='1024'/>
--  <machine type='kvm' name='pseries-2.5' maxCpus='1024'/>
--  <machine type='kvm' name='pseries-2.2' maxCpus='1024'/>
--  <machine type='kvm' name='taihu' maxCpus='1'/>
--  <machine type='kvm' name='pseries-2.3' maxCpus='1024'/>
--  <machine type='kvm' name='pseries-2.1' maxCpus='1024'/>
--  <machine type='kvm' name='40p' maxCpus='1'/>
-+  <machine type='kvm' name='pseries-2.10' alias='pseries' hotplugCpus='yes' maxCpus='1024' default='yes' numaMemSupported='yes'/>
-+  <machine type='kvm' name='ref405ep' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='virtex-ml507' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='powernv' maxCpus='2048' numaMemSupported='yes'/>
-+  <machine type='kvm' name='ppce500' maxCpus='32' numaMemSupported='yes'/>
-+  <machine type='kvm' name='mpc8544ds' maxCpus='15' numaMemSupported='yes'/>
-+  <machine type='kvm' name='bamboo' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='g3beige' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='prep' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pseries-2.9' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='kvm' name='mac99' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pseries-2.6' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pseries-2.7' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pseries-2.8' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pseries-2.4' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pseries-2.5' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pseries-2.2' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='kvm' name='taihu' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pseries-2.3' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pseries-2.1' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='kvm' name='40p' maxCpus='1' numaMemSupported='yes'/>
-   <cpu type='tcg' name='default' typename='604-powerpc64-cpu'/>
-   <cpu type='tcg' name='ppc' typename='604-powerpc64-cpu'/>
-   <cpu type='tcg' name='ppc32' typename='604-powerpc64-cpu'/>
-@@ -1035,25 +1035,25 @@
-   <cpu type='tcg' name='MPC8544E_v11'/>
-   <cpu type='tcg' name='405GPb'/>
-   <cpu type='tcg' name='MPC8541E_v11'/>
--  <machine type='tcg' name='pseries-2.10' alias='pseries' hotplugCpus='yes' maxCpus='1024' default='yes'/>
--  <machine type='tcg' name='ref405ep' maxCpus='1'/>
--  <machine type='tcg' name='virtex-ml507' maxCpus='1'/>
--  <machine type='tcg' name='powernv' maxCpus='2048'/>
--  <machine type='tcg' name='ppce500' maxCpus='32'/>
--  <machine type='tcg' name='mpc8544ds' maxCpus='15'/>
--  <machine type='tcg' name='bamboo' maxCpus='1'/>
--  <machine type='tcg' name='g3beige' maxCpus='1'/>
--  <machine type='tcg' name='prep' maxCpus='1'/>
--  <machine type='tcg' name='pseries-2.9' hotplugCpus='yes' maxCpus='1024'/>
--  <machine type='tcg' name='mac99' maxCpus='1'/>
--  <machine type='tcg' name='pseries-2.6' maxCpus='1024'/>
--  <machine type='tcg' name='pseries-2.7' hotplugCpus='yes' maxCpus='1024'/>
--  <machine type='tcg' name='pseries-2.8' hotplugCpus='yes' maxCpus='1024'/>
--  <machine type='tcg' name='pseries-2.4' maxCpus='1024'/>
--  <machine type='tcg' name='pseries-2.5' maxCpus='1024'/>
--  <machine type='tcg' name='pseries-2.2' maxCpus='1024'/>
--  <machine type='tcg' name='taihu' maxCpus='1'/>
--  <machine type='tcg' name='pseries-2.3' maxCpus='1024'/>
--  <machine type='tcg' name='pseries-2.1' maxCpus='1024'/>
--  <machine type='tcg' name='40p' maxCpus='1'/>
-+  <machine type='tcg' name='pseries-2.10' alias='pseries' hotplugCpus='yes' maxCpus='1024' default='yes' numaMemSupported='yes'/>
-+  <machine type='tcg' name='ref405ep' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='virtex-ml507' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='powernv' maxCpus='2048' numaMemSupported='yes'/>
-+  <machine type='tcg' name='ppce500' maxCpus='32' numaMemSupported='yes'/>
-+  <machine type='tcg' name='mpc8544ds' maxCpus='15' numaMemSupported='yes'/>
-+  <machine type='tcg' name='bamboo' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='g3beige' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='prep' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pseries-2.9' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='tcg' name='mac99' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pseries-2.6' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pseries-2.7' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pseries-2.8' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pseries-2.4' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pseries-2.5' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pseries-2.2' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='tcg' name='taihu' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pseries-2.3' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pseries-2.1' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='tcg' name='40p' maxCpus='1' numaMemSupported='yes'/>
- </qemuCaps>
-diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
-index 27ce348b80..b307b439f6 100644
---- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
-+++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
-@@ -211,13 +211,13 @@
-   <cpu type='kvm' name='z196-base' typename='z196-base-s390-cpu' usable='yes'/>
-   <cpu type='kvm' name='z13-base' typename='z13-base-s390-cpu' usable='yes'/>
-   <cpu type='kvm' name='z890' typename='z890-s390-cpu' usable='yes'/>
--  <machine type='kvm' name='s390-ccw-virtio-2.10' alias='s390-ccw-virtio' maxCpus='248' default='yes'/>
--  <machine type='kvm' name='s390-ccw-virtio-2.7' maxCpus='248'/>
--  <machine type='kvm' name='s390-ccw-virtio-2.6' maxCpus='248'/>
--  <machine type='kvm' name='s390-ccw-virtio-2.5' maxCpus='248'/>
--  <machine type='kvm' name='s390-ccw-virtio-2.4' maxCpus='248'/>
--  <machine type='kvm' name='s390-ccw-virtio-2.9' maxCpus='248'/>
--  <machine type='kvm' name='s390-ccw-virtio-2.8' maxCpus='248'/>
-+  <machine type='kvm' name='s390-ccw-virtio-2.10' alias='s390-ccw-virtio' maxCpus='248' default='yes' numaMemSupported='yes'/>
-+  <machine type='kvm' name='s390-ccw-virtio-2.7' maxCpus='248' numaMemSupported='yes'/>
-+  <machine type='kvm' name='s390-ccw-virtio-2.6' maxCpus='248' numaMemSupported='yes'/>
-+  <machine type='kvm' name='s390-ccw-virtio-2.5' maxCpus='248' numaMemSupported='yes'/>
-+  <machine type='kvm' name='s390-ccw-virtio-2.4' maxCpus='248' numaMemSupported='yes'/>
-+  <machine type='kvm' name='s390-ccw-virtio-2.9' maxCpus='248' numaMemSupported='yes'/>
-+  <machine type='kvm' name='s390-ccw-virtio-2.8' maxCpus='248' numaMemSupported='yes'/>
-   <cpu type='tcg' name='z10EC-base' typename='z10EC-base-s390-cpu' usable='no'>
-     <blocker name='dateh2'/>
-     <blocker name='pfpo'/>
-@@ -1262,11 +1262,11 @@
-     <blocker name='msa'/>
-     <blocker name='type'/>
-   </cpu>
--  <machine type='tcg' name='s390-ccw-virtio-2.10' alias='s390-ccw-virtio' maxCpus='248' default='yes'/>
--  <machine type='tcg' name='s390-ccw-virtio-2.7' maxCpus='248'/>
--  <machine type='tcg' name='s390-ccw-virtio-2.6' maxCpus='248'/>
--  <machine type='tcg' name='s390-ccw-virtio-2.5' maxCpus='248'/>
--  <machine type='tcg' name='s390-ccw-virtio-2.4' maxCpus='248'/>
--  <machine type='tcg' name='s390-ccw-virtio-2.9' maxCpus='248'/>
--  <machine type='tcg' name='s390-ccw-virtio-2.8' maxCpus='248'/>
-+  <machine type='tcg' name='s390-ccw-virtio-2.10' alias='s390-ccw-virtio' maxCpus='248' default='yes' numaMemSupported='yes'/>
-+  <machine type='tcg' name='s390-ccw-virtio-2.7' maxCpus='248' numaMemSupported='yes'/>
-+  <machine type='tcg' name='s390-ccw-virtio-2.6' maxCpus='248' numaMemSupported='yes'/>
-+  <machine type='tcg' name='s390-ccw-virtio-2.5' maxCpus='248' numaMemSupported='yes'/>
-+  <machine type='tcg' name='s390-ccw-virtio-2.4' maxCpus='248' numaMemSupported='yes'/>
-+  <machine type='tcg' name='s390-ccw-virtio-2.9' maxCpus='248' numaMemSupported='yes'/>
-+  <machine type='tcg' name='s390-ccw-virtio-2.8' maxCpus='248' numaMemSupported='yes'/>
- </qemuCaps>
-diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
-index 368985a611..8e4ab591db 100644
---- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
-+++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
-@@ -532,41 +532,41 @@
-     <blocker name='3dnowprefetch'/>
-   </cpu>
-   <cpu type='kvm' name='486' typename='486-x86_64-cpu' usable='yes'/>
--  <machine type='kvm' name='pc-i440fx-2.10' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes'/>
--  <machine type='kvm' name='pc-0.12' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-1.3' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='xenpv' maxCpus='1'/>
--  <machine type='kvm' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-0.11' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-0.10' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-1.2' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='isapc' hotplugCpus='yes' maxCpus='1'/>
--  <machine type='kvm' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='xenfv' hotplugCpus='yes' maxCpus='128'/>
--  <machine type='kvm' name='pc-0.15' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-0.14' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288'/>
--  <machine type='kvm' name='pc-1.1' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288'/>
--  <machine type='kvm' name='pc-1.0' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-2.9' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-0.13' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-q35-2.10' alias='q35' hotplugCpus='yes' maxCpus='288'/>
-+  <machine type='kvm' name='pc-i440fx-2.10' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-0.12' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-1.3' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='xenpv' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-0.11' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-0.10' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-1.2' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='isapc' hotplugCpus='yes' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='xenfv' hotplugCpus='yes' maxCpus='128' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-0.15' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-0.14' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-1.1' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-1.0' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.9' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-0.13' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-2.10' alias='q35' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/>
-   <hostCPU type='tcg' model='base' migratability='yes'>
-     <property name='phys-bits' type='number' value='0'/>
-     <property name='core-id' type='number' value='-1'/>
-@@ -949,39 +949,39 @@
-     <blocker name='3dnowprefetch'/>
-   </cpu>
-   <cpu type='tcg' name='486' typename='486-x86_64-cpu' usable='yes'/>
--  <machine type='tcg' name='pc-i440fx-2.10' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes'/>
--  <machine type='tcg' name='pc-0.12' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-1.3' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='xenpv' maxCpus='1'/>
--  <machine type='tcg' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-0.11' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-0.10' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-1.2' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='isapc' hotplugCpus='yes' maxCpus='1'/>
--  <machine type='tcg' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='xenfv' hotplugCpus='yes' maxCpus='128'/>
--  <machine type='tcg' name='pc-0.15' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-0.14' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288'/>
--  <machine type='tcg' name='pc-1.1' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288'/>
--  <machine type='tcg' name='pc-1.0' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-2.9' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-0.13' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-q35-2.10' alias='q35' hotplugCpus='yes' maxCpus='288'/>
-+  <machine type='tcg' name='pc-i440fx-2.10' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-0.12' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-1.3' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='xenpv' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-0.11' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-0.10' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-1.2' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='isapc' hotplugCpus='yes' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='xenfv' hotplugCpus='yes' maxCpus='128' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-0.15' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-0.14' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-1.1' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-1.0' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.9' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-0.13' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-2.10' alias='q35' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/>
- </qemuCaps>
-diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
-index c5bcf1c818..83c2905e1f 100644
---- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
-+++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
-@@ -218,14 +218,14 @@
-   <cpu type='kvm' name='z9BC' typename='z9BC-s390x-cpu' usable='yes'/>
-   <cpu type='kvm' name='z10EC.3-base' typename='z10EC.3-base-s390x-cpu' usable='yes'/>
-   <cpu type='kvm' name='z990.3-base' typename='z990.3-base-s390x-cpu' usable='yes'/>
--  <machine type='kvm' name='s390-ccw-virtio-2.11' alias='s390-ccw-virtio' hotplugCpus='yes' maxCpus='248' default='yes'/>
--  <machine type='kvm' name='s390-ccw-virtio-2.7' hotplugCpus='yes' maxCpus='248'/>
--  <machine type='kvm' name='s390-ccw-virtio-2.6' hotplugCpus='yes' maxCpus='248'/>
--  <machine type='kvm' name='s390-ccw-virtio-2.10' hotplugCpus='yes' maxCpus='248'/>
--  <machine type='kvm' name='s390-ccw-virtio-2.5' hotplugCpus='yes' maxCpus='248'/>
--  <machine type='kvm' name='s390-ccw-virtio-2.4' hotplugCpus='yes' maxCpus='248'/>
--  <machine type='kvm' name='s390-ccw-virtio-2.9' hotplugCpus='yes' maxCpus='248'/>
--  <machine type='kvm' name='s390-ccw-virtio-2.8' hotplugCpus='yes' maxCpus='248'/>
-+  <machine type='kvm' name='s390-ccw-virtio-2.11' alias='s390-ccw-virtio' hotplugCpus='yes' maxCpus='248' default='yes' numaMemSupported='yes'/>
-+  <machine type='kvm' name='s390-ccw-virtio-2.7' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/>
-+  <machine type='kvm' name='s390-ccw-virtio-2.6' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/>
-+  <machine type='kvm' name='s390-ccw-virtio-2.10' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/>
-+  <machine type='kvm' name='s390-ccw-virtio-2.5' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/>
-+  <machine type='kvm' name='s390-ccw-virtio-2.4' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/>
-+  <machine type='kvm' name='s390-ccw-virtio-2.9' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/>
-+  <machine type='kvm' name='s390-ccw-virtio-2.8' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/>
-   <cpu type='tcg' name='z890.2' typename='z890.2-s390x-cpu' usable='no'>
-     <blocker name='klmd-sha-1'/>
-     <blocker name='kimd-sha-1'/>
-@@ -2609,12 +2609,12 @@
-     <blocker name='hfpm'/>
-     <blocker name='type'/>
-   </cpu>
--  <machine type='tcg' name='s390-ccw-virtio-2.11' alias='s390-ccw-virtio' hotplugCpus='yes' maxCpus='248' default='yes'/>
--  <machine type='tcg' name='s390-ccw-virtio-2.7' hotplugCpus='yes' maxCpus='248'/>
--  <machine type='tcg' name='s390-ccw-virtio-2.6' hotplugCpus='yes' maxCpus='248'/>
--  <machine type='tcg' name='s390-ccw-virtio-2.10' hotplugCpus='yes' maxCpus='248'/>
--  <machine type='tcg' name='s390-ccw-virtio-2.5' hotplugCpus='yes' maxCpus='248'/>
--  <machine type='tcg' name='s390-ccw-virtio-2.4' hotplugCpus='yes' maxCpus='248'/>
--  <machine type='tcg' name='s390-ccw-virtio-2.9' hotplugCpus='yes' maxCpus='248'/>
--  <machine type='tcg' name='s390-ccw-virtio-2.8' hotplugCpus='yes' maxCpus='248'/>
-+  <machine type='tcg' name='s390-ccw-virtio-2.11' alias='s390-ccw-virtio' hotplugCpus='yes' maxCpus='248' default='yes' numaMemSupported='yes'/>
-+  <machine type='tcg' name='s390-ccw-virtio-2.7' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/>
-+  <machine type='tcg' name='s390-ccw-virtio-2.6' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/>
-+  <machine type='tcg' name='s390-ccw-virtio-2.10' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/>
-+  <machine type='tcg' name='s390-ccw-virtio-2.5' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/>
-+  <machine type='tcg' name='s390-ccw-virtio-2.4' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/>
-+  <machine type='tcg' name='s390-ccw-virtio-2.9' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/>
-+  <machine type='tcg' name='s390-ccw-virtio-2.8' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/>
- </qemuCaps>
-diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
-index 717ef46f78..ddc187a584 100644
---- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
-+++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
-@@ -510,41 +510,41 @@
-   <cpu type='kvm' name='Broadwell' typename='Broadwell-x86_64-cpu' usable='yes'/>
-   <cpu type='kvm' name='Broadwell-noTSX' typename='Broadwell-noTSX-x86_64-cpu' usable='yes'/>
-   <cpu type='kvm' name='486' typename='486-x86_64-cpu' usable='yes'/>
--  <machine type='kvm' name='pc-i440fx-2.11' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes'/>
--  <machine type='kvm' name='pc-0.12' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-1.3' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-2.10' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-0.11' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-0.10' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-1.2' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='isapc' hotplugCpus='yes' maxCpus='1'/>
--  <machine type='kvm' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-0.15' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-0.14' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288'/>
--  <machine type='kvm' name='pc-1.1' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288'/>
--  <machine type='kvm' name='pc-1.0' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-2.9' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-q35-2.11' alias='q35' hotplugCpus='yes' maxCpus='288'/>
--  <machine type='kvm' name='pc-0.13' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288'/>
-+  <machine type='kvm' name='pc-i440fx-2.11' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-0.12' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-1.3' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.10' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-0.11' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-0.10' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-1.2' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='isapc' hotplugCpus='yes' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-0.15' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-0.14' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-1.1' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-1.0' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.9' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-2.11' alias='q35' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-0.13' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/>
-   <hostCPU type='tcg' model='base' migratability='yes'>
-     <property name='phys-bits' type='number' value='0'/>
-     <property name='core-id' type='number' value='-1'/>
-@@ -943,39 +943,39 @@
-     <blocker name='3dnowprefetch'/>
-   </cpu>
-   <cpu type='tcg' name='486' typename='486-x86_64-cpu' usable='yes'/>
--  <machine type='tcg' name='pc-i440fx-2.11' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes'/>
--  <machine type='tcg' name='pc-0.12' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-1.3' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-2.10' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-0.11' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-0.10' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-1.2' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='isapc' hotplugCpus='yes' maxCpus='1'/>
--  <machine type='tcg' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-0.15' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-0.14' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288'/>
--  <machine type='tcg' name='pc-1.1' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288'/>
--  <machine type='tcg' name='pc-1.0' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-2.9' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-q35-2.11' alias='q35' hotplugCpus='yes' maxCpus='288'/>
--  <machine type='tcg' name='pc-0.13' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288'/>
-+  <machine type='tcg' name='pc-i440fx-2.11' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-0.12' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-1.3' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.10' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-0.11' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-0.10' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-1.2' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='isapc' hotplugCpus='yes' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-0.15' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-0.14' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-1.1' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-1.0' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.9' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-2.11' alias='q35' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-0.13' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/>
- </qemuCaps>
-diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
-index fbee7661a1..fddbfebddd 100644
---- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
-+++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
-@@ -198,63 +198,63 @@
-   <cpu type='kvm' name='cortex-r5' typename='cortex-r5-arm-cpu'/>
-   <cpu type='kvm' name='pxa270-a1' typename='pxa270-a1-arm-cpu'/>
-   <cpu type='kvm' name='pxa270' typename='pxa270-arm-cpu'/>
--  <machine type='kvm' name='integratorcp' maxCpus='1'/>
--  <machine type='kvm' name='nuri' maxCpus='2'/>
--  <machine type='kvm' name='mps2-an511' maxCpus='1'/>
--  <machine type='kvm' name='verdex' maxCpus='1'/>
--  <machine type='kvm' name='mps2-an505' maxCpus='1'/>
--  <machine type='kvm' name='ast2500-evb' maxCpus='1'/>
--  <machine type='kvm' name='smdkc210' maxCpus='2'/>
--  <machine type='kvm' name='collie' maxCpus='1'/>
--  <machine type='kvm' name='imx25-pdk' maxCpus='1'/>
--  <machine type='kvm' name='spitz' maxCpus='1'/>
--  <machine type='kvm' name='realview-pbx-a9' maxCpus='4'/>
--  <machine type='kvm' name='realview-eb' maxCpus='1'/>
--  <machine type='kvm' name='realview-pb-a8' maxCpus='1'/>
--  <machine type='kvm' name='versatilepb' maxCpus='1'/>
--  <machine type='kvm' name='emcraft-sf2' maxCpus='1'/>
--  <machine type='kvm' name='virt-2.9' maxCpus='255'/>
--  <machine type='kvm' name='musicpal' maxCpus='1'/>
--  <machine type='kvm' name='z2' maxCpus='1'/>
--  <machine type='kvm' name='akita' maxCpus='1'/>
--  <machine type='kvm' name='virt-2.7' maxCpus='255'/>
--  <machine type='kvm' name='kzm' maxCpus='1'/>
--  <machine type='kvm' name='virt-2.8' maxCpus='255'/>
--  <machine type='kvm' name='realview-eb-mpcore' maxCpus='4'/>
--  <machine type='kvm' name='mcimx7d-sabre' maxCpus='2'/>
--  <machine type='kvm' name='sx1' maxCpus='1'/>
--  <machine type='kvm' name='sx1-v1' maxCpus='1'/>
--  <machine type='kvm' name='virt-2.6' maxCpus='255'/>
--  <machine type='kvm' name='cubieboard' maxCpus='1'/>
--  <machine type='kvm' name='highbank' maxCpus='4'/>
--  <machine type='kvm' name='raspi2' maxCpus='4'/>
--  <machine type='kvm' name='raspi3' maxCpus='4'/>
--  <machine type='kvm' name='netduino2' maxCpus='1'/>
--  <machine type='kvm' name='terrier' maxCpus='1'/>
--  <machine type='kvm' name='n810' maxCpus='1'/>
--  <machine type='kvm' name='mainstone' maxCpus='1'/>
--  <machine type='kvm' name='palmetto-bmc' maxCpus='1'/>
--  <machine type='kvm' name='sabrelite' maxCpus='4'/>
--  <machine type='kvm' name='midway' maxCpus='4'/>
--  <machine type='kvm' name='romulus-bmc' maxCpus='1'/>
--  <machine type='kvm' name='cheetah' maxCpus='1'/>
--  <machine type='kvm' name='tosa' maxCpus='1'/>
--  <machine type='kvm' name='borzoi' maxCpus='1'/>
--  <machine type='kvm' name='versatileab' maxCpus='1'/>
--  <machine type='kvm' name='lm3s6965evb' maxCpus='1'/>
--  <machine type='kvm' name='n800' maxCpus='1'/>
--  <machine type='kvm' name='virt-2.10' maxCpus='255'/>
--  <machine type='kvm' name='virt-2.11' maxCpus='255'/>
--  <machine type='kvm' name='connex' maxCpus='1'/>
--  <machine type='kvm' name='virt-2.12' alias='virt' maxCpus='255'/>
--  <machine type='kvm' name='xilinx-zynq-a9' maxCpus='1'/>
--  <machine type='kvm' name='xlnx-ep108' maxCpus='6'/>
--  <machine type='kvm' name='mps2-an385' maxCpus='1'/>
--  <machine type='kvm' name='vexpress-a9' maxCpus='4'/>
--  <machine type='kvm' name='vexpress-a15' maxCpus='4'/>
--  <machine type='kvm' name='xlnx-zcu102' maxCpus='6'/>
--  <machine type='kvm' name='canon-a1100' maxCpus='1'/>
--  <machine type='kvm' name='lm3s811evb' maxCpus='1'/>
-+  <machine type='kvm' name='integratorcp' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='nuri' maxCpus='2' numaMemSupported='yes'/>
-+  <machine type='kvm' name='mps2-an511' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='verdex' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='mps2-an505' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='ast2500-evb' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='smdkc210' maxCpus='2' numaMemSupported='yes'/>
-+  <machine type='kvm' name='collie' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='imx25-pdk' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='spitz' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='realview-pbx-a9' maxCpus='4' numaMemSupported='yes'/>
-+  <machine type='kvm' name='realview-eb' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='realview-pb-a8' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='versatilepb' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='emcraft-sf2' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='virt-2.9' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='musicpal' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='z2' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='akita' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='virt-2.7' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='kzm' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='virt-2.8' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='realview-eb-mpcore' maxCpus='4' numaMemSupported='yes'/>
-+  <machine type='kvm' name='mcimx7d-sabre' maxCpus='2' numaMemSupported='yes'/>
-+  <machine type='kvm' name='sx1' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='sx1-v1' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='virt-2.6' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='cubieboard' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='highbank' maxCpus='4' numaMemSupported='yes'/>
-+  <machine type='kvm' name='raspi2' maxCpus='4' numaMemSupported='yes'/>
-+  <machine type='kvm' name='raspi3' maxCpus='4' numaMemSupported='yes'/>
-+  <machine type='kvm' name='netduino2' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='terrier' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='n810' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='mainstone' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='palmetto-bmc' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='sabrelite' maxCpus='4' numaMemSupported='yes'/>
-+  <machine type='kvm' name='midway' maxCpus='4' numaMemSupported='yes'/>
-+  <machine type='kvm' name='romulus-bmc' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='cheetah' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='tosa' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='borzoi' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='versatileab' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='lm3s6965evb' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='n800' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='virt-2.10' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='virt-2.11' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='connex' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='virt-2.12' alias='virt' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='xilinx-zynq-a9' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='xlnx-ep108' maxCpus='6' numaMemSupported='yes'/>
-+  <machine type='kvm' name='mps2-an385' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='vexpress-a9' maxCpus='4' numaMemSupported='yes'/>
-+  <machine type='kvm' name='vexpress-a15' maxCpus='4' numaMemSupported='yes'/>
-+  <machine type='kvm' name='xlnx-zcu102' maxCpus='6' numaMemSupported='yes'/>
-+  <machine type='kvm' name='canon-a1100' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='lm3s811evb' maxCpus='1' numaMemSupported='yes'/>
-   <cpu type='tcg' name='pxa262' typename='pxa262-arm-cpu'/>
-   <cpu type='tcg' name='pxa270-a0' typename='pxa270-a0-arm-cpu'/>
-   <cpu type='tcg' name='arm1136' typename='arm1136-arm-cpu'/>
-@@ -289,63 +289,63 @@
-   <cpu type='tcg' name='cortex-r5' typename='cortex-r5-arm-cpu'/>
-   <cpu type='tcg' name='pxa270-a1' typename='pxa270-a1-arm-cpu'/>
-   <cpu type='tcg' name='pxa270' typename='pxa270-arm-cpu'/>
--  <machine type='tcg' name='integratorcp' maxCpus='1'/>
--  <machine type='tcg' name='nuri' maxCpus='2'/>
--  <machine type='tcg' name='mps2-an511' maxCpus='1'/>
--  <machine type='tcg' name='verdex' maxCpus='1'/>
--  <machine type='tcg' name='mps2-an505' maxCpus='1'/>
--  <machine type='tcg' name='ast2500-evb' maxCpus='1'/>
--  <machine type='tcg' name='smdkc210' maxCpus='2'/>
--  <machine type='tcg' name='collie' maxCpus='1'/>
--  <machine type='tcg' name='imx25-pdk' maxCpus='1'/>
--  <machine type='tcg' name='spitz' maxCpus='1'/>
--  <machine type='tcg' name='realview-pbx-a9' maxCpus='4'/>
--  <machine type='tcg' name='realview-eb' maxCpus='1'/>
--  <machine type='tcg' name='realview-pb-a8' maxCpus='1'/>
--  <machine type='tcg' name='versatilepb' maxCpus='1'/>
--  <machine type='tcg' name='emcraft-sf2' maxCpus='1'/>
--  <machine type='tcg' name='virt-2.9' maxCpus='255'/>
--  <machine type='tcg' name='musicpal' maxCpus='1'/>
--  <machine type='tcg' name='z2' maxCpus='1'/>
--  <machine type='tcg' name='akita' maxCpus='1'/>
--  <machine type='tcg' name='virt-2.7' maxCpus='255'/>
--  <machine type='tcg' name='kzm' maxCpus='1'/>
--  <machine type='tcg' name='virt-2.8' maxCpus='255'/>
--  <machine type='tcg' name='realview-eb-mpcore' maxCpus='4'/>
--  <machine type='tcg' name='mcimx7d-sabre' maxCpus='2'/>
--  <machine type='tcg' name='sx1' maxCpus='1'/>
--  <machine type='tcg' name='sx1-v1' maxCpus='1'/>
--  <machine type='tcg' name='virt-2.6' maxCpus='255'/>
--  <machine type='tcg' name='cubieboard' maxCpus='1'/>
--  <machine type='tcg' name='highbank' maxCpus='4'/>
--  <machine type='tcg' name='raspi2' maxCpus='4'/>
--  <machine type='tcg' name='raspi3' maxCpus='4'/>
--  <machine type='tcg' name='netduino2' maxCpus='1'/>
--  <machine type='tcg' name='terrier' maxCpus='1'/>
--  <machine type='tcg' name='n810' maxCpus='1'/>
--  <machine type='tcg' name='mainstone' maxCpus='1'/>
--  <machine type='tcg' name='palmetto-bmc' maxCpus='1'/>
--  <machine type='tcg' name='sabrelite' maxCpus='4'/>
--  <machine type='tcg' name='midway' maxCpus='4'/>
--  <machine type='tcg' name='romulus-bmc' maxCpus='1'/>
--  <machine type='tcg' name='cheetah' maxCpus='1'/>
--  <machine type='tcg' name='tosa' maxCpus='1'/>
--  <machine type='tcg' name='borzoi' maxCpus='1'/>
--  <machine type='tcg' name='versatileab' maxCpus='1'/>
--  <machine type='tcg' name='lm3s6965evb' maxCpus='1'/>
--  <machine type='tcg' name='n800' maxCpus='1'/>
--  <machine type='tcg' name='virt-2.10' maxCpus='255'/>
--  <machine type='tcg' name='virt-2.11' maxCpus='255'/>
--  <machine type='tcg' name='connex' maxCpus='1'/>
--  <machine type='tcg' name='virt-2.12' alias='virt' maxCpus='255'/>
--  <machine type='tcg' name='xilinx-zynq-a9' maxCpus='1'/>
--  <machine type='tcg' name='xlnx-ep108' maxCpus='6'/>
--  <machine type='tcg' name='mps2-an385' maxCpus='1'/>
--  <machine type='tcg' name='vexpress-a9' maxCpus='4'/>
--  <machine type='tcg' name='vexpress-a15' maxCpus='4'/>
--  <machine type='tcg' name='xlnx-zcu102' maxCpus='6'/>
--  <machine type='tcg' name='canon-a1100' maxCpus='1'/>
--  <machine type='tcg' name='lm3s811evb' maxCpus='1'/>
-+  <machine type='tcg' name='integratorcp' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='nuri' maxCpus='2' numaMemSupported='yes'/>
-+  <machine type='tcg' name='mps2-an511' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='verdex' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='mps2-an505' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='ast2500-evb' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='smdkc210' maxCpus='2' numaMemSupported='yes'/>
-+  <machine type='tcg' name='collie' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='imx25-pdk' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='spitz' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='realview-pbx-a9' maxCpus='4' numaMemSupported='yes'/>
-+  <machine type='tcg' name='realview-eb' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='realview-pb-a8' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='versatilepb' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='emcraft-sf2' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='virt-2.9' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='musicpal' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='z2' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='akita' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='virt-2.7' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='kzm' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='virt-2.8' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='realview-eb-mpcore' maxCpus='4' numaMemSupported='yes'/>
-+  <machine type='tcg' name='mcimx7d-sabre' maxCpus='2' numaMemSupported='yes'/>
-+  <machine type='tcg' name='sx1' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='sx1-v1' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='virt-2.6' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='cubieboard' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='highbank' maxCpus='4' numaMemSupported='yes'/>
-+  <machine type='tcg' name='raspi2' maxCpus='4' numaMemSupported='yes'/>
-+  <machine type='tcg' name='raspi3' maxCpus='4' numaMemSupported='yes'/>
-+  <machine type='tcg' name='netduino2' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='terrier' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='n810' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='mainstone' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='palmetto-bmc' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='sabrelite' maxCpus='4' numaMemSupported='yes'/>
-+  <machine type='tcg' name='midway' maxCpus='4' numaMemSupported='yes'/>
-+  <machine type='tcg' name='romulus-bmc' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='cheetah' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='tosa' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='borzoi' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='versatileab' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='lm3s6965evb' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='n800' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='virt-2.10' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='virt-2.11' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='connex' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='virt-2.12' alias='virt' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='xilinx-zynq-a9' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='xlnx-ep108' maxCpus='6' numaMemSupported='yes'/>
-+  <machine type='tcg' name='mps2-an385' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='vexpress-a9' maxCpus='4' numaMemSupported='yes'/>
-+  <machine type='tcg' name='vexpress-a15' maxCpus='4' numaMemSupported='yes'/>
-+  <machine type='tcg' name='xlnx-zcu102' maxCpus='6' numaMemSupported='yes'/>
-+  <machine type='tcg' name='canon-a1100' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='lm3s811evb' maxCpus='1' numaMemSupported='yes'/>
-   <gic version='3' kernel='yes' emulated='yes'/>
-   <gic version='2' kernel='no' emulated='yes'/>
- </qemuCaps>
-diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
-index 31a643f5d1..148b928520 100644
---- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
-+++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
-@@ -600,31 +600,31 @@
-   <cpu type='kvm' name='750_v3.1'/>
-   <cpu type='kvm' name='power8e_v2.1'/>
-   <cpu type='kvm' name='mpc8568e'/>
--  <machine type='kvm' name='pseries-2.12' alias='pseries' hotplugCpus='yes' maxCpus='1024' default='yes'/>
--  <machine type='kvm' name='ref405ep' maxCpus='1'/>
--  <machine type='kvm' name='sam460ex' maxCpus='1'/>
--  <machine type='kvm' name='virtex-ml507' maxCpus='1'/>
--  <machine type='kvm' name='powernv' maxCpus='2048'/>
--  <machine type='kvm' name='ppce500' maxCpus='32'/>
--  <machine type='kvm' name='mpc8544ds' maxCpus='15'/>
--  <machine type='kvm' name='pseries-2.12-sxxm' hotplugCpus='yes' maxCpus='1024'/>
--  <machine type='kvm' name='bamboo' maxCpus='1'/>
--  <machine type='kvm' name='g3beige' maxCpus='1'/>
--  <machine type='kvm' name='pseries-2.10' hotplugCpus='yes' maxCpus='1024'/>
--  <machine type='kvm' name='prep' maxCpus='1'/>
--  <machine type='kvm' name='pseries-2.11' hotplugCpus='yes' maxCpus='1024'/>
--  <machine type='kvm' name='pseries-2.9' hotplugCpus='yes' maxCpus='1024'/>
--  <machine type='kvm' name='mac99' maxCpus='1'/>
--  <machine type='kvm' name='pseries-2.6' maxCpus='1024'/>
--  <machine type='kvm' name='pseries-2.7' hotplugCpus='yes' maxCpus='1024'/>
--  <machine type='kvm' name='pseries-2.8' hotplugCpus='yes' maxCpus='1024'/>
--  <machine type='kvm' name='pseries-2.4' maxCpus='1024'/>
--  <machine type='kvm' name='pseries-2.5' maxCpus='1024'/>
--  <machine type='kvm' name='pseries-2.2' maxCpus='1024'/>
--  <machine type='kvm' name='taihu' maxCpus='1'/>
--  <machine type='kvm' name='pseries-2.3' maxCpus='1024'/>
--  <machine type='kvm' name='pseries-2.1' maxCpus='1024'/>
--  <machine type='kvm' name='40p' maxCpus='1'/>
-+  <machine type='kvm' name='pseries-2.12' alias='pseries' hotplugCpus='yes' maxCpus='1024' default='yes' numaMemSupported='yes'/>
-+  <machine type='kvm' name='ref405ep' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='sam460ex' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='virtex-ml507' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='powernv' maxCpus='2048' numaMemSupported='yes'/>
-+  <machine type='kvm' name='ppce500' maxCpus='32' numaMemSupported='yes'/>
-+  <machine type='kvm' name='mpc8544ds' maxCpus='15' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pseries-2.12-sxxm' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='kvm' name='bamboo' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='g3beige' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pseries-2.10' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='kvm' name='prep' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pseries-2.11' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pseries-2.9' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='kvm' name='mac99' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pseries-2.6' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pseries-2.7' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pseries-2.8' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pseries-2.4' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pseries-2.5' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pseries-2.2' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='kvm' name='taihu' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pseries-2.3' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pseries-2.1' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='kvm' name='40p' maxCpus='1' numaMemSupported='yes'/>
-   <cpu type='tcg' name='default' typename='604-powerpc64-cpu'/>
-   <cpu type='tcg' name='ppc' typename='604-powerpc64-cpu'/>
-   <cpu type='tcg' name='ppc32' typename='604-powerpc64-cpu'/>
-@@ -1062,29 +1062,29 @@
-   <cpu type='tcg' name='750_v3.1'/>
-   <cpu type='tcg' name='power8e_v2.1'/>
-   <cpu type='tcg' name='mpc8568e'/>
--  <machine type='tcg' name='pseries-2.12' alias='pseries' hotplugCpus='yes' maxCpus='1024' default='yes'/>
--  <machine type='tcg' name='ref405ep' maxCpus='1'/>
--  <machine type='tcg' name='sam460ex' maxCpus='1'/>
--  <machine type='tcg' name='virtex-ml507' maxCpus='1'/>
--  <machine type='tcg' name='powernv' maxCpus='2048'/>
--  <machine type='tcg' name='ppce500' maxCpus='32'/>
--  <machine type='tcg' name='mpc8544ds' maxCpus='15'/>
--  <machine type='tcg' name='pseries-2.12-sxxm' hotplugCpus='yes' maxCpus='1024'/>
--  <machine type='tcg' name='bamboo' maxCpus='1'/>
--  <machine type='tcg' name='g3beige' maxCpus='1'/>
--  <machine type='tcg' name='pseries-2.10' hotplugCpus='yes' maxCpus='1024'/>
--  <machine type='tcg' name='prep' maxCpus='1'/>
--  <machine type='tcg' name='pseries-2.11' hotplugCpus='yes' maxCpus='1024'/>
--  <machine type='tcg' name='pseries-2.9' hotplugCpus='yes' maxCpus='1024'/>
--  <machine type='tcg' name='mac99' maxCpus='1'/>
--  <machine type='tcg' name='pseries-2.6' maxCpus='1024'/>
--  <machine type='tcg' name='pseries-2.7' hotplugCpus='yes' maxCpus='1024'/>
--  <machine type='tcg' name='pseries-2.8' hotplugCpus='yes' maxCpus='1024'/>
--  <machine type='tcg' name='pseries-2.4' maxCpus='1024'/>
--  <machine type='tcg' name='pseries-2.5' maxCpus='1024'/>
--  <machine type='tcg' name='pseries-2.2' maxCpus='1024'/>
--  <machine type='tcg' name='taihu' maxCpus='1'/>
--  <machine type='tcg' name='pseries-2.3' maxCpus='1024'/>
--  <machine type='tcg' name='pseries-2.1' maxCpus='1024'/>
--  <machine type='tcg' name='40p' maxCpus='1'/>
-+  <machine type='tcg' name='pseries-2.12' alias='pseries' hotplugCpus='yes' maxCpus='1024' default='yes' numaMemSupported='yes'/>
-+  <machine type='tcg' name='ref405ep' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='sam460ex' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='virtex-ml507' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='powernv' maxCpus='2048' numaMemSupported='yes'/>
-+  <machine type='tcg' name='ppce500' maxCpus='32' numaMemSupported='yes'/>
-+  <machine type='tcg' name='mpc8544ds' maxCpus='15' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pseries-2.12-sxxm' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='tcg' name='bamboo' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='g3beige' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pseries-2.10' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='tcg' name='prep' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pseries-2.11' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pseries-2.9' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='tcg' name='mac99' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pseries-2.6' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pseries-2.7' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pseries-2.8' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pseries-2.4' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pseries-2.5' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pseries-2.2' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='tcg' name='taihu' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pseries-2.3' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pseries-2.1' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='tcg' name='40p' maxCpus='1' numaMemSupported='yes'/>
- </qemuCaps>
-diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
-index d0ea4d780a..2b1301d234 100644
---- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
-+++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
-@@ -231,15 +231,15 @@
-   <cpu type='kvm' name='z9BC' typename='z9BC-s390x-cpu' usable='yes'/>
-   <cpu type='kvm' name='z10EC.3-base' typename='z10EC.3-base-s390x-cpu' usable='yes'/>
-   <cpu type='kvm' name='z990.3-base' typename='z990.3-base-s390x-cpu' usable='yes'/>
--  <machine type='kvm' name='s390-ccw-virtio-2.12' alias='s390-ccw-virtio' hotplugCpus='yes' maxCpus='248' default='yes'/>
--  <machine type='kvm' name='s390-ccw-virtio-2.7' hotplugCpus='yes' maxCpus='248'/>
--  <machine type='kvm' name='s390-ccw-virtio-2.6' hotplugCpus='yes' maxCpus='248'/>
--  <machine type='kvm' name='s390-ccw-virtio-2.11' hotplugCpus='yes' maxCpus='248'/>
--  <machine type='kvm' name='s390-ccw-virtio-2.10' hotplugCpus='yes' maxCpus='248'/>
--  <machine type='kvm' name='s390-ccw-virtio-2.5' hotplugCpus='yes' maxCpus='248'/>
--  <machine type='kvm' name='s390-ccw-virtio-2.4' hotplugCpus='yes' maxCpus='248'/>
--  <machine type='kvm' name='s390-ccw-virtio-2.9' hotplugCpus='yes' maxCpus='248'/>
--  <machine type='kvm' name='s390-ccw-virtio-2.8' hotplugCpus='yes' maxCpus='248'/>
-+  <machine type='kvm' name='s390-ccw-virtio-2.12' alias='s390-ccw-virtio' hotplugCpus='yes' maxCpus='248' default='yes' numaMemSupported='yes'/>
-+  <machine type='kvm' name='s390-ccw-virtio-2.7' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/>
-+  <machine type='kvm' name='s390-ccw-virtio-2.6' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/>
-+  <machine type='kvm' name='s390-ccw-virtio-2.11' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/>
-+  <machine type='kvm' name='s390-ccw-virtio-2.10' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/>
-+  <machine type='kvm' name='s390-ccw-virtio-2.5' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/>
-+  <machine type='kvm' name='s390-ccw-virtio-2.4' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/>
-+  <machine type='kvm' name='s390-ccw-virtio-2.9' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/>
-+  <machine type='kvm' name='s390-ccw-virtio-2.8' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/>
-   <cpu type='tcg' name='z890.2' typename='z890.2-s390x-cpu' usable='no'>
-     <blocker name='klmd-sha-1'/>
-     <blocker name='kimd-sha-1'/>
-@@ -2479,13 +2479,13 @@
-     <blocker name='kmac-dea'/>
-     <blocker name='hfpm'/>
-   </cpu>
--  <machine type='tcg' name='s390-ccw-virtio-2.12' alias='s390-ccw-virtio' hotplugCpus='yes' maxCpus='248' default='yes'/>
--  <machine type='tcg' name='s390-ccw-virtio-2.7' hotplugCpus='yes' maxCpus='248'/>
--  <machine type='tcg' name='s390-ccw-virtio-2.6' hotplugCpus='yes' maxCpus='248'/>
--  <machine type='tcg' name='s390-ccw-virtio-2.11' hotplugCpus='yes' maxCpus='248'/>
--  <machine type='tcg' name='s390-ccw-virtio-2.10' hotplugCpus='yes' maxCpus='248'/>
--  <machine type='tcg' name='s390-ccw-virtio-2.5' hotplugCpus='yes' maxCpus='248'/>
--  <machine type='tcg' name='s390-ccw-virtio-2.4' hotplugCpus='yes' maxCpus='248'/>
--  <machine type='tcg' name='s390-ccw-virtio-2.9' hotplugCpus='yes' maxCpus='248'/>
--  <machine type='tcg' name='s390-ccw-virtio-2.8' hotplugCpus='yes' maxCpus='248'/>
-+  <machine type='tcg' name='s390-ccw-virtio-2.12' alias='s390-ccw-virtio' hotplugCpus='yes' maxCpus='248' default='yes' numaMemSupported='yes'/>
-+  <machine type='tcg' name='s390-ccw-virtio-2.7' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/>
-+  <machine type='tcg' name='s390-ccw-virtio-2.6' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/>
-+  <machine type='tcg' name='s390-ccw-virtio-2.11' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/>
-+  <machine type='tcg' name='s390-ccw-virtio-2.10' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/>
-+  <machine type='tcg' name='s390-ccw-virtio-2.5' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/>
-+  <machine type='tcg' name='s390-ccw-virtio-2.4' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/>
-+  <machine type='tcg' name='s390-ccw-virtio-2.9' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/>
-+  <machine type='tcg' name='s390-ccw-virtio-2.8' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/>
- </qemuCaps>
-diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
-index 3db7162a34..125346ffd7 100644
---- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
-+++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
-@@ -667,43 +667,43 @@
-     <blocker name='3dnowprefetch'/>
-   </cpu>
-   <cpu type='kvm' name='486' typename='486-x86_64-cpu' usable='yes'/>
--  <machine type='kvm' name='pc-i440fx-2.12' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes'/>
--  <machine type='kvm' name='isapc' hotplugCpus='yes' maxCpus='1'/>
--  <machine type='kvm' name='pc-1.1' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-1.2' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-1.3' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-1.0' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-2.9' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-q35-2.11' hotplugCpus='yes' maxCpus='288'/>
--  <machine type='kvm' name='pc-q35-2.12' alias='q35' hotplugCpus='yes' maxCpus='288'/>
--  <machine type='kvm' name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288'/>
--  <machine type='kvm' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288'/>
--  <machine type='kvm' name='pc-0.15' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-2.11' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288'/>
--  <machine type='kvm' name='pc-0.13' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-0.14' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-2.10' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-0.11' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-0.12' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-0.10' hotplugCpus='yes' maxCpus='255'/>
-+  <machine type='kvm' name='pc-i440fx-2.12' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes' numaMemSupported='yes'/>
-+  <machine type='kvm' name='isapc' hotplugCpus='yes' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-1.1' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-1.2' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-1.3' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-1.0' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.9' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-2.11' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-2.12' alias='q35' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-0.15' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.11' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-0.13' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-0.14' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.10' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-0.11' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-0.12' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-0.10' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-   <hostCPU type='tcg' model='base' migratability='yes'>
-     <property name='phys-bits' type='number' value='0'/>
-     <property name='core-id' type='number' value='-1'/>
-@@ -1242,43 +1242,43 @@
-     <blocker name='3dnowprefetch'/>
-   </cpu>
-   <cpu type='tcg' name='486' typename='486-x86_64-cpu' usable='yes'/>
--  <machine type='tcg' name='pc-i440fx-2.12' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes'/>
--  <machine type='tcg' name='isapc' hotplugCpus='yes' maxCpus='1'/>
--  <machine type='tcg' name='pc-1.1' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-1.2' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-1.3' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-1.0' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-2.9' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-q35-2.11' hotplugCpus='yes' maxCpus='288'/>
--  <machine type='tcg' name='pc-q35-2.12' alias='q35' hotplugCpus='yes' maxCpus='288'/>
--  <machine type='tcg' name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288'/>
--  <machine type='tcg' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288'/>
--  <machine type='tcg' name='pc-0.15' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-2.11' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288'/>
--  <machine type='tcg' name='pc-0.13' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-0.14' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-2.10' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-0.11' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-0.12' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-0.10' hotplugCpus='yes' maxCpus='255'/>
-+  <machine type='tcg' name='pc-i440fx-2.12' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes' numaMemSupported='yes'/>
-+  <machine type='tcg' name='isapc' hotplugCpus='yes' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-1.1' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-1.2' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-1.3' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-1.0' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.9' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-2.11' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-2.12' alias='q35' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-0.15' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.11' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-0.13' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-0.14' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.10' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-0.11' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-0.12' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-0.10' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-   <sev>
-     <cbitpos>47</cbitpos>
-     <reducedPhysBits>1</reducedPhysBits>
-diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
-index 9b486effe1..b4745d49b9 100644
---- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
-+++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
-@@ -167,35 +167,35 @@
-   <cpu type='kvm' name='core2duo'/>
-   <cpu type='kvm' name='phenom'/>
-   <cpu type='kvm' name='qemu64'/>
--  <machine type='kvm' name='pc-i440fx-2.4' alias='pc' maxCpus='255' default='yes'/>
--  <machine type='kvm' name='pc-1.3' maxCpus='255'/>
--  <machine type='kvm' name='pc-0.12' maxCpus='255'/>
--  <machine type='kvm' name='pc-q35-1.6' maxCpus='255'/>
--  <machine type='kvm' name='pc-q35-1.5' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-1.6' maxCpus='255'/>
--  <machine type='kvm' name='pc-q35-2.2' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-1.7' maxCpus='255'/>
--  <machine type='kvm' name='pc-q35-2.1' maxCpus='255'/>
--  <machine type='kvm' name='pc-0.11' maxCpus='255'/>
--  <machine type='kvm' name='pc-0.10' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-2.2' maxCpus='255'/>
--  <machine type='kvm' name='pc-1.2' maxCpus='255'/>
--  <machine type='kvm' name='isapc' maxCpus='1'/>
--  <machine type='kvm' name='pc-i440fx-2.3' maxCpus='255'/>
--  <machine type='kvm' name='pc-q35-1.4' maxCpus='255'/>
--  <machine type='kvm' name='pc-0.15' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-1.5' maxCpus='255'/>
--  <machine type='kvm' name='pc-q35-2.0' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-1.4' maxCpus='255'/>
--  <machine type='kvm' name='pc-0.14' maxCpus='255'/>
--  <machine type='kvm' name='pc-1.1' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-2.1' maxCpus='255'/>
--  <machine type='kvm' name='pc-q35-1.7' maxCpus='255'/>
--  <machine type='kvm' name='pc-1.0' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-2.0' maxCpus='255'/>
--  <machine type='kvm' name='pc-q35-2.4' alias='q35' maxCpus='255'/>
--  <machine type='kvm' name='pc-q35-2.3' maxCpus='255'/>
--  <machine type='kvm' name='pc-0.13' maxCpus='255'/>
-+  <machine type='kvm' name='pc-i440fx-2.4' alias='pc' maxCpus='255' default='yes' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-1.3' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-0.12' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-1.6' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-1.5' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-1.6' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-2.2' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-1.7' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-2.1' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-0.11' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-0.10' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.2' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-1.2' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='isapc' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.3' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-1.4' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-0.15' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-1.5' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-2.0' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-1.4' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-0.14' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-1.1' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.1' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-1.7' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-1.0' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.0' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-2.4' alias='q35' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-2.3' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-0.13' maxCpus='255' numaMemSupported='yes'/>
-   <cpu type='tcg' name='Opteron_G5'/>
-   <cpu type='tcg' name='Opteron_G4'/>
-   <cpu type='tcg' name='Opteron_G3'/>
-@@ -224,33 +224,33 @@
-   <cpu type='tcg' name='core2duo'/>
-   <cpu type='tcg' name='phenom'/>
-   <cpu type='tcg' name='qemu64'/>
--  <machine type='tcg' name='pc-i440fx-2.4' alias='pc' maxCpus='255' default='yes'/>
--  <machine type='tcg' name='pc-1.3' maxCpus='255'/>
--  <machine type='tcg' name='pc-0.12' maxCpus='255'/>
--  <machine type='tcg' name='pc-q35-1.6' maxCpus='255'/>
--  <machine type='tcg' name='pc-q35-1.5' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-1.6' maxCpus='255'/>
--  <machine type='tcg' name='pc-q35-2.2' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-1.7' maxCpus='255'/>
--  <machine type='tcg' name='pc-q35-2.1' maxCpus='255'/>
--  <machine type='tcg' name='pc-0.11' maxCpus='255'/>
--  <machine type='tcg' name='pc-0.10' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-2.2' maxCpus='255'/>
--  <machine type='tcg' name='pc-1.2' maxCpus='255'/>
--  <machine type='tcg' name='isapc' maxCpus='1'/>
--  <machine type='tcg' name='pc-i440fx-2.3' maxCpus='255'/>
--  <machine type='tcg' name='pc-q35-1.4' maxCpus='255'/>
--  <machine type='tcg' name='pc-0.15' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-1.5' maxCpus='255'/>
--  <machine type='tcg' name='pc-q35-2.0' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-1.4' maxCpus='255'/>
--  <machine type='tcg' name='pc-0.14' maxCpus='255'/>
--  <machine type='tcg' name='pc-1.1' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-2.1' maxCpus='255'/>
--  <machine type='tcg' name='pc-q35-1.7' maxCpus='255'/>
--  <machine type='tcg' name='pc-1.0' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-2.0' maxCpus='255'/>
--  <machine type='tcg' name='pc-q35-2.4' alias='q35' maxCpus='255'/>
--  <machine type='tcg' name='pc-q35-2.3' maxCpus='255'/>
--  <machine type='tcg' name='pc-0.13' maxCpus='255'/>
-+  <machine type='tcg' name='pc-i440fx-2.4' alias='pc' maxCpus='255' default='yes' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-1.3' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-0.12' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-1.6' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-1.5' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-1.6' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-2.2' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-1.7' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-2.1' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-0.11' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-0.10' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.2' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-1.2' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='isapc' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.3' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-1.4' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-0.15' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-1.5' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-2.0' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-1.4' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-0.14' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-1.1' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.1' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-1.7' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-1.0' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.0' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-2.4' alias='q35' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-2.3' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-0.13' maxCpus='255' numaMemSupported='yes'/>
- </qemuCaps>
-diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
-index 147b179fdb..21fc702fc7 100644
---- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
-+++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
-@@ -173,37 +173,37 @@
-   <cpu type='kvm' name='core2duo'/>
-   <cpu type='kvm' name='phenom'/>
-   <cpu type='kvm' name='qemu64'/>
--  <machine type='kvm' name='pc-i440fx-2.5' alias='pc' maxCpus='255' default='yes'/>
--  <machine type='kvm' name='pc-i440fx-2.4' maxCpus='255'/>
--  <machine type='kvm' name='pc-1.3' maxCpus='255'/>
--  <machine type='kvm' name='pc-0.12' maxCpus='255'/>
--  <machine type='kvm' name='pc-q35-1.6' maxCpus='255'/>
--  <machine type='kvm' name='pc-q35-1.5' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-1.6' maxCpus='255'/>
--  <machine type='kvm' name='pc-q35-2.2' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-1.7' maxCpus='255'/>
--  <machine type='kvm' name='pc-q35-2.1' maxCpus='255'/>
--  <machine type='kvm' name='pc-0.11' maxCpus='255'/>
--  <machine type='kvm' name='pc-0.10' maxCpus='255'/>
--  <machine type='kvm' name='pc-1.2' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-2.2' maxCpus='255'/>
--  <machine type='kvm' name='isapc' maxCpus='1'/>
--  <machine type='kvm' name='pc-i440fx-2.3' maxCpus='255'/>
--  <machine type='kvm' name='pc-q35-1.4' maxCpus='255'/>
--  <machine type='kvm' name='pc-q35-2.5' alias='q35' maxCpus='255'/>
--  <machine type='kvm' name='pc-0.15' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-1.5' maxCpus='255'/>
--  <machine type='kvm' name='pc-q35-2.0' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-1.4' maxCpus='255'/>
--  <machine type='kvm' name='pc-0.14' maxCpus='255'/>
--  <machine type='kvm' name='pc-1.1' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-2.1' maxCpus='255'/>
--  <machine type='kvm' name='pc-q35-1.7' maxCpus='255'/>
--  <machine type='kvm' name='pc-1.0' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-2.0' maxCpus='255'/>
--  <machine type='kvm' name='pc-q35-2.4' maxCpus='255'/>
--  <machine type='kvm' name='pc-q35-2.3' maxCpus='255'/>
--  <machine type='kvm' name='pc-0.13' maxCpus='255'/>
-+  <machine type='kvm' name='pc-i440fx-2.5' alias='pc' maxCpus='255' default='yes' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.4' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-1.3' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-0.12' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-1.6' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-1.5' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-1.6' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-2.2' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-1.7' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-2.1' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-0.11' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-0.10' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-1.2' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.2' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='isapc' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.3' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-1.4' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-2.5' alias='q35' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-0.15' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-1.5' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-2.0' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-1.4' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-0.14' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-1.1' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.1' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-1.7' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-1.0' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.0' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-2.4' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-2.3' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-0.13' maxCpus='255' numaMemSupported='yes'/>
-   <cpu type='tcg' name='Opteron_G5'/>
-   <cpu type='tcg' name='Opteron_G4'/>
-   <cpu type='tcg' name='Opteron_G3'/>
-@@ -232,35 +232,35 @@
-   <cpu type='tcg' name='core2duo'/>
-   <cpu type='tcg' name='phenom'/>
-   <cpu type='tcg' name='qemu64'/>
--  <machine type='tcg' name='pc-i440fx-2.5' alias='pc' maxCpus='255' default='yes'/>
--  <machine type='tcg' name='pc-i440fx-2.4' maxCpus='255'/>
--  <machine type='tcg' name='pc-1.3' maxCpus='255'/>
--  <machine type='tcg' name='pc-0.12' maxCpus='255'/>
--  <machine type='tcg' name='pc-q35-1.6' maxCpus='255'/>
--  <machine type='tcg' name='pc-q35-1.5' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-1.6' maxCpus='255'/>
--  <machine type='tcg' name='pc-q35-2.2' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-1.7' maxCpus='255'/>
--  <machine type='tcg' name='pc-q35-2.1' maxCpus='255'/>
--  <machine type='tcg' name='pc-0.11' maxCpus='255'/>
--  <machine type='tcg' name='pc-0.10' maxCpus='255'/>
--  <machine type='tcg' name='pc-1.2' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-2.2' maxCpus='255'/>
--  <machine type='tcg' name='isapc' maxCpus='1'/>
--  <machine type='tcg' name='pc-i440fx-2.3' maxCpus='255'/>
--  <machine type='tcg' name='pc-q35-1.4' maxCpus='255'/>
--  <machine type='tcg' name='pc-q35-2.5' alias='q35' maxCpus='255'/>
--  <machine type='tcg' name='pc-0.15' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-1.5' maxCpus='255'/>
--  <machine type='tcg' name='pc-q35-2.0' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-1.4' maxCpus='255'/>
--  <machine type='tcg' name='pc-0.14' maxCpus='255'/>
--  <machine type='tcg' name='pc-1.1' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-2.1' maxCpus='255'/>
--  <machine type='tcg' name='pc-q35-1.7' maxCpus='255'/>
--  <machine type='tcg' name='pc-1.0' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-2.0' maxCpus='255'/>
--  <machine type='tcg' name='pc-q35-2.4' maxCpus='255'/>
--  <machine type='tcg' name='pc-q35-2.3' maxCpus='255'/>
--  <machine type='tcg' name='pc-0.13' maxCpus='255'/>
-+  <machine type='tcg' name='pc-i440fx-2.5' alias='pc' maxCpus='255' default='yes' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.4' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-1.3' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-0.12' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-1.6' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-1.5' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-1.6' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-2.2' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-1.7' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-2.1' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-0.11' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-0.10' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-1.2' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.2' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='isapc' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.3' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-1.4' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-2.5' alias='q35' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-0.15' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-1.5' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-2.0' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-1.4' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-0.14' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-1.1' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.1' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-1.7' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-1.0' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.0' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-2.4' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-2.3' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-0.13' maxCpus='255' numaMemSupported='yes'/>
- </qemuCaps>
-diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
-index fddca13ee2..c41c30c923 100644
---- a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
-+++ b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
-@@ -159,47 +159,47 @@
-   <cpu type='kvm' name='cortex-r5'/>
-   <cpu type='kvm' name='pxa270-a1'/>
-   <cpu type='kvm' name='pxa270'/>
--  <machine type='kvm' name='integratorcp' maxCpus='1'/>
--  <machine type='kvm' name='nuri' maxCpus='2'/>
--  <machine type='kvm' name='verdex' maxCpus='1'/>
--  <machine type='kvm' name='smdkc210' maxCpus='2'/>
--  <machine type='kvm' name='collie' maxCpus='1'/>
--  <machine type='kvm' name='imx25-pdk' maxCpus='1'/>
--  <machine type='kvm' name='spitz' maxCpus='1'/>
--  <machine type='kvm' name='realview-pbx-a9' maxCpus='4'/>
--  <machine type='kvm' name='realview-eb' maxCpus='1'/>
--  <machine type='kvm' name='versatilepb' maxCpus='1'/>
--  <machine type='kvm' name='realview-pb-a8' maxCpus='1'/>
--  <machine type='kvm' name='musicpal' maxCpus='1'/>
--  <machine type='kvm' name='z2' maxCpus='1'/>
--  <machine type='kvm' name='akita' maxCpus='1'/>
--  <machine type='kvm' name='kzm' maxCpus='1'/>
--  <machine type='kvm' name='realview-eb-mpcore' maxCpus='4'/>
--  <machine type='kvm' name='sx1' maxCpus='1'/>
--  <machine type='kvm' name='sx1-v1' maxCpus='1'/>
--  <machine type='kvm' name='virt-2.6' alias='virt' maxCpus='255'/>
--  <machine type='kvm' name='cubieboard' maxCpus='1'/>
--  <machine type='kvm' name='highbank' maxCpus='4'/>
--  <machine type='kvm' name='raspi2' maxCpus='4'/>
--  <machine type='kvm' name='netduino2' maxCpus='1'/>
--  <machine type='kvm' name='terrier' maxCpus='1'/>
--  <machine type='kvm' name='n810' maxCpus='1'/>
--  <machine type='kvm' name='mainstone' maxCpus='1'/>
--  <machine type='kvm' name='palmetto-bmc' maxCpus='1'/>
--  <machine type='kvm' name='midway' maxCpus='4'/>
--  <machine type='kvm' name='cheetah' maxCpus='1'/>
--  <machine type='kvm' name='tosa' maxCpus='1'/>
--  <machine type='kvm' name='borzoi' maxCpus='1'/>
--  <machine type='kvm' name='versatileab' maxCpus='1'/>
--  <machine type='kvm' name='lm3s6965evb' maxCpus='1'/>
--  <machine type='kvm' name='n800' maxCpus='1'/>
--  <machine type='kvm' name='connex' maxCpus='1'/>
--  <machine type='kvm' name='xilinx-zynq-a9' maxCpus='1'/>
--  <machine type='kvm' name='xlnx-ep108' maxCpus='1'/>
--  <machine type='kvm' name='vexpress-a9' maxCpus='4'/>
--  <machine type='kvm' name='vexpress-a15' maxCpus='4'/>
--  <machine type='kvm' name='canon-a1100' maxCpus='1'/>
--  <machine type='kvm' name='lm3s811evb' maxCpus='1'/>
-+  <machine type='kvm' name='integratorcp' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='nuri' maxCpus='2' numaMemSupported='yes'/>
-+  <machine type='kvm' name='verdex' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='smdkc210' maxCpus='2' numaMemSupported='yes'/>
-+  <machine type='kvm' name='collie' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='imx25-pdk' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='spitz' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='realview-pbx-a9' maxCpus='4' numaMemSupported='yes'/>
-+  <machine type='kvm' name='realview-eb' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='versatilepb' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='realview-pb-a8' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='musicpal' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='z2' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='akita' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='kzm' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='realview-eb-mpcore' maxCpus='4' numaMemSupported='yes'/>
-+  <machine type='kvm' name='sx1' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='sx1-v1' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='virt-2.6' alias='virt' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='cubieboard' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='highbank' maxCpus='4' numaMemSupported='yes'/>
-+  <machine type='kvm' name='raspi2' maxCpus='4' numaMemSupported='yes'/>
-+  <machine type='kvm' name='netduino2' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='terrier' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='n810' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='mainstone' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='palmetto-bmc' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='midway' maxCpus='4' numaMemSupported='yes'/>
-+  <machine type='kvm' name='cheetah' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='tosa' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='borzoi' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='versatileab' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='lm3s6965evb' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='n800' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='connex' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='xilinx-zynq-a9' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='xlnx-ep108' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='vexpress-a9' maxCpus='4' numaMemSupported='yes'/>
-+  <machine type='kvm' name='vexpress-a15' maxCpus='4' numaMemSupported='yes'/>
-+  <machine type='kvm' name='canon-a1100' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='lm3s811evb' maxCpus='1' numaMemSupported='yes'/>
-   <cpu type='tcg' name='pxa262'/>
-   <cpu type='tcg' name='pxa270-a0'/>
-   <cpu type='tcg' name='arm1136'/>
-@@ -230,47 +230,47 @@
-   <cpu type='tcg' name='cortex-r5'/>
-   <cpu type='tcg' name='pxa270-a1'/>
-   <cpu type='tcg' name='pxa270'/>
--  <machine type='tcg' name='integratorcp' maxCpus='1'/>
--  <machine type='tcg' name='nuri' maxCpus='2'/>
--  <machine type='tcg' name='verdex' maxCpus='1'/>
--  <machine type='tcg' name='smdkc210' maxCpus='2'/>
--  <machine type='tcg' name='collie' maxCpus='1'/>
--  <machine type='tcg' name='imx25-pdk' maxCpus='1'/>
--  <machine type='tcg' name='spitz' maxCpus='1'/>
--  <machine type='tcg' name='realview-pbx-a9' maxCpus='4'/>
--  <machine type='tcg' name='realview-eb' maxCpus='1'/>
--  <machine type='tcg' name='versatilepb' maxCpus='1'/>
--  <machine type='tcg' name='realview-pb-a8' maxCpus='1'/>
--  <machine type='tcg' name='musicpal' maxCpus='1'/>
--  <machine type='tcg' name='z2' maxCpus='1'/>
--  <machine type='tcg' name='akita' maxCpus='1'/>
--  <machine type='tcg' name='kzm' maxCpus='1'/>
--  <machine type='tcg' name='realview-eb-mpcore' maxCpus='4'/>
--  <machine type='tcg' name='sx1' maxCpus='1'/>
--  <machine type='tcg' name='sx1-v1' maxCpus='1'/>
--  <machine type='tcg' name='virt-2.6' alias='virt' maxCpus='255'/>
--  <machine type='tcg' name='cubieboard' maxCpus='1'/>
--  <machine type='tcg' name='highbank' maxCpus='4'/>
--  <machine type='tcg' name='raspi2' maxCpus='4'/>
--  <machine type='tcg' name='netduino2' maxCpus='1'/>
--  <machine type='tcg' name='terrier' maxCpus='1'/>
--  <machine type='tcg' name='n810' maxCpus='1'/>
--  <machine type='tcg' name='mainstone' maxCpus='1'/>
--  <machine type='tcg' name='palmetto-bmc' maxCpus='1'/>
--  <machine type='tcg' name='midway' maxCpus='4'/>
--  <machine type='tcg' name='cheetah' maxCpus='1'/>
--  <machine type='tcg' name='tosa' maxCpus='1'/>
--  <machine type='tcg' name='borzoi' maxCpus='1'/>
--  <machine type='tcg' name='versatileab' maxCpus='1'/>
--  <machine type='tcg' name='lm3s6965evb' maxCpus='1'/>
--  <machine type='tcg' name='n800' maxCpus='1'/>
--  <machine type='tcg' name='connex' maxCpus='1'/>
--  <machine type='tcg' name='xilinx-zynq-a9' maxCpus='1'/>
--  <machine type='tcg' name='xlnx-ep108' maxCpus='1'/>
--  <machine type='tcg' name='vexpress-a9' maxCpus='4'/>
--  <machine type='tcg' name='vexpress-a15' maxCpus='4'/>
--  <machine type='tcg' name='canon-a1100' maxCpus='1'/>
--  <machine type='tcg' name='lm3s811evb' maxCpus='1'/>
-+  <machine type='tcg' name='integratorcp' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='nuri' maxCpus='2' numaMemSupported='yes'/>
-+  <machine type='tcg' name='verdex' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='smdkc210' maxCpus='2' numaMemSupported='yes'/>
-+  <machine type='tcg' name='collie' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='imx25-pdk' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='spitz' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='realview-pbx-a9' maxCpus='4' numaMemSupported='yes'/>
-+  <machine type='tcg' name='realview-eb' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='versatilepb' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='realview-pb-a8' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='musicpal' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='z2' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='akita' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='kzm' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='realview-eb-mpcore' maxCpus='4' numaMemSupported='yes'/>
-+  <machine type='tcg' name='sx1' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='sx1-v1' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='virt-2.6' alias='virt' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='cubieboard' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='highbank' maxCpus='4' numaMemSupported='yes'/>
-+  <machine type='tcg' name='raspi2' maxCpus='4' numaMemSupported='yes'/>
-+  <machine type='tcg' name='netduino2' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='terrier' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='n810' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='mainstone' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='palmetto-bmc' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='midway' maxCpus='4' numaMemSupported='yes'/>
-+  <machine type='tcg' name='cheetah' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='tosa' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='borzoi' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='versatileab' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='lm3s6965evb' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='n800' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='connex' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='xilinx-zynq-a9' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='xlnx-ep108' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='vexpress-a9' maxCpus='4' numaMemSupported='yes'/>
-+  <machine type='tcg' name='vexpress-a15' maxCpus='4' numaMemSupported='yes'/>
-+  <machine type='tcg' name='canon-a1100' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='lm3s811evb' maxCpus='1' numaMemSupported='yes'/>
-   <gic version='3' kernel='no' emulated='no'/>
-   <gic version='2' kernel='yes' emulated='yes'/>
- </qemuCaps>
-diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
-index deb5c28790..b619ec4dd1 100644
---- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
-+++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
-@@ -556,21 +556,21 @@
-   <cpu type='kvm' name='MPC8544E_v11'/>
-   <cpu type='kvm' name='405GPb'/>
-   <cpu type='kvm' name='MPC8541E_v11'/>
--  <machine type='kvm' name='pseries-2.6' alias='pseries' maxCpus='255' default='yes'/>
--  <machine type='kvm' name='ref405ep' maxCpus='1'/>
--  <machine type='kvm' name='virtex-ml507' maxCpus='1'/>
--  <machine type='kvm' name='ppce500' maxCpus='32'/>
--  <machine type='kvm' name='mpc8544ds' maxCpus='15'/>
--  <machine type='kvm' name='bamboo' maxCpus='1'/>
--  <machine type='kvm' name='g3beige' maxCpus='1'/>
--  <machine type='kvm' name='prep' maxCpus='1'/>
--  <machine type='kvm' name='mac99' maxCpus='1'/>
--  <machine type='kvm' name='pseries-2.4' maxCpus='255'/>
--  <machine type='kvm' name='pseries-2.5' maxCpus='255'/>
--  <machine type='kvm' name='pseries-2.2' maxCpus='255'/>
--  <machine type='kvm' name='taihu' maxCpus='1'/>
--  <machine type='kvm' name='pseries-2.3' maxCpus='255'/>
--  <machine type='kvm' name='pseries-2.1' maxCpus='255'/>
-+  <machine type='kvm' name='pseries-2.6' alias='pseries' maxCpus='255' default='yes' numaMemSupported='yes'/>
-+  <machine type='kvm' name='ref405ep' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='virtex-ml507' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='ppce500' maxCpus='32' numaMemSupported='yes'/>
-+  <machine type='kvm' name='mpc8544ds' maxCpus='15' numaMemSupported='yes'/>
-+  <machine type='kvm' name='bamboo' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='g3beige' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='prep' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='mac99' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pseries-2.4' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pseries-2.5' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pseries-2.2' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='taihu' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pseries-2.3' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pseries-2.1' maxCpus='255' numaMemSupported='yes'/>
-   <cpu type='tcg' name='default'/>
-   <cpu type='tcg' name='ppc'/>
-   <cpu type='tcg' name='ppc32'/>
-@@ -1001,19 +1001,19 @@
-   <cpu type='tcg' name='MPC8544E_v11'/>
-   <cpu type='tcg' name='405GPb'/>
-   <cpu type='tcg' name='MPC8541E_v11'/>
--  <machine type='tcg' name='pseries-2.6' alias='pseries' maxCpus='255' default='yes'/>
--  <machine type='tcg' name='ref405ep' maxCpus='1'/>
--  <machine type='tcg' name='virtex-ml507' maxCpus='1'/>
--  <machine type='tcg' name='ppce500' maxCpus='32'/>
--  <machine type='tcg' name='mpc8544ds' maxCpus='15'/>
--  <machine type='tcg' name='bamboo' maxCpus='1'/>
--  <machine type='tcg' name='g3beige' maxCpus='1'/>
--  <machine type='tcg' name='prep' maxCpus='1'/>
--  <machine type='tcg' name='mac99' maxCpus='1'/>
--  <machine type='tcg' name='pseries-2.4' maxCpus='255'/>
--  <machine type='tcg' name='pseries-2.5' maxCpus='255'/>
--  <machine type='tcg' name='pseries-2.2' maxCpus='255'/>
--  <machine type='tcg' name='taihu' maxCpus='1'/>
--  <machine type='tcg' name='pseries-2.3' maxCpus='255'/>
--  <machine type='tcg' name='pseries-2.1' maxCpus='255'/>
-+  <machine type='tcg' name='pseries-2.6' alias='pseries' maxCpus='255' default='yes' numaMemSupported='yes'/>
-+  <machine type='tcg' name='ref405ep' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='virtex-ml507' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='ppce500' maxCpus='32' numaMemSupported='yes'/>
-+  <machine type='tcg' name='mpc8544ds' maxCpus='15' numaMemSupported='yes'/>
-+  <machine type='tcg' name='bamboo' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='g3beige' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='prep' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='mac99' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pseries-2.4' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pseries-2.5' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pseries-2.2' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='taihu' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pseries-2.3' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pseries-2.1' maxCpus='255' numaMemSupported='yes'/>
- </qemuCaps>
-diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
-index fc508aba8a..492f2720fd 100644
---- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
-+++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
-@@ -185,31 +185,31 @@
-   <cpu type='kvm' name='core2duo'/>
-   <cpu type='kvm' name='phenom'/>
-   <cpu type='kvm' name='qemu64'/>
--  <machine type='kvm' name='pc-i440fx-2.6' alias='pc' maxCpus='255' default='yes'/>
--  <machine type='kvm' name='pc-0.12' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-2.4' maxCpus='255'/>
--  <machine type='kvm' name='pc-1.3' maxCpus='255'/>
--  <machine type='kvm' name='pc-q35-2.6' alias='q35' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-1.7' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-1.6' maxCpus='255'/>
--  <machine type='kvm' name='pc-0.11' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-2.3' maxCpus='255'/>
--  <machine type='kvm' name='pc-0.10' maxCpus='255'/>
--  <machine type='kvm' name='pc-1.2' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-2.2' maxCpus='255'/>
--  <machine type='kvm' name='isapc' maxCpus='1'/>
--  <machine type='kvm' name='pc-q35-2.5' maxCpus='255'/>
--  <machine type='kvm' name='pc-0.15' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-1.5' maxCpus='255'/>
--  <machine type='kvm' name='pc-0.14' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-1.4' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-2.5' maxCpus='255'/>
--  <machine type='kvm' name='pc-1.1' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-2.1' maxCpus='255'/>
--  <machine type='kvm' name='pc-1.0' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-2.0' maxCpus='255'/>
--  <machine type='kvm' name='pc-q35-2.4' maxCpus='255'/>
--  <machine type='kvm' name='pc-0.13' maxCpus='255'/>
-+  <machine type='kvm' name='pc-i440fx-2.6' alias='pc' maxCpus='255' default='yes' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-0.12' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.4' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-1.3' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-2.6' alias='q35' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-1.7' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-1.6' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-0.11' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.3' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-0.10' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-1.2' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.2' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='isapc' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-2.5' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-0.15' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-1.5' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-0.14' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-1.4' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.5' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-1.1' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.1' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-1.0' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.0' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-2.4' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-0.13' maxCpus='255' numaMemSupported='yes'/>
-   <cpu type='tcg' name='Opteron_G5'/>
-   <cpu type='tcg' name='Opteron_G4'/>
-   <cpu type='tcg' name='Opteron_G3'/>
-@@ -238,29 +238,29 @@
-   <cpu type='tcg' name='core2duo'/>
-   <cpu type='tcg' name='phenom'/>
-   <cpu type='tcg' name='qemu64'/>
--  <machine type='tcg' name='pc-i440fx-2.6' alias='pc' maxCpus='255' default='yes'/>
--  <machine type='tcg' name='pc-0.12' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-2.4' maxCpus='255'/>
--  <machine type='tcg' name='pc-1.3' maxCpus='255'/>
--  <machine type='tcg' name='pc-q35-2.6' alias='q35' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-1.7' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-1.6' maxCpus='255'/>
--  <machine type='tcg' name='pc-0.11' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-2.3' maxCpus='255'/>
--  <machine type='tcg' name='pc-0.10' maxCpus='255'/>
--  <machine type='tcg' name='pc-1.2' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-2.2' maxCpus='255'/>
--  <machine type='tcg' name='isapc' maxCpus='1'/>
--  <machine type='tcg' name='pc-q35-2.5' maxCpus='255'/>
--  <machine type='tcg' name='pc-0.15' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-1.5' maxCpus='255'/>
--  <machine type='tcg' name='pc-0.14' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-1.4' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-2.5' maxCpus='255'/>
--  <machine type='tcg' name='pc-1.1' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-2.1' maxCpus='255'/>
--  <machine type='tcg' name='pc-1.0' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-2.0' maxCpus='255'/>
--  <machine type='tcg' name='pc-q35-2.4' maxCpus='255'/>
--  <machine type='tcg' name='pc-0.13' maxCpus='255'/>
-+  <machine type='tcg' name='pc-i440fx-2.6' alias='pc' maxCpus='255' default='yes' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-0.12' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.4' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-1.3' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-2.6' alias='q35' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-1.7' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-1.6' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-0.11' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.3' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-0.10' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-1.2' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.2' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='isapc' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-2.5' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-0.15' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-1.5' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-0.14' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-1.4' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.5' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-1.1' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.1' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-1.0' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.0' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-2.4' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-0.13' maxCpus='255' numaMemSupported='yes'/>
- </qemuCaps>
-diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
-index 17351ca6bf..2bacb2008a 100644
---- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
-+++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
-@@ -97,13 +97,13 @@
-   <package></package>
-   <arch>s390x</arch>
-   <cpu type='kvm' name='host'/>
--  <machine type='kvm' name='s390-ccw-virtio-2.7' alias='s390-ccw-virtio' maxCpus='248' default='yes'/>
--  <machine type='kvm' name='s390-ccw-virtio-2.5' maxCpus='248'/>
--  <machine type='kvm' name='s390-ccw-virtio-2.4' maxCpus='248'/>
--  <machine type='kvm' name='s390-ccw-virtio-2.6' maxCpus='248'/>
-+  <machine type='kvm' name='s390-ccw-virtio-2.7' alias='s390-ccw-virtio' maxCpus='248' default='yes' numaMemSupported='yes'/>
-+  <machine type='kvm' name='s390-ccw-virtio-2.5' maxCpus='248' numaMemSupported='yes'/>
-+  <machine type='kvm' name='s390-ccw-virtio-2.4' maxCpus='248' numaMemSupported='yes'/>
-+  <machine type='kvm' name='s390-ccw-virtio-2.6' maxCpus='248' numaMemSupported='yes'/>
-   <cpu type='tcg' name='host'/>
--  <machine type='tcg' name='s390-ccw-virtio-2.7' alias='s390-ccw-virtio' maxCpus='248' default='yes'/>
--  <machine type='tcg' name='s390-ccw-virtio-2.5' maxCpus='248'/>
--  <machine type='tcg' name='s390-ccw-virtio-2.4' maxCpus='248'/>
--  <machine type='tcg' name='s390-ccw-virtio-2.6' maxCpus='248'/>
-+  <machine type='tcg' name='s390-ccw-virtio-2.7' alias='s390-ccw-virtio' maxCpus='248' default='yes' numaMemSupported='yes'/>
-+  <machine type='tcg' name='s390-ccw-virtio-2.5' maxCpus='248' numaMemSupported='yes'/>
-+  <machine type='tcg' name='s390-ccw-virtio-2.4' maxCpus='248' numaMemSupported='yes'/>
-+  <machine type='tcg' name='s390-ccw-virtio-2.6' maxCpus='248' numaMemSupported='yes'/>
- </qemuCaps>
-diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
-index ed199057dc..71cfc3f2c3 100644
---- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
-+++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
-@@ -191,33 +191,33 @@
-   <cpu type='kvm' name='core2duo'/>
-   <cpu type='kvm' name='phenom'/>
-   <cpu type='kvm' name='qemu64'/>
--  <machine type='kvm' name='pc-i440fx-2.7' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes'/>
--  <machine type='kvm' name='pc-0.12' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-1.3' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-q35-2.7' alias='q35' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-0.11' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-0.10' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-1.2' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='isapc' hotplugCpus='yes' maxCpus='1'/>
--  <machine type='kvm' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-0.15' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-0.14' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-1.1' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-1.0' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-0.13' hotplugCpus='yes' maxCpus='255'/>
-+  <machine type='kvm' name='pc-i440fx-2.7' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-0.12' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-1.3' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-2.7' alias='q35' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-0.11' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-0.10' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-1.2' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='isapc' hotplugCpus='yes' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-0.15' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-0.14' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-1.1' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-1.0' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-0.13' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-   <cpu type='tcg' name='Opteron_G5'/>
-   <cpu type='tcg' name='Opteron_G4'/>
-   <cpu type='tcg' name='Opteron_G3'/>
-@@ -247,31 +247,31 @@
-   <cpu type='tcg' name='core2duo'/>
-   <cpu type='tcg' name='phenom'/>
-   <cpu type='tcg' name='qemu64'/>
--  <machine type='tcg' name='pc-i440fx-2.7' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes'/>
--  <machine type='tcg' name='pc-0.12' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-1.3' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-q35-2.7' alias='q35' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-0.11' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-0.10' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-1.2' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='isapc' hotplugCpus='yes' maxCpus='1'/>
--  <machine type='tcg' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-0.15' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-0.14' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-1.1' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-1.0' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-0.13' hotplugCpus='yes' maxCpus='255'/>
-+  <machine type='tcg' name='pc-i440fx-2.7' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-0.12' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-1.3' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-2.7' alias='q35' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-0.11' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-0.10' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-1.2' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='isapc' hotplugCpus='yes' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-0.15' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-0.14' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-1.1' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-1.0' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-0.13' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
- </qemuCaps>
-diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
-index 7becf1bfb6..335e2c1a69 100644
---- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
-+++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
-@@ -184,11 +184,11 @@
-   <cpu type='kvm' name='z196-base'/>
-   <cpu type='kvm' name='z13-base'/>
-   <cpu type='kvm' name='z890'/>
--  <machine type='kvm' name='s390-ccw-virtio-2.8' alias='s390-ccw-virtio' maxCpus='248' default='yes'/>
--  <machine type='kvm' name='s390-ccw-virtio-2.7' maxCpus='248'/>
--  <machine type='kvm' name='s390-ccw-virtio-2.6' maxCpus='248'/>
--  <machine type='kvm' name='s390-ccw-virtio-2.5' maxCpus='248'/>
--  <machine type='kvm' name='s390-ccw-virtio-2.4' maxCpus='248'/>
-+  <machine type='kvm' name='s390-ccw-virtio-2.8' alias='s390-ccw-virtio' maxCpus='248' default='yes' numaMemSupported='yes'/>
-+  <machine type='kvm' name='s390-ccw-virtio-2.7' maxCpus='248' numaMemSupported='yes'/>
-+  <machine type='kvm' name='s390-ccw-virtio-2.6' maxCpus='248' numaMemSupported='yes'/>
-+  <machine type='kvm' name='s390-ccw-virtio-2.5' maxCpus='248' numaMemSupported='yes'/>
-+  <machine type='kvm' name='s390-ccw-virtio-2.4' maxCpus='248' numaMemSupported='yes'/>
-   <cpu type='tcg' name='z10EC-base'/>
-   <cpu type='tcg' name='z9EC-base'/>
-   <cpu type='tcg' name='z196.2-base'/>
-@@ -253,9 +253,9 @@
-   <cpu type='tcg' name='z196-base'/>
-   <cpu type='tcg' name='z13-base'/>
-   <cpu type='tcg' name='z890'/>
--  <machine type='tcg' name='s390-ccw-virtio-2.8' alias='s390-ccw-virtio' maxCpus='248' default='yes'/>
--  <machine type='tcg' name='s390-ccw-virtio-2.7' maxCpus='248'/>
--  <machine type='tcg' name='s390-ccw-virtio-2.6' maxCpus='248'/>
--  <machine type='tcg' name='s390-ccw-virtio-2.5' maxCpus='248'/>
--  <machine type='tcg' name='s390-ccw-virtio-2.4' maxCpus='248'/>
-+  <machine type='tcg' name='s390-ccw-virtio-2.8' alias='s390-ccw-virtio' maxCpus='248' default='yes' numaMemSupported='yes'/>
-+  <machine type='tcg' name='s390-ccw-virtio-2.7' maxCpus='248' numaMemSupported='yes'/>
-+  <machine type='tcg' name='s390-ccw-virtio-2.6' maxCpus='248' numaMemSupported='yes'/>
-+  <machine type='tcg' name='s390-ccw-virtio-2.5' maxCpus='248' numaMemSupported='yes'/>
-+  <machine type='tcg' name='s390-ccw-virtio-2.4' maxCpus='248' numaMemSupported='yes'/>
- </qemuCaps>
-diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
-index 2a0b1f61de..30ef536ecb 100644
---- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
-+++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
-@@ -222,37 +222,37 @@
-   <cpu type='kvm' name='Broadwell' usable='yes'/>
-   <cpu type='kvm' name='Broadwell-noTSX' usable='yes'/>
-   <cpu type='kvm' name='486' usable='yes'/>
--  <machine type='kvm' name='pc-i440fx-2.8' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes'/>
--  <machine type='kvm' name='pc-0.12' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-1.3' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='xenpv' maxCpus='1'/>
--  <machine type='kvm' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-0.11' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-0.10' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-1.2' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='isapc' hotplugCpus='yes' maxCpus='1'/>
--  <machine type='kvm' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='xenfv' hotplugCpus='yes' maxCpus='128'/>
--  <machine type='kvm' name='pc-0.15' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-0.14' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-1.1' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-q35-2.8' alias='q35' hotplugCpus='yes' maxCpus='288'/>
--  <machine type='kvm' name='pc-1.0' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-0.13' hotplugCpus='yes' maxCpus='255'/>
-+  <machine type='kvm' name='pc-i440fx-2.8' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-0.12' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-1.3' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='xenpv' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-0.11' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-0.10' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-1.2' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='isapc' hotplugCpus='yes' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='xenfv' hotplugCpus='yes' maxCpus='128' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-0.15' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-0.14' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-1.1' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-2.8' alias='q35' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-1.0' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-0.13' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-   <cpu type='tcg' name='host' usable='no'>
-     <blocker name='kvm'/>
-   </cpu>
-@@ -378,35 +378,35 @@
-     <blocker name='3dnowprefetch'/>
-   </cpu>
-   <cpu type='tcg' name='486' usable='yes'/>
--  <machine type='tcg' name='pc-i440fx-2.8' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes'/>
--  <machine type='tcg' name='pc-0.12' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-1.3' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='xenpv' maxCpus='1'/>
--  <machine type='tcg' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-0.11' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-0.10' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-1.2' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='isapc' hotplugCpus='yes' maxCpus='1'/>
--  <machine type='tcg' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='xenfv' hotplugCpus='yes' maxCpus='128'/>
--  <machine type='tcg' name='pc-0.15' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-0.14' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-1.1' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-q35-2.8' alias='q35' hotplugCpus='yes' maxCpus='288'/>
--  <machine type='tcg' name='pc-1.0' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-0.13' hotplugCpus='yes' maxCpus='255'/>
-+  <machine type='tcg' name='pc-i440fx-2.8' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-0.12' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-1.3' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='xenpv' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-0.11' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-0.10' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-1.2' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='isapc' hotplugCpus='yes' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='xenfv' hotplugCpus='yes' maxCpus='128' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-0.15' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-0.14' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-1.1' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-2.8' alias='q35' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-1.0' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-0.13' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
- </qemuCaps>
-diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
-index 9141e29757..e6aee2519b 100644
---- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
-+++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
-@@ -573,26 +573,26 @@
-   <cpu type='kvm' name='MPC8544E_v11'/>
-   <cpu type='kvm' name='405GPb'/>
-   <cpu type='kvm' name='MPC8541E_v11'/>
--  <machine type='kvm' name='pseries-2.9' alias='pseries' hotplugCpus='yes' maxCpus='1024' default='yes'/>
--  <machine type='kvm' name='ref405ep' maxCpus='1'/>
--  <machine type='kvm' name='virtex-ml507' maxCpus='1'/>
--  <machine type='kvm' name='powernv' maxCpus='2048'/>
--  <machine type='kvm' name='ppce500' maxCpus='32'/>
--  <machine type='kvm' name='mpc8544ds' maxCpus='15'/>
--  <machine type='kvm' name='bamboo' maxCpus='1'/>
--  <machine type='kvm' name='g3beige' maxCpus='1'/>
--  <machine type='kvm' name='prep' maxCpus='1'/>
--  <machine type='kvm' name='mac99' maxCpus='1'/>
--  <machine type='kvm' name='pseries-2.6' maxCpus='1024'/>
--  <machine type='kvm' name='pseries-2.7' hotplugCpus='yes' maxCpus='1024'/>
--  <machine type='kvm' name='pseries-2.8' hotplugCpus='yes' maxCpus='1024'/>
--  <machine type='kvm' name='pseries-2.4' maxCpus='1024'/>
--  <machine type='kvm' name='pseries-2.5' maxCpus='1024'/>
--  <machine type='kvm' name='pseries-2.2' maxCpus='1024'/>
--  <machine type='kvm' name='taihu' maxCpus='1'/>
--  <machine type='kvm' name='pseries-2.3' maxCpus='1024'/>
--  <machine type='kvm' name='pseries-2.1' maxCpus='1024'/>
--  <machine type='kvm' name='40p' maxCpus='1'/>
-+  <machine type='kvm' name='pseries-2.9' alias='pseries' hotplugCpus='yes' maxCpus='1024' default='yes' numaMemSupported='yes'/>
-+  <machine type='kvm' name='ref405ep' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='virtex-ml507' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='powernv' maxCpus='2048' numaMemSupported='yes'/>
-+  <machine type='kvm' name='ppce500' maxCpus='32' numaMemSupported='yes'/>
-+  <machine type='kvm' name='mpc8544ds' maxCpus='15' numaMemSupported='yes'/>
-+  <machine type='kvm' name='bamboo' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='g3beige' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='prep' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='mac99' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pseries-2.6' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pseries-2.7' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pseries-2.8' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pseries-2.4' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pseries-2.5' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pseries-2.2' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='kvm' name='taihu' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pseries-2.3' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pseries-2.1' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='kvm' name='40p' maxCpus='1' numaMemSupported='yes'/>
-   <cpu type='tcg' name='default' typename='604-powerpc64-cpu'/>
-   <cpu type='tcg' name='ppc' typename='604-powerpc64-cpu'/>
-   <cpu type='tcg' name='ppc32' typename='604-powerpc64-cpu'/>
-@@ -1026,24 +1026,24 @@
-   <cpu type='tcg' name='MPC8544E_v11'/>
-   <cpu type='tcg' name='405GPb'/>
-   <cpu type='tcg' name='MPC8541E_v11'/>
--  <machine type='tcg' name='pseries-2.9' alias='pseries' hotplugCpus='yes' maxCpus='1024' default='yes'/>
--  <machine type='tcg' name='ref405ep' maxCpus='1'/>
--  <machine type='tcg' name='virtex-ml507' maxCpus='1'/>
--  <machine type='tcg' name='powernv' maxCpus='2048'/>
--  <machine type='tcg' name='ppce500' maxCpus='32'/>
--  <machine type='tcg' name='mpc8544ds' maxCpus='15'/>
--  <machine type='tcg' name='bamboo' maxCpus='1'/>
--  <machine type='tcg' name='g3beige' maxCpus='1'/>
--  <machine type='tcg' name='prep' maxCpus='1'/>
--  <machine type='tcg' name='mac99' maxCpus='1'/>
--  <machine type='tcg' name='pseries-2.6' maxCpus='1024'/>
--  <machine type='tcg' name='pseries-2.7' hotplugCpus='yes' maxCpus='1024'/>
--  <machine type='tcg' name='pseries-2.8' hotplugCpus='yes' maxCpus='1024'/>
--  <machine type='tcg' name='pseries-2.4' maxCpus='1024'/>
--  <machine type='tcg' name='pseries-2.5' maxCpus='1024'/>
--  <machine type='tcg' name='pseries-2.2' maxCpus='1024'/>
--  <machine type='tcg' name='taihu' maxCpus='1'/>
--  <machine type='tcg' name='pseries-2.3' maxCpus='1024'/>
--  <machine type='tcg' name='pseries-2.1' maxCpus='1024'/>
--  <machine type='tcg' name='40p' maxCpus='1'/>
-+  <machine type='tcg' name='pseries-2.9' alias='pseries' hotplugCpus='yes' maxCpus='1024' default='yes' numaMemSupported='yes'/>
-+  <machine type='tcg' name='ref405ep' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='virtex-ml507' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='powernv' maxCpus='2048' numaMemSupported='yes'/>
-+  <machine type='tcg' name='ppce500' maxCpus='32' numaMemSupported='yes'/>
-+  <machine type='tcg' name='mpc8544ds' maxCpus='15' numaMemSupported='yes'/>
-+  <machine type='tcg' name='bamboo' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='g3beige' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='prep' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='mac99' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pseries-2.6' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pseries-2.7' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pseries-2.8' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pseries-2.4' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pseries-2.5' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pseries-2.2' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='tcg' name='taihu' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pseries-2.3' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pseries-2.1' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='tcg' name='40p' maxCpus='1' numaMemSupported='yes'/>
- </qemuCaps>
-diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
-index bcc7d4bd4e..ce042443df 100644
---- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
-+++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
-@@ -190,12 +190,12 @@
-   <cpu type='kvm' name='z196-base' typename='z196-base-s390-cpu'/>
-   <cpu type='kvm' name='z13-base' typename='z13-base-s390-cpu'/>
-   <cpu type='kvm' name='z890' typename='z890-s390-cpu'/>
--  <machine type='kvm' name='s390-ccw-virtio-2.9' alias='s390-ccw-virtio' maxCpus='248' default='yes'/>
--  <machine type='kvm' name='s390-ccw-virtio-2.7' maxCpus='248'/>
--  <machine type='kvm' name='s390-ccw-virtio-2.6' maxCpus='248'/>
--  <machine type='kvm' name='s390-ccw-virtio-2.5' maxCpus='248'/>
--  <machine type='kvm' name='s390-ccw-virtio-2.4' maxCpus='248'/>
--  <machine type='kvm' name='s390-ccw-virtio-2.8' maxCpus='248'/>
-+  <machine type='kvm' name='s390-ccw-virtio-2.9' alias='s390-ccw-virtio' maxCpus='248' default='yes' numaMemSupported='yes'/>
-+  <machine type='kvm' name='s390-ccw-virtio-2.7' maxCpus='248' numaMemSupported='yes'/>
-+  <machine type='kvm' name='s390-ccw-virtio-2.6' maxCpus='248' numaMemSupported='yes'/>
-+  <machine type='kvm' name='s390-ccw-virtio-2.5' maxCpus='248' numaMemSupported='yes'/>
-+  <machine type='kvm' name='s390-ccw-virtio-2.4' maxCpus='248' numaMemSupported='yes'/>
-+  <machine type='kvm' name='s390-ccw-virtio-2.8' maxCpus='248' numaMemSupported='yes'/>
-   <cpu type='tcg' name='z10EC-base' typename='z10EC-base-s390-cpu'/>
-   <cpu type='tcg' name='z9EC-base' typename='z9EC-base-s390-cpu'/>
-   <cpu type='tcg' name='z196.2-base' typename='z196.2-base-s390-cpu'/>
-@@ -260,10 +260,10 @@
-   <cpu type='tcg' name='z196-base' typename='z196-base-s390-cpu'/>
-   <cpu type='tcg' name='z13-base' typename='z13-base-s390-cpu'/>
-   <cpu type='tcg' name='z890' typename='z890-s390-cpu'/>
--  <machine type='tcg' name='s390-ccw-virtio-2.9' alias='s390-ccw-virtio' maxCpus='248' default='yes'/>
--  <machine type='tcg' name='s390-ccw-virtio-2.7' maxCpus='248'/>
--  <machine type='tcg' name='s390-ccw-virtio-2.6' maxCpus='248'/>
--  <machine type='tcg' name='s390-ccw-virtio-2.5' maxCpus='248'/>
--  <machine type='tcg' name='s390-ccw-virtio-2.4' maxCpus='248'/>
--  <machine type='tcg' name='s390-ccw-virtio-2.8' maxCpus='248'/>
-+  <machine type='tcg' name='s390-ccw-virtio-2.9' alias='s390-ccw-virtio' maxCpus='248' default='yes' numaMemSupported='yes'/>
-+  <machine type='tcg' name='s390-ccw-virtio-2.7' maxCpus='248' numaMemSupported='yes'/>
-+  <machine type='tcg' name='s390-ccw-virtio-2.6' maxCpus='248' numaMemSupported='yes'/>
-+  <machine type='tcg' name='s390-ccw-virtio-2.5' maxCpus='248' numaMemSupported='yes'/>
-+  <machine type='tcg' name='s390-ccw-virtio-2.4' maxCpus='248' numaMemSupported='yes'/>
-+  <machine type='tcg' name='s390-ccw-virtio-2.8' maxCpus='248' numaMemSupported='yes'/>
- </qemuCaps>
-diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
-index 5cd82aa979..6781484056 100644
---- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
-+++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
-@@ -473,39 +473,39 @@
-   <cpu type='kvm' name='Broadwell' typename='Broadwell-x86_64-cpu' usable='yes'/>
-   <cpu type='kvm' name='Broadwell-noTSX' typename='Broadwell-noTSX-x86_64-cpu' usable='yes'/>
-   <cpu type='kvm' name='486' typename='486-x86_64-cpu' usable='yes'/>
--  <machine type='kvm' name='pc-i440fx-2.9' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes'/>
--  <machine type='kvm' name='pc-0.12' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-1.3' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='xenpv' maxCpus='1'/>
--  <machine type='kvm' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-0.11' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-0.10' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-1.2' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='isapc' hotplugCpus='yes' maxCpus='1'/>
--  <machine type='kvm' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='xenfv' hotplugCpus='yes' maxCpus='128'/>
--  <machine type='kvm' name='pc-0.15' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-0.14' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-q35-2.9' alias='q35' hotplugCpus='yes' maxCpus='288'/>
--  <machine type='kvm' name='pc-1.1' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288'/>
--  <machine type='kvm' name='pc-1.0' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-0.13' hotplugCpus='yes' maxCpus='255'/>
-+  <machine type='kvm' name='pc-i440fx-2.9' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-0.12' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-1.3' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='xenpv' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-0.11' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-0.10' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-1.2' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='isapc' hotplugCpus='yes' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='xenfv' hotplugCpus='yes' maxCpus='128' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-0.15' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-0.14' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-2.9' alias='q35' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-1.1' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-1.0' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-0.13' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-   <hostCPU type='tcg' model='base' migratability='yes'>
-     <property name='phys-bits' type='number' value='0'/>
-     <property name='core-id' type='number' value='-1'/>
-@@ -865,37 +865,37 @@
-     <blocker name='3dnowprefetch'/>
-   </cpu>
-   <cpu type='tcg' name='486' typename='486-x86_64-cpu' usable='yes'/>
--  <machine type='tcg' name='pc-i440fx-2.9' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes'/>
--  <machine type='tcg' name='pc-0.12' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-1.3' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='xenpv' maxCpus='1'/>
--  <machine type='tcg' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-0.11' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-0.10' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-1.2' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='isapc' hotplugCpus='yes' maxCpus='1'/>
--  <machine type='tcg' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='xenfv' hotplugCpus='yes' maxCpus='128'/>
--  <machine type='tcg' name='pc-0.15' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-0.14' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-q35-2.9' alias='q35' hotplugCpus='yes' maxCpus='288'/>
--  <machine type='tcg' name='pc-1.1' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288'/>
--  <machine type='tcg' name='pc-1.0' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-0.13' hotplugCpus='yes' maxCpus='255'/>
-+  <machine type='tcg' name='pc-i440fx-2.9' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-0.12' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-1.3' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='xenpv' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-0.11' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-0.10' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-1.2' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='isapc' hotplugCpus='yes' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='xenfv' hotplugCpus='yes' maxCpus='128' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-0.15' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-0.14' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-2.9' alias='q35' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-1.1' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-1.0' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-0.13' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
- </qemuCaps>
-diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
-index 6916da2047..b4b9d7ee01 100644
---- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
-+++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
-@@ -602,32 +602,32 @@
-   <cpu type='kvm' name='750_v3.1'/>
-   <cpu type='kvm' name='power5+_v2.1'/>
-   <cpu type='kvm' name='mpc8568e'/>
--  <machine type='kvm' name='pseries-3.0' alias='pseries' hotplugCpus='yes' maxCpus='1024' default='yes'/>
--  <machine type='kvm' name='ref405ep' maxCpus='1'/>
--  <machine type='kvm' name='sam460ex' maxCpus='1'/>
--  <machine type='kvm' name='virtex-ml507' maxCpus='1'/>
--  <machine type='kvm' name='powernv' maxCpus='2048'/>
--  <machine type='kvm' name='ppce500' maxCpus='32'/>
--  <machine type='kvm' name='mpc8544ds' maxCpus='15'/>
--  <machine type='kvm' name='pseries-2.12-sxxm' hotplugCpus='yes' maxCpus='1024'/>
--  <machine type='kvm' name='bamboo' maxCpus='1'/>
--  <machine type='kvm' name='g3beige' maxCpus='1'/>
--  <machine type='kvm' name='pseries-2.10' hotplugCpus='yes' maxCpus='1024'/>
--  <machine type='kvm' name='prep' maxCpus='1'/>
--  <machine type='kvm' name='pseries-2.11' hotplugCpus='yes' maxCpus='1024'/>
--  <machine type='kvm' name='pseries-2.12' hotplugCpus='yes' maxCpus='1024'/>
--  <machine type='kvm' name='pseries-2.9' hotplugCpus='yes' maxCpus='1024'/>
--  <machine type='kvm' name='mac99' maxCpus='1'/>
--  <machine type='kvm' name='pseries-2.6' maxCpus='1024'/>
--  <machine type='kvm' name='pseries-2.7' hotplugCpus='yes' maxCpus='1024'/>
--  <machine type='kvm' name='pseries-2.8' hotplugCpus='yes' maxCpus='1024'/>
--  <machine type='kvm' name='pseries-2.4' maxCpus='1024'/>
--  <machine type='kvm' name='pseries-2.5' maxCpus='1024'/>
--  <machine type='kvm' name='pseries-2.2' maxCpus='1024'/>
--  <machine type='kvm' name='taihu' maxCpus='1'/>
--  <machine type='kvm' name='pseries-2.3' maxCpus='1024'/>
--  <machine type='kvm' name='pseries-2.1' maxCpus='1024'/>
--  <machine type='kvm' name='40p' maxCpus='1'/>
-+  <machine type='kvm' name='pseries-3.0' alias='pseries' hotplugCpus='yes' maxCpus='1024' default='yes' numaMemSupported='yes'/>
-+  <machine type='kvm' name='ref405ep' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='sam460ex' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='virtex-ml507' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='powernv' maxCpus='2048' numaMemSupported='yes'/>
-+  <machine type='kvm' name='ppce500' maxCpus='32' numaMemSupported='yes'/>
-+  <machine type='kvm' name='mpc8544ds' maxCpus='15' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pseries-2.12-sxxm' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='kvm' name='bamboo' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='g3beige' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pseries-2.10' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='kvm' name='prep' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pseries-2.11' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pseries-2.12' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pseries-2.9' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='kvm' name='mac99' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pseries-2.6' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pseries-2.7' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pseries-2.8' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pseries-2.4' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pseries-2.5' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pseries-2.2' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='kvm' name='taihu' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pseries-2.3' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pseries-2.1' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='kvm' name='40p' maxCpus='1' numaMemSupported='yes'/>
-   <cpu type='tcg' name='default' typename='604-powerpc64-cpu'/>
-   <cpu type='tcg' name='ppc' typename='604-powerpc64-cpu'/>
-   <cpu type='tcg' name='ppc32' typename='604-powerpc64-cpu'/>
-@@ -1065,30 +1065,30 @@
-   <cpu type='tcg' name='750_v3.1'/>
-   <cpu type='tcg' name='power5+_v2.1'/>
-   <cpu type='tcg' name='mpc8568e'/>
--  <machine type='tcg' name='pseries-3.0' alias='pseries' hotplugCpus='yes' maxCpus='1024' default='yes'/>
--  <machine type='tcg' name='ref405ep' maxCpus='1'/>
--  <machine type='tcg' name='sam460ex' maxCpus='1'/>
--  <machine type='tcg' name='virtex-ml507' maxCpus='1'/>
--  <machine type='tcg' name='powernv' maxCpus='2048'/>
--  <machine type='tcg' name='ppce500' maxCpus='32'/>
--  <machine type='tcg' name='mpc8544ds' maxCpus='15'/>
--  <machine type='tcg' name='pseries-2.12-sxxm' hotplugCpus='yes' maxCpus='1024'/>
--  <machine type='tcg' name='bamboo' maxCpus='1'/>
--  <machine type='tcg' name='g3beige' maxCpus='1'/>
--  <machine type='tcg' name='pseries-2.10' hotplugCpus='yes' maxCpus='1024'/>
--  <machine type='tcg' name='prep' maxCpus='1'/>
--  <machine type='tcg' name='pseries-2.11' hotplugCpus='yes' maxCpus='1024'/>
--  <machine type='tcg' name='pseries-2.12' hotplugCpus='yes' maxCpus='1024'/>
--  <machine type='tcg' name='pseries-2.9' hotplugCpus='yes' maxCpus='1024'/>
--  <machine type='tcg' name='mac99' maxCpus='1'/>
--  <machine type='tcg' name='pseries-2.6' maxCpus='1024'/>
--  <machine type='tcg' name='pseries-2.7' hotplugCpus='yes' maxCpus='1024'/>
--  <machine type='tcg' name='pseries-2.8' hotplugCpus='yes' maxCpus='1024'/>
--  <machine type='tcg' name='pseries-2.4' maxCpus='1024'/>
--  <machine type='tcg' name='pseries-2.5' maxCpus='1024'/>
--  <machine type='tcg' name='pseries-2.2' maxCpus='1024'/>
--  <machine type='tcg' name='taihu' maxCpus='1'/>
--  <machine type='tcg' name='pseries-2.3' maxCpus='1024'/>
--  <machine type='tcg' name='pseries-2.1' maxCpus='1024'/>
--  <machine type='tcg' name='40p' maxCpus='1'/>
-+  <machine type='tcg' name='pseries-3.0' alias='pseries' hotplugCpus='yes' maxCpus='1024' default='yes' numaMemSupported='yes'/>
-+  <machine type='tcg' name='ref405ep' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='sam460ex' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='virtex-ml507' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='powernv' maxCpus='2048' numaMemSupported='yes'/>
-+  <machine type='tcg' name='ppce500' maxCpus='32' numaMemSupported='yes'/>
-+  <machine type='tcg' name='mpc8544ds' maxCpus='15' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pseries-2.12-sxxm' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='tcg' name='bamboo' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='g3beige' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pseries-2.10' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='tcg' name='prep' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pseries-2.11' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pseries-2.12' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pseries-2.9' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='tcg' name='mac99' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pseries-2.6' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pseries-2.7' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pseries-2.8' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pseries-2.4' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pseries-2.5' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pseries-2.2' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='tcg' name='taihu' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pseries-2.3' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pseries-2.1' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='tcg' name='40p' maxCpus='1' numaMemSupported='yes'/>
- </qemuCaps>
-diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
-index 802b624073..14550b8c7f 100644
---- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
-+++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
-@@ -104,9 +104,9 @@
-   <microcodeVersion>0</microcodeVersion>
-   <package></package>
-   <arch>riscv32</arch>
--  <machine type='tcg' name='spike_v1.10' maxCpus='1' default='yes'/>
--  <machine type='tcg' name='spike_v1.9.1' maxCpus='1'/>
--  <machine type='tcg' name='sifive_e' maxCpus='1'/>
--  <machine type='tcg' name='virt' maxCpus='8'/>
--  <machine type='tcg' name='sifive_u' maxCpus='1'/>
-+  <machine type='tcg' name='spike_v1.10' maxCpus='1' default='yes' numaMemSupported='yes'/>
-+  <machine type='tcg' name='spike_v1.9.1' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='sifive_e' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='virt' maxCpus='8' numaMemSupported='yes'/>
-+  <machine type='tcg' name='sifive_u' maxCpus='1' numaMemSupported='yes'/>
- </qemuCaps>
-diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
-index a16db0912d..1479b2bb2d 100644
---- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
-+++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
-@@ -104,9 +104,9 @@
-   <microcodeVersion>0</microcodeVersion>
-   <package></package>
-   <arch>riscv64</arch>
--  <machine type='tcg' name='spike_v1.10' maxCpus='1' default='yes'/>
--  <machine type='tcg' name='spike_v1.9.1' maxCpus='1'/>
--  <machine type='tcg' name='sifive_e' maxCpus='1'/>
--  <machine type='tcg' name='virt' maxCpus='8'/>
--  <machine type='tcg' name='sifive_u' maxCpus='1'/>
-+  <machine type='tcg' name='spike_v1.10' maxCpus='1' default='yes' numaMemSupported='yes'/>
-+  <machine type='tcg' name='spike_v1.9.1' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='sifive_e' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='virt' maxCpus='8' numaMemSupported='yes'/>
-+  <machine type='tcg' name='sifive_u' maxCpus='1' numaMemSupported='yes'/>
- </qemuCaps>
-diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
-index 6992e10237..96984d2bc3 100644
---- a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
-+++ b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
-@@ -240,16 +240,16 @@
-   <cpu type='kvm' name='z9BC' typename='z9BC-s390x-cpu' usable='yes'/>
-   <cpu type='kvm' name='z10EC.3-base' typename='z10EC.3-base-s390x-cpu' usable='yes'/>
-   <cpu type='kvm' name='z990.3-base' typename='z990.3-base-s390x-cpu' usable='yes'/>
--  <machine type='kvm' name='s390-ccw-virtio-3.0' alias='s390-ccw-virtio' hotplugCpus='yes' maxCpus='248' default='yes'/>
--  <machine type='kvm' name='s390-ccw-virtio-2.7' hotplugCpus='yes' maxCpus='248'/>
--  <machine type='kvm' name='s390-ccw-virtio-2.6' hotplugCpus='yes' maxCpus='248'/>
--  <machine type='kvm' name='s390-ccw-virtio-2.11' hotplugCpus='yes' maxCpus='248'/>
--  <machine type='kvm' name='s390-ccw-virtio-2.10' hotplugCpus='yes' maxCpus='248'/>
--  <machine type='kvm' name='s390-ccw-virtio-2.5' hotplugCpus='yes' maxCpus='248'/>
--  <machine type='kvm' name='s390-ccw-virtio-2.4' hotplugCpus='yes' maxCpus='248'/>
--  <machine type='kvm' name='s390-ccw-virtio-2.9' hotplugCpus='yes' maxCpus='248'/>
--  <machine type='kvm' name='s390-ccw-virtio-2.8' hotplugCpus='yes' maxCpus='248'/>
--  <machine type='kvm' name='s390-ccw-virtio-2.12' hotplugCpus='yes' maxCpus='248'/>
-+  <machine type='kvm' name='s390-ccw-virtio-3.0' alias='s390-ccw-virtio' hotplugCpus='yes' maxCpus='248' default='yes' numaMemSupported='yes'/>
-+  <machine type='kvm' name='s390-ccw-virtio-2.7' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/>
-+  <machine type='kvm' name='s390-ccw-virtio-2.6' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/>
-+  <machine type='kvm' name='s390-ccw-virtio-2.11' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/>
-+  <machine type='kvm' name='s390-ccw-virtio-2.10' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/>
-+  <machine type='kvm' name='s390-ccw-virtio-2.5' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/>
-+  <machine type='kvm' name='s390-ccw-virtio-2.4' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/>
-+  <machine type='kvm' name='s390-ccw-virtio-2.9' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/>
-+  <machine type='kvm' name='s390-ccw-virtio-2.8' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/>
-+  <machine type='kvm' name='s390-ccw-virtio-2.12' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/>
-   <cpu type='tcg' name='z890.2' typename='z890.2-s390x-cpu' usable='no'>
-     <blocker name='klmd-sha-1'/>
-     <blocker name='kimd-sha-1'/>
-@@ -2689,14 +2689,14 @@
-     <blocker name='kmac-dea'/>
-     <blocker name='hfpm'/>
-   </cpu>
--  <machine type='tcg' name='s390-ccw-virtio-3.0' alias='s390-ccw-virtio' hotplugCpus='yes' maxCpus='248' default='yes'/>
--  <machine type='tcg' name='s390-ccw-virtio-2.7' hotplugCpus='yes' maxCpus='248'/>
--  <machine type='tcg' name='s390-ccw-virtio-2.6' hotplugCpus='yes' maxCpus='248'/>
--  <machine type='tcg' name='s390-ccw-virtio-2.11' hotplugCpus='yes' maxCpus='248'/>
--  <machine type='tcg' name='s390-ccw-virtio-2.10' hotplugCpus='yes' maxCpus='248'/>
--  <machine type='tcg' name='s390-ccw-virtio-2.5' hotplugCpus='yes' maxCpus='248'/>
--  <machine type='tcg' name='s390-ccw-virtio-2.4' hotplugCpus='yes' maxCpus='248'/>
--  <machine type='tcg' name='s390-ccw-virtio-2.9' hotplugCpus='yes' maxCpus='248'/>
--  <machine type='tcg' name='s390-ccw-virtio-2.8' hotplugCpus='yes' maxCpus='248'/>
--  <machine type='tcg' name='s390-ccw-virtio-2.12' hotplugCpus='yes' maxCpus='248'/>
-+  <machine type='tcg' name='s390-ccw-virtio-3.0' alias='s390-ccw-virtio' hotplugCpus='yes' maxCpus='248' default='yes' numaMemSupported='yes'/>
-+  <machine type='tcg' name='s390-ccw-virtio-2.7' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/>
-+  <machine type='tcg' name='s390-ccw-virtio-2.6' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/>
-+  <machine type='tcg' name='s390-ccw-virtio-2.11' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/>
-+  <machine type='tcg' name='s390-ccw-virtio-2.10' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/>
-+  <machine type='tcg' name='s390-ccw-virtio-2.5' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/>
-+  <machine type='tcg' name='s390-ccw-virtio-2.4' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/>
-+  <machine type='tcg' name='s390-ccw-virtio-2.9' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/>
-+  <machine type='tcg' name='s390-ccw-virtio-2.8' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/>
-+  <machine type='tcg' name='s390-ccw-virtio-2.12' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/>
- </qemuCaps>
-diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
-index 9fdfc634ff..f936f502c3 100644
---- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
-+++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
-@@ -585,45 +585,45 @@
-   <cpu type='kvm' name='Broadwell-IBRS' typename='Broadwell-IBRS-x86_64-cpu' usable='yes'/>
-   <cpu type='kvm' name='Broadwell' typename='Broadwell-x86_64-cpu' usable='yes'/>
-   <cpu type='kvm' name='486' typename='486-x86_64-cpu' usable='yes'/>
--  <machine type='kvm' name='pc-i440fx-3.0' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes'/>
--  <machine type='kvm' name='isapc' hotplugCpus='yes' maxCpus='1'/>
--  <machine type='kvm' name='pc-1.1' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-1.2' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-1.3' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-1.0' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-2.9' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-q35-2.11' hotplugCpus='yes' maxCpus='288'/>
--  <machine type='kvm' name='pc-q35-2.12' hotplugCpus='yes' maxCpus='288'/>
--  <machine type='kvm' name='pc-q35-3.0' alias='q35' hotplugCpus='yes' maxCpus='288'/>
--  <machine type='kvm' name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288'/>
--  <machine type='kvm' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288'/>
--  <machine type='kvm' name='pc-0.15' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-2.11' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288'/>
--  <machine type='kvm' name='pc-0.13' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-2.12' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-0.14' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-2.10' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-0.11' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-0.12' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-0.10' hotplugCpus='yes' maxCpus='255'/>
-+  <machine type='kvm' name='pc-i440fx-3.0' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes' numaMemSupported='yes'/>
-+  <machine type='kvm' name='isapc' hotplugCpus='yes' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-1.1' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-1.2' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-1.3' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-1.0' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.9' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-2.11' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-2.12' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-3.0' alias='q35' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-0.15' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.11' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-0.13' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.12' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-0.14' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.10' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-0.11' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-0.12' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-0.10' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-   <hostCPU type='tcg' model='base' migratability='yes'>
-     <property name='phys-bits' type='number' value='0'/>
-     <property name='core-id' type='number' value='-1'/>
-@@ -1189,43 +1189,43 @@
-     <blocker name='3dnowprefetch'/>
-   </cpu>
-   <cpu type='tcg' name='486' typename='486-x86_64-cpu' usable='yes'/>
--  <machine type='tcg' name='pc-i440fx-3.0' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes'/>
--  <machine type='tcg' name='isapc' hotplugCpus='yes' maxCpus='1'/>
--  <machine type='tcg' name='pc-1.1' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-1.2' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-1.3' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-1.0' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-2.9' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-q35-2.11' hotplugCpus='yes' maxCpus='288'/>
--  <machine type='tcg' name='pc-q35-2.12' hotplugCpus='yes' maxCpus='288'/>
--  <machine type='tcg' name='pc-q35-3.0' alias='q35' hotplugCpus='yes' maxCpus='288'/>
--  <machine type='tcg' name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288'/>
--  <machine type='tcg' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288'/>
--  <machine type='tcg' name='pc-0.15' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-2.11' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288'/>
--  <machine type='tcg' name='pc-0.13' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-2.12' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-0.14' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-2.10' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-0.11' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-0.12' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-0.10' hotplugCpus='yes' maxCpus='255'/>
-+  <machine type='tcg' name='pc-i440fx-3.0' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes' numaMemSupported='yes'/>
-+  <machine type='tcg' name='isapc' hotplugCpus='yes' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-1.1' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-1.2' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-1.3' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-1.0' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.9' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-2.11' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-2.12' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-3.0' alias='q35' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-0.15' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.11' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-0.13' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.12' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-0.14' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.10' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-0.11' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-0.12' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-0.10' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
- </qemuCaps>
-diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
-index 4039923e5f..e1bc4beddb 100644
---- a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
-+++ b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
-@@ -607,33 +607,33 @@
-   <cpu type='kvm' name='750_v3.1'/>
-   <cpu type='kvm' name='power5+_v2.1'/>
-   <cpu type='kvm' name='mpc8568e'/>
--  <machine type='kvm' name='pseries-3.1' alias='pseries' hotplugCpus='yes' maxCpus='1024' default='yes'/>
--  <machine type='kvm' name='ref405ep' maxCpus='1'/>
--  <machine type='kvm' name='sam460ex' maxCpus='1'/>
--  <machine type='kvm' name='virtex-ml507' maxCpus='1'/>
--  <machine type='kvm' name='powernv' maxCpus='2048'/>
--  <machine type='kvm' name='ppce500' maxCpus='32'/>
--  <machine type='kvm' name='mpc8544ds' maxCpus='15'/>
--  <machine type='kvm' name='pseries-2.12-sxxm' hotplugCpus='yes' maxCpus='1024'/>
--  <machine type='kvm' name='bamboo' maxCpus='1'/>
--  <machine type='kvm' name='g3beige' maxCpus='1'/>
--  <machine type='kvm' name='pseries-3.0' hotplugCpus='yes' maxCpus='1024'/>
--  <machine type='kvm' name='pseries-2.10' hotplugCpus='yes' maxCpus='1024'/>
--  <machine type='kvm' name='prep' maxCpus='1'/>
--  <machine type='kvm' name='pseries-2.11' hotplugCpus='yes' maxCpus='1024'/>
--  <machine type='kvm' name='pseries-2.12' hotplugCpus='yes' maxCpus='1024'/>
--  <machine type='kvm' name='pseries-2.9' hotplugCpus='yes' maxCpus='1024'/>
--  <machine type='kvm' name='mac99' maxCpus='1'/>
--  <machine type='kvm' name='pseries-2.6' maxCpus='1024'/>
--  <machine type='kvm' name='pseries-2.7' hotplugCpus='yes' maxCpus='1024'/>
--  <machine type='kvm' name='pseries-2.8' hotplugCpus='yes' maxCpus='1024'/>
--  <machine type='kvm' name='pseries-2.4' maxCpus='1024'/>
--  <machine type='kvm' name='pseries-2.5' maxCpus='1024'/>
--  <machine type='kvm' name='pseries-2.2' maxCpus='1024'/>
--  <machine type='kvm' name='taihu' maxCpus='1'/>
--  <machine type='kvm' name='pseries-2.3' maxCpus='1024'/>
--  <machine type='kvm' name='pseries-2.1' maxCpus='1024'/>
--  <machine type='kvm' name='40p' maxCpus='1'/>
-+  <machine type='kvm' name='pseries-3.1' alias='pseries' hotplugCpus='yes' maxCpus='1024' default='yes' numaMemSupported='yes'/>
-+  <machine type='kvm' name='ref405ep' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='sam460ex' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='virtex-ml507' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='powernv' maxCpus='2048' numaMemSupported='yes'/>
-+  <machine type='kvm' name='ppce500' maxCpus='32' numaMemSupported='yes'/>
-+  <machine type='kvm' name='mpc8544ds' maxCpus='15' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pseries-2.12-sxxm' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='kvm' name='bamboo' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='g3beige' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pseries-3.0' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pseries-2.10' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='kvm' name='prep' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pseries-2.11' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pseries-2.12' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pseries-2.9' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='kvm' name='mac99' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pseries-2.6' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pseries-2.7' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pseries-2.8' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pseries-2.4' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pseries-2.5' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pseries-2.2' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='kvm' name='taihu' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pseries-2.3' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pseries-2.1' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='kvm' name='40p' maxCpus='1' numaMemSupported='yes'/>
-   <cpu type='tcg' name='default' typename='604-powerpc64-cpu'/>
-   <cpu type='tcg' name='ppc' typename='604-powerpc64-cpu'/>
-   <cpu type='tcg' name='ppc32' typename='604-powerpc64-cpu'/>
-@@ -1071,31 +1071,31 @@
-   <cpu type='tcg' name='750_v3.1'/>
-   <cpu type='tcg' name='power5+_v2.1'/>
-   <cpu type='tcg' name='mpc8568e'/>
--  <machine type='tcg' name='pseries-3.1' alias='pseries' hotplugCpus='yes' maxCpus='1024' default='yes'/>
--  <machine type='tcg' name='ref405ep' maxCpus='1'/>
--  <machine type='tcg' name='sam460ex' maxCpus='1'/>
--  <machine type='tcg' name='virtex-ml507' maxCpus='1'/>
--  <machine type='tcg' name='powernv' maxCpus='2048'/>
--  <machine type='tcg' name='ppce500' maxCpus='32'/>
--  <machine type='tcg' name='mpc8544ds' maxCpus='15'/>
--  <machine type='tcg' name='pseries-2.12-sxxm' hotplugCpus='yes' maxCpus='1024'/>
--  <machine type='tcg' name='bamboo' maxCpus='1'/>
--  <machine type='tcg' name='g3beige' maxCpus='1'/>
--  <machine type='tcg' name='pseries-3.0' hotplugCpus='yes' maxCpus='1024'/>
--  <machine type='tcg' name='pseries-2.10' hotplugCpus='yes' maxCpus='1024'/>
--  <machine type='tcg' name='prep' maxCpus='1'/>
--  <machine type='tcg' name='pseries-2.11' hotplugCpus='yes' maxCpus='1024'/>
--  <machine type='tcg' name='pseries-2.12' hotplugCpus='yes' maxCpus='1024'/>
--  <machine type='tcg' name='pseries-2.9' hotplugCpus='yes' maxCpus='1024'/>
--  <machine type='tcg' name='mac99' maxCpus='1'/>
--  <machine type='tcg' name='pseries-2.6' maxCpus='1024'/>
--  <machine type='tcg' name='pseries-2.7' hotplugCpus='yes' maxCpus='1024'/>
--  <machine type='tcg' name='pseries-2.8' hotplugCpus='yes' maxCpus='1024'/>
--  <machine type='tcg' name='pseries-2.4' maxCpus='1024'/>
--  <machine type='tcg' name='pseries-2.5' maxCpus='1024'/>
--  <machine type='tcg' name='pseries-2.2' maxCpus='1024'/>
--  <machine type='tcg' name='taihu' maxCpus='1'/>
--  <machine type='tcg' name='pseries-2.3' maxCpus='1024'/>
--  <machine type='tcg' name='pseries-2.1' maxCpus='1024'/>
--  <machine type='tcg' name='40p' maxCpus='1'/>
-+  <machine type='tcg' name='pseries-3.1' alias='pseries' hotplugCpus='yes' maxCpus='1024' default='yes' numaMemSupported='yes'/>
-+  <machine type='tcg' name='ref405ep' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='sam460ex' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='virtex-ml507' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='powernv' maxCpus='2048' numaMemSupported='yes'/>
-+  <machine type='tcg' name='ppce500' maxCpus='32' numaMemSupported='yes'/>
-+  <machine type='tcg' name='mpc8544ds' maxCpus='15' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pseries-2.12-sxxm' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='tcg' name='bamboo' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='g3beige' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pseries-3.0' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pseries-2.10' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='tcg' name='prep' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pseries-2.11' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pseries-2.12' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pseries-2.9' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='tcg' name='mac99' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pseries-2.6' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pseries-2.7' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pseries-2.8' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pseries-2.4' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pseries-2.5' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pseries-2.2' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='tcg' name='taihu' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pseries-2.3' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pseries-2.1' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='tcg' name='40p' maxCpus='1' numaMemSupported='yes'/>
- </qemuCaps>
-diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
-index 02fc245fca..f462022fb5 100644
---- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
-+++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
-@@ -664,47 +664,47 @@
-   <cpu type='kvm' name='Broadwell-IBRS' typename='Broadwell-IBRS-x86_64-cpu' usable='yes'/>
-   <cpu type='kvm' name='Broadwell' typename='Broadwell-x86_64-cpu' usable='yes'/>
-   <cpu type='kvm' name='486' typename='486-x86_64-cpu' usable='yes'/>
--  <machine type='kvm' name='pc-i440fx-3.1' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes'/>
--  <machine type='kvm' name='isapc' hotplugCpus='yes' maxCpus='1'/>
--  <machine type='kvm' name='pc-1.1' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-1.2' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-1.3' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-1.0' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-2.9' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-q35-3.1' alias='q35' hotplugCpus='yes' maxCpus='288'/>
--  <machine type='kvm' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-q35-2.11' hotplugCpus='yes' maxCpus='288'/>
--  <machine type='kvm' name='pc-q35-2.12' hotplugCpus='yes' maxCpus='288'/>
--  <machine type='kvm' name='pc-q35-3.0' hotplugCpus='yes' maxCpus='288'/>
--  <machine type='kvm' name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288'/>
--  <machine type='kvm' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288'/>
--  <machine type='kvm' name='pc-0.15' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-2.11' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288'/>
--  <machine type='kvm' name='pc-0.13' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-2.12' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-0.14' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-3.0' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-2.10' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-0.11' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-0.12' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-0.10' hotplugCpus='yes' maxCpus='255'/>
-+  <machine type='kvm' name='pc-i440fx-3.1' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes' numaMemSupported='yes'/>
-+  <machine type='kvm' name='isapc' hotplugCpus='yes' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-1.1' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-1.2' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-1.3' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-1.0' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.9' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-3.1' alias='q35' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-2.11' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-2.12' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-3.0' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-0.15' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.11' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-0.13' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.12' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-0.14' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-3.0' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.10' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-0.11' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-0.12' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-0.10' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-   <hostCPU type='tcg' model='base' migratability='yes'>
-     <property name='phys-bits' type='number' value='0'/>
-     <property name='core-id' type='number' value='-1'/>
-@@ -1374,45 +1374,45 @@
-     <blocker name='3dnowprefetch'/>
-   </cpu>
-   <cpu type='tcg' name='486' typename='486-x86_64-cpu' usable='yes'/>
--  <machine type='tcg' name='pc-i440fx-3.1' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes'/>
--  <machine type='tcg' name='isapc' hotplugCpus='yes' maxCpus='1'/>
--  <machine type='tcg' name='pc-1.1' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-1.2' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-1.3' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-1.0' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-2.9' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-q35-3.1' alias='q35' hotplugCpus='yes' maxCpus='288'/>
--  <machine type='tcg' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-q35-2.11' hotplugCpus='yes' maxCpus='288'/>
--  <machine type='tcg' name='pc-q35-2.12' hotplugCpus='yes' maxCpus='288'/>
--  <machine type='tcg' name='pc-q35-3.0' hotplugCpus='yes' maxCpus='288'/>
--  <machine type='tcg' name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288'/>
--  <machine type='tcg' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288'/>
--  <machine type='tcg' name='pc-0.15' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-2.11' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288'/>
--  <machine type='tcg' name='pc-0.13' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-2.12' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-0.14' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-3.0' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-2.10' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-0.11' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-0.12' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-0.10' hotplugCpus='yes' maxCpus='255'/>
-+  <machine type='tcg' name='pc-i440fx-3.1' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes' numaMemSupported='yes'/>
-+  <machine type='tcg' name='isapc' hotplugCpus='yes' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-1.1' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-1.2' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-1.3' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-1.0' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.9' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-3.1' alias='q35' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-2.11' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-2.12' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-3.0' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-0.15' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.11' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-0.13' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.12' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-0.14' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-3.0' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.10' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-0.11' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-0.12' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-0.10' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
- </qemuCaps>
-diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
-index 278f2d9135..963c991d5e 100644
---- a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
-+++ b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
-@@ -215,72 +215,72 @@
-   <cpu type='kvm' name='cortex-r5' typename='cortex-r5-arm-cpu'/>
-   <cpu type='kvm' name='pxa270-a1' typename='pxa270-a1-arm-cpu'/>
-   <cpu type='kvm' name='pxa270' typename='pxa270-arm-cpu'/>
--  <machine type='kvm' name='integratorcp' maxCpus='1'/>
--  <machine type='kvm' name='nuri' maxCpus='2'/>
--  <machine type='kvm' name='mps2-an511' maxCpus='1'/>
--  <machine type='kvm' name='verdex' maxCpus='1'/>
--  <machine type='kvm' name='mps2-an505' maxCpus='1'/>
--  <machine type='kvm' name='virt-3.0' maxCpus='512'/>
--  <machine type='kvm' name='ast2500-evb' maxCpus='1'/>
--  <machine type='kvm' name='smdkc210' maxCpus='2'/>
--  <machine type='kvm' name='collie' maxCpus='1'/>
--  <machine type='kvm' name='xlnx-versal-virt' maxCpus='2'/>
--  <machine type='kvm' name='imx25-pdk' maxCpus='1'/>
--  <machine type='kvm' name='spitz' maxCpus='1'/>
--  <machine type='kvm' name='musca-b1' maxCpus='2'/>
--  <machine type='kvm' name='realview-pbx-a9' maxCpus='4'/>
--  <machine type='kvm' name='realview-eb' maxCpus='1'/>
--  <machine type='kvm' name='realview-pb-a8' maxCpus='1'/>
--  <machine type='kvm' name='versatilepb' maxCpus='1'/>
--  <machine type='kvm' name='emcraft-sf2' maxCpus='1'/>
--  <machine type='kvm' name='virt-2.9' maxCpus='255'/>
--  <machine type='kvm' name='musicpal' maxCpus='1'/>
--  <machine type='kvm' name='z2' maxCpus='1'/>
--  <machine type='kvm' name='akita' maxCpus='1'/>
--  <machine type='kvm' name='virt-2.7' maxCpus='255'/>
--  <machine type='kvm' name='kzm' maxCpus='1'/>
--  <machine type='kvm' name='virt-2.8' maxCpus='255'/>
--  <machine type='kvm' name='realview-eb-mpcore' maxCpus='4'/>
--  <machine type='kvm' name='musca-a' maxCpus='2'/>
--  <machine type='kvm' name='mcimx7d-sabre' maxCpus='2'/>
--  <machine type='kvm' name='sx1' maxCpus='1'/>
--  <machine type='kvm' name='sx1-v1' maxCpus='1'/>
--  <machine type='kvm' name='virt-2.6' maxCpus='255'/>
--  <machine type='kvm' name='cubieboard' maxCpus='1'/>
--  <machine type='kvm' name='virt-4.0' alias='virt' maxCpus='512'/>
--  <machine type='kvm' name='highbank' maxCpus='4'/>
--  <machine type='kvm' name='raspi2' maxCpus='4'/>
--  <machine type='kvm' name='raspi3' maxCpus='4'/>
--  <machine type='kvm' name='netduino2' maxCpus='1'/>
--  <machine type='kvm' name='terrier' maxCpus='1'/>
--  <machine type='kvm' name='n810' maxCpus='1'/>
--  <machine type='kvm' name='mainstone' maxCpus='1'/>
--  <machine type='kvm' name='palmetto-bmc' maxCpus='1'/>
--  <machine type='kvm' name='sabrelite' maxCpus='4'/>
--  <machine type='kvm' name='midway' maxCpus='4'/>
--  <machine type='kvm' name='romulus-bmc' maxCpus='1'/>
--  <machine type='kvm' name='cheetah' maxCpus='1'/>
--  <machine type='kvm' name='tosa' maxCpus='1'/>
--  <machine type='kvm' name='borzoi' maxCpus='1'/>
--  <machine type='kvm' name='versatileab' maxCpus='1'/>
--  <machine type='kvm' name='lm3s6965evb' maxCpus='1'/>
--  <machine type='kvm' name='n800' maxCpus='1'/>
--  <machine type='kvm' name='virt-2.10' maxCpus='255'/>
--  <machine type='kvm' name='virt-2.11' maxCpus='255'/>
--  <machine type='kvm' name='connex' maxCpus='1'/>
--  <machine type='kvm' name='virt-2.12' maxCpus='255'/>
--  <machine type='kvm' name='microbit' maxCpus='1'/>
--  <machine type='kvm' name='witherspoon-bmc' maxCpus='1'/>
--  <machine type='kvm' name='xilinx-zynq-a9' maxCpus='1'/>
--  <machine type='kvm' name='mps2-an385' maxCpus='1'/>
--  <machine type='kvm' name='vexpress-a9' maxCpus='4'/>
--  <machine type='kvm' name='mps2-an521' maxCpus='2'/>
--  <machine type='kvm' name='mcimx6ul-evk' maxCpus='1'/>
--  <machine type='kvm' name='vexpress-a15' maxCpus='4'/>
--  <machine type='kvm' name='xlnx-zcu102' maxCpus='6'/>
--  <machine type='kvm' name='virt-3.1' maxCpus='512'/>
--  <machine type='kvm' name='canon-a1100' maxCpus='1'/>
--  <machine type='kvm' name='lm3s811evb' maxCpus='1'/>
-+  <machine type='kvm' name='integratorcp' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='nuri' maxCpus='2' numaMemSupported='yes'/>
-+  <machine type='kvm' name='mps2-an511' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='verdex' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='mps2-an505' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='virt-3.0' maxCpus='512' numaMemSupported='yes'/>
-+  <machine type='kvm' name='ast2500-evb' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='smdkc210' maxCpus='2' numaMemSupported='yes'/>
-+  <machine type='kvm' name='collie' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='xlnx-versal-virt' maxCpus='2' numaMemSupported='yes'/>
-+  <machine type='kvm' name='imx25-pdk' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='spitz' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='musca-b1' maxCpus='2' numaMemSupported='yes'/>
-+  <machine type='kvm' name='realview-pbx-a9' maxCpus='4' numaMemSupported='yes'/>
-+  <machine type='kvm' name='realview-eb' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='realview-pb-a8' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='versatilepb' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='emcraft-sf2' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='virt-2.9' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='musicpal' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='z2' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='akita' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='virt-2.7' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='kzm' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='virt-2.8' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='realview-eb-mpcore' maxCpus='4' numaMemSupported='yes'/>
-+  <machine type='kvm' name='musca-a' maxCpus='2' numaMemSupported='yes'/>
-+  <machine type='kvm' name='mcimx7d-sabre' maxCpus='2' numaMemSupported='yes'/>
-+  <machine type='kvm' name='sx1' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='sx1-v1' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='virt-2.6' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='cubieboard' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='virt-4.0' alias='virt' maxCpus='512' numaMemSupported='yes'/>
-+  <machine type='kvm' name='highbank' maxCpus='4' numaMemSupported='yes'/>
-+  <machine type='kvm' name='raspi2' maxCpus='4' numaMemSupported='yes'/>
-+  <machine type='kvm' name='raspi3' maxCpus='4' numaMemSupported='yes'/>
-+  <machine type='kvm' name='netduino2' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='terrier' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='n810' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='mainstone' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='palmetto-bmc' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='sabrelite' maxCpus='4' numaMemSupported='yes'/>
-+  <machine type='kvm' name='midway' maxCpus='4' numaMemSupported='yes'/>
-+  <machine type='kvm' name='romulus-bmc' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='cheetah' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='tosa' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='borzoi' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='versatileab' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='lm3s6965evb' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='n800' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='virt-2.10' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='virt-2.11' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='connex' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='virt-2.12' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='microbit' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='witherspoon-bmc' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='xilinx-zynq-a9' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='mps2-an385' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='vexpress-a9' maxCpus='4' numaMemSupported='yes'/>
-+  <machine type='kvm' name='mps2-an521' maxCpus='2' numaMemSupported='yes'/>
-+  <machine type='kvm' name='mcimx6ul-evk' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='vexpress-a15' maxCpus='4' numaMemSupported='yes'/>
-+  <machine type='kvm' name='xlnx-zcu102' maxCpus='6' numaMemSupported='yes'/>
-+  <machine type='kvm' name='virt-3.1' maxCpus='512' numaMemSupported='yes'/>
-+  <machine type='kvm' name='canon-a1100' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='lm3s811evb' maxCpus='1' numaMemSupported='yes'/>
-   <cpu type='tcg' name='pxa262' typename='pxa262-arm-cpu'/>
-   <cpu type='tcg' name='pxa270-a0' typename='pxa270-a0-arm-cpu'/>
-   <cpu type='tcg' name='arm1136' typename='arm1136-arm-cpu'/>
-@@ -318,72 +318,72 @@
-   <cpu type='tcg' name='cortex-r5' typename='cortex-r5-arm-cpu'/>
-   <cpu type='tcg' name='pxa270-a1' typename='pxa270-a1-arm-cpu'/>
-   <cpu type='tcg' name='pxa270' typename='pxa270-arm-cpu'/>
--  <machine type='tcg' name='integratorcp' maxCpus='1'/>
--  <machine type='tcg' name='nuri' maxCpus='2'/>
--  <machine type='tcg' name='mps2-an511' maxCpus='1'/>
--  <machine type='tcg' name='verdex' maxCpus='1'/>
--  <machine type='tcg' name='mps2-an505' maxCpus='1'/>
--  <machine type='tcg' name='virt-3.0' maxCpus='512'/>
--  <machine type='tcg' name='ast2500-evb' maxCpus='1'/>
--  <machine type='tcg' name='smdkc210' maxCpus='2'/>
--  <machine type='tcg' name='collie' maxCpus='1'/>
--  <machine type='tcg' name='xlnx-versal-virt' maxCpus='2'/>
--  <machine type='tcg' name='imx25-pdk' maxCpus='1'/>
--  <machine type='tcg' name='spitz' maxCpus='1'/>
--  <machine type='tcg' name='musca-b1' maxCpus='2'/>
--  <machine type='tcg' name='realview-pbx-a9' maxCpus='4'/>
--  <machine type='tcg' name='realview-eb' maxCpus='1'/>
--  <machine type='tcg' name='realview-pb-a8' maxCpus='1'/>
--  <machine type='tcg' name='versatilepb' maxCpus='1'/>
--  <machine type='tcg' name='emcraft-sf2' maxCpus='1'/>
--  <machine type='tcg' name='virt-2.9' maxCpus='255'/>
--  <machine type='tcg' name='musicpal' maxCpus='1'/>
--  <machine type='tcg' name='z2' maxCpus='1'/>
--  <machine type='tcg' name='akita' maxCpus='1'/>
--  <machine type='tcg' name='virt-2.7' maxCpus='255'/>
--  <machine type='tcg' name='kzm' maxCpus='1'/>
--  <machine type='tcg' name='virt-2.8' maxCpus='255'/>
--  <machine type='tcg' name='realview-eb-mpcore' maxCpus='4'/>
--  <machine type='tcg' name='musca-a' maxCpus='2'/>
--  <machine type='tcg' name='mcimx7d-sabre' maxCpus='2'/>
--  <machine type='tcg' name='sx1' maxCpus='1'/>
--  <machine type='tcg' name='sx1-v1' maxCpus='1'/>
--  <machine type='tcg' name='virt-2.6' maxCpus='255'/>
--  <machine type='tcg' name='cubieboard' maxCpus='1'/>
--  <machine type='tcg' name='virt-4.0' alias='virt' maxCpus='512'/>
--  <machine type='tcg' name='highbank' maxCpus='4'/>
--  <machine type='tcg' name='raspi2' maxCpus='4'/>
--  <machine type='tcg' name='raspi3' maxCpus='4'/>
--  <machine type='tcg' name='netduino2' maxCpus='1'/>
--  <machine type='tcg' name='terrier' maxCpus='1'/>
--  <machine type='tcg' name='n810' maxCpus='1'/>
--  <machine type='tcg' name='mainstone' maxCpus='1'/>
--  <machine type='tcg' name='palmetto-bmc' maxCpus='1'/>
--  <machine type='tcg' name='sabrelite' maxCpus='4'/>
--  <machine type='tcg' name='midway' maxCpus='4'/>
--  <machine type='tcg' name='romulus-bmc' maxCpus='1'/>
--  <machine type='tcg' name='cheetah' maxCpus='1'/>
--  <machine type='tcg' name='tosa' maxCpus='1'/>
--  <machine type='tcg' name='borzoi' maxCpus='1'/>
--  <machine type='tcg' name='versatileab' maxCpus='1'/>
--  <machine type='tcg' name='lm3s6965evb' maxCpus='1'/>
--  <machine type='tcg' name='n800' maxCpus='1'/>
--  <machine type='tcg' name='virt-2.10' maxCpus='255'/>
--  <machine type='tcg' name='virt-2.11' maxCpus='255'/>
--  <machine type='tcg' name='connex' maxCpus='1'/>
--  <machine type='tcg' name='virt-2.12' maxCpus='255'/>
--  <machine type='tcg' name='microbit' maxCpus='1'/>
--  <machine type='tcg' name='witherspoon-bmc' maxCpus='1'/>
--  <machine type='tcg' name='xilinx-zynq-a9' maxCpus='1'/>
--  <machine type='tcg' name='mps2-an385' maxCpus='1'/>
--  <machine type='tcg' name='vexpress-a9' maxCpus='4'/>
--  <machine type='tcg' name='mps2-an521' maxCpus='2'/>
--  <machine type='tcg' name='mcimx6ul-evk' maxCpus='1'/>
--  <machine type='tcg' name='vexpress-a15' maxCpus='4'/>
--  <machine type='tcg' name='xlnx-zcu102' maxCpus='6'/>
--  <machine type='tcg' name='virt-3.1' maxCpus='512'/>
--  <machine type='tcg' name='canon-a1100' maxCpus='1'/>
--  <machine type='tcg' name='lm3s811evb' maxCpus='1'/>
-+  <machine type='tcg' name='integratorcp' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='nuri' maxCpus='2' numaMemSupported='yes'/>
-+  <machine type='tcg' name='mps2-an511' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='verdex' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='mps2-an505' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='virt-3.0' maxCpus='512' numaMemSupported='yes'/>
-+  <machine type='tcg' name='ast2500-evb' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='smdkc210' maxCpus='2' numaMemSupported='yes'/>
-+  <machine type='tcg' name='collie' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='xlnx-versal-virt' maxCpus='2' numaMemSupported='yes'/>
-+  <machine type='tcg' name='imx25-pdk' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='spitz' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='musca-b1' maxCpus='2' numaMemSupported='yes'/>
-+  <machine type='tcg' name='realview-pbx-a9' maxCpus='4' numaMemSupported='yes'/>
-+  <machine type='tcg' name='realview-eb' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='realview-pb-a8' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='versatilepb' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='emcraft-sf2' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='virt-2.9' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='musicpal' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='z2' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='akita' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='virt-2.7' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='kzm' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='virt-2.8' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='realview-eb-mpcore' maxCpus='4' numaMemSupported='yes'/>
-+  <machine type='tcg' name='musca-a' maxCpus='2' numaMemSupported='yes'/>
-+  <machine type='tcg' name='mcimx7d-sabre' maxCpus='2' numaMemSupported='yes'/>
-+  <machine type='tcg' name='sx1' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='sx1-v1' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='virt-2.6' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='cubieboard' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='virt-4.0' alias='virt' maxCpus='512' numaMemSupported='yes'/>
-+  <machine type='tcg' name='highbank' maxCpus='4' numaMemSupported='yes'/>
-+  <machine type='tcg' name='raspi2' maxCpus='4' numaMemSupported='yes'/>
-+  <machine type='tcg' name='raspi3' maxCpus='4' numaMemSupported='yes'/>
-+  <machine type='tcg' name='netduino2' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='terrier' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='n810' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='mainstone' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='palmetto-bmc' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='sabrelite' maxCpus='4' numaMemSupported='yes'/>
-+  <machine type='tcg' name='midway' maxCpus='4' numaMemSupported='yes'/>
-+  <machine type='tcg' name='romulus-bmc' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='cheetah' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='tosa' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='borzoi' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='versatileab' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='lm3s6965evb' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='n800' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='virt-2.10' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='virt-2.11' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='connex' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='virt-2.12' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='microbit' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='witherspoon-bmc' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='xilinx-zynq-a9' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='mps2-an385' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='vexpress-a9' maxCpus='4' numaMemSupported='yes'/>
-+  <machine type='tcg' name='mps2-an521' maxCpus='2' numaMemSupported='yes'/>
-+  <machine type='tcg' name='mcimx6ul-evk' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='vexpress-a15' maxCpus='4' numaMemSupported='yes'/>
-+  <machine type='tcg' name='xlnx-zcu102' maxCpus='6' numaMemSupported='yes'/>
-+  <machine type='tcg' name='virt-3.1' maxCpus='512' numaMemSupported='yes'/>
-+  <machine type='tcg' name='canon-a1100' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='lm3s811evb' maxCpus='1' numaMemSupported='yes'/>
-   <gic version='3' kernel='yes' emulated='yes'/>
-   <gic version='2' kernel='no' emulated='yes'/>
- </qemuCaps>
-diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
-index 897ca08af0..2062fd0a90 100644
---- a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
-+++ b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
-@@ -621,34 +621,34 @@
-   <cpu type='kvm' name='750_v3.1'/>
-   <cpu type='kvm' name='power8e_v2.1'/>
-   <cpu type='kvm' name='mpc8568e'/>
--  <machine type='kvm' name='pseries-4.0' alias='pseries' hotplugCpus='yes' maxCpus='1024' default='yes'/>
--  <machine type='kvm' name='ref405ep' maxCpus='1'/>
--  <machine type='kvm' name='sam460ex' maxCpus='1'/>
--  <machine type='kvm' name='virtex-ml507' maxCpus='1'/>
--  <machine type='kvm' name='powernv' maxCpus='2048'/>
--  <machine type='kvm' name='ppce500' maxCpus='32'/>
--  <machine type='kvm' name='mpc8544ds' maxCpus='15'/>
--  <machine type='kvm' name='pseries-3.1' hotplugCpus='yes' maxCpus='1024'/>
--  <machine type='kvm' name='pseries-2.12-sxxm' hotplugCpus='yes' maxCpus='1024'/>
--  <machine type='kvm' name='bamboo' maxCpus='1'/>
--  <machine type='kvm' name='g3beige' maxCpus='1'/>
--  <machine type='kvm' name='pseries-3.0' hotplugCpus='yes' maxCpus='1024'/>
--  <machine type='kvm' name='pseries-2.10' hotplugCpus='yes' maxCpus='1024'/>
--  <machine type='kvm' name='prep' maxCpus='1'/>
--  <machine type='kvm' name='pseries-2.11' hotplugCpus='yes' maxCpus='1024'/>
--  <machine type='kvm' name='pseries-2.12' hotplugCpus='yes' maxCpus='1024'/>
--  <machine type='kvm' name='pseries-2.9' hotplugCpus='yes' maxCpus='1024'/>
--  <machine type='kvm' name='mac99' maxCpus='1'/>
--  <machine type='kvm' name='pseries-2.6' maxCpus='1024'/>
--  <machine type='kvm' name='pseries-2.7' hotplugCpus='yes' maxCpus='1024'/>
--  <machine type='kvm' name='pseries-2.8' hotplugCpus='yes' maxCpus='1024'/>
--  <machine type='kvm' name='pseries-2.4' maxCpus='1024'/>
--  <machine type='kvm' name='pseries-2.5' maxCpus='1024'/>
--  <machine type='kvm' name='pseries-2.2' maxCpus='1024'/>
--  <machine type='kvm' name='taihu' maxCpus='1'/>
--  <machine type='kvm' name='pseries-2.3' maxCpus='1024'/>
--  <machine type='kvm' name='pseries-2.1' maxCpus='1024'/>
--  <machine type='kvm' name='40p' maxCpus='1'/>
-+  <machine type='kvm' name='pseries-4.0' alias='pseries' hotplugCpus='yes' maxCpus='1024' default='yes' numaMemSupported='yes'/>
-+  <machine type='kvm' name='ref405ep' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='sam460ex' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='virtex-ml507' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='powernv' maxCpus='2048' numaMemSupported='yes'/>
-+  <machine type='kvm' name='ppce500' maxCpus='32' numaMemSupported='yes'/>
-+  <machine type='kvm' name='mpc8544ds' maxCpus='15' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pseries-3.1' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pseries-2.12-sxxm' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='kvm' name='bamboo' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='g3beige' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pseries-3.0' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pseries-2.10' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='kvm' name='prep' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pseries-2.11' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pseries-2.12' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pseries-2.9' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='kvm' name='mac99' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pseries-2.6' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pseries-2.7' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pseries-2.8' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pseries-2.4' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pseries-2.5' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pseries-2.2' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='kvm' name='taihu' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pseries-2.3' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pseries-2.1' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='kvm' name='40p' maxCpus='1' numaMemSupported='yes'/>
-   <cpu type='tcg' name='default' typename='604-powerpc64-cpu'/>
-   <cpu type='tcg' name='ppc' typename='604-powerpc64-cpu'/>
-   <cpu type='tcg' name='ppc32' typename='604-powerpc64-cpu'/>
-@@ -1086,32 +1086,32 @@
-   <cpu type='tcg' name='750_v3.1'/>
-   <cpu type='tcg' name='power8e_v2.1'/>
-   <cpu type='tcg' name='mpc8568e'/>
--  <machine type='tcg' name='pseries-4.0' alias='pseries' hotplugCpus='yes' maxCpus='1024' default='yes'/>
--  <machine type='tcg' name='ref405ep' maxCpus='1'/>
--  <machine type='tcg' name='sam460ex' maxCpus='1'/>
--  <machine type='tcg' name='virtex-ml507' maxCpus='1'/>
--  <machine type='tcg' name='powernv' maxCpus='2048'/>
--  <machine type='tcg' name='ppce500' maxCpus='32'/>
--  <machine type='tcg' name='mpc8544ds' maxCpus='15'/>
--  <machine type='tcg' name='pseries-3.1' hotplugCpus='yes' maxCpus='1024'/>
--  <machine type='tcg' name='pseries-2.12-sxxm' hotplugCpus='yes' maxCpus='1024'/>
--  <machine type='tcg' name='bamboo' maxCpus='1'/>
--  <machine type='tcg' name='g3beige' maxCpus='1'/>
--  <machine type='tcg' name='pseries-3.0' hotplugCpus='yes' maxCpus='1024'/>
--  <machine type='tcg' name='pseries-2.10' hotplugCpus='yes' maxCpus='1024'/>
--  <machine type='tcg' name='prep' maxCpus='1'/>
--  <machine type='tcg' name='pseries-2.11' hotplugCpus='yes' maxCpus='1024'/>
--  <machine type='tcg' name='pseries-2.12' hotplugCpus='yes' maxCpus='1024'/>
--  <machine type='tcg' name='pseries-2.9' hotplugCpus='yes' maxCpus='1024'/>
--  <machine type='tcg' name='mac99' maxCpus='1'/>
--  <machine type='tcg' name='pseries-2.6' maxCpus='1024'/>
--  <machine type='tcg' name='pseries-2.7' hotplugCpus='yes' maxCpus='1024'/>
--  <machine type='tcg' name='pseries-2.8' hotplugCpus='yes' maxCpus='1024'/>
--  <machine type='tcg' name='pseries-2.4' maxCpus='1024'/>
--  <machine type='tcg' name='pseries-2.5' maxCpus='1024'/>
--  <machine type='tcg' name='pseries-2.2' maxCpus='1024'/>
--  <machine type='tcg' name='taihu' maxCpus='1'/>
--  <machine type='tcg' name='pseries-2.3' maxCpus='1024'/>
--  <machine type='tcg' name='pseries-2.1' maxCpus='1024'/>
--  <machine type='tcg' name='40p' maxCpus='1'/>
-+  <machine type='tcg' name='pseries-4.0' alias='pseries' hotplugCpus='yes' maxCpus='1024' default='yes' numaMemSupported='yes'/>
-+  <machine type='tcg' name='ref405ep' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='sam460ex' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='virtex-ml507' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='powernv' maxCpus='2048' numaMemSupported='yes'/>
-+  <machine type='tcg' name='ppce500' maxCpus='32' numaMemSupported='yes'/>
-+  <machine type='tcg' name='mpc8544ds' maxCpus='15' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pseries-3.1' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pseries-2.12-sxxm' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='tcg' name='bamboo' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='g3beige' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pseries-3.0' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pseries-2.10' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='tcg' name='prep' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pseries-2.11' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pseries-2.12' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pseries-2.9' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='tcg' name='mac99' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pseries-2.6' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pseries-2.7' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pseries-2.8' hotplugCpus='yes' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pseries-2.4' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pseries-2.5' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pseries-2.2' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='tcg' name='taihu' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pseries-2.3' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pseries-2.1' maxCpus='1024' numaMemSupported='yes'/>
-+  <machine type='tcg' name='40p' maxCpus='1' numaMemSupported='yes'/>
- </qemuCaps>
-diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
-index 1993d52d42..3bd809f824 100644
---- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
-+++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
-@@ -179,9 +179,9 @@
-   <microcodeVersion>0</microcodeVersion>
-   <package>v4.0.0</package>
-   <arch>riscv32</arch>
--  <machine type='tcg' name='spike_v1.10' maxCpus='1' default='yes'/>
--  <machine type='tcg' name='virt' maxCpus='8'/>
--  <machine type='tcg' name='sifive_u' maxCpus='4'/>
--  <machine type='tcg' name='sifive_e' maxCpus='1'/>
--  <machine type='tcg' name='spike_v1.9.1' maxCpus='1'/>
-+  <machine type='tcg' name='spike_v1.10' maxCpus='1' default='yes' numaMemSupported='yes'/>
-+  <machine type='tcg' name='virt' maxCpus='8' numaMemSupported='yes'/>
-+  <machine type='tcg' name='sifive_u' maxCpus='4' numaMemSupported='yes'/>
-+  <machine type='tcg' name='sifive_e' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='spike_v1.9.1' maxCpus='1' numaMemSupported='yes'/>
- </qemuCaps>
-diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
-index 348138ab5a..b0ad30460b 100644
---- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
-+++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
-@@ -179,9 +179,9 @@
-   <microcodeVersion>0</microcodeVersion>
-   <package>v4.0.0</package>
-   <arch>riscv64</arch>
--  <machine type='tcg' name='spike_v1.10' maxCpus='1' default='yes'/>
--  <machine type='tcg' name='virt' maxCpus='8'/>
--  <machine type='tcg' name='sifive_u' maxCpus='4'/>
--  <machine type='tcg' name='sifive_e' maxCpus='1'/>
--  <machine type='tcg' name='spike_v1.9.1' maxCpus='1'/>
-+  <machine type='tcg' name='spike_v1.10' maxCpus='1' default='yes' numaMemSupported='yes'/>
-+  <machine type='tcg' name='virt' maxCpus='8' numaMemSupported='yes'/>
-+  <machine type='tcg' name='sifive_u' maxCpus='4' numaMemSupported='yes'/>
-+  <machine type='tcg' name='sifive_e' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='spike_v1.9.1' maxCpus='1' numaMemSupported='yes'/>
- </qemuCaps>
-diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
-index 1542ed6c68..44e527f570 100644
---- a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
-+++ b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
-@@ -254,18 +254,18 @@
-   <cpu type='kvm' name='z9BC' typename='z9BC-s390x-cpu' usable='yes'/>
-   <cpu type='kvm' name='z10EC.3-base' typename='z10EC.3-base-s390x-cpu' usable='yes'/>
-   <cpu type='kvm' name='z990.3-base' typename='z990.3-base-s390x-cpu' usable='yes'/>
--  <machine type='kvm' name='s390-ccw-virtio-4.0' alias='s390-ccw-virtio' hotplugCpus='yes' maxCpus='248' default='yes'/>
--  <machine type='kvm' name='s390-ccw-virtio-2.7' hotplugCpus='yes' maxCpus='248'/>
--  <machine type='kvm' name='s390-ccw-virtio-2.6' hotplugCpus='yes' maxCpus='248'/>
--  <machine type='kvm' name='s390-ccw-virtio-2.11' hotplugCpus='yes' maxCpus='248'/>
--  <machine type='kvm' name='s390-ccw-virtio-2.10' hotplugCpus='yes' maxCpus='248'/>
--  <machine type='kvm' name='s390-ccw-virtio-3.1' hotplugCpus='yes' maxCpus='248'/>
--  <machine type='kvm' name='s390-ccw-virtio-2.5' hotplugCpus='yes' maxCpus='248'/>
--  <machine type='kvm' name='s390-ccw-virtio-2.4' hotplugCpus='yes' maxCpus='248'/>
--  <machine type='kvm' name='s390-ccw-virtio-3.0' hotplugCpus='yes' maxCpus='248'/>
--  <machine type='kvm' name='s390-ccw-virtio-2.9' hotplugCpus='yes' maxCpus='248'/>
--  <machine type='kvm' name='s390-ccw-virtio-2.8' hotplugCpus='yes' maxCpus='248'/>
--  <machine type='kvm' name='s390-ccw-virtio-2.12' hotplugCpus='yes' maxCpus='248'/>
-+  <machine type='kvm' name='s390-ccw-virtio-4.0' alias='s390-ccw-virtio' hotplugCpus='yes' maxCpus='248' default='yes' numaMemSupported='yes'/>
-+  <machine type='kvm' name='s390-ccw-virtio-2.7' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/>
-+  <machine type='kvm' name='s390-ccw-virtio-2.6' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/>
-+  <machine type='kvm' name='s390-ccw-virtio-2.11' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/>
-+  <machine type='kvm' name='s390-ccw-virtio-2.10' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/>
-+  <machine type='kvm' name='s390-ccw-virtio-3.1' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/>
-+  <machine type='kvm' name='s390-ccw-virtio-2.5' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/>
-+  <machine type='kvm' name='s390-ccw-virtio-2.4' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/>
-+  <machine type='kvm' name='s390-ccw-virtio-3.0' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/>
-+  <machine type='kvm' name='s390-ccw-virtio-2.9' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/>
-+  <machine type='kvm' name='s390-ccw-virtio-2.8' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/>
-+  <machine type='kvm' name='s390-ccw-virtio-2.12' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/>
-   <hostCPU type='tcg' model='zEC12.2-base' migratability='no'>
-     <property name='dateh2' type='boolean' value='false'/>
-     <property name='aen' type='boolean' value='true'/>
-@@ -2902,16 +2902,16 @@
-     <blocker name='kmac-dea'/>
-     <blocker name='hfpm'/>
-   </cpu>
--  <machine type='tcg' name='s390-ccw-virtio-4.0' alias='s390-ccw-virtio' hotplugCpus='yes' maxCpus='248' default='yes'/>
--  <machine type='tcg' name='s390-ccw-virtio-2.7' hotplugCpus='yes' maxCpus='248'/>
--  <machine type='tcg' name='s390-ccw-virtio-2.6' hotplugCpus='yes' maxCpus='248'/>
--  <machine type='tcg' name='s390-ccw-virtio-2.11' hotplugCpus='yes' maxCpus='248'/>
--  <machine type='tcg' name='s390-ccw-virtio-2.10' hotplugCpus='yes' maxCpus='248'/>
--  <machine type='tcg' name='s390-ccw-virtio-3.1' hotplugCpus='yes' maxCpus='248'/>
--  <machine type='tcg' name='s390-ccw-virtio-2.5' hotplugCpus='yes' maxCpus='248'/>
--  <machine type='tcg' name='s390-ccw-virtio-2.4' hotplugCpus='yes' maxCpus='248'/>
--  <machine type='tcg' name='s390-ccw-virtio-3.0' hotplugCpus='yes' maxCpus='248'/>
--  <machine type='tcg' name='s390-ccw-virtio-2.9' hotplugCpus='yes' maxCpus='248'/>
--  <machine type='tcg' name='s390-ccw-virtio-2.8' hotplugCpus='yes' maxCpus='248'/>
--  <machine type='tcg' name='s390-ccw-virtio-2.12' hotplugCpus='yes' maxCpus='248'/>
-+  <machine type='tcg' name='s390-ccw-virtio-4.0' alias='s390-ccw-virtio' hotplugCpus='yes' maxCpus='248' default='yes' numaMemSupported='yes'/>
-+  <machine type='tcg' name='s390-ccw-virtio-2.7' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/>
-+  <machine type='tcg' name='s390-ccw-virtio-2.6' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/>
-+  <machine type='tcg' name='s390-ccw-virtio-2.11' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/>
-+  <machine type='tcg' name='s390-ccw-virtio-2.10' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/>
-+  <machine type='tcg' name='s390-ccw-virtio-3.1' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/>
-+  <machine type='tcg' name='s390-ccw-virtio-2.5' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/>
-+  <machine type='tcg' name='s390-ccw-virtio-2.4' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/>
-+  <machine type='tcg' name='s390-ccw-virtio-3.0' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/>
-+  <machine type='tcg' name='s390-ccw-virtio-2.9' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/>
-+  <machine type='tcg' name='s390-ccw-virtio-2.8' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/>
-+  <machine type='tcg' name='s390-ccw-virtio-2.12' hotplugCpus='yes' maxCpus='248' numaMemSupported='yes'/>
- </qemuCaps>
-diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
-index 9292313570..ab43924eaa 100644
---- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
-+++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
-@@ -671,47 +671,47 @@
-   <cpu type='kvm' name='Broadwell-IBRS' typename='Broadwell-IBRS-x86_64-cpu' usable='yes'/>
-   <cpu type='kvm' name='Broadwell' typename='Broadwell-x86_64-cpu' usable='yes'/>
-   <cpu type='kvm' name='486' typename='486-x86_64-cpu' usable='yes'/>
--  <machine type='kvm' name='pc-i440fx-4.0' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes'/>
--  <machine type='kvm' name='isapc' hotplugCpus='yes' maxCpus='1'/>
--  <machine type='kvm' name='pc-1.1' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-1.2' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-1.3' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-1.0' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-2.9' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-q35-3.1' hotplugCpus='yes' maxCpus='288'/>
--  <machine type='kvm' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-q35-2.11' hotplugCpus='yes' maxCpus='288'/>
--  <machine type='kvm' name='pc-q35-2.12' hotplugCpus='yes' maxCpus='288'/>
--  <machine type='kvm' name='pc-q35-3.0' hotplugCpus='yes' maxCpus='288'/>
--  <machine type='kvm' name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288'/>
--  <machine type='kvm' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288'/>
--  <machine type='kvm' name='pc-0.15' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-2.11' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288'/>
--  <machine type='kvm' name='pc-0.13' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-2.12' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-0.14' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-3.0' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-3.1' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-2.10' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-0.12' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-q35-4.0' alias='q35' hotplugCpus='yes' maxCpus='288'/>
-+  <machine type='kvm' name='pc-i440fx-4.0' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes' numaMemSupported='yes'/>
-+  <machine type='kvm' name='isapc' hotplugCpus='yes' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-1.1' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-1.2' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-1.3' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-1.0' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.9' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-3.1' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-2.11' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-2.12' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-3.0' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-0.15' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.11' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-0.13' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.12' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-0.14' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-3.0' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-3.1' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.10' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-0.12' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-4.0' alias='q35' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/>
-   <hostCPU type='tcg' model='base' migratability='yes'>
-     <property name='phys-bits' type='number' value='0'/>
-     <property name='core-id' type='number' value='-1'/>
-@@ -1382,45 +1382,45 @@
-     <blocker name='3dnowprefetch'/>
-   </cpu>
-   <cpu type='tcg' name='486' typename='486-x86_64-cpu' usable='yes'/>
--  <machine type='tcg' name='pc-i440fx-4.0' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes'/>
--  <machine type='tcg' name='isapc' hotplugCpus='yes' maxCpus='1'/>
--  <machine type='tcg' name='pc-1.1' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-1.2' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-1.3' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-1.0' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-2.9' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-q35-3.1' hotplugCpus='yes' maxCpus='288'/>
--  <machine type='tcg' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-q35-2.11' hotplugCpus='yes' maxCpus='288'/>
--  <machine type='tcg' name='pc-q35-2.12' hotplugCpus='yes' maxCpus='288'/>
--  <machine type='tcg' name='pc-q35-3.0' hotplugCpus='yes' maxCpus='288'/>
--  <machine type='tcg' name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288'/>
--  <machine type='tcg' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288'/>
--  <machine type='tcg' name='pc-0.15' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-2.11' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288'/>
--  <machine type='tcg' name='pc-0.13' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-2.12' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-0.14' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-3.0' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-3.1' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-2.10' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-0.12' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-q35-4.0' alias='q35' hotplugCpus='yes' maxCpus='288'/>
-+  <machine type='tcg' name='pc-i440fx-4.0' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes' numaMemSupported='yes'/>
-+  <machine type='tcg' name='isapc' hotplugCpus='yes' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-1.1' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-1.2' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-1.3' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-1.0' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.9' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-3.1' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-2.11' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-2.12' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-3.0' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-0.15' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.11' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-0.13' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.12' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-0.14' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-3.0' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-3.1' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.10' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-0.12' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-4.0' alias='q35' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/>
- </qemuCaps>
-diff --git a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
-index d07a27b4f8..aff2c6fcad 100644
---- a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
-+++ b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
-@@ -847,50 +847,50 @@
-   <cpu type='kvm' name='Broadwell' typename='Broadwell-x86_64-cpu' usable='yes'/>
-   <cpu type='kvm' name='486-v1' typename='486-v1-x86_64-cpu' usable='yes'/>
-   <cpu type='kvm' name='486' typename='486-x86_64-cpu' usable='yes'/>
--  <machine type='kvm' name='pc-i440fx-4.1' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes'/>
--  <machine type='kvm' name='pc-0.15' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-2.12' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-0.12' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-1.1' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288'/>
--  <machine type='kvm' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-0.14' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288'/>
--  <machine type='kvm' name='pc-i440fx-2.11' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-q35-3.1' hotplugCpus='yes' maxCpus='288'/>
--  <machine type='kvm' name='pc-q35-4.1' alias='q35' hotplugCpus='yes' maxCpus='288'/>
--  <machine type='kvm' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-1.3' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-2.9' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='isapc' hotplugCpus='yes' maxCpus='1'/>
--  <machine type='kvm' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-3.1' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-q35-2.12' hotplugCpus='yes' maxCpus='288'/>
--  <machine type='kvm' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-1.0' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-q35-4.0.1' hotplugCpus='yes' maxCpus='288'/>
--  <machine type='kvm' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-0.13' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288'/>
--  <machine type='kvm' name='pc-i440fx-2.10' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-q35-3.0' hotplugCpus='yes' maxCpus='288'/>
--  <machine type='kvm' name='pc-q35-4.0' hotplugCpus='yes' maxCpus='288'/>
--  <machine type='kvm' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-1.2' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-4.0' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-i440fx-3.0' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='kvm' name='pc-q35-2.11' hotplugCpus='yes' maxCpus='288'/>
-+  <machine type='kvm' name='pc-i440fx-4.1' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-0.15' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.12' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-0.12' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-1.1' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-0.14' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.11' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-3.1' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-4.1' alias='q35' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-1.3' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.9' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='isapc' hotplugCpus='yes' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-3.1' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-2.12' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-1.0' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-4.0.1' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-0.13' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.10' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-3.0' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-4.0' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-1.2' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-4.0' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-3.0' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-2.11' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/>
-   <hostCPU type='tcg' model='base' migratability='yes'>
-     <property name='cmov' type='boolean' value='true' migratable='yes'/>
-     <property name='ia64' type='boolean' value='false'/>
-@@ -1951,48 +1951,48 @@
-   </cpu>
-   <cpu type='tcg' name='486-v1' typename='486-v1-x86_64-cpu' usable='yes'/>
-   <cpu type='tcg' name='486' typename='486-x86_64-cpu' usable='yes'/>
--  <machine type='tcg' name='pc-i440fx-4.1' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes'/>
--  <machine type='tcg' name='pc-0.15' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-2.12' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-0.12' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-1.1' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288'/>
--  <machine type='tcg' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-0.14' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288'/>
--  <machine type='tcg' name='pc-i440fx-2.11' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-q35-3.1' hotplugCpus='yes' maxCpus='288'/>
--  <machine type='tcg' name='pc-q35-4.1' alias='q35' hotplugCpus='yes' maxCpus='288'/>
--  <machine type='tcg' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-1.3' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-2.9' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='isapc' hotplugCpus='yes' maxCpus='1'/>
--  <machine type='tcg' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-3.1' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-q35-2.12' hotplugCpus='yes' maxCpus='288'/>
--  <machine type='tcg' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-1.0' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-q35-4.0.1' hotplugCpus='yes' maxCpus='288'/>
--  <machine type='tcg' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-0.13' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288'/>
--  <machine type='tcg' name='pc-i440fx-2.10' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-q35-3.0' hotplugCpus='yes' maxCpus='288'/>
--  <machine type='tcg' name='pc-q35-4.0' hotplugCpus='yes' maxCpus='288'/>
--  <machine type='tcg' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-1.2' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-4.0' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-i440fx-3.0' hotplugCpus='yes' maxCpus='255'/>
--  <machine type='tcg' name='pc-q35-2.11' hotplugCpus='yes' maxCpus='288'/>
-+  <machine type='tcg' name='pc-i440fx-4.1' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-0.15' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.12' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-0.12' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-1.1' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-0.14' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.11' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-3.1' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-4.1' alias='q35' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-1.3' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.9' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='isapc' hotplugCpus='yes' maxCpus='1' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-3.1' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-2.12' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-1.0' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-4.0.1' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-0.13' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.10' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-3.0' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-4.0' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-1.2' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-4.0' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-3.0' hotplugCpus='yes' maxCpus='255' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-2.11' hotplugCpus='yes' maxCpus='288' numaMemSupported='yes'/>
- </qemuCaps>
-diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
-index fb3d5996c4..6aa36bac54 100644
---- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
-+++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
-@@ -251,7 +251,7 @@
-   <machine type='kvm' name='mps2-an511' maxCpus='1' defaultCPU='cortex-m3-arm-cpu'/>
-   <machine type='kvm' name='mps2-an505' maxCpus='1' defaultCPU='cortex-m33-arm-cpu'/>
-   <machine type='kvm' name='verdex' maxCpus='1' defaultCPU='pxa270-c0-arm-cpu'/>
--  <machine type='kvm' name='virt-3.0' maxCpus='512' defaultCPU='cortex-a15-arm-cpu'/>
-+  <machine type='kvm' name='virt-3.0' maxCpus='512' defaultCPU='cortex-a15-arm-cpu' numaMemSupported='yes'/>
-   <machine type='kvm' name='ast2500-evb' maxCpus='2'/>
-   <machine type='kvm' name='smdkc210' maxCpus='2'/>
-   <machine type='kvm' name='collie' maxCpus='1' defaultCPU='sa1110-arm-cpu'/>
-@@ -264,26 +264,26 @@
-   <machine type='kvm' name='versatilepb' maxCpus='1' defaultCPU='arm926-arm-cpu'/>
-   <machine type='kvm' name='realview-pb-a8' maxCpus='1' defaultCPU='cortex-a8-arm-cpu'/>
-   <machine type='kvm' name='emcraft-sf2' maxCpus='1' defaultCPU='cortex-m3-arm-cpu'/>
--  <machine type='kvm' name='virt-2.9' maxCpus='255' defaultCPU='cortex-a15-arm-cpu'/>
-+  <machine type='kvm' name='virt-2.9' maxCpus='255' defaultCPU='cortex-a15-arm-cpu' numaMemSupported='yes'/>
-   <machine type='kvm' name='musicpal' maxCpus='1' defaultCPU='arm926-arm-cpu'/>
--  <machine type='kvm' name='sbsa-ref' maxCpus='512' defaultCPU='cortex-a57-arm-cpu'/>
-+  <machine type='kvm' name='sbsa-ref' maxCpus='512' defaultCPU='cortex-a57-arm-cpu' numaMemSupported='yes'/>
-   <machine type='kvm' name='z2' maxCpus='1' defaultCPU='pxa270-c5-arm-cpu'/>
-   <machine type='kvm' name='akita' maxCpus='1' defaultCPU='pxa270-c0-arm-cpu'/>
--  <machine type='kvm' name='virt-2.7' maxCpus='255' defaultCPU='cortex-a15-arm-cpu'/>
-+  <machine type='kvm' name='virt-2.7' maxCpus='255' defaultCPU='cortex-a15-arm-cpu' numaMemSupported='yes'/>
-   <machine type='kvm' name='kzm' maxCpus='1'/>
-   <machine type='kvm' name='swift-bmc' maxCpus='2'/>
--  <machine type='kvm' name='virt-2.8' maxCpus='255' defaultCPU='cortex-a15-arm-cpu'/>
-+  <machine type='kvm' name='virt-2.8' maxCpus='255' defaultCPU='cortex-a15-arm-cpu' numaMemSupported='yes'/>
-   <machine type='kvm' name='realview-eb-mpcore' maxCpus='4' defaultCPU='arm11mpcore-arm-cpu'/>
-   <machine type='kvm' name='musca-a' maxCpus='2' defaultCPU='cortex-m33-arm-cpu'/>
-   <machine type='kvm' name='mcimx7d-sabre' maxCpus='2'/>
-   <machine type='kvm' name='sx1' maxCpus='1' defaultCPU='ti925t-arm-cpu'/>
--  <machine type='kvm' name='virt-4.2' alias='virt' maxCpus='512' defaultCPU='cortex-a15-arm-cpu'/>
-+  <machine type='kvm' name='virt-4.2' alias='virt' maxCpus='512' defaultCPU='cortex-a15-arm-cpu' numaMemSupported='yes'/>
-   <machine type='kvm' name='sx1-v1' maxCpus='1' defaultCPU='ti925t-arm-cpu'/>
--  <machine type='kvm' name='virt-2.6' maxCpus='255' defaultCPU='cortex-a15-arm-cpu'/>
-+  <machine type='kvm' name='virt-2.6' maxCpus='255' defaultCPU='cortex-a15-arm-cpu' numaMemSupported='yes'/>
-   <machine type='kvm' name='cubieboard' maxCpus='1' defaultCPU='cortex-a9-arm-cpu'/>
--  <machine type='kvm' name='virt-4.0' maxCpus='512' defaultCPU='cortex-a15-arm-cpu'/>
-+  <machine type='kvm' name='virt-4.0' maxCpus='512' defaultCPU='cortex-a15-arm-cpu' numaMemSupported='yes'/>
-   <machine type='kvm' name='highbank' maxCpus='4'/>
--  <machine type='kvm' name='virt-4.1' maxCpus='512' defaultCPU='cortex-a15-arm-cpu'/>
-+  <machine type='kvm' name='virt-4.1' maxCpus='512' defaultCPU='cortex-a15-arm-cpu' numaMemSupported='yes'/>
-   <machine type='kvm' name='raspi2' maxCpus='4'/>
-   <machine type='kvm' name='raspi3' maxCpus='4'/>
-   <machine type='kvm' name='netduino2' maxCpus='1'/>
-@@ -300,10 +300,10 @@
-   <machine type='kvm' name='versatileab' maxCpus='1' defaultCPU='arm926-arm-cpu'/>
-   <machine type='kvm' name='lm3s6965evb' maxCpus='1' defaultCPU='cortex-m3-arm-cpu'/>
-   <machine type='kvm' name='n800' maxCpus='1' defaultCPU='arm1136-r2-arm-cpu'/>
--  <machine type='kvm' name='virt-2.10' maxCpus='255' defaultCPU='cortex-a15-arm-cpu'/>
--  <machine type='kvm' name='virt-2.11' maxCpus='255' defaultCPU='cortex-a15-arm-cpu'/>
-+  <machine type='kvm' name='virt-2.10' maxCpus='255' defaultCPU='cortex-a15-arm-cpu' numaMemSupported='yes'/>
-+  <machine type='kvm' name='virt-2.11' maxCpus='255' defaultCPU='cortex-a15-arm-cpu' numaMemSupported='yes'/>
-   <machine type='kvm' name='connex' maxCpus='1'/>
--  <machine type='kvm' name='virt-2.12' maxCpus='255' defaultCPU='cortex-a15-arm-cpu'/>
-+  <machine type='kvm' name='virt-2.12' maxCpus='255' defaultCPU='cortex-a15-arm-cpu' numaMemSupported='yes'/>
-   <machine type='kvm' name='microbit' maxCpus='1'/>
-   <machine type='kvm' name='witherspoon-bmc' maxCpus='2'/>
-   <machine type='kvm' name='xilinx-zynq-a9' maxCpus='1' defaultCPU='cortex-a9-arm-cpu'/>
-@@ -314,7 +314,7 @@
-   <machine type='kvm' name='mcimx6ul-evk' maxCpus='1'/>
-   <machine type='kvm' name='vexpress-a15' maxCpus='4' defaultCPU='cortex-a15-arm-cpu'/>
-   <machine type='kvm' name='xlnx-zcu102' maxCpus='6'/>
--  <machine type='kvm' name='virt-3.1' maxCpus='512' defaultCPU='cortex-a15-arm-cpu'/>
-+  <machine type='kvm' name='virt-3.1' maxCpus='512' defaultCPU='cortex-a15-arm-cpu' numaMemSupported='yes'/>
-   <machine type='kvm' name='canon-a1100' maxCpus='1'/>
-   <machine type='kvm' name='lm3s811evb' maxCpus='1' defaultCPU='cortex-m3-arm-cpu'/>
-   <hostCPU type='tcg' model='max' migratability='no'>
-@@ -380,7 +380,7 @@
-   <machine type='tcg' name='mps2-an511' maxCpus='1' defaultCPU='cortex-m3-arm-cpu'/>
-   <machine type='tcg' name='mps2-an505' maxCpus='1' defaultCPU='cortex-m33-arm-cpu'/>
-   <machine type='tcg' name='verdex' maxCpus='1' defaultCPU='pxa270-c0-arm-cpu'/>
--  <machine type='tcg' name='virt-3.0' maxCpus='512' defaultCPU='cortex-a15-arm-cpu'/>
-+  <machine type='tcg' name='virt-3.0' maxCpus='512' defaultCPU='cortex-a15-arm-cpu' numaMemSupported='yes'/>
-   <machine type='tcg' name='ast2500-evb' maxCpus='2'/>
-   <machine type='tcg' name='smdkc210' maxCpus='2'/>
-   <machine type='tcg' name='collie' maxCpus='1' defaultCPU='sa1110-arm-cpu'/>
-@@ -393,26 +393,26 @@
-   <machine type='tcg' name='versatilepb' maxCpus='1' defaultCPU='arm926-arm-cpu'/>
-   <machine type='tcg' name='realview-pb-a8' maxCpus='1' defaultCPU='cortex-a8-arm-cpu'/>
-   <machine type='tcg' name='emcraft-sf2' maxCpus='1' defaultCPU='cortex-m3-arm-cpu'/>
--  <machine type='tcg' name='virt-2.9' maxCpus='255' defaultCPU='cortex-a15-arm-cpu'/>
-+  <machine type='tcg' name='virt-2.9' maxCpus='255' defaultCPU='cortex-a15-arm-cpu' numaMemSupported='yes'/>
-   <machine type='tcg' name='musicpal' maxCpus='1' defaultCPU='arm926-arm-cpu'/>
--  <machine type='tcg' name='sbsa-ref' maxCpus='512' defaultCPU='cortex-a57-arm-cpu'/>
-+  <machine type='tcg' name='sbsa-ref' maxCpus='512' defaultCPU='cortex-a57-arm-cpu' numaMemSupported='yes'/>
-   <machine type='tcg' name='z2' maxCpus='1' defaultCPU='pxa270-c5-arm-cpu'/>
-   <machine type='tcg' name='akita' maxCpus='1' defaultCPU='pxa270-c0-arm-cpu'/>
--  <machine type='tcg' name='virt-2.7' maxCpus='255' defaultCPU='cortex-a15-arm-cpu'/>
-+  <machine type='tcg' name='virt-2.7' maxCpus='255' defaultCPU='cortex-a15-arm-cpu' numaMemSupported='yes'/>
-   <machine type='tcg' name='kzm' maxCpus='1'/>
-   <machine type='tcg' name='swift-bmc' maxCpus='2'/>
--  <machine type='tcg' name='virt-2.8' maxCpus='255' defaultCPU='cortex-a15-arm-cpu'/>
-+  <machine type='tcg' name='virt-2.8' maxCpus='255' defaultCPU='cortex-a15-arm-cpu' numaMemSupported='yes'/>
-   <machine type='tcg' name='realview-eb-mpcore' maxCpus='4' defaultCPU='arm11mpcore-arm-cpu'/>
-   <machine type='tcg' name='musca-a' maxCpus='2' defaultCPU='cortex-m33-arm-cpu'/>
-   <machine type='tcg' name='mcimx7d-sabre' maxCpus='2'/>
-   <machine type='tcg' name='sx1' maxCpus='1' defaultCPU='ti925t-arm-cpu'/>
--  <machine type='tcg' name='virt-4.2' alias='virt' maxCpus='512' defaultCPU='cortex-a15-arm-cpu'/>
-+  <machine type='tcg' name='virt-4.2' alias='virt' maxCpus='512' defaultCPU='cortex-a15-arm-cpu' numaMemSupported='yes'/>
-   <machine type='tcg' name='sx1-v1' maxCpus='1' defaultCPU='ti925t-arm-cpu'/>
--  <machine type='tcg' name='virt-2.6' maxCpus='255' defaultCPU='cortex-a15-arm-cpu'/>
-+  <machine type='tcg' name='virt-2.6' maxCpus='255' defaultCPU='cortex-a15-arm-cpu' numaMemSupported='yes'/>
-   <machine type='tcg' name='cubieboard' maxCpus='1' defaultCPU='cortex-a9-arm-cpu'/>
--  <machine type='tcg' name='virt-4.0' maxCpus='512' defaultCPU='cortex-a15-arm-cpu'/>
-+  <machine type='tcg' name='virt-4.0' maxCpus='512' defaultCPU='cortex-a15-arm-cpu' numaMemSupported='yes'/>
-   <machine type='tcg' name='highbank' maxCpus='4'/>
--  <machine type='tcg' name='virt-4.1' maxCpus='512' defaultCPU='cortex-a15-arm-cpu'/>
-+  <machine type='tcg' name='virt-4.1' maxCpus='512' defaultCPU='cortex-a15-arm-cpu' numaMemSupported='yes'/>
-   <machine type='tcg' name='raspi2' maxCpus='4'/>
-   <machine type='tcg' name='raspi3' maxCpus='4'/>
-   <machine type='tcg' name='netduino2' maxCpus='1'/>
-@@ -429,10 +429,10 @@
-   <machine type='tcg' name='versatileab' maxCpus='1' defaultCPU='arm926-arm-cpu'/>
-   <machine type='tcg' name='lm3s6965evb' maxCpus='1' defaultCPU='cortex-m3-arm-cpu'/>
-   <machine type='tcg' name='n800' maxCpus='1' defaultCPU='arm1136-r2-arm-cpu'/>
--  <machine type='tcg' name='virt-2.10' maxCpus='255' defaultCPU='cortex-a15-arm-cpu'/>
--  <machine type='tcg' name='virt-2.11' maxCpus='255' defaultCPU='cortex-a15-arm-cpu'/>
-+  <machine type='tcg' name='virt-2.10' maxCpus='255' defaultCPU='cortex-a15-arm-cpu' numaMemSupported='yes'/>
-+  <machine type='tcg' name='virt-2.11' maxCpus='255' defaultCPU='cortex-a15-arm-cpu' numaMemSupported='yes'/>
-   <machine type='tcg' name='connex' maxCpus='1'/>
--  <machine type='tcg' name='virt-2.12' maxCpus='255' defaultCPU='cortex-a15-arm-cpu'/>
-+  <machine type='tcg' name='virt-2.12' maxCpus='255' defaultCPU='cortex-a15-arm-cpu' numaMemSupported='yes'/>
-   <machine type='tcg' name='microbit' maxCpus='1'/>
-   <machine type='tcg' name='witherspoon-bmc' maxCpus='2'/>
-   <machine type='tcg' name='xilinx-zynq-a9' maxCpus='1' defaultCPU='cortex-a9-arm-cpu'/>
-@@ -442,7 +442,7 @@
-   <machine type='tcg' name='mcimx6ul-evk' maxCpus='1'/>
-   <machine type='tcg' name='vexpress-a15' maxCpus='4' defaultCPU='cortex-a15-arm-cpu'/>
-   <machine type='tcg' name='xlnx-zcu102' maxCpus='6'/>
--  <machine type='tcg' name='virt-3.1' maxCpus='512' defaultCPU='cortex-a15-arm-cpu'/>
-+  <machine type='tcg' name='virt-3.1' maxCpus='512' defaultCPU='cortex-a15-arm-cpu' numaMemSupported='yes'/>
-   <machine type='tcg' name='canon-a1100' maxCpus='1'/>
-   <machine type='tcg' name='lm3s811evb' maxCpus='1' defaultCPU='cortex-m3-arm-cpu'/>
-   <gic version='3' kernel='yes' emulated='yes'/>
-diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
-index daea978d9f..871dc41579 100644
---- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
-+++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
-@@ -626,34 +626,34 @@
-   <cpu type='kvm' name='750_v3.1'/>
-   <cpu type='kvm' name='power8e_v2.1'/>
-   <cpu type='kvm' name='mpc8568e'/>
--  <machine type='kvm' name='pseries-4.2' alias='pseries' hotplugCpus='yes' maxCpus='1024' default='yes' defaultCPU='host-powerpc64-cpu'/>
-+  <machine type='kvm' name='pseries-4.2' alias='pseries' hotplugCpus='yes' maxCpus='1024' default='yes' defaultCPU='host-powerpc64-cpu' numaMemSupported='yes'/>
-   <machine type='kvm' name='ref405ep' maxCpus='1'/>
-   <machine type='kvm' name='sam460ex' maxCpus='1' defaultCPU='460exb-powerpc64-cpu'/>
-   <machine type='kvm' name='virtex-ml507' maxCpus='1' defaultCPU='440-xilinx-powerpc64-cpu'/>
-   <machine type='kvm' name='ppce500' maxCpus='32' defaultCPU='e500v2_v30-powerpc64-cpu'/>
-   <machine type='kvm' name='mpc8544ds' maxCpus='15' defaultCPU='e500v2_v30-powerpc64-cpu'/>
--  <machine type='kvm' name='pseries-3.1' hotplugCpus='yes' maxCpus='1024' defaultCPU='host-powerpc64-cpu'/>
--  <machine type='kvm' name='pseries-2.12-sxxm' hotplugCpus='yes' maxCpus='1024' defaultCPU='host-powerpc64-cpu'/>
-+  <machine type='kvm' name='pseries-3.1' hotplugCpus='yes' maxCpus='1024' defaultCPU='host-powerpc64-cpu' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pseries-2.12-sxxm' hotplugCpus='yes' maxCpus='1024' defaultCPU='host-powerpc64-cpu' numaMemSupported='yes'/>
-   <machine type='kvm' name='bamboo' maxCpus='1' defaultCPU='440epb-powerpc64-cpu'/>
-   <machine type='kvm' name='g3beige' maxCpus='1' defaultCPU='750_v3.1-powerpc64-cpu'/>
--  <machine type='kvm' name='pseries-3.0' hotplugCpus='yes' maxCpus='1024' defaultCPU='host-powerpc64-cpu'/>
--  <machine type='kvm' name='pseries-2.10' hotplugCpus='yes' maxCpus='1024' defaultCPU='host-powerpc64-cpu'/>
-+  <machine type='kvm' name='pseries-3.0' hotplugCpus='yes' maxCpus='1024' defaultCPU='host-powerpc64-cpu' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pseries-2.10' hotplugCpus='yes' maxCpus='1024' defaultCPU='host-powerpc64-cpu' numaMemSupported='yes'/>
-   <machine type='kvm' name='prep' maxCpus='1' defaultCPU='602-powerpc64-cpu'/>
--  <machine type='kvm' name='pseries-2.11' hotplugCpus='yes' maxCpus='1024' defaultCPU='host-powerpc64-cpu'/>
--  <machine type='kvm' name='pseries-2.12' hotplugCpus='yes' maxCpus='1024' defaultCPU='host-powerpc64-cpu'/>
--  <machine type='kvm' name='pseries-2.9' hotplugCpus='yes' maxCpus='1024' defaultCPU='host-powerpc64-cpu'/>
-+  <machine type='kvm' name='pseries-2.11' hotplugCpus='yes' maxCpus='1024' defaultCPU='host-powerpc64-cpu' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pseries-2.12' hotplugCpus='yes' maxCpus='1024' defaultCPU='host-powerpc64-cpu' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pseries-2.9' hotplugCpus='yes' maxCpus='1024' defaultCPU='host-powerpc64-cpu' numaMemSupported='yes'/>
-   <machine type='kvm' name='mac99' maxCpus='1' defaultCPU='970fx_v3.1-powerpc64-cpu'/>
--  <machine type='kvm' name='pseries-2.6' maxCpus='1024' defaultCPU='host-powerpc64-cpu'/>
--  <machine type='kvm' name='pseries-2.7' hotplugCpus='yes' maxCpus='1024' defaultCPU='host-powerpc64-cpu'/>
--  <machine type='kvm' name='pseries-2.8' hotplugCpus='yes' maxCpus='1024' defaultCPU='host-powerpc64-cpu'/>
--  <machine type='kvm' name='pseries-2.4' maxCpus='1024' defaultCPU='host-powerpc64-cpu'/>
--  <machine type='kvm' name='pseries-2.5' maxCpus='1024' defaultCPU='host-powerpc64-cpu'/>
--  <machine type='kvm' name='pseries-4.0' hotplugCpus='yes' maxCpus='1024' defaultCPU='host-powerpc64-cpu'/>
--  <machine type='kvm' name='pseries-4.1' hotplugCpus='yes' maxCpus='1024' defaultCPU='host-powerpc64-cpu'/>
--  <machine type='kvm' name='pseries-2.2' maxCpus='1024' defaultCPU='host-powerpc64-cpu'/>
-+  <machine type='kvm' name='pseries-2.6' maxCpus='1024' defaultCPU='host-powerpc64-cpu' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pseries-2.7' hotplugCpus='yes' maxCpus='1024' defaultCPU='host-powerpc64-cpu' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pseries-2.8' hotplugCpus='yes' maxCpus='1024' defaultCPU='host-powerpc64-cpu' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pseries-2.4' maxCpus='1024' defaultCPU='host-powerpc64-cpu' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pseries-2.5' maxCpus='1024' defaultCPU='host-powerpc64-cpu' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pseries-4.0' hotplugCpus='yes' maxCpus='1024' defaultCPU='host-powerpc64-cpu' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pseries-4.1' hotplugCpus='yes' maxCpus='1024' defaultCPU='host-powerpc64-cpu' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pseries-2.2' maxCpus='1024' defaultCPU='host-powerpc64-cpu' numaMemSupported='yes'/>
-   <machine type='kvm' name='taihu' maxCpus='1'/>
--  <machine type='kvm' name='pseries-2.3' maxCpus='1024' defaultCPU='host-powerpc64-cpu'/>
--  <machine type='kvm' name='pseries-2.1' maxCpus='1024' defaultCPU='host-powerpc64-cpu'/>
-+  <machine type='kvm' name='pseries-2.3' maxCpus='1024' defaultCPU='host-powerpc64-cpu' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pseries-2.1' maxCpus='1024' defaultCPU='host-powerpc64-cpu' numaMemSupported='yes'/>
-   <machine type='kvm' name='powernv8' maxCpus='2048' defaultCPU='power8_v2.0-powerpc64-cpu'/>
-   <machine type='kvm' name='powernv9' alias='powernv' maxCpus='2048' defaultCPU='power9_v2.0-powerpc64-cpu'/>
-   <machine type='kvm' name='40p' maxCpus='1' defaultCPU='604-powerpc64-cpu'/>
-@@ -1094,34 +1094,34 @@
-   <cpu type='tcg' name='750_v3.1'/>
-   <cpu type='tcg' name='power8e_v2.1'/>
-   <cpu type='tcg' name='mpc8568e'/>
--  <machine type='tcg' name='pseries-4.2' alias='pseries' hotplugCpus='yes' maxCpus='1024' default='yes' defaultCPU='power9_v2.0-powerpc64-cpu'/>
-+  <machine type='tcg' name='pseries-4.2' alias='pseries' hotplugCpus='yes' maxCpus='1024' default='yes' defaultCPU='power9_v2.0-powerpc64-cpu' numaMemSupported='yes'/>
-   <machine type='tcg' name='ref405ep' maxCpus='1'/>
-   <machine type='tcg' name='sam460ex' maxCpus='1' defaultCPU='460exb-powerpc64-cpu'/>
-   <machine type='tcg' name='virtex-ml507' maxCpus='1' defaultCPU='440-xilinx-powerpc64-cpu'/>
-   <machine type='tcg' name='ppce500' maxCpus='32' defaultCPU='e500v2_v30-powerpc64-cpu'/>
-   <machine type='tcg' name='mpc8544ds' maxCpus='15' defaultCPU='e500v2_v30-powerpc64-cpu'/>
--  <machine type='tcg' name='pseries-3.1' hotplugCpus='yes' maxCpus='1024' defaultCPU='power8_v2.0-powerpc64-cpu'/>
--  <machine type='tcg' name='pseries-2.12-sxxm' hotplugCpus='yes' maxCpus='1024' defaultCPU='power8_v2.0-powerpc64-cpu'/>
-+  <machine type='tcg' name='pseries-3.1' hotplugCpus='yes' maxCpus='1024' defaultCPU='power8_v2.0-powerpc64-cpu' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pseries-2.12-sxxm' hotplugCpus='yes' maxCpus='1024' defaultCPU='power8_v2.0-powerpc64-cpu' numaMemSupported='yes'/>
-   <machine type='tcg' name='bamboo' maxCpus='1' defaultCPU='440epb-powerpc64-cpu'/>
-   <machine type='tcg' name='g3beige' maxCpus='1' defaultCPU='750_v3.1-powerpc64-cpu'/>
--  <machine type='tcg' name='pseries-3.0' hotplugCpus='yes' maxCpus='1024' defaultCPU='power8_v2.0-powerpc64-cpu'/>
--  <machine type='tcg' name='pseries-2.10' hotplugCpus='yes' maxCpus='1024' defaultCPU='power8_v2.0-powerpc64-cpu'/>
-+  <machine type='tcg' name='pseries-3.0' hotplugCpus='yes' maxCpus='1024' defaultCPU='power8_v2.0-powerpc64-cpu' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pseries-2.10' hotplugCpus='yes' maxCpus='1024' defaultCPU='power8_v2.0-powerpc64-cpu' numaMemSupported='yes'/>
-   <machine type='tcg' name='prep' maxCpus='1' defaultCPU='602-powerpc64-cpu'/>
--  <machine type='tcg' name='pseries-2.11' hotplugCpus='yes' maxCpus='1024' defaultCPU='power8_v2.0-powerpc64-cpu'/>
--  <machine type='tcg' name='pseries-2.12' hotplugCpus='yes' maxCpus='1024' defaultCPU='power8_v2.0-powerpc64-cpu'/>
--  <machine type='tcg' name='pseries-2.9' hotplugCpus='yes' maxCpus='1024' defaultCPU='power8_v2.0-powerpc64-cpu'/>
-+  <machine type='tcg' name='pseries-2.11' hotplugCpus='yes' maxCpus='1024' defaultCPU='power8_v2.0-powerpc64-cpu' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pseries-2.12' hotplugCpus='yes' maxCpus='1024' defaultCPU='power8_v2.0-powerpc64-cpu' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pseries-2.9' hotplugCpus='yes' maxCpus='1024' defaultCPU='power8_v2.0-powerpc64-cpu' numaMemSupported='yes'/>
-   <machine type='tcg' name='mac99' maxCpus='1' defaultCPU='970fx_v3.1-powerpc64-cpu'/>
--  <machine type='tcg' name='pseries-2.6' maxCpus='1024' defaultCPU='power7_v2.3-powerpc64-cpu'/>
--  <machine type='tcg' name='pseries-2.7' hotplugCpus='yes' maxCpus='1024' defaultCPU='power7_v2.3-powerpc64-cpu'/>
--  <machine type='tcg' name='pseries-2.8' hotplugCpus='yes' maxCpus='1024' defaultCPU='power8_v2.0-powerpc64-cpu'/>
--  <machine type='tcg' name='pseries-2.4' maxCpus='1024' defaultCPU='power7_v2.3-powerpc64-cpu'/>
--  <machine type='tcg' name='pseries-2.5' maxCpus='1024' defaultCPU='power7_v2.3-powerpc64-cpu'/>
--  <machine type='tcg' name='pseries-4.0' hotplugCpus='yes' maxCpus='1024' defaultCPU='power9_v2.0-powerpc64-cpu'/>
--  <machine type='tcg' name='pseries-4.1' hotplugCpus='yes' maxCpus='1024' defaultCPU='power9_v2.0-powerpc64-cpu'/>
--  <machine type='tcg' name='pseries-2.2' maxCpus='1024' defaultCPU='power7_v2.3-powerpc64-cpu'/>
-+  <machine type='tcg' name='pseries-2.6' maxCpus='1024' defaultCPU='power7_v2.3-powerpc64-cpu' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pseries-2.7' hotplugCpus='yes' maxCpus='1024' defaultCPU='power7_v2.3-powerpc64-cpu' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pseries-2.8' hotplugCpus='yes' maxCpus='1024' defaultCPU='power8_v2.0-powerpc64-cpu' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pseries-2.4' maxCpus='1024' defaultCPU='power7_v2.3-powerpc64-cpu' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pseries-2.5' maxCpus='1024' defaultCPU='power7_v2.3-powerpc64-cpu' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pseries-4.0' hotplugCpus='yes' maxCpus='1024' defaultCPU='power9_v2.0-powerpc64-cpu' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pseries-4.1' hotplugCpus='yes' maxCpus='1024' defaultCPU='power9_v2.0-powerpc64-cpu' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pseries-2.2' maxCpus='1024' defaultCPU='power7_v2.3-powerpc64-cpu' numaMemSupported='yes'/>
-   <machine type='tcg' name='taihu' maxCpus='1'/>
--  <machine type='tcg' name='pseries-2.3' maxCpus='1024' defaultCPU='power7_v2.3-powerpc64-cpu'/>
--  <machine type='tcg' name='pseries-2.1' maxCpus='1024' defaultCPU='power7_v2.3-powerpc64-cpu'/>
-+  <machine type='tcg' name='pseries-2.3' maxCpus='1024' defaultCPU='power7_v2.3-powerpc64-cpu' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pseries-2.1' maxCpus='1024' defaultCPU='power7_v2.3-powerpc64-cpu' numaMemSupported='yes'/>
-   <machine type='tcg' name='powernv8' maxCpus='2048' defaultCPU='power8_v2.0-powerpc64-cpu'/>
-   <machine type='tcg' name='powernv9' alias='powernv' maxCpus='2048' defaultCPU='power9_v2.0-powerpc64-cpu'/>
-   <machine type='tcg' name='40p' maxCpus='1' defaultCPU='604-powerpc64-cpu'/>
-diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
-index 2d5b2ad0f0..383aa10f49 100644
---- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
-+++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
-@@ -1099,53 +1099,53 @@
-   <cpu type='kvm' name='Broadwell' typename='Broadwell-x86_64-cpu' usable='yes'/>
-   <cpu type='kvm' name='486-v1' typename='486-v1-x86_64-cpu' usable='yes'/>
-   <cpu type='kvm' name='486' typename='486-x86_64-cpu' usable='yes'/>
--  <machine type='kvm' name='pc-i440fx-4.2' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='kvm' name='pc-0.15' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='kvm' name='pc-i440fx-2.12' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='kvm' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='kvm' name='pc-q35-4.2' alias='q35' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='kvm' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='kvm' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='kvm' name='pc-0.12' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='kvm' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='kvm' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='kvm' name='pc-1.1' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='kvm' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='kvm' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='kvm' name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='kvm' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='kvm' name='pc-0.14' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='kvm' name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='kvm' name='pc-i440fx-2.11' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='kvm' name='pc-q35-3.1' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='kvm' name='pc-q35-4.1' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='kvm' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='kvm' name='pc-1.3' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='kvm' name='pc-i440fx-4.1' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='kvm' name='pc-i440fx-2.9' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='kvm' name='isapc' hotplugCpus='yes' maxCpus='1' defaultCPU='486-x86_64-cpu'/>
--  <machine type='kvm' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='kvm' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='kvm' name='pc-i440fx-3.1' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='kvm' name='pc-q35-2.12' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='kvm' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='kvm' name='pc-1.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='kvm' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='kvm' name='pc-q35-4.0.1' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='kvm' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='kvm' name='pc-0.13' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='kvm' name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='kvm' name='pc-i440fx-2.10' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='kvm' name='pc-q35-3.0' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='kvm' name='pc-q35-4.0' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/>
-+  <machine type='kvm' name='pc-i440fx-4.2' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-0.15' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.12' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-4.2' alias='q35' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-0.12' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-1.1' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-0.14' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.11' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-3.1' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-4.1' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-1.3' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-4.1' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.9' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='kvm' name='isapc' hotplugCpus='yes' maxCpus='1' defaultCPU='486-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-3.1' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-2.12' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-1.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-4.0.1' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-0.13' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.10' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-3.0' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-4.0' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-   <machine type='kvm' name='microvm' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='kvm' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='kvm' name='pc-1.2' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='kvm' name='pc-i440fx-4.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='kvm' name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='kvm' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='kvm' name='pc-i440fx-3.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='kvm' name='pc-q35-2.11' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/>
-+  <machine type='kvm' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-1.2' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-4.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-3.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-2.11' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-   <hostCPU type='tcg' model='base' migratability='yes'>
-     <property name='vmx-entry-load-rtit-ctl' type='boolean' value='false'/>
-     <property name='cmov' type='boolean' value='true' migratable='yes'/>
-@@ -2562,51 +2562,51 @@
-   </cpu>
-   <cpu type='tcg' name='486-v1' typename='486-v1-x86_64-cpu' usable='yes'/>
-   <cpu type='tcg' name='486' typename='486-x86_64-cpu' usable='yes'/>
--  <machine type='tcg' name='pc-i440fx-4.2' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='tcg' name='pc-0.15' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='tcg' name='pc-i440fx-2.12' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='tcg' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='tcg' name='pc-q35-4.2' alias='q35' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='tcg' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='tcg' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='tcg' name='pc-0.12' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='tcg' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='tcg' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='tcg' name='pc-1.1' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='tcg' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='tcg' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='tcg' name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='tcg' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='tcg' name='pc-0.14' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='tcg' name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='tcg' name='pc-i440fx-2.11' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='tcg' name='pc-q35-3.1' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='tcg' name='pc-q35-4.1' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='tcg' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='tcg' name='pc-1.3' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='tcg' name='pc-i440fx-4.1' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='tcg' name='pc-i440fx-2.9' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='tcg' name='isapc' hotplugCpus='yes' maxCpus='1' defaultCPU='486-x86_64-cpu'/>
--  <machine type='tcg' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='tcg' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='tcg' name='pc-i440fx-3.1' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='tcg' name='pc-q35-2.12' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='tcg' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='tcg' name='pc-1.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='tcg' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='tcg' name='pc-q35-4.0.1' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='tcg' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='tcg' name='pc-0.13' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='tcg' name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='tcg' name='pc-i440fx-2.10' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='tcg' name='pc-q35-3.0' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='tcg' name='pc-q35-4.0' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/>
-+  <machine type='tcg' name='pc-i440fx-4.2' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-0.15' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.12' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-4.2' alias='q35' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-0.12' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-1.1' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-0.14' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.11' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-3.1' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-4.1' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-1.3' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-4.1' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.9' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='tcg' name='isapc' hotplugCpus='yes' maxCpus='1' defaultCPU='486-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-3.1' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-2.12' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-1.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-4.0.1' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-0.13' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.10' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-3.0' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-4.0' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-   <machine type='tcg' name='microvm' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='tcg' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='tcg' name='pc-1.2' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='tcg' name='pc-i440fx-4.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='tcg' name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='tcg' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='tcg' name='pc-i440fx-3.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='tcg' name='pc-q35-2.11' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/>
-+  <machine type='tcg' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-1.2' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-4.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-3.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-2.11' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
- </qemuCaps>
-diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
-index be0be79fda..92ad10c9b8 100644
---- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
-+++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
-@@ -255,7 +255,7 @@
-   <machine type='kvm' name='mps2-an511' maxCpus='1' defaultCPU='cortex-m3-arm-cpu'/>
-   <machine type='kvm' name='mps2-an505' maxCpus='1' defaultCPU='cortex-m33-arm-cpu'/>
-   <machine type='kvm' name='verdex' maxCpus='1' defaultCPU='pxa270-c0-arm-cpu'/>
--  <machine type='kvm' name='virt-3.0' maxCpus='512' defaultCPU='cortex-a15-arm-cpu'/>
-+  <machine type='kvm' name='virt-3.0' maxCpus='512' defaultCPU='cortex-a15-arm-cpu' numaMemSupported='yes'/>
-   <machine type='kvm' name='ast2500-evb' maxCpus='2'/>
-   <machine type='kvm' name='smdkc210' maxCpus='2'/>
-   <machine type='kvm' name='collie' maxCpus='1' defaultCPU='sa1110-arm-cpu'/>
-@@ -268,26 +268,26 @@
-   <machine type='kvm' name='versatilepb' maxCpus='1' defaultCPU='arm926-arm-cpu'/>
-   <machine type='kvm' name='realview-pb-a8' maxCpus='1' defaultCPU='cortex-a8-arm-cpu'/>
-   <machine type='kvm' name='emcraft-sf2' maxCpus='1' defaultCPU='cortex-m3-arm-cpu'/>
--  <machine type='kvm' name='virt-2.9' maxCpus='255' defaultCPU='cortex-a15-arm-cpu'/>
-+  <machine type='kvm' name='virt-2.9' maxCpus='255' defaultCPU='cortex-a15-arm-cpu' numaMemSupported='yes'/>
-   <machine type='kvm' name='musicpal' maxCpus='1' defaultCPU='arm926-arm-cpu'/>
-   <machine type='kvm' name='sbsa-ref' maxCpus='512' defaultCPU='cortex-a57-arm-cpu'/>
-   <machine type='kvm' name='z2' maxCpus='1' defaultCPU='pxa270-c5-arm-cpu'/>
-   <machine type='kvm' name='akita' maxCpus='1' defaultCPU='pxa270-c0-arm-cpu'/>
--  <machine type='kvm' name='virt-2.7' maxCpus='255' defaultCPU='cortex-a15-arm-cpu'/>
-+  <machine type='kvm' name='virt-2.7' maxCpus='255' defaultCPU='cortex-a15-arm-cpu' numaMemSupported='yes'/>
-   <machine type='kvm' name='kzm' maxCpus='1'/>
-   <machine type='kvm' name='swift-bmc' maxCpus='2'/>
--  <machine type='kvm' name='virt-2.8' maxCpus='255' defaultCPU='cortex-a15-arm-cpu'/>
-+  <machine type='kvm' name='virt-2.8' maxCpus='255' defaultCPU='cortex-a15-arm-cpu' numaMemSupported='yes'/>
-   <machine type='kvm' name='realview-eb-mpcore' maxCpus='4' defaultCPU='arm11mpcore-arm-cpu'/>
-   <machine type='kvm' name='musca-a' maxCpus='2' defaultCPU='cortex-m33-arm-cpu'/>
-   <machine type='kvm' name='mcimx7d-sabre' maxCpus='2'/>
-   <machine type='kvm' name='sx1' maxCpus='1' defaultCPU='ti925t-arm-cpu'/>
--  <machine type='kvm' name='virt-4.2' maxCpus='512' defaultCPU='cortex-a15-arm-cpu'/>
-+  <machine type='kvm' name='virt-4.2' maxCpus='512' defaultCPU='cortex-a15-arm-cpu' numaMemSupported='yes'/>
-   <machine type='kvm' name='sx1-v1' maxCpus='1' defaultCPU='ti925t-arm-cpu'/>
--  <machine type='kvm' name='virt-2.6' maxCpus='255' defaultCPU='cortex-a15-arm-cpu'/>
-+  <machine type='kvm' name='virt-2.6' maxCpus='255' defaultCPU='cortex-a15-arm-cpu' numaMemSupported='yes'/>
-   <machine type='kvm' name='cubieboard' maxCpus='1' defaultCPU='cortex-a9-arm-cpu'/>
--  <machine type='kvm' name='virt-4.0' maxCpus='512' defaultCPU='cortex-a15-arm-cpu'/>
-+  <machine type='kvm' name='virt-4.0' maxCpus='512' defaultCPU='cortex-a15-arm-cpu' numaMemSupported='yes'/>
-   <machine type='kvm' name='highbank' maxCpus='4'/>
--  <machine type='kvm' name='virt-4.1' maxCpus='512' defaultCPU='cortex-a15-arm-cpu'/>
-+  <machine type='kvm' name='virt-4.1' maxCpus='512' defaultCPU='cortex-a15-arm-cpu' numaMemSupported='yes'/>
-   <machine type='kvm' name='raspi2' maxCpus='4'/>
-   <machine type='kvm' name='raspi3' maxCpus='4'/>
-   <machine type='kvm' name='netduino2' maxCpus='1'/>
-@@ -306,10 +306,10 @@
-   <machine type='kvm' name='versatileab' maxCpus='1' defaultCPU='arm926-arm-cpu'/>
-   <machine type='kvm' name='lm3s6965evb' maxCpus='1' defaultCPU='cortex-m3-arm-cpu'/>
-   <machine type='kvm' name='n800' maxCpus='1' defaultCPU='arm1136-r2-arm-cpu'/>
--  <machine type='kvm' name='virt-2.10' maxCpus='255' defaultCPU='cortex-a15-arm-cpu'/>
--  <machine type='kvm' name='virt-2.11' maxCpus='255' defaultCPU='cortex-a15-arm-cpu'/>
-+  <machine type='kvm' name='virt-2.10' maxCpus='255' defaultCPU='cortex-a15-arm-cpu' numaMemSupported='yes'/>
-+  <machine type='kvm' name='virt-2.11' maxCpus='255' defaultCPU='cortex-a15-arm-cpu' numaMemSupported='yes'/>
-   <machine type='kvm' name='connex' maxCpus='1'/>
--  <machine type='kvm' name='virt-2.12' maxCpus='255' defaultCPU='cortex-a15-arm-cpu'/>
-+  <machine type='kvm' name='virt-2.12' maxCpus='255' defaultCPU='cortex-a15-arm-cpu' numaMemSupported='yes'/>
-   <machine type='kvm' name='microbit' maxCpus='1'/>
-   <machine type='kvm' name='witherspoon-bmc' maxCpus='2'/>
-   <machine type='kvm' name='xilinx-zynq-a9' maxCpus='1' defaultCPU='cortex-a9-arm-cpu'/>
-@@ -320,8 +320,8 @@
-   <machine type='kvm' name='mcimx6ul-evk' maxCpus='1'/>
-   <machine type='kvm' name='vexpress-a15' maxCpus='4' defaultCPU='cortex-a15-arm-cpu'/>
-   <machine type='kvm' name='xlnx-zcu102' maxCpus='6'/>
--  <machine type='kvm' name='virt-5.0' alias='virt' maxCpus='512' defaultCPU='cortex-a15-arm-cpu'/>
--  <machine type='kvm' name='virt-3.1' maxCpus='512' defaultCPU='cortex-a15-arm-cpu'/>
-+  <machine type='kvm' name='virt-5.0' alias='virt' maxCpus='512' defaultCPU='cortex-a15-arm-cpu' numaMemSupported='yes'/>
-+  <machine type='kvm' name='virt-3.1' maxCpus='512' defaultCPU='cortex-a15-arm-cpu' numaMemSupported='yes'/>
-   <machine type='kvm' name='canon-a1100' maxCpus='1'/>
-   <machine type='kvm' name='lm3s811evb' maxCpus='1' defaultCPU='cortex-m3-arm-cpu'/>
-   <hostCPU type='tcg' model='max' migratability='no'>
-@@ -388,7 +388,7 @@
-   <machine type='tcg' name='mps2-an511' maxCpus='1' defaultCPU='cortex-m3-arm-cpu'/>
-   <machine type='tcg' name='mps2-an505' maxCpus='1' defaultCPU='cortex-m33-arm-cpu'/>
-   <machine type='tcg' name='verdex' maxCpus='1' defaultCPU='pxa270-c0-arm-cpu'/>
--  <machine type='tcg' name='virt-3.0' maxCpus='512' defaultCPU='cortex-a15-arm-cpu'/>
-+  <machine type='tcg' name='virt-3.0' maxCpus='512' defaultCPU='cortex-a15-arm-cpu' numaMemSupported='yes'/>
-   <machine type='tcg' name='ast2500-evb' maxCpus='2'/>
-   <machine type='tcg' name='smdkc210' maxCpus='2'/>
-   <machine type='tcg' name='collie' maxCpus='1' defaultCPU='sa1110-arm-cpu'/>
-@@ -401,26 +401,26 @@
-   <machine type='tcg' name='versatilepb' maxCpus='1' defaultCPU='arm926-arm-cpu'/>
-   <machine type='tcg' name='realview-pb-a8' maxCpus='1' defaultCPU='cortex-a8-arm-cpu'/>
-   <machine type='tcg' name='emcraft-sf2' maxCpus='1' defaultCPU='cortex-m3-arm-cpu'/>
--  <machine type='tcg' name='virt-2.9' maxCpus='255' defaultCPU='cortex-a15-arm-cpu'/>
-+  <machine type='tcg' name='virt-2.9' maxCpus='255' defaultCPU='cortex-a15-arm-cpu' numaMemSupported='yes'/>
-   <machine type='tcg' name='musicpal' maxCpus='1' defaultCPU='arm926-arm-cpu'/>
-   <machine type='tcg' name='sbsa-ref' maxCpus='512' defaultCPU='cortex-a57-arm-cpu'/>
-   <machine type='tcg' name='z2' maxCpus='1' defaultCPU='pxa270-c5-arm-cpu'/>
-   <machine type='tcg' name='akita' maxCpus='1' defaultCPU='pxa270-c0-arm-cpu'/>
--  <machine type='tcg' name='virt-2.7' maxCpus='255' defaultCPU='cortex-a15-arm-cpu'/>
-+  <machine type='tcg' name='virt-2.7' maxCpus='255' defaultCPU='cortex-a15-arm-cpu' numaMemSupported='yes'/>
-   <machine type='tcg' name='kzm' maxCpus='1'/>
-   <machine type='tcg' name='swift-bmc' maxCpus='2'/>
--  <machine type='tcg' name='virt-2.8' maxCpus='255' defaultCPU='cortex-a15-arm-cpu'/>
-+  <machine type='tcg' name='virt-2.8' maxCpus='255' defaultCPU='cortex-a15-arm-cpu' numaMemSupported='yes'/>
-   <machine type='tcg' name='realview-eb-mpcore' maxCpus='4' defaultCPU='arm11mpcore-arm-cpu'/>
-   <machine type='tcg' name='musca-a' maxCpus='2' defaultCPU='cortex-m33-arm-cpu'/>
-   <machine type='tcg' name='mcimx7d-sabre' maxCpus='2'/>
-   <machine type='tcg' name='sx1' maxCpus='1' defaultCPU='ti925t-arm-cpu'/>
--  <machine type='tcg' name='virt-4.2' maxCpus='512' defaultCPU='cortex-a15-arm-cpu'/>
-+  <machine type='tcg' name='virt-4.2' maxCpus='512' defaultCPU='cortex-a15-arm-cpu' numaMemSupported='yes'/>
-   <machine type='tcg' name='sx1-v1' maxCpus='1' defaultCPU='ti925t-arm-cpu'/>
--  <machine type='tcg' name='virt-2.6' maxCpus='255' defaultCPU='cortex-a15-arm-cpu'/>
-+  <machine type='tcg' name='virt-2.6' maxCpus='255' defaultCPU='cortex-a15-arm-cpu' numaMemSupported='yes'/>
-   <machine type='tcg' name='cubieboard' maxCpus='1' defaultCPU='cortex-a9-arm-cpu'/>
--  <machine type='tcg' name='virt-4.0' maxCpus='512' defaultCPU='cortex-a15-arm-cpu'/>
-+  <machine type='tcg' name='virt-4.0' maxCpus='512' defaultCPU='cortex-a15-arm-cpu' numaMemSupported='yes'/>
-   <machine type='tcg' name='highbank' maxCpus='4'/>
--  <machine type='tcg' name='virt-4.1' maxCpus='512' defaultCPU='cortex-a15-arm-cpu'/>
-+  <machine type='tcg' name='virt-4.1' maxCpus='512' defaultCPU='cortex-a15-arm-cpu' numaMemSupported='yes'/>
-   <machine type='tcg' name='raspi2' maxCpus='4'/>
-   <machine type='tcg' name='raspi3' maxCpus='4'/>
-   <machine type='tcg' name='netduino2' maxCpus='1'/>
-@@ -439,10 +439,10 @@
-   <machine type='tcg' name='versatileab' maxCpus='1' defaultCPU='arm926-arm-cpu'/>
-   <machine type='tcg' name='lm3s6965evb' maxCpus='1' defaultCPU='cortex-m3-arm-cpu'/>
-   <machine type='tcg' name='n800' maxCpus='1' defaultCPU='arm1136-r2-arm-cpu'/>
--  <machine type='tcg' name='virt-2.10' maxCpus='255' defaultCPU='cortex-a15-arm-cpu'/>
--  <machine type='tcg' name='virt-2.11' maxCpus='255' defaultCPU='cortex-a15-arm-cpu'/>
-+  <machine type='tcg' name='virt-2.10' maxCpus='255' defaultCPU='cortex-a15-arm-cpu' numaMemSupported='yes'/>
-+  <machine type='tcg' name='virt-2.11' maxCpus='255' defaultCPU='cortex-a15-arm-cpu' numaMemSupported='yes'/>
-   <machine type='tcg' name='connex' maxCpus='1'/>
--  <machine type='tcg' name='virt-2.12' maxCpus='255' defaultCPU='cortex-a15-arm-cpu'/>
-+  <machine type='tcg' name='virt-2.12' maxCpus='255' defaultCPU='cortex-a15-arm-cpu' numaMemSupported='yes'/>
-   <machine type='tcg' name='microbit' maxCpus='1'/>
-   <machine type='tcg' name='witherspoon-bmc' maxCpus='2'/>
-   <machine type='tcg' name='xilinx-zynq-a9' maxCpus='1' defaultCPU='cortex-a9-arm-cpu'/>
-@@ -453,8 +453,8 @@
-   <machine type='tcg' name='mcimx6ul-evk' maxCpus='1'/>
-   <machine type='tcg' name='vexpress-a15' maxCpus='4' defaultCPU='cortex-a15-arm-cpu'/>
-   <machine type='tcg' name='xlnx-zcu102' maxCpus='6'/>
--  <machine type='tcg' name='virt-5.0' alias='virt' maxCpus='512' defaultCPU='cortex-a15-arm-cpu'/>
--  <machine type='tcg' name='virt-3.1' maxCpus='512' defaultCPU='cortex-a15-arm-cpu'/>
-+  <machine type='tcg' name='virt-5.0' alias='virt' maxCpus='512' defaultCPU='cortex-a15-arm-cpu' numaMemSupported='yes'/>
-+  <machine type='tcg' name='virt-3.1' maxCpus='512' defaultCPU='cortex-a15-arm-cpu' numaMemSupported='yes'/>
-   <machine type='tcg' name='canon-a1100' maxCpus='1'/>
-   <machine type='tcg' name='lm3s811evb' maxCpus='1' defaultCPU='cortex-m3-arm-cpu'/>
-   <gic version='3' kernel='yes' emulated='yes'/>
-diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
-index 3ee17a66a4..6842b3c28a 100644
---- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
-+++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
-@@ -638,36 +638,36 @@
-   <cpu type='kvm' name='970_v2.2'/>
-   <cpu type='kvm' name='mpc8533e_v10'/>
-   <cpu type='kvm' name='mpc8379'/>
--  <machine type='kvm' name='pseries-5.0' alias='pseries' hotplugCpus='yes' maxCpus='1024' default='yes' defaultCPU='host-powerpc64-cpu'/>
-+  <machine type='kvm' name='pseries-5.0' alias='pseries' hotplugCpus='yes' maxCpus='1024' default='yes' defaultCPU='host-powerpc64-cpu' numaMemSupported='yes'/>
-   <machine type='kvm' name='powernv9' alias='powernv' maxCpus='2048' defaultCPU='power9_v2.0-powerpc64-cpu'/>
-   <machine type='kvm' name='g3beige' maxCpus='1' defaultCPU='750_v3.1-powerpc64-cpu'/>
--  <machine type='kvm' name='pseries-2.12' hotplugCpus='yes' maxCpus='1024' defaultCPU='host-powerpc64-cpu'/>
--  <machine type='kvm' name='pseries-2.9' hotplugCpus='yes' maxCpus='1024' defaultCPU='host-powerpc64-cpu'/>
-+  <machine type='kvm' name='pseries-2.12' hotplugCpus='yes' maxCpus='1024' defaultCPU='host-powerpc64-cpu' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pseries-2.9' hotplugCpus='yes' maxCpus='1024' defaultCPU='host-powerpc64-cpu' numaMemSupported='yes'/>
-   <machine type='kvm' name='ref405ep' maxCpus='1'/>
--  <machine type='kvm' name='pseries-2.2' maxCpus='1024' defaultCPU='host-powerpc64-cpu'/>
-+  <machine type='kvm' name='pseries-2.2' maxCpus='1024' defaultCPU='host-powerpc64-cpu' numaMemSupported='yes'/>
-   <machine type='kvm' name='40p' maxCpus='1' defaultCPU='604-powerpc64-cpu'/>
--  <machine type='kvm' name='pseries-4.2' hotplugCpus='yes' maxCpus='1024' defaultCPU='host-powerpc64-cpu'/>
--  <machine type='kvm' name='pseries-2.12-sxxm' hotplugCpus='yes' maxCpus='1024' defaultCPU='host-powerpc64-cpu'/>
--  <machine type='kvm' name='pseries-2.3' maxCpus='1024' defaultCPU='host-powerpc64-cpu'/>
--  <machine type='kvm' name='pseries-2.6' maxCpus='1024' defaultCPU='host-powerpc64-cpu'/>
-+  <machine type='kvm' name='pseries-4.2' hotplugCpus='yes' maxCpus='1024' defaultCPU='host-powerpc64-cpu' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pseries-2.12-sxxm' hotplugCpus='yes' maxCpus='1024' defaultCPU='host-powerpc64-cpu' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pseries-2.3' maxCpus='1024' defaultCPU='host-powerpc64-cpu' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pseries-2.6' maxCpus='1024' defaultCPU='host-powerpc64-cpu' numaMemSupported='yes'/>
-   <machine type='kvm' name='sam460ex' maxCpus='1' defaultCPU='460exb-powerpc64-cpu'/>
-   <machine type='kvm' name='virtex-ml507' maxCpus='1' defaultCPU='440-xilinx-powerpc64-cpu'/>
--  <machine type='kvm' name='pseries-3.0' hotplugCpus='yes' maxCpus='1024' defaultCPU='host-powerpc64-cpu'/>
--  <machine type='kvm' name='pseries-2.7' hotplugCpus='yes' maxCpus='1024' defaultCPU='host-powerpc64-cpu'/>
--  <machine type='kvm' name='pseries-2.8' hotplugCpus='yes' maxCpus='1024' defaultCPU='host-powerpc64-cpu'/>
--  <machine type='kvm' name='pseries-4.0' hotplugCpus='yes' maxCpus='1024' defaultCPU='host-powerpc64-cpu'/>
-+  <machine type='kvm' name='pseries-3.0' hotplugCpus='yes' maxCpus='1024' defaultCPU='host-powerpc64-cpu' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pseries-2.7' hotplugCpus='yes' maxCpus='1024' defaultCPU='host-powerpc64-cpu' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pseries-2.8' hotplugCpus='yes' maxCpus='1024' defaultCPU='host-powerpc64-cpu' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pseries-4.0' hotplugCpus='yes' maxCpus='1024' defaultCPU='host-powerpc64-cpu' numaMemSupported='yes'/>
-   <machine type='kvm' name='bamboo' maxCpus='1' defaultCPU='440epb-powerpc64-cpu'/>
--  <machine type='kvm' name='pseries-2.1' maxCpus='1024' defaultCPU='host-powerpc64-cpu'/>
-+  <machine type='kvm' name='pseries-2.1' maxCpus='1024' defaultCPU='host-powerpc64-cpu' numaMemSupported='yes'/>
-   <machine type='kvm' name='taihu' maxCpus='1'/>
--  <machine type='kvm' name='pseries-2.10' hotplugCpus='yes' maxCpus='1024' defaultCPU='host-powerpc64-cpu'/>
--  <machine type='kvm' name='pseries-2.4' maxCpus='1024' defaultCPU='host-powerpc64-cpu'/>
-+  <machine type='kvm' name='pseries-2.10' hotplugCpus='yes' maxCpus='1024' defaultCPU='host-powerpc64-cpu' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pseries-2.4' maxCpus='1024' defaultCPU='host-powerpc64-cpu' numaMemSupported='yes'/>
-   <machine type='kvm' name='mpc8544ds' maxCpus='15' defaultCPU='e500v2_v30-powerpc64-cpu'/>
--  <machine type='kvm' name='pseries-4.1' hotplugCpus='yes' maxCpus='1024' defaultCPU='host-powerpc64-cpu'/>
-+  <machine type='kvm' name='pseries-4.1' hotplugCpus='yes' maxCpus='1024' defaultCPU='host-powerpc64-cpu' numaMemSupported='yes'/>
-   <machine type='kvm' name='powernv8' maxCpus='2048' defaultCPU='power8_v2.0-powerpc64-cpu'/>
-   <machine type='kvm' name='powernv10' maxCpus='2048' defaultCPU='power10_v1.0-powerpc64-cpu'/>
--  <machine type='kvm' name='pseries-2.11' hotplugCpus='yes' maxCpus='1024' defaultCPU='host-powerpc64-cpu'/>
--  <machine type='kvm' name='pseries-2.5' maxCpus='1024' defaultCPU='host-powerpc64-cpu'/>
--  <machine type='kvm' name='pseries-3.1' hotplugCpus='yes' maxCpus='1024' defaultCPU='host-powerpc64-cpu'/>
-+  <machine type='kvm' name='pseries-2.11' hotplugCpus='yes' maxCpus='1024' defaultCPU='host-powerpc64-cpu' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pseries-2.5' maxCpus='1024' defaultCPU='host-powerpc64-cpu' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pseries-3.1' hotplugCpus='yes' maxCpus='1024' defaultCPU='host-powerpc64-cpu' numaMemSupported='yes'/>
-   <machine type='kvm' name='mac99' maxCpus='1' defaultCPU='970fx_v3.1-powerpc64-cpu'/>
-   <machine type='kvm' name='ppce500' maxCpus='32' defaultCPU='e500v2_v30-powerpc64-cpu'/>
-   <cpu type='tcg' name='default' typename='604-powerpc64-cpu'/>
-@@ -1109,36 +1109,36 @@
-   <cpu type='tcg' name='970_v2.2'/>
-   <cpu type='tcg' name='mpc8533e_v10'/>
-   <cpu type='tcg' name='mpc8379'/>
--  <machine type='tcg' name='pseries-5.0' alias='pseries' hotplugCpus='yes' maxCpus='1024' default='yes' defaultCPU='power9_v2.0-powerpc64-cpu'/>
-+  <machine type='tcg' name='pseries-5.0' alias='pseries' hotplugCpus='yes' maxCpus='1024' default='yes' defaultCPU='power9_v2.0-powerpc64-cpu' numaMemSupported='yes'/>
-   <machine type='tcg' name='powernv9' alias='powernv' maxCpus='2048' defaultCPU='power9_v2.0-powerpc64-cpu'/>
-   <machine type='tcg' name='g3beige' maxCpus='1' defaultCPU='750_v3.1-powerpc64-cpu'/>
--  <machine type='tcg' name='pseries-2.12' hotplugCpus='yes' maxCpus='1024' defaultCPU='power8_v2.0-powerpc64-cpu'/>
--  <machine type='tcg' name='pseries-2.9' hotplugCpus='yes' maxCpus='1024' defaultCPU='power8_v2.0-powerpc64-cpu'/>
-+  <machine type='tcg' name='pseries-2.12' hotplugCpus='yes' maxCpus='1024' defaultCPU='power8_v2.0-powerpc64-cpu' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pseries-2.9' hotplugCpus='yes' maxCpus='1024' defaultCPU='power8_v2.0-powerpc64-cpu' numaMemSupported='yes'/>
-   <machine type='tcg' name='ref405ep' maxCpus='1'/>
--  <machine type='tcg' name='pseries-2.2' maxCpus='1024' defaultCPU='power7_v2.3-powerpc64-cpu'/>
-+  <machine type='tcg' name='pseries-2.2' maxCpus='1024' defaultCPU='power7_v2.3-powerpc64-cpu' numaMemSupported='yes'/>
-   <machine type='tcg' name='40p' maxCpus='1' defaultCPU='604-powerpc64-cpu'/>
--  <machine type='tcg' name='pseries-4.2' hotplugCpus='yes' maxCpus='1024' defaultCPU='power9_v2.0-powerpc64-cpu'/>
--  <machine type='tcg' name='pseries-2.12-sxxm' hotplugCpus='yes' maxCpus='1024' defaultCPU='power8_v2.0-powerpc64-cpu'/>
--  <machine type='tcg' name='pseries-2.3' maxCpus='1024' defaultCPU='power7_v2.3-powerpc64-cpu'/>
--  <machine type='tcg' name='pseries-2.6' maxCpus='1024' defaultCPU='power7_v2.3-powerpc64-cpu'/>
-+  <machine type='tcg' name='pseries-4.2' hotplugCpus='yes' maxCpus='1024' defaultCPU='power9_v2.0-powerpc64-cpu' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pseries-2.12-sxxm' hotplugCpus='yes' maxCpus='1024' defaultCPU='power8_v2.0-powerpc64-cpu' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pseries-2.3' maxCpus='1024' defaultCPU='power7_v2.3-powerpc64-cpu' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pseries-2.6' maxCpus='1024' defaultCPU='power7_v2.3-powerpc64-cpu' numaMemSupported='yes'/>
-   <machine type='tcg' name='sam460ex' maxCpus='1' defaultCPU='460exb-powerpc64-cpu'/>
-   <machine type='tcg' name='virtex-ml507' maxCpus='1' defaultCPU='440-xilinx-powerpc64-cpu'/>
--  <machine type='tcg' name='pseries-3.0' hotplugCpus='yes' maxCpus='1024' defaultCPU='power8_v2.0-powerpc64-cpu'/>
--  <machine type='tcg' name='pseries-2.7' hotplugCpus='yes' maxCpus='1024' defaultCPU='power7_v2.3-powerpc64-cpu'/>
--  <machine type='tcg' name='pseries-2.8' hotplugCpus='yes' maxCpus='1024' defaultCPU='power8_v2.0-powerpc64-cpu'/>
--  <machine type='tcg' name='pseries-4.0' hotplugCpus='yes' maxCpus='1024' defaultCPU='power9_v2.0-powerpc64-cpu'/>
-+  <machine type='tcg' name='pseries-3.0' hotplugCpus='yes' maxCpus='1024' defaultCPU='power8_v2.0-powerpc64-cpu' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pseries-2.7' hotplugCpus='yes' maxCpus='1024' defaultCPU='power7_v2.3-powerpc64-cpu' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pseries-2.8' hotplugCpus='yes' maxCpus='1024' defaultCPU='power8_v2.0-powerpc64-cpu' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pseries-4.0' hotplugCpus='yes' maxCpus='1024' defaultCPU='power9_v2.0-powerpc64-cpu' numaMemSupported='yes'/>
-   <machine type='tcg' name='bamboo' maxCpus='1' defaultCPU='440epb-powerpc64-cpu'/>
--  <machine type='tcg' name='pseries-2.1' maxCpus='1024' defaultCPU='power7_v2.3-powerpc64-cpu'/>
-+  <machine type='tcg' name='pseries-2.1' maxCpus='1024' defaultCPU='power7_v2.3-powerpc64-cpu' numaMemSupported='yes'/>
-   <machine type='tcg' name='taihu' maxCpus='1'/>
--  <machine type='tcg' name='pseries-2.10' hotplugCpus='yes' maxCpus='1024' defaultCPU='power8_v2.0-powerpc64-cpu'/>
--  <machine type='tcg' name='pseries-2.4' maxCpus='1024' defaultCPU='power7_v2.3-powerpc64-cpu'/>
-+  <machine type='tcg' name='pseries-2.10' hotplugCpus='yes' maxCpus='1024' defaultCPU='power8_v2.0-powerpc64-cpu' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pseries-2.4' maxCpus='1024' defaultCPU='power7_v2.3-powerpc64-cpu' numaMemSupported='yes'/>
-   <machine type='tcg' name='mpc8544ds' maxCpus='15' defaultCPU='e500v2_v30-powerpc64-cpu'/>
--  <machine type='tcg' name='pseries-4.1' hotplugCpus='yes' maxCpus='1024' defaultCPU='power9_v2.0-powerpc64-cpu'/>
-+  <machine type='tcg' name='pseries-4.1' hotplugCpus='yes' maxCpus='1024' defaultCPU='power9_v2.0-powerpc64-cpu' numaMemSupported='yes'/>
-   <machine type='tcg' name='powernv8' maxCpus='2048' defaultCPU='power8_v2.0-powerpc64-cpu'/>
-   <machine type='tcg' name='powernv10' maxCpus='2048' defaultCPU='power10_v1.0-powerpc64-cpu'/>
--  <machine type='tcg' name='pseries-2.11' hotplugCpus='yes' maxCpus='1024' defaultCPU='power8_v2.0-powerpc64-cpu'/>
--  <machine type='tcg' name='pseries-2.5' maxCpus='1024' defaultCPU='power7_v2.3-powerpc64-cpu'/>
--  <machine type='tcg' name='pseries-3.1' hotplugCpus='yes' maxCpus='1024' defaultCPU='power8_v2.0-powerpc64-cpu'/>
-+  <machine type='tcg' name='pseries-2.11' hotplugCpus='yes' maxCpus='1024' defaultCPU='power8_v2.0-powerpc64-cpu' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pseries-2.5' maxCpus='1024' defaultCPU='power7_v2.3-powerpc64-cpu' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pseries-3.1' hotplugCpus='yes' maxCpus='1024' defaultCPU='power8_v2.0-powerpc64-cpu' numaMemSupported='yes'/>
-   <machine type='tcg' name='mac99' maxCpus='1' defaultCPU='970fx_v3.1-powerpc64-cpu'/>
-   <machine type='tcg' name='ppce500' maxCpus='32' defaultCPU='e500v2_v30-powerpc64-cpu'/>
- </qemuCaps>
-diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
-index 73f9319199..577b96e6fa 100644
---- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
-+++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
-@@ -1136,51 +1136,51 @@
-   <cpu type='kvm' name='Broadwell' typename='Broadwell-x86_64-cpu' usable='yes'/>
-   <cpu type='kvm' name='486-v1' typename='486-v1-x86_64-cpu' usable='yes'/>
-   <cpu type='kvm' name='486' typename='486-x86_64-cpu' usable='yes'/>
--  <machine type='kvm' name='pc-i440fx-5.0' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='kvm' name='pc-i440fx-2.12' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='kvm' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='kvm' name='pc-q35-4.2' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='kvm' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='kvm' name='pc-i440fx-4.2' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='kvm' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='kvm' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='kvm' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='kvm' name='pc-1.1' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='kvm' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='kvm' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='kvm' name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='kvm' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='kvm' name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='kvm' name='pc-i440fx-2.11' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='kvm' name='pc-q35-3.1' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='kvm' name='pc-q35-4.1' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='kvm' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='kvm' name='pc-1.3' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='kvm' name='pc-i440fx-4.1' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='kvm' name='pc-i440fx-2.9' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='kvm' name='isapc' hotplugCpus='yes' maxCpus='1' defaultCPU='486-x86_64-cpu'/>
--  <machine type='kvm' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='kvm' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='kvm' name='pc-i440fx-3.1' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='kvm' name='pc-q35-2.12' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='kvm' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='kvm' name='pc-1.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='kvm' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='kvm' name='pc-q35-4.0.1' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='kvm' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='kvm' name='pc-q35-5.0' alias='q35' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='kvm' name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='kvm' name='pc-i440fx-2.10' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='kvm' name='pc-q35-3.0' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='kvm' name='pc-q35-4.0' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/>
-+  <machine type='kvm' name='pc-i440fx-5.0' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.12' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-4.2' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-4.2' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-1.1' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.11' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-3.1' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-4.1' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-1.3' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-4.1' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.9' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='kvm' name='isapc' hotplugCpus='yes' maxCpus='1' defaultCPU='486-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-3.1' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-2.12' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-1.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-4.0.1' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-5.0' alias='q35' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.10' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-3.0' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-4.0' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-   <machine type='kvm' name='microvm' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='kvm' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='kvm' name='pc-1.2' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='kvm' name='pc-i440fx-4.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='kvm' name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='kvm' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='kvm' name='pc-i440fx-3.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='kvm' name='pc-q35-2.11' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/>
-+  <machine type='kvm' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-1.2' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-4.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-i440fx-3.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='kvm' name='pc-q35-2.11' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-   <hostCPU type='tcg' model='base' migratability='yes'>
-     <property name='vmx-entry-load-rtit-ctl' type='boolean' value='false'/>
-     <property name='cmov' type='boolean' value='true' migratable='yes'/>
-@@ -2659,49 +2659,49 @@
-   </cpu>
-   <cpu type='tcg' name='486-v1' typename='486-v1-x86_64-cpu' usable='yes'/>
-   <cpu type='tcg' name='486' typename='486-x86_64-cpu' usable='yes'/>
--  <machine type='tcg' name='pc-i440fx-5.0' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='tcg' name='pc-i440fx-2.12' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='tcg' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='tcg' name='pc-q35-4.2' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='tcg' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='tcg' name='pc-i440fx-4.2' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='tcg' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='tcg' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='tcg' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='tcg' name='pc-1.1' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='tcg' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='tcg' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='tcg' name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='tcg' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='tcg' name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='tcg' name='pc-i440fx-2.11' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='tcg' name='pc-q35-3.1' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='tcg' name='pc-q35-4.1' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='tcg' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='tcg' name='pc-1.3' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='tcg' name='pc-i440fx-4.1' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='tcg' name='pc-i440fx-2.9' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='tcg' name='isapc' hotplugCpus='yes' maxCpus='1' defaultCPU='486-x86_64-cpu'/>
--  <machine type='tcg' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='tcg' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='tcg' name='pc-i440fx-3.1' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='tcg' name='pc-q35-2.12' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='tcg' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='tcg' name='pc-1.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='tcg' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='tcg' name='pc-q35-4.0.1' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='tcg' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='tcg' name='pc-q35-5.0' alias='q35' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='tcg' name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='tcg' name='pc-i440fx-2.10' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='tcg' name='pc-q35-3.0' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='tcg' name='pc-q35-4.0' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/>
-+  <machine type='tcg' name='pc-i440fx-5.0' alias='pc' hotplugCpus='yes' maxCpus='255' default='yes' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.12' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-4.2' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.5' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-4.2' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-1.5' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-2.7' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.2' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-1.1' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.7' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-2.4' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-2.10' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-1.7' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-2.9' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.11' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-3.1' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-4.1' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.4' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-1.3' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-4.1' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.9' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='tcg' name='isapc' hotplugCpus='yes' maxCpus='1' defaultCPU='486-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-1.4' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-2.6' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-3.1' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-2.12' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.1' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-1.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.6' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-4.0.1' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-1.6' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-5.0' alias='q35' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-2.8' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.10' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-3.0' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-4.0' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-   <machine type='tcg' name='microvm' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='tcg' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='tcg' name='pc-1.2' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='tcg' name='pc-i440fx-4.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='tcg' name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='tcg' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='tcg' name='pc-i440fx-3.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu'/>
--  <machine type='tcg' name='pc-q35-2.11' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu'/>
-+  <machine type='tcg' name='pc-i440fx-2.3' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-1.2' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-4.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-2.8' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-2.5' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-i440fx-3.0' hotplugCpus='yes' maxCpus='255' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
-+  <machine type='tcg' name='pc-q35-2.11' hotplugCpus='yes' maxCpus='288' defaultCPU='qemu64-x86_64-cpu' numaMemSupported='yes'/>
- </qemuCaps>
-diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c
-index bae1fa828b..6c43f07015 100644
---- a/tests/testutilsqemu.c
-+++ b/tests/testutilsqemu.c
-@@ -344,7 +344,8 @@ int qemuTestCapsCacheInsert(virFileCachePtr cache,
-                                       NULL,
-                                       0,
-                                       false,
--                                      false);
-+                                      false,
-+                                      true);
-             }
-             for (j = 0; kvm_machines[i][j] != NULL; j++) {
-                 virQEMUCapsAddMachine(tmpCaps,
-@@ -354,7 +355,8 @@ int qemuTestCapsCacheInsert(virFileCachePtr cache,
-                                       NULL,
-                                       0,
-                                       false,
--                                      false);
-+                                      false,
-+                                      true);
-                 virQEMUCapsSet(tmpCaps, QEMU_CAPS_KVM);
-             }
-         }
--- 
-2.27.0
-
diff --git a/qemu-Use-CPU-clusters-for-guests.patch b/qemu-Use-CPU-clusters-for-guests.patch
new file mode 100644
index 0000000000000000000000000000000000000000..fd54b34e61fc40868098f8d913443e6995b70cf2
--- /dev/null
+++ b/qemu-Use-CPU-clusters-for-guests.patch
@@ -0,0 +1,733 @@
+From 00a3773961b74702c1fe12ed086f6f7feedf8efa Mon Sep 17 00:00:00 2001
+From: Andrea Bolognani <abologna@redhat.com>
+Date: Fri, 5 Jan 2024 18:44:56 +0100
+Subject: [PATCH] qemu: Use CPU clusters for guests
+
+https://issues.redhat.com/browse/RHEL-7043
+
+Signed-off-by: Andrea Bolognani <abologna@redhat.com>
+Reviewed-by: Peter Krempa <pkrempa@redhat.com>
+---
+ src/qemu/qemu_command.c                       |  5 ++-
+ .../cpu-hotplug-startup.x86_64-latest.args    |  2 +-
+ .../cpu-numa-disjoint.x86_64-latest.args      |  2 +-
+ .../cpu-numa-disordered.x86_64-latest.args    | 38 +++++++++++++++++++
+ .../cpu-numa-memshared.x86_64-latest.args     |  2 +-
+ ...-numa-no-memory-element.x86_64-latest.args |  2 +-
+ .../cpu-numa1.x86_64-latest.args              |  2 +-
+ .../cpu-numa2.x86_64-latest.args              |  2 +-
+ .../cpu-topology1.x86_64-latest.args          |  2 +-
+ .../cpu-topology2.x86_64-latest.args          |  2 +-
+ .../cpu-topology3.x86_64-latest.args          |  2 +-
+ .../cpu-topology4.x86_64-latest.args          |  2 +-
+ ...memory-no-numa-topology.x86_64-latest.args |  2 +-
+ ...fd-memory-numa-topology.x86_64-latest.args |  2 +-
+ ...d-memory-numa-topology2.x86_64-latest.args |  2 +-
+ ...d-memory-numa-topology3.x86_64-latest.args |  2 +-
+ .../hugepages-nvdimm.x86_64-latest.args       |  2 +-
+ ...memory-default-hugepage.x86_64-latest.args |  2 +-
+ .../memfd-memory-numa.x86_64-latest.args      |  2 +-
+ ...emory-hotplug-dimm-addr.x86_64-latest.args |  2 +-
+ .../memory-hotplug-dimm.x86_64-latest.args    |  2 +-
+ ...memory-hotplug-multiple.x86_64-latest.args |  2 +-
+ ...y-hotplug-nvdimm-access.x86_64-latest.args |  2 +-
+ ...ry-hotplug-nvdimm-align.x86_64-latest.args |  2 +-
+ ...ry-hotplug-nvdimm-label.x86_64-latest.args |  2 +-
+ ...ory-hotplug-nvdimm-pmem.x86_64-latest.args |  2 +-
+ ...-nvdimm-ppc64-abi-update.ppc64-latest.args |  2 +-
+ ...ory-hotplug-nvdimm-ppc64.ppc64-latest.args |  2 +-
+ ...hotplug-nvdimm-readonly.x86_64-latest.args |  2 +-
+ .../memory-hotplug-nvdimm.x86_64-latest.args  |  2 +-
+ ...mory-hotplug-virtio-mem.x86_64-latest.args |  2 +-
+ ...ory-hotplug-virtio-pmem.x86_64-latest.args |  2 +-
+ .../memory-hotplug.x86_64-latest.args         |  2 +-
+ ...auto-memory-vcpu-cpuset.x86_64-latest.args |  2 +-
+ ...no-cpuset-and-placement.x86_64-latest.args |  2 +-
+ ...d-auto-vcpu-no-numatune.x86_64-latest.args | 36 ++++++++++++++++++
+ ...to-vcpu-static-numatune.x86_64-latest.args |  2 +-
+ ...static-memory-auto-vcpu.x86_64-latest.args |  2 +-
+ ...static-vcpu-no-numatune.x86_64-latest.args | 36 ++++++++++++++++++
+ .../qemuxml2argvdata/numad.x86_64-latest.args |  2 +-
+ ...ne-auto-nodeset-invalid.x86_64-latest.args |  2 +-
+ .../pci-expander-bus.x86_64-latest.args       |  2 +-
+ .../pcie-expander-bus.x86_64-latest.args      |  2 +-
+ .../pseries-phb-numa-node.ppc64-latest.args   |  2 +-
+ 44 files changed, 154 insertions(+), 41 deletions(-)
+ create mode 100644 tests/qemuxml2argvdata/cpu-numa-disordered.x86_64-latest.args
+ create mode 100644 tests/qemuxml2argvdata/numad-auto-vcpu-no-numatune.x86_64-latest.args
+ create mode 100644 tests/qemuxml2argvdata/numad-static-vcpu-no-numatune.x86_64-latest.args
+
+diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
+index 461584566f..7410a4280d 100644
+--- a/src/qemu/qemu_command.c
++++ b/src/qemu/qemu_command.c
+@@ -7217,7 +7217,8 @@ qemuBuildSmpCommandLine(virCommand *cmd,
+                            _("Only 1 die per socket is supported"));
+             return -1;
+         }
+-        if (def->cpu->clusters != 1) {
++        if (def->cpu->clusters != 1 &&
++            !virQEMUCapsGet(qemuCaps, QEMU_CAPS_SMP_CLUSTERS)) {
+             virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+                            _("Only 1 cluster per die is supported"));
+             return -1;
+@@ -7225,6 +7226,8 @@ qemuBuildSmpCommandLine(virCommand *cmd,
+         virBufferAsprintf(&buf, ",sockets=%u", def->cpu->sockets);
+         if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_SMP_DIES))
+             virBufferAsprintf(&buf, ",dies=%u", def->cpu->dies);
++        if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_SMP_CLUSTERS))
++            virBufferAsprintf(&buf, ",clusters=%u", def->cpu->clusters);
+         virBufferAsprintf(&buf, ",cores=%u", def->cpu->cores);
+         virBufferAsprintf(&buf, ",threads=%u", def->cpu->threads);
+     } else {
+diff --git a/tests/qemuxml2argvdata/cpu-hotplug-startup.x86_64-latest.args b/tests/qemuxml2argvdata/cpu-hotplug-startup.x86_64-latest.args
+index 009c08d71a..af1b464104 100644
+--- a/tests/qemuxml2argvdata/cpu-hotplug-startup.x86_64-latest.args
++++ b/tests/qemuxml2argvdata/cpu-hotplug-startup.x86_64-latest.args
+@@ -16,7 +16,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+ -m size=219136k \
+ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
+ -overcommit mem-lock=off \
+--smp 1,maxcpus=6,sockets=3,dies=1,cores=2,threads=1 \
++-smp 1,maxcpus=6,sockets=3,dies=1,clusters=1,cores=2,threads=1 \
+ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+ -display none \
+ -no-user-config \
+diff --git a/tests/qemuxml2argvdata/cpu-numa-disjoint.x86_64-latest.args b/tests/qemuxml2argvdata/cpu-numa-disjoint.x86_64-latest.args
+index 3b12934425..22fca082a8 100644
+--- a/tests/qemuxml2argvdata/cpu-numa-disjoint.x86_64-latest.args
++++ b/tests/qemuxml2argvdata/cpu-numa-disjoint.x86_64-latest.args
+@@ -15,7 +15,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+ -cpu qemu64 \
+ -m size=219136k \
+ -overcommit mem-lock=off \
+--smp 16,sockets=2,dies=1,cores=4,threads=2 \
++-smp 16,sockets=2,dies=1,clusters=1,cores=4,threads=2 \
+ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":112197632}' \
+ -numa node,nodeid=0,cpus=0-3,cpus=8-11,memdev=ram-node0 \
+ -object '{"qom-type":"memory-backend-ram","id":"ram-node1","size":112197632}' \
+diff --git a/tests/qemuxml2argvdata/cpu-numa-disordered.x86_64-latest.args b/tests/qemuxml2argvdata/cpu-numa-disordered.x86_64-latest.args
+new file mode 100644
+index 0000000000..bc4a6ad5f3
+--- /dev/null
++++ b/tests/qemuxml2argvdata/cpu-numa-disordered.x86_64-latest.args
+@@ -0,0 +1,38 @@
++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,acpi=off \
++-accel tcg \
++-cpu qemu64 \
++-m size=328704k \
++-overcommit mem-lock=off \
++-smp 16,sockets=2,dies=1,clusters=1,cores=4,threads=2 \
++-object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":112197632}' \
++-numa node,nodeid=0,cpus=0-5,memdev=ram-node0 \
++-object '{"qom-type":"memory-backend-ram","id":"ram-node1","size":112197632}' \
++-numa node,nodeid=1,cpus=11-15,memdev=ram-node1 \
++-object '{"qom-type":"memory-backend-ram","id":"ram-node2","size":112197632}' \
++-numa node,nodeid=2,cpus=6-10,memdev=ram-node2 \
++-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"}' \
++-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-numa-memshared.x86_64-latest.args b/tests/qemuxml2argvdata/cpu-numa-memshared.x86_64-latest.args
+index 0c9ec88b8b..1e486b1bbc 100644
+--- a/tests/qemuxml2argvdata/cpu-numa-memshared.x86_64-latest.args
++++ b/tests/qemuxml2argvdata/cpu-numa-memshared.x86_64-latest.args
+@@ -15,7 +15,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+ -cpu qemu64 \
+ -m size=219136k \
+ -overcommit mem-lock=off \
+--smp 16,sockets=2,dies=1,cores=4,threads=2 \
++-smp 16,sockets=2,dies=1,clusters=1,cores=4,threads=2 \
+ -object '{"qom-type":"memory-backend-file","id":"ram-node0","mem-path":"/var/lib/libvirt/qemu/ram/-1-QEMUGuest1/ram-node0","share":true,"size":112197632}' \
+ -numa node,nodeid=0,cpus=0-7,memdev=ram-node0 \
+ -object '{"qom-type":"memory-backend-file","id":"ram-node1","mem-path":"/var/lib/libvirt/qemu/ram/-1-QEMUGuest1/ram-node1","share":false,"size":112197632}' \
+diff --git a/tests/qemuxml2argvdata/cpu-numa-no-memory-element.x86_64-latest.args b/tests/qemuxml2argvdata/cpu-numa-no-memory-element.x86_64-latest.args
+index 31a61f023e..59372c4ab9 100644
+--- a/tests/qemuxml2argvdata/cpu-numa-no-memory-element.x86_64-latest.args
++++ b/tests/qemuxml2argvdata/cpu-numa-no-memory-element.x86_64-latest.args
+@@ -15,7 +15,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+ -cpu qemu64 \
+ -m size=219136k \
+ -overcommit mem-lock=off \
+--smp 16,sockets=2,dies=1,cores=4,threads=2 \
++-smp 16,sockets=2,dies=1,clusters=1,cores=4,threads=2 \
+ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":112197632}' \
+ -numa node,nodeid=0,cpus=0-7,memdev=ram-node0 \
+ -object '{"qom-type":"memory-backend-ram","id":"ram-node1","size":112197632}' \
+diff --git a/tests/qemuxml2argvdata/cpu-numa1.x86_64-latest.args b/tests/qemuxml2argvdata/cpu-numa1.x86_64-latest.args
+index 31a61f023e..59372c4ab9 100644
+--- a/tests/qemuxml2argvdata/cpu-numa1.x86_64-latest.args
++++ b/tests/qemuxml2argvdata/cpu-numa1.x86_64-latest.args
+@@ -15,7 +15,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+ -cpu qemu64 \
+ -m size=219136k \
+ -overcommit mem-lock=off \
+--smp 16,sockets=2,dies=1,cores=4,threads=2 \
++-smp 16,sockets=2,dies=1,clusters=1,cores=4,threads=2 \
+ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":112197632}' \
+ -numa node,nodeid=0,cpus=0-7,memdev=ram-node0 \
+ -object '{"qom-type":"memory-backend-ram","id":"ram-node1","size":112197632}' \
+diff --git a/tests/qemuxml2argvdata/cpu-numa2.x86_64-latest.args b/tests/qemuxml2argvdata/cpu-numa2.x86_64-latest.args
+index 31a61f023e..59372c4ab9 100644
+--- a/tests/qemuxml2argvdata/cpu-numa2.x86_64-latest.args
++++ b/tests/qemuxml2argvdata/cpu-numa2.x86_64-latest.args
+@@ -15,7 +15,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+ -cpu qemu64 \
+ -m size=219136k \
+ -overcommit mem-lock=off \
+--smp 16,sockets=2,dies=1,cores=4,threads=2 \
++-smp 16,sockets=2,dies=1,clusters=1,cores=4,threads=2 \
+ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":112197632}' \
+ -numa node,nodeid=0,cpus=0-7,memdev=ram-node0 \
+ -object '{"qom-type":"memory-backend-ram","id":"ram-node1","size":112197632}' \
+diff --git a/tests/qemuxml2argvdata/cpu-topology1.x86_64-latest.args b/tests/qemuxml2argvdata/cpu-topology1.x86_64-latest.args
+index 009c08d71a..af1b464104 100644
+--- a/tests/qemuxml2argvdata/cpu-topology1.x86_64-latest.args
++++ b/tests/qemuxml2argvdata/cpu-topology1.x86_64-latest.args
+@@ -16,7 +16,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+ -m size=219136k \
+ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
+ -overcommit mem-lock=off \
+--smp 1,maxcpus=6,sockets=3,dies=1,cores=2,threads=1 \
++-smp 1,maxcpus=6,sockets=3,dies=1,clusters=1,cores=2,threads=1 \
+ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+ -display none \
+ -no-user-config \
+diff --git a/tests/qemuxml2argvdata/cpu-topology2.x86_64-latest.args b/tests/qemuxml2argvdata/cpu-topology2.x86_64-latest.args
+index 7ba175fa80..8560eb6126 100644
+--- a/tests/qemuxml2argvdata/cpu-topology2.x86_64-latest.args
++++ b/tests/qemuxml2argvdata/cpu-topology2.x86_64-latest.args
+@@ -16,7 +16,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+ -m size=219136k \
+ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
+ -overcommit mem-lock=off \
+--smp 6,sockets=1,dies=1,cores=2,threads=3 \
++-smp 6,sockets=1,dies=1,clusters=1,cores=2,threads=3 \
+ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+ -display none \
+ -no-user-config \
+diff --git a/tests/qemuxml2argvdata/cpu-topology3.x86_64-latest.args b/tests/qemuxml2argvdata/cpu-topology3.x86_64-latest.args
+index c11b4cd307..3878c558b8 100644
+--- a/tests/qemuxml2argvdata/cpu-topology3.x86_64-latest.args
++++ b/tests/qemuxml2argvdata/cpu-topology3.x86_64-latest.args
+@@ -16,7 +16,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+ -m size=219136k \
+ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
+ -overcommit mem-lock=off \
+--smp 6,sockets=3,dies=1,cores=2,threads=1 \
++-smp 6,sockets=3,dies=1,clusters=1,cores=2,threads=1 \
+ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+ -display none \
+ -no-user-config \
+diff --git a/tests/qemuxml2argvdata/cpu-topology4.x86_64-latest.args b/tests/qemuxml2argvdata/cpu-topology4.x86_64-latest.args
+index d0e31ba2b5..8720038c0d 100644
+--- a/tests/qemuxml2argvdata/cpu-topology4.x86_64-latest.args
++++ b/tests/qemuxml2argvdata/cpu-topology4.x86_64-latest.args
+@@ -16,7 +16,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+ -m size=219136k \
+ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
+ -overcommit mem-lock=off \
+--smp 1,maxcpus=6,sockets=1,dies=3,cores=2,threads=1 \
++-smp 1,maxcpus=6,sockets=1,dies=3,clusters=1,cores=2,threads=1 \
+ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+ -display none \
+ -no-user-config \
+diff --git a/tests/qemuxml2argvdata/fd-memory-no-numa-topology.x86_64-latest.args b/tests/qemuxml2argvdata/fd-memory-no-numa-topology.x86_64-latest.args
+index 58b3c7b544..1bd75a85a6 100644
+--- a/tests/qemuxml2argvdata/fd-memory-no-numa-topology.x86_64-latest.args
++++ b/tests/qemuxml2argvdata/fd-memory-no-numa-topology.x86_64-latest.args
+@@ -16,7 +16,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-instance-00000092/.config \
+ -m size=14680064k \
+ -object '{"qom-type":"memory-backend-file","id":"pc.ram","mem-path":"/var/lib/libvirt/qemu/ram/-1-instance-00000092/pc.ram","share":true,"x-use-canonical-path-for-ramblock-id":false,"prealloc":true,"size":15032385536}' \
+ -overcommit mem-lock=off \
+--smp 8,sockets=8,dies=1,cores=1,threads=1 \
++-smp 8,sockets=8,dies=1,clusters=1,cores=1,threads=1 \
+ -uuid 126f2720-6f8e-45ab-a886-ec9277079a67 \
+ -display none \
+ -no-user-config \
+diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology.x86_64-latest.args b/tests/qemuxml2argvdata/fd-memory-numa-topology.x86_64-latest.args
+index 21f9a16540..17ef506431 100644
+--- a/tests/qemuxml2argvdata/fd-memory-numa-topology.x86_64-latest.args
++++ b/tests/qemuxml2argvdata/fd-memory-numa-topology.x86_64-latest.args
+@@ -15,7 +15,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-instance-00000092/.config \
+ -cpu qemu64 \
+ -m size=14680064k \
+ -overcommit mem-lock=off \
+--smp 8,sockets=1,dies=1,cores=8,threads=1 \
++-smp 8,sockets=1,dies=1,clusters=1,cores=8,threads=1 \
+ -object '{"qom-type":"memory-backend-file","id":"ram-node0","mem-path":"/var/lib/libvirt/qemu/ram/-1-instance-00000092/ram-node0","share":true,"prealloc":true,"size":15032385536}' \
+ -numa node,nodeid=0,cpus=0-7,memdev=ram-node0 \
+ -uuid 126f2720-6f8e-45ab-a886-ec9277079a67 \
+diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology2.x86_64-latest.args b/tests/qemuxml2argvdata/fd-memory-numa-topology2.x86_64-latest.args
+index 3bf16f9caf..b247231b85 100644
+--- a/tests/qemuxml2argvdata/fd-memory-numa-topology2.x86_64-latest.args
++++ b/tests/qemuxml2argvdata/fd-memory-numa-topology2.x86_64-latest.args
+@@ -15,7 +15,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-instance-00000092/.config \
+ -cpu qemu64 \
+ -m size=29360128k \
+ -overcommit mem-lock=off \
+--smp 20,sockets=1,dies=1,cores=20,threads=1 \
++-smp 20,sockets=1,dies=1,clusters=1,cores=20,threads=1 \
+ -object '{"qom-type":"memory-backend-file","id":"ram-node0","mem-path":"/var/lib/libvirt/qemu/ram/-1-instance-00000092/ram-node0","share":false,"prealloc":true,"size":15032385536}' \
+ -numa node,nodeid=0,cpus=0-7,cpus=16-19,memdev=ram-node0 \
+ -object '{"qom-type":"memory-backend-file","id":"ram-node1","mem-path":"/var/lib/libvirt/qemu/ram/-1-instance-00000092/ram-node1","share":true,"prealloc":true,"size":15032385536}' \
+diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology3.x86_64-latest.args b/tests/qemuxml2argvdata/fd-memory-numa-topology3.x86_64-latest.args
+index 3153e22d56..9e94209499 100644
+--- a/tests/qemuxml2argvdata/fd-memory-numa-topology3.x86_64-latest.args
++++ b/tests/qemuxml2argvdata/fd-memory-numa-topology3.x86_64-latest.args
+@@ -15,7 +15,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-instance-00000092/.config \
+ -cpu qemu64 \
+ -m size=44040192k \
+ -overcommit mem-lock=off \
+--smp 32,sockets=1,dies=1,cores=32,threads=1 \
++-smp 32,sockets=1,dies=1,clusters=1,cores=32,threads=1 \
+ -object '{"qom-type":"memory-backend-file","id":"ram-node0","mem-path":"/var/lib/libvirt/qemu/ram/-1-instance-00000092/ram-node0","share":true,"prealloc":true,"size":15032385536}' \
+ -numa node,nodeid=0,cpus=0-1,cpus=6-31,memdev=ram-node0 \
+ -object '{"qom-type":"memory-backend-file","id":"ram-node1","mem-path":"/var/lib/libvirt/qemu/ram/-1-instance-00000092/ram-node1","share":true,"prealloc":true,"size":15032385536}' \
+diff --git a/tests/qemuxml2argvdata/hugepages-nvdimm.x86_64-latest.args b/tests/qemuxml2argvdata/hugepages-nvdimm.x86_64-latest.args
+index fa376accb5..f30db0ad09 100644
+--- a/tests/qemuxml2argvdata/hugepages-nvdimm.x86_64-latest.args
++++ b/tests/qemuxml2argvdata/hugepages-nvdimm.x86_64-latest.args
+@@ -15,7 +15,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+ -cpu qemu64 \
+ -m size=1048576k,slots=16,maxmem=1099511627776k \
+ -overcommit mem-lock=off \
+--smp 2,sockets=2,dies=1,cores=1,threads=1 \
++-smp 2,sockets=2,dies=1,clusters=1,cores=1,threads=1 \
+ -object '{"qom-type":"memory-backend-file","id":"ram-node0","mem-path":"/dev/hugepages2M/libvirt/qemu/-1-QEMUGuest1","share":true,"prealloc":true,"size":1073741824}' \
+ -numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \
+ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+diff --git a/tests/qemuxml2argvdata/memfd-memory-default-hugepage.x86_64-latest.args b/tests/qemuxml2argvdata/memfd-memory-default-hugepage.x86_64-latest.args
+index 55969eb2fd..f850d7be60 100644
+--- a/tests/qemuxml2argvdata/memfd-memory-default-hugepage.x86_64-latest.args
++++ b/tests/qemuxml2argvdata/memfd-memory-default-hugepage.x86_64-latest.args
+@@ -15,7 +15,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-instance-00000092/.config \
+ -cpu qemu64 \
+ -m size=14680064k \
+ -overcommit mem-lock=off \
+--smp 8,sockets=1,dies=1,cores=8,threads=1 \
++-smp 8,sockets=1,dies=1,clusters=1,cores=8,threads=1 \
+ -object '{"qom-type":"thread-context","id":"tc-ram-node0","node-affinity":[3]}' \
+ -object '{"qom-type":"memory-backend-memfd","id":"ram-node0","hugetlb":true,"hugetlbsize":2097152,"share":true,"prealloc":true,"size":15032385536,"host-nodes":[3],"policy":"preferred","prealloc-context":"tc-ram-node0"}' \
+ -numa node,nodeid=0,cpus=0-7,memdev=ram-node0 \
+diff --git a/tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args b/tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args
+index 1ef2d69fcb..dbe2b82a56 100644
+--- a/tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args
++++ b/tests/qemuxml2argvdata/memfd-memory-numa.x86_64-latest.args
+@@ -15,7 +15,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-instance-00000092/.config \
+ -cpu qemu64 \
+ -m size=14680064k,slots=16,maxmem=1099511627776k \
+ -overcommit mem-lock=off \
+--smp 8,sockets=1,dies=1,cores=8,threads=1 \
++-smp 8,sockets=1,dies=1,clusters=1,cores=8,threads=1 \
+ -object '{"qom-type":"thread-context","id":"tc-ram-node0","node-affinity":[3]}' \
+ -object '{"qom-type":"memory-backend-memfd","id":"ram-node0","hugetlb":true,"hugetlbsize":2097152,"share":true,"prealloc":true,"prealloc-threads":8,"size":15032385536,"host-nodes":[3],"policy":"preferred","prealloc-context":"tc-ram-node0"}' \
+ -numa node,nodeid=0,cpus=0-7,memdev=ram-node0 \
+diff --git a/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.x86_64-latest.args b/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.x86_64-latest.args
+index 6ae1fd1b98..c15fe191de 100644
+--- a/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.x86_64-latest.args
++++ b/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.x86_64-latest.args
+@@ -15,7 +15,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+ -cpu qemu64 \
+ -m size=219136k,slots=16,maxmem=1099511627776k \
+ -overcommit mem-lock=off \
+--smp 2,sockets=2,dies=1,cores=1,threads=1 \
++-smp 2,sockets=2,dies=1,clusters=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 \
+diff --git a/tests/qemuxml2argvdata/memory-hotplug-dimm.x86_64-latest.args b/tests/qemuxml2argvdata/memory-hotplug-dimm.x86_64-latest.args
+index 71817da309..a729930db2 100644
+--- a/tests/qemuxml2argvdata/memory-hotplug-dimm.x86_64-latest.args
++++ b/tests/qemuxml2argvdata/memory-hotplug-dimm.x86_64-latest.args
+@@ -15,7 +15,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+ -cpu qemu64 \
+ -m size=219136k,slots=16,maxmem=1099511627776k \
+ -overcommit mem-lock=off \
+--smp 2,sockets=2,dies=1,cores=1,threads=1 \
++-smp 2,sockets=2,dies=1,clusters=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 \
+diff --git a/tests/qemuxml2argvdata/memory-hotplug-multiple.x86_64-latest.args b/tests/qemuxml2argvdata/memory-hotplug-multiple.x86_64-latest.args
+index ad1dad01ac..f1f2f93a11 100644
+--- a/tests/qemuxml2argvdata/memory-hotplug-multiple.x86_64-latest.args
++++ b/tests/qemuxml2argvdata/memory-hotplug-multiple.x86_64-latest.args
+@@ -15,7 +15,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+ -cpu qemu64 \
+ -m size=2095104k,slots=2,maxmem=1099511627776k \
+ -overcommit mem-lock=off \
+--smp 2,sockets=2,dies=1,cores=1,threads=1 \
++-smp 2,sockets=2,dies=1,clusters=1,cores=1,threads=1 \
+ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":2145386496}' \
+ -numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \
+ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.x86_64-latest.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.x86_64-latest.args
+index f09ae22927..d53732b39e 100644
+--- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.x86_64-latest.args
++++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.x86_64-latest.args
+@@ -15,7 +15,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+ -cpu qemu64 \
+ -m size=219136k,slots=16,maxmem=1099511627776k \
+ -overcommit mem-lock=off \
+--smp 2,sockets=2,dies=1,cores=1,threads=1 \
++-smp 2,sockets=2,dies=1,clusters=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 \
+diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.x86_64-latest.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.x86_64-latest.args
+index 6cfe4b8263..cba467d9d3 100644
+--- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.x86_64-latest.args
++++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.x86_64-latest.args
+@@ -15,7 +15,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+ -cpu qemu64 \
+ -m size=219136k,slots=16,maxmem=1099511627776k \
+ -overcommit mem-lock=off \
+--smp 2,sockets=2,dies=1,cores=1,threads=1 \
++-smp 2,sockets=2,dies=1,clusters=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 \
+diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.x86_64-latest.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.x86_64-latest.args
+index 4041c15b2b..2ad23a0224 100644
+--- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.x86_64-latest.args
++++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.x86_64-latest.args
+@@ -15,7 +15,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+ -cpu qemu64 \
+ -m size=219136k,slots=16,maxmem=1099511627776k \
+ -overcommit mem-lock=off \
+--smp 2,sockets=2,dies=1,cores=1,threads=1 \
++-smp 2,sockets=2,dies=1,clusters=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 \
+diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-latest.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-latest.args
+index 3547e96c00..ac5ca187b1 100644
+--- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-latest.args
++++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.x86_64-latest.args
+@@ -15,7 +15,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+ -cpu qemu64 \
+ -m size=219136k,slots=16,maxmem=1099511627776k \
+ -overcommit mem-lock=off \
+--smp 2,sockets=2,dies=1,cores=1,threads=1 \
++-smp 2,sockets=2,dies=1,clusters=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 \
+diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64-abi-update.ppc64-latest.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64-abi-update.ppc64-latest.args
+index 9b57518fca..c2c1623d9f 100644
+--- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64-abi-update.ppc64-latest.args
++++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64-abi-update.ppc64-latest.args
+@@ -15,7 +15,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+ -cpu POWER9 \
+ -m size=1048576k,slots=16,maxmem=1099511627776k \
+ -overcommit mem-lock=off \
+--smp 2,sockets=2,dies=1,cores=1,threads=1 \
++-smp 2,sockets=2,dies=1,clusters=1,cores=1,threads=1 \
+ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":1073741824}' \
+ -numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \
+ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64.ppc64-latest.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64.ppc64-latest.args
+index 9b57518fca..c2c1623d9f 100644
+--- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64.ppc64-latest.args
++++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-ppc64.ppc64-latest.args
+@@ -15,7 +15,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+ -cpu POWER9 \
+ -m size=1048576k,slots=16,maxmem=1099511627776k \
+ -overcommit mem-lock=off \
+--smp 2,sockets=2,dies=1,cores=1,threads=1 \
++-smp 2,sockets=2,dies=1,clusters=1,cores=1,threads=1 \
+ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":1073741824}' \
+ -numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \
+ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.x86_64-latest.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.x86_64-latest.args
+index 17bacfb2f6..8af4673841 100644
+--- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.x86_64-latest.args
++++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.x86_64-latest.args
+@@ -15,7 +15,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+ -cpu qemu64 \
+ -m size=219136k,slots=16,maxmem=1099511627776k \
+ -overcommit mem-lock=off \
+--smp 2,sockets=2,dies=1,cores=1,threads=1 \
++-smp 2,sockets=2,dies=1,clusters=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 \
+diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm.x86_64-latest.args b/tests/qemuxml2argvdata/memory-hotplug-nvdimm.x86_64-latest.args
+index 1321e5556e..6531caa908 100644
+--- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm.x86_64-latest.args
++++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm.x86_64-latest.args
+@@ -15,7 +15,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+ -cpu qemu64 \
+ -m size=1048576k,slots=16,maxmem=1099511627776k \
+ -overcommit mem-lock=off \
+--smp 2,sockets=2,dies=1,cores=1,threads=1 \
++-smp 2,sockets=2,dies=1,clusters=1,cores=1,threads=1 \
+ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":1073741824}' \
+ -numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \
+ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+diff --git a/tests/qemuxml2argvdata/memory-hotplug-virtio-mem.x86_64-latest.args b/tests/qemuxml2argvdata/memory-hotplug-virtio-mem.x86_64-latest.args
+index 607ce9b0e8..dbe96ae21d 100644
+--- a/tests/qemuxml2argvdata/memory-hotplug-virtio-mem.x86_64-latest.args
++++ b/tests/qemuxml2argvdata/memory-hotplug-virtio-mem.x86_64-latest.args
+@@ -15,7 +15,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+ -cpu qemu64 \
+ -m size=2095104k,maxmem=1099511627776k \
+ -overcommit mem-lock=off \
+--smp 2,sockets=2,dies=1,cores=1,threads=1 \
++-smp 2,sockets=2,dies=1,clusters=1,cores=1,threads=1 \
+ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":2145386496}' \
+ -numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \
+ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+diff --git a/tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.x86_64-latest.args b/tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.x86_64-latest.args
+index 9bbde420a9..df7b7f80a9 100644
+--- a/tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.x86_64-latest.args
++++ b/tests/qemuxml2argvdata/memory-hotplug-virtio-pmem.x86_64-latest.args
+@@ -15,7 +15,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+ -cpu qemu64 \
+ -m size=2095104k,maxmem=1099511627776k \
+ -overcommit mem-lock=off \
+--smp 2,sockets=2,dies=1,cores=1,threads=1 \
++-smp 2,sockets=2,dies=1,clusters=1,cores=1,threads=1 \
+ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":2145386496}' \
+ -numa node,nodeid=0,cpus=0-1,memdev=ram-node0 \
+ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+diff --git a/tests/qemuxml2argvdata/memory-hotplug.x86_64-latest.args b/tests/qemuxml2argvdata/memory-hotplug.x86_64-latest.args
+index 53f0fbc68f..d04d9d73e9 100644
+--- a/tests/qemuxml2argvdata/memory-hotplug.x86_64-latest.args
++++ b/tests/qemuxml2argvdata/memory-hotplug.x86_64-latest.args
+@@ -15,7 +15,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+ -cpu qemu64 \
+ -m size=219136k,slots=16,maxmem=1099511627776k \
+ -overcommit mem-lock=off \
+--smp 2,sockets=2,dies=1,cores=1,threads=1 \
++-smp 2,sockets=2,dies=1,clusters=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 \
+diff --git a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.x86_64-latest.args b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.x86_64-latest.args
+index d4238f3d9e..138c8255f7 100644
+--- a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.x86_64-latest.args
++++ b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.x86_64-latest.args
+@@ -16,7 +16,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+ -m size=219136k \
+ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264,"host-nodes":[0,1,2,3],"policy":"interleave"}' \
+ -overcommit mem-lock=off \
+--smp 2,sockets=2,dies=1,cores=1,threads=1 \
++-smp 2,sockets=2,dies=1,clusters=1,cores=1,threads=1 \
+ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+ -display none \
+ -no-user-config \
+diff --git a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-placement.x86_64-latest.args b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-placement.x86_64-latest.args
+index d4238f3d9e..138c8255f7 100644
+--- a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-placement.x86_64-latest.args
++++ b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-placement.x86_64-latest.args
+@@ -16,7 +16,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+ -m size=219136k \
+ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264,"host-nodes":[0,1,2,3],"policy":"interleave"}' \
+ -overcommit mem-lock=off \
+--smp 2,sockets=2,dies=1,cores=1,threads=1 \
++-smp 2,sockets=2,dies=1,clusters=1,cores=1,threads=1 \
+ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+ -display none \
+ -no-user-config \
+diff --git a/tests/qemuxml2argvdata/numad-auto-vcpu-no-numatune.x86_64-latest.args b/tests/qemuxml2argvdata/numad-auto-vcpu-no-numatune.x86_64-latest.args
+new file mode 100644
+index 0000000000..f13f04c9d4
+--- /dev/null
++++ b/tests/qemuxml2argvdata/numad-auto-vcpu-no-numatune.x86_64-latest.args
+@@ -0,0 +1,36 @@
++LC_ALL=C \
++PATH=/bin \
++HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
++USER=test \
++LOGNAME=test \
++XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
++XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
++XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
++/usr/bin/qemu-system-x86_64 \
++-name guest=QEMUGuest1,debug-threads=on \
++-S \
++-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
++-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
++-accel tcg \
++-cpu qemu64 \
++-m size=219136k \
++-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264,"host-nodes":[0,1,2,3],"policy":"bind"}' \
++-overcommit mem-lock=off \
++-smp 2,sockets=2,dies=1,clusters=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 \
++-msg timestamp=on
+diff --git a/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.x86_64-latest.args b/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.x86_64-latest.args
+index 9ddfb286b5..f1c49619db 100644
+--- a/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.x86_64-latest.args
++++ b/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.x86_64-latest.args
+@@ -16,7 +16,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+ -m size=219136k \
+ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264,"host-nodes":[0],"policy":"interleave"}' \
+ -overcommit mem-lock=off \
+--smp 2,sockets=2,dies=1,cores=1,threads=1 \
++-smp 2,sockets=2,dies=1,clusters=1,cores=1,threads=1 \
+ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+ -display none \
+ -no-user-config \
+diff --git a/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.x86_64-latest.args b/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.x86_64-latest.args
+index d4238f3d9e..138c8255f7 100644
+--- a/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.x86_64-latest.args
++++ b/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.x86_64-latest.args
+@@ -16,7 +16,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+ -m size=219136k \
+ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264,"host-nodes":[0,1,2,3],"policy":"interleave"}' \
+ -overcommit mem-lock=off \
+--smp 2,sockets=2,dies=1,cores=1,threads=1 \
++-smp 2,sockets=2,dies=1,clusters=1,cores=1,threads=1 \
+ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+ -display none \
+ -no-user-config \
+diff --git a/tests/qemuxml2argvdata/numad-static-vcpu-no-numatune.x86_64-latest.args b/tests/qemuxml2argvdata/numad-static-vcpu-no-numatune.x86_64-latest.args
+new file mode 100644
+index 0000000000..76ca5c4bea
+--- /dev/null
++++ b/tests/qemuxml2argvdata/numad-static-vcpu-no-numatune.x86_64-latest.args
+@@ -0,0 +1,36 @@
++LC_ALL=C \
++PATH=/bin \
++HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1 \
++USER=test \
++LOGNAME=test \
++XDG_DATA_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.local/share \
++XDG_CACHE_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.cache \
++XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
++/usr/bin/qemu-system-x86_64 \
++-name guest=QEMUGuest1,debug-threads=on \
++-S \
++-object '{"qom-type":"secret","id":"masterKey0","format":"raw","file":"/var/lib/libvirt/qemu/domain--1-QEMUGuest1/master-key.aes"}' \
++-machine pc,usb=off,dump-guest-core=off,memory-backend=pc.ram,acpi=off \
++-accel tcg \
++-cpu qemu64 \
++-m size=219136k \
++-object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264}' \
++-overcommit mem-lock=off \
++-smp 2,sockets=2,dies=1,clusters=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 \
++-msg timestamp=on
+diff --git a/tests/qemuxml2argvdata/numad.x86_64-latest.args b/tests/qemuxml2argvdata/numad.x86_64-latest.args
+index d4238f3d9e..138c8255f7 100644
+--- a/tests/qemuxml2argvdata/numad.x86_64-latest.args
++++ b/tests/qemuxml2argvdata/numad.x86_64-latest.args
+@@ -16,7 +16,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+ -m size=219136k \
+ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264,"host-nodes":[0,1,2,3],"policy":"interleave"}' \
+ -overcommit mem-lock=off \
+--smp 2,sockets=2,dies=1,cores=1,threads=1 \
++-smp 2,sockets=2,dies=1,clusters=1,cores=1,threads=1 \
+ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+ -display none \
+ -no-user-config \
+diff --git a/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.x86_64-latest.args b/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.x86_64-latest.args
+index 57a2b893f1..e35471d91b 100644
+--- a/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.x86_64-latest.args
++++ b/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.x86_64-latest.args
+@@ -16,7 +16,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+ -m size=219136k \
+ -object '{"qom-type":"memory-backend-ram","id":"pc.ram","size":224395264,"host-nodes":[0,1,2,3],"policy":"preferred"}' \
+ -overcommit mem-lock=off \
+--smp 2,sockets=2,dies=1,cores=1,threads=1 \
++-smp 2,sockets=2,dies=1,clusters=1,cores=1,threads=1 \
+ -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
+ -display none \
+ -no-user-config \
+diff --git a/tests/qemuxml2argvdata/pci-expander-bus.x86_64-latest.args b/tests/qemuxml2argvdata/pci-expander-bus.x86_64-latest.args
+index bf553a8e32..d3960731be 100644
+--- a/tests/qemuxml2argvdata/pci-expander-bus.x86_64-latest.args
++++ b/tests/qemuxml2argvdata/pci-expander-bus.x86_64-latest.args
+@@ -15,7 +15,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-expander-test/.config \
+ -cpu qemu64 \
+ -m size=219136k \
+ -overcommit mem-lock=off \
+--smp 16,sockets=2,dies=1,cores=4,threads=2 \
++-smp 16,sockets=2,dies=1,clusters=1,cores=4,threads=2 \
+ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":112197632}' \
+ -numa node,nodeid=0,cpus=0-7,memdev=ram-node0 \
+ -object '{"qom-type":"memory-backend-ram","id":"ram-node1","size":112197632}' \
+diff --git a/tests/qemuxml2argvdata/pcie-expander-bus.x86_64-latest.args b/tests/qemuxml2argvdata/pcie-expander-bus.x86_64-latest.args
+index 3fb86c29c2..b179fadc27 100644
+--- a/tests/qemuxml2argvdata/pcie-expander-bus.x86_64-latest.args
++++ b/tests/qemuxml2argvdata/pcie-expander-bus.x86_64-latest.args
+@@ -15,7 +15,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-pcie-expander-bus-te/.config \
+ -cpu qemu64 \
+ -m size=219136k \
+ -overcommit mem-lock=off \
+--smp 16,sockets=2,dies=1,cores=4,threads=2 \
++-smp 16,sockets=2,dies=1,clusters=1,cores=4,threads=2 \
+ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":112197632}' \
+ -numa node,nodeid=0,cpus=0-7,memdev=ram-node0 \
+ -object '{"qom-type":"memory-backend-ram","id":"ram-node1","size":112197632}' \
+diff --git a/tests/qemuxml2argvdata/pseries-phb-numa-node.ppc64-latest.args b/tests/qemuxml2argvdata/pseries-phb-numa-node.ppc64-latest.args
+index 7ffcb1d8c5..942540a296 100644
+--- a/tests/qemuxml2argvdata/pseries-phb-numa-node.ppc64-latest.args
++++ b/tests/qemuxml2argvdata/pseries-phb-numa-node.ppc64-latest.args
+@@ -15,7 +15,7 @@ XDG_CONFIG_HOME=/var/lib/libvirt/qemu/domain--1-QEMUGuest1/.config \
+ -cpu POWER9 \
+ -m size=2097152k \
+ -overcommit mem-lock=off \
+--smp 8,sockets=2,dies=1,cores=1,threads=4 \
++-smp 8,sockets=2,dies=1,clusters=1,cores=1,threads=4 \
+ -object '{"qom-type":"memory-backend-ram","id":"ram-node0","size":1073741824,"host-nodes":[1],"policy":"bind"}' \
+ -numa node,nodeid=0,cpus=0-3,memdev=ram-node0 \
+ -object '{"qom-type":"memory-backend-ram","id":"ram-node1","size":1073741824,"host-nodes":[2],"policy":"bind"}' \
+-- 
+2.27.0
+
diff --git a/qemu-Use-qemuSecurityDomainSetPathLabel-to-set-secla.patch b/qemu-Use-qemuSecurityDomainSetPathLabel-to-set-secla.patch
deleted file mode 100644
index acb2c04f6b43ebd89518ec7ae6d431955f7e9f0d..0000000000000000000000000000000000000000
--- a/qemu-Use-qemuSecurityDomainSetPathLabel-to-set-secla.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From e6b532333a0f7dcd3c1466b941b5ce8317a70d62 Mon Sep 17 00:00:00 2001
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Wed, 17 Jun 2020 11:01:05 +0200
-Subject: [PATCH 009/108] qemu: Use qemuSecurityDomainSetPathLabel() to set
- seclabes on not saved state files
-
-There are two places within qemu driver that misuse
-qemuSecuritySetSavedStateLabel() to set seclabels on tempfiles
-that are not state files: qemuDomainScreenshot() and
-qemuDomainMemoryPeek(). They are doing so because of lack of
-qemuSecurityDomainSetPathLabel() at the time of their
-introduction.
-
-In all three secdrivers (well, four if you count NOP driver) the
-implementation of .domainSetSavedStateLabel and
-.domainSetPathLabel callbacks is the same anyway.
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Erik Skultety <eskultet@redhat.com>
-(cherry picked from commit 8c6257942425c36e6f6d96629d334fb09a94da28)
----
- src/qemu/qemu_driver.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
-index e7166e4af3..196b301751 100644
---- a/src/qemu/qemu_driver.c
-+++ b/src/qemu/qemu_driver.c
-@@ -4083,7 +4083,7 @@ qemuDomainScreenshot(virDomainPtr dom,
-     }
-     unlink_tmp = true;
- 
--    qemuSecuritySetSavedStateLabel(driver, vm, tmp);
-+    qemuSecurityDomainSetPathLabel(driver, vm, tmp, false);
- 
-     qemuDomainObjEnterMonitor(driver, vm);
-     if (qemuMonitorScreendump(priv->mon, videoAlias, screen, tmp) < 0) {
-@@ -11699,7 +11699,7 @@ qemuDomainMemoryPeek(virDomainPtr dom,
-         goto endjob;
-     }
- 
--    qemuSecuritySetSavedStateLabel(driver, vm, tmp);
-+    qemuSecurityDomainSetPathLabel(driver, vm, tmp, false);
- 
-     priv = vm->privateData;
-     qemuDomainObjEnterMonitor(driver, vm);
--- 
-2.33.0
-
diff --git a/qemu-Validate-domain-definition-even-on-migration.patch b/qemu-Validate-domain-definition-even-on-migration.patch
deleted file mode 100644
index e272d7d7cc08e845fabeb0ed36f772b0a8f70f52..0000000000000000000000000000000000000000
--- a/qemu-Validate-domain-definition-even-on-migration.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 3fbf29d9a7f89c7fc627c11c4ec65a2e10fd391a Mon Sep 17 00:00:00 2001
-From: jiangdawei15 <jiangdawei15@huawei.com>
-Date: Thu, 11 Aug 2022 21:20:29 +0800
-Subject: [PATCH 07/22] qemu: Validate domain definition even on migration
-
-When we are about to spawn QEMU, we validate the domain
-definition against qemuCaps. Except when domain is/was already
-running before (i.e. on incoming migration, snapshots, resume
-from a file). However, especially on incoming migration it may
-happen that the destination QEMU is different to the source
-QEMU, e.g. the destination QEMU may have some devices disabled.
-
-And we have a function that validates devices/features requested
-in domain XML against the desired QEMU capabilities (aka
-qemuCaps) - it's virDomainDefValidate() which calls
-qemuValidateDomainDef() and qemuValidateDomainDeviceDef()
-subsequently.
-
-But the problem here is that the validation function is
-explicitly skipped over in specific scenarios (like incoming
-migration, restore from a snapshot or previously saved file).
-
-This in turn means that we may spawn QEMU and request
-device/features it doesn't support. When that happens QEMU fails
-to load migration stream:
-
-  qemu-kvm: ... 'virtio-mem-pci' is not a valid device model name
-
-(NB, while the example shows one particular device, the problem
-is paramount)
-
-This problem is easier to run into since we are slowly moving
-validation from qemu_command.c into said validation functions.
-
-The solution is simple: do the validation in all cases. And while
-it may happen that users would be unable to migrate/restore a
-guest due to a bug in our validator, spawning QEMU without
-validation is worse (especially when you consider that users can
-supply their own XMLs for migrate/restore operations - these were
-never validated).
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2048435
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Peter Krempa <pkrempa@redhat.com>
----
- src/qemu/qemu_process.c | 6 +-----
- 1 file changed, 1 insertion(+), 5 deletions(-)
-
-diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
-index 0f3e651630..b240149f7a 100644
---- a/src/qemu/qemu_process.c
-+++ b/src/qemu/qemu_process.c
-@@ -5685,11 +5685,7 @@ qemuProcessStartValidate(virQEMUDriverPtr driver,
- 
-     }
- 
--    /* Checks below should not be executed when starting a qemu process for a
--     * VM that was running before (migration, snapshots, save). It's more
--     * important to start such VM than keep the configuration clean */
--    if ((flags & VIR_QEMU_PROCESS_START_NEW) &&
--        virDomainDefValidate(vm->def, 0, driver->xmlopt) < 0)
-+    if (virDomainDefValidate(vm->def, 0, driver->xmlopt) < 0)
-         return -1;
- 
-     if (qemuProcessStartValidateGraphics(vm) < 0)
--- 
-2.33.0
-
diff --git a/libvirt-qemu-add-pointer-check-in-qemuMonitorLastError.patch b/qemu-add-pointer-check-in-qemuMonitorLastError.patch
similarity index 75%
rename from libvirt-qemu-add-pointer-check-in-qemuMonitorLastError.patch
rename to qemu-add-pointer-check-in-qemuMonitorLastError.patch
index d844230d4553ff246a617dd4ddfd2c613decb1e6..ae8458d6940e715750773545ace4f1ff207ef281 100644
--- a/libvirt-qemu-add-pointer-check-in-qemuMonitorLastError.patch
+++ b/qemu-add-pointer-check-in-qemuMonitorLastError.patch
@@ -1,7 +1,7 @@
-From 2d72ad8dfbd8987379a58fd9b280cdaf4d191542 Mon Sep 17 00:00:00 2001
+From 7461beaf732475406e39375ea8e1c6311140046f Mon Sep 17 00:00:00 2001
 From: Feng Ni <fengni@huawei.com>
 Date: Wed, 15 Apr 2020 11:14:35 +0800
-Subject: qemu: add pointer check in qemuMonitorLastError
+Subject: [PATCH] qemu: add pointer check in qemuMonitorLastError
 
 We found a exception when libvirt occurrs segmentation fault.
 thread 1 is waiting object lock in qemuConnectMonitor,
@@ -15,12 +15,12 @@ Signed-off-by: Xu Yandong <xuyandong2@huawei.com>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
-index a62fed8..cc62948 100644
+index ec586b9036..a69ead6109 100644
 --- a/src/qemu/qemu_monitor.c
 +++ b/src/qemu/qemu_monitor.c
-@@ -966,7 +966,7 @@ qemuMonitorSend(qemuMonitorPtr mon,
+@@ -893,7 +893,7 @@ qemuMonitorSend(qemuMonitor *mon,
  virErrorPtr
- qemuMonitorLastError(qemuMonitorPtr mon)
+ qemuMonitorLastError(qemuMonitor *mon)
  {
 -    if (mon->lastError.code == VIR_ERR_OK)
 +    if (!mon || mon->lastError.code == VIR_ERR_OK)
@@ -28,5 +28,5 @@ index a62fed8..cc62948 100644
  
      return virErrorCopyNew(&mon->lastError);
 -- 
-2.23.0
+2.27.0
 
diff --git a/qemu-agent-set-ifname-to-NULL-after-freeing.patch b/qemu-agent-set-ifname-to-NULL-after-freeing.patch
deleted file mode 100644
index 6eb5de22f6f673726083676aee30f6204fdb8adb..0000000000000000000000000000000000000000
--- a/qemu-agent-set-ifname-to-NULL-after-freeing.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 0133001d6c4cdc25f6f8b8453c60c94296336576 Mon Sep 17 00:00:00 2001
-From: Jan Tomko <jtomko@redhat.com>
-Date: Wed, 14 Oct 2020 17:23:54 +0800
-Subject: [PATCH] qemu: agent: set ifname to NULL after freeing
-
-CVE-2020-25637
-
-Signed-off-by: Jan Tomko <jtomko@redhat.com>
-Rported-by: Ilja Van Sprundel <ivansprundel@ioactive.com>
-Reviewed-by: Mauro Matteo Cascella <mcascell@redhat.com>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
-
-cherry-pick from commit a63b48c5ecef077bf0f909a85f453a605600cf05
-Signed-off-by: Jiajie Li <lijiajie11@huawei.com>
----
- src/qemu/qemu_agent.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c
-index d7fcc869c6..31d3268d42 100644
---- a/src/qemu/qemu_agent.c
-+++ b/src/qemu/qemu_agent.c
-@@ -2166,6 +2166,7 @@ qemuAgentGetInterfaces(qemuAgentPtr agent,
- 
-         /* Has to be freed for each interface. */
-         virStringListFree(ifname);
-+        ifname = NULL;
- 
-         /* as well as IP address which - moreover -
-          * can be presented multiple times */
--- 
-2.23.0
-
diff --git a/qemu-avoid-maybe-uninitialized-warning-by-GCC-10.patch b/qemu-avoid-maybe-uninitialized-warning-by-GCC-10.patch
deleted file mode 100644
index 7f0cb2982a138e6781d14403672b467a28818678..0000000000000000000000000000000000000000
--- a/qemu-avoid-maybe-uninitialized-warning-by-GCC-10.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 9175d3c2891632e6497faf6f8320440c4f2bd41d Mon Sep 17 00:00:00 2001
-From: Boris Fiuczynski <fiuczy@linux.ibm.com>
-Date: Thu, 13 Aug 2020 16:03:44 +0200
-Subject: [PATCH 044/108] qemu: avoid maybe-uninitialized warning by GCC 10
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-GCC 10 complains about "well_formed_uri" may be used uninitialzed.
-Even though it is a false positive, we can easily avoid it.
-
-Avoiding
-  ../src/qemu/qemu_migration.c: In function ‘qemuMigrationDstPrepareDirect’:
-  ../src/qemu/qemu_migration.c:2920:16: error: ‘well_formed_uri’ may be used uninitialized in this function [-Werror=maybe-uninitialized]
-    2920 |             if (well_formed_uri) {
-         |                ^
-
-Signed-off-by: Boris Fiuczynski <fiuczy@linux.ibm.com>
-Reviewed-by: Marc Hartmayer <mhartmay@linux.ibm.com>
-Reviewed-by: Erik Skultety <eskultet@redhat.com>
-(cherry picked from commit d96d359a032cda609f9adf3caafdf8425d8aa4ac)
----
- src/qemu/qemu_migration.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
-index 30b92dfb87..32be433e93 100644
---- a/src/qemu/qemu_migration.c
-+++ b/src/qemu/qemu_migration.c
-@@ -2896,7 +2896,7 @@ qemuMigrationDstPrepareDirect(virQEMUDriverPtr driver,
- 
-         *uri_out = g_strdup_printf(incFormat, "tcp", hostname, port);
-     } else {
--        bool well_formed_uri;
-+        bool well_formed_uri = false;
- 
-         if (!(uri = qemuMigrationAnyParseURI(uri_in, &well_formed_uri)))
-             goto cleanup;
--- 
-2.33.0
-
diff --git a/qemu-blockjob-Transition-into-ready-state-only-from-.patch b/qemu-blockjob-Transition-into-ready-state-only-from-.patch
deleted file mode 100644
index 8f67ec4643929ab930f76d4980d952eaf5603a2a..0000000000000000000000000000000000000000
--- a/qemu-blockjob-Transition-into-ready-state-only-from-.patch
+++ /dev/null
@@ -1,105 +0,0 @@
-From 3fba88d137292cb4468693c932842805ddd13f37 Mon Sep 17 00:00:00 2001
-From: Peter Krempa <pkrempa@redhat.com>
-Date: Tue, 20 Apr 2021 12:58:28 +0200
-Subject: [PATCH 064/108] qemu: blockjob: Transition into 'ready' state only
- from expected states
-
-In certain rare occasions qemu can transition a block job which was
-already 'ready' into 'standby' and then back. If this happens in the
-following order libvirt will get confused about the actual job state:
-
-1) the block copy job is 'ready' (job->state == QEMU_BLOCKJOB_STATE_READY)
-
-2) user calls qemuDomainBlockJobAbort with VIR_DOMAIN_BLOCK_JOB_ABORT_PIVOT
-   flag but without VIR_DOMAIN_BLOCK_JOB_ABORT_ASYNC
-
-3) the block job is switched to synchronous event handling
-
-4) the block job blips to 'standby' and back to 'ready', the event is
-   not processed since the blockjob is in sync mode for now
-
-5) qemuDomainBlockJobPivot is called:
-    5.1) 'job-complete' QMP command is issued
-    5.2) job->state is set to QEMU_BLOCKJOB_STATE_PIVOTING
-
-6) code for synchronous-wait for the job completion in qemuDomainBlockJobAbort
-   is invoked
-
-7) the waiting loop calls qemuBlockJobUpdate:
-
-    7.1) job->newstate is QEMU_BLOCKJOB_STATE_READY due to 4)
-    7.2) qemuBlockJobEventProcess is called
-    7.3) the handler for QEMU_BLOCKJOB_STATE_READY overwrites
-         job->state from QEMU_BLOCKJOB_STATE_PIVOTING to QEMU_BLOCKJOB_STATE_READY
-
-8) qemuDomainBlockJobAbort is looking for a finished job, so waits again
-
-9) qemu finishes the blockjob and transitions it into 'concluded' state
-
-10) qemuBlockJobUpdate is triggered again, this time finalizing the job.
-    10.1) job->newstate is = QEMU_BLOCKJOB_STATE_CONCLUDED
-          job->state is = QEMU_BLOCKJOB_STATE_READY
-    10.2) qemuBlockJobEventProcessConcluded is called, the function
-          checks whether there was an error with the blockjob. Since
-          there was no error job->newstate becomes
-          QEMU_BLOCKJOB_STATE_COMPLETED.
-    10.3) qemuBlockJobEventProcessConcludedTransition selects the action
-          for the appropriate block job type where we have:
-
-    case QEMU_BLOCKJOB_TYPE_COPY:
-        if (job->state == QEMU_BLOCKJOB_STATE_PIVOTING && success)
-            qemuBlockJobProcessEventConcludedCopyPivot(driver, vm, job, asyncJob);
-        else
-            qemuBlockJobProcessEventConcludedCopyAbort(driver, vm, job, asyncJob);
-        break;
-
-          Since job->state is QEMU_BLOCKJOB_STATE_READY,
-          qemuBlockJobProcessEventConcludedCopyAbort is called.
-
-This patch forbids transitions to QEMU_BLOCKJOB_STATE_READY if the
-previous job state isn't QEMU_BLOCKJOB_STATE_RUNNING or
-QEMU_BLOCKJOB_STATE_NEW.
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1951507
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-(cherry picked from commit 81e770c2f152635219cec76585c770fb9f6ce030)
----
- src/qemu/qemu_blockjob.c | 19 +++++++++++++------
- 1 file changed, 13 insertions(+), 6 deletions(-)
-
-diff --git a/src/qemu/qemu_blockjob.c b/src/qemu/qemu_blockjob.c
-index ea82ce95eb..b4431b54f5 100644
---- a/src/qemu/qemu_blockjob.c
-+++ b/src/qemu/qemu_blockjob.c
-@@ -1638,14 +1638,21 @@ qemuBlockJobEventProcess(virQEMUDriverPtr driver,
-         break;
- 
-     case QEMU_BLOCKJOB_STATE_READY:
--        /* mirror may be NULL for copy job corresponding to migration */
--        if (job->disk) {
--            job->disk->mirrorState = VIR_DOMAIN_DISK_MIRROR_STATE_READY;
--            qemuBlockJobEmitEvents(driver, vm, job->disk, job->type, job->newstate);
-+        /* in certain cases qemu can blip out and back into 'ready' state for
-+         * a blockjob. In cases when we already are past RUNNING the job such
-+         * as when pivoting/aborting this could reset the internally set job
-+         * state, thus we ignore it if the job isn't in expected state */
-+        if (job->state == QEMU_BLOCKJOB_STATE_NEW ||
-+            job->state == QEMU_BLOCKJOB_STATE_RUNNING) {
-+            /* mirror may be NULL for copy job corresponding to migration */
-+            if (job->disk) {
-+                job->disk->mirrorState = VIR_DOMAIN_DISK_MIRROR_STATE_READY;
-+                qemuBlockJobEmitEvents(driver, vm, job->disk, job->type, job->newstate);
-+            }
-+            job->state = job->newstate;
-+            qemuDomainSaveStatus(vm);
-         }
--        job->state = job->newstate;
-         job->newstate = -1;
--        qemuDomainSaveStatus(vm);
-         break;
- 
-     case QEMU_BLOCKJOB_STATE_NEW:
--- 
-2.33.0
-
diff --git a/qemu-capabilities-Enable-detection-of-QEMU_CAPS_OBJE.patch b/qemu-capabilities-Enable-detection-of-QEMU_CAPS_OBJE.patch
deleted file mode 100644
index 7cb7ff65d94fea295fa4a92bf92211b2d4712d92..0000000000000000000000000000000000000000
--- a/qemu-capabilities-Enable-detection-of-QEMU_CAPS_OBJE.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 50faad7d541f17426770b69117cd156a33fc5f93 Mon Sep 17 00:00:00 2001
-From: Yan Wang <wangyan122@huawei.com>
-Date: Thu, 24 Mar 2022 13:01:15 +0800
-Subject: [PATCH 16/16] qemu: capabilities: Enable detection of
- QEMU_CAPS_OBJECT_QAPIFIED
-
-Base the detection on the presence of the 'secret' qom-type entry, which
-isn't conditionally compiled in qemu.
-
-All caps-based test now switch to using JSON for -object.
-
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-Signed-off-by: Yan Wang <wangyan122@huawei.com>
----
- src/qemu/qemu_capabilities.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
-index e232a37b79..3b4e26822b 100644
---- a/src/qemu/qemu_capabilities.c
-+++ b/src/qemu/qemu_capabilities.c
-@@ -1457,6 +1457,7 @@ static struct virQEMUCapsStringFlags virQEMUCapsQMPSchemaQueries[] = {
-     { "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 },
-+    { "object-add/arg-type/qom-type/^secret", QEMU_CAPS_OBJECT_QAPIFIED },
- };
- 
- typedef struct _virQEMUCapsObjectTypeProps virQEMUCapsObjectTypeProps;
--- 
-2.27.0
-
diff --git a/qemu-capabilities-Introduce-QEMU_CAPS_OBJECT_QAPIFIE.patch b/qemu-capabilities-Introduce-QEMU_CAPS_OBJECT_QAPIFIE.patch
deleted file mode 100644
index eac937c72b2aac7d70586a7fb13a1a68db4479d5..0000000000000000000000000000000000000000
--- a/qemu-capabilities-Introduce-QEMU_CAPS_OBJECT_QAPIFIE.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From a604b93e9f9f6033d5fe251f84591fb6474e2386 Mon Sep 17 00:00:00 2001
-From: Yan Wang <wangyan122@huawei.com>
-Date: Thu, 24 Mar 2022 12:41:43 +0800
-Subject: [PATCH 10/16] qemu: capabilities: Introduce QEMU_CAPS_OBJECT_QAPIFIED
-
-Starting from qemu-6.0 the parameters of -object/object-add are formally
-described by the QAPI schema. Additionally this changes the nesting of
-the properties as the 'props' nested object will be flattened to the
-parent.
-
-We'll need to detect whether qemu switched to this new approach to
-generate the objects with proper nesting and also allow testing.
-
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-Signed-off-by: Yan Wang <wangyan122@huawei.com>
----
- src/qemu/qemu_capabilities.c | 8 +++++---
- src/qemu/qemu_capabilities.h | 2 ++
- 2 files changed, 7 insertions(+), 3 deletions(-)
-
-diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
-index 0fb3e74c77..e232a37b79 100644
---- a/src/qemu/qemu_capabilities.c
-+++ b/src/qemu/qemu_capabilities.c
-@@ -569,9 +569,11 @@ VIR_ENUM_IMPL(virQEMUCaps,
-               "blockdev-reopen",
-               "storage.werror",
- 
--	      "migration-param.bandwidth",
--	      "migration-param.downtime",
--	      "migration-param.xbzrle-cache-size",
-+	          "migration-param.bandwidth",
-+	          "migration-param.downtime",
-+	          "migration-param.xbzrle-cache-size",
-+
-+              "object.qapified",
-     );
- 
- 
-diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
-index 10a6ce50e7..ffb366f84a 100644
---- a/src/qemu/qemu_capabilities.h
-+++ b/src/qemu/qemu_capabilities.h
-@@ -554,6 +554,8 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
-     QEMU_CAPS_MIGRATION_PARAM_DOWNTIME, /* downtime-limit field in migrate-set-parameters */
-     QEMU_CAPS_MIGRATION_PARAM_XBZRLE_CACHE_SIZE, /* xbzrle-cache-size field in migrate-set-parameters */
- 
-+    QEMU_CAPS_OBJECT_QAPIFIED, /* parameters for object-add are formally described */
-+
-     QEMU_CAPS_LAST /* this must always be the last item */
- } virQEMUCapsFlags;
- 
--- 
-2.27.0
-
diff --git a/qemu-command-Generate-commandline-of-iothread-object.patch b/qemu-command-Generate-commandline-of-iothread-object.patch
deleted file mode 100644
index 7e032067cb761410c3350b8ecc7e5e2c732f57b6..0000000000000000000000000000000000000000
--- a/qemu-command-Generate-commandline-of-iothread-object.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 868eae25430b00560be5f078d12137b875ce6239 Mon Sep 17 00:00:00 2001
-From: Peter Krempa <pkrempa@redhat.com>
-Date: Thu, 26 Nov 2020 19:07:03 +0100
-Subject: [PATCH 09/16] qemu: command: Generate commandline of iothread objects
- JSON
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The commandline generator for 'iothread' objects has a private
-implementation of the properties. Convert it to JSON so that it can be
-later validated.
-
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/qemu/qemu_command.c | 18 +++++++++++-------
- 1 file changed, 11 insertions(+), 7 deletions(-)
-
-diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
-index 4ec661e4b5..be51400928 100644
---- a/src/qemu/qemu_command.c
-+++ b/src/qemu/qemu_command.c
-@@ -7386,15 +7386,19 @@ qemuBuildIOThreadCommandLine(virCommandPtr cmd,
-     if (def->niothreadids == 0)
-         return 0;
- 
--    /* Create iothread objects using the defined iothreadids list
--     * and the defined id and name from the list. These may be used
--     * by a disk definition which will associate to an iothread by
--     * supplying a value of an id from the list
--     */
-     for (i = 0; i < def->niothreadids; i++) {
-+        g_autoptr(virJSONValue) props = NULL;
-+        g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
-+        g_autofree char *alias = g_strdup_printf("iothread%u", def->iothreadids[i]->iothread_id);
-+
-+        if (qemuMonitorCreateObjectProps(&props, "iothread", alias, NULL) < 0)
-+            return -1;
-+
-+        if (virQEMUBuildObjectCommandlineFromJSON(&buf, props) < 0)
-+            return -1;
-+
-         virCommandAddArg(cmd, "-object");
--        virCommandAddArgFormat(cmd, "iothread,id=iothread%u",
--                               def->iothreadids[i]->iothread_id);
-+        virCommandAddArgBuffer(cmd, &buf);
-     }
- 
-     return 0;
--- 
-2.27.0
-
diff --git a/qemu-command-Generate-commandline-of-masterKey0-secr.patch b/qemu-command-Generate-commandline-of-masterKey0-secr.patch
deleted file mode 100644
index 9f875844b56ef15f4a7dd00194ba17c84747e7a6..0000000000000000000000000000000000000000
--- a/qemu-command-Generate-commandline-of-masterKey0-secr.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From b1e1413077ee5bb9f0f5eed82cf6c629d7df4ebf Mon Sep 17 00:00:00 2001
-From: Peter Krempa <pkrempa@redhat.com>
-Date: Thu, 26 Nov 2020 19:07:03 +0100
-Subject: [PATCH 07/16] qemu: command: Generate commandline of 'masterKey0'
- secret via JSON
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-While the 'masterKey0' secret object will never be hotplugged we want to
-generate it through JSON so that we'll be able to validate all
-parameters of '-object' against the QAPI schema once 'object-add' is
-qapified in qemu.
-
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/qemu/qemu_command.c | 12 ++++++++++--
- 1 file changed, 10 insertions(+), 2 deletions(-)
-
-diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
-index d5d46c0892..6a861f3c8f 100644
---- a/src/qemu/qemu_command.c
-+++ b/src/qemu/qemu_command.c
-@@ -208,6 +208,7 @@ qemuBuildMasterKeyCommandLine(virCommandPtr cmd,
-     g_autofree char *alias = NULL;
-     g_autofree char *path = NULL;
-     g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
-+    g_autoptr(virJSONValue) props = NULL;
- 
-     /* If the -object secret does not exist, then just return. This just
-      * means the domain won't be able to use a secret master key and is
-@@ -229,9 +230,16 @@ qemuBuildMasterKeyCommandLine(virCommandPtr cmd,
-     if (!(path = qemuDomainGetMasterKeyFilePath(priv->libDir)))
-         return -1;
- 
-+    if (qemuMonitorCreateObjectProps(&props, "secret", alias,
-+                                     "s:format", "raw",
-+                                     "s:file", path,
-+                                     NULL) < 0)
-+        return -1;
-+
-+    if (virQEMUBuildObjectCommandlineFromJSON(&buf, props) < 0)
-+        return -1;
-+
-     virCommandAddArg(cmd, "-object");
--    virBufferAsprintf(&buf, "secret,id=%s,format=raw,file=", alias);
--    virQEMUBuildBufferEscapeComma(&buf, path);
-     virCommandAddArgBuffer(cmd, &buf);
- 
-     return 0;
--- 
-2.27.0
-
diff --git a/qemu-command-Generate-commandline-of-sev0-sev-guest-.patch b/qemu-command-Generate-commandline-of-sev0-sev-guest-.patch
deleted file mode 100644
index 6e35b1eb843578bf59e5d66194db607116b5cf89..0000000000000000000000000000000000000000
--- a/qemu-command-Generate-commandline-of-sev0-sev-guest-.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-From 2626cba5134d81501f0fcc138c0f6d3427f7656e Mon Sep 17 00:00:00 2001
-From: Yan Wang <wangyan122@huawei.com>
-Date: Thu, 24 Mar 2022 12:37:24 +0800
-Subject: [PATCH 08/16] qemu: command: Generate commandline of 'sev0' sev-guest
- object via JSON MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8
- Content-Transfer-Encoding: 8bit
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-While the 'sev0' sev-guest object will never be hotplugged, but we want
-to generate it through JSON so that we'll be able to validate all
-parameters of '-object' against the QAPI schema once 'object-add' is
-qapified in qemu.
-
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Signed-off-by: Yan Wang <wangyan122@huawei.com>
----
- src/qemu/qemu_command.c                       | 32 +++++++++++--------
- .../launch-security-sev.x86_64-2.12.0.args    |  2 +-
- 2 files changed, 19 insertions(+), 15 deletions(-)
-
-diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
-index 6a861f3c8f..4ec661e4b5 100644
---- a/src/qemu/qemu_command.c
-+++ b/src/qemu/qemu_command.c
-@@ -9392,9 +9392,11 @@ static int
- qemuBuildSEVCommandLine(virDomainObjPtr vm, virCommandPtr cmd,
-                         virDomainSEVDefPtr sev)
- {
-+    g_autoptr(virJSONValue) props = NULL;
-     g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
-     qemuDomainObjPrivatePtr priv = vm->privateData;
--    char *path = NULL;
-+    g_autofree char *dhpath = NULL;
-+    g_autofree char *sessionpath = NULL;
- 
-     if (!sev)
-         return 0;
-@@ -9402,21 +9404,23 @@ qemuBuildSEVCommandLine(virDomainObjPtr vm, virCommandPtr cmd,
-     VIR_DEBUG("policy=0x%x cbitpos=%d reduced_phys_bits=%d",
-               sev->policy, sev->cbitpos, sev->reduced_phys_bits);
- 
--    virBufferAsprintf(&buf, "sev-guest,id=sev0,cbitpos=%d", sev->cbitpos);
--    virBufferAsprintf(&buf, ",reduced-phys-bits=%d", sev->reduced_phys_bits);
--    virBufferAsprintf(&buf, ",policy=0x%x", sev->policy);
-+    if (sev->dh_cert)
-+        dhpath = g_strdup_printf("%s/dh_cert.base64", priv->libDir);
- 
--    if (sev->dh_cert) {
--        path = g_strdup_printf("%s/dh_cert.base64", priv->libDir);
--        virBufferAsprintf(&buf, ",dh-cert-file=%s", path);
--        VIR_FREE(path);
--    }
-+    if (sev->session)
-+        sessionpath = g_strdup_printf("%s/session.base64", priv->libDir);
- 
--    if (sev->session) {
--        path = g_strdup_printf("%s/session.base64", priv->libDir);
--        virBufferAsprintf(&buf, ",session-file=%s", path);
--        VIR_FREE(path);
--    }
-+    if (qemuMonitorCreateObjectProps(&props, "sev-guest", "sev0",
-+                                     "u:cbitpos", sev->cbitpos,
-+                                     "u:reduced-phys-bits", sev->reduced_phys_bits,
-+                                     "u:policy", sev->policy,
-+                                     "S:dh-cert-file", dhpath,
-+                                     "S:session-file", sessionpath,
-+                                     NULL) < 0)
-+        return -1;
-+
-+    if (virQEMUBuildObjectCommandlineFromJSON(&buf, props) < 0)
-+        return -1;
- 
-     virCommandAddArg(cmd, "-object");
-     virCommandAddArgBuffer(cmd, &buf);
-diff --git a/tests/qemuxml2argvdata/launch-security-sev.x86_64-2.12.0.args b/tests/qemuxml2argvdata/launch-security-sev.x86_64-2.12.0.args
-index 378c3b681c..9fad85737a 100644
---- a/tests/qemuxml2argvdata/launch-security-sev.x86_64-2.12.0.args
-+++ b/tests/qemuxml2argvdata/launch-security-sev.x86_64-2.12.0.args
-@@ -29,7 +29,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
- -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 \
---object sev-guest,id=sev0,cbitpos=47,reduced-phys-bits=1,policy=0x1,\
-+-object sev-guest,id=sev0,cbitpos=47,reduced-phys-bits=1,policy=1,\
- dh-cert-file=/tmp/lib/domain--1-QEMUGuest1/dh_cert.base64,\
- session-file=/tmp/lib/domain--1-QEMUGuest1/session.base64 \
- -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\
--- 
-2.27.0
-
diff --git a/qemu-command-Generate-netdev-command-line-via-JSON-c.patch b/qemu-command-Generate-netdev-command-line-via-JSON-c.patch
deleted file mode 100644
index 90b8a68fd80b1bbfddfc0d95253d76c9de38eadf..0000000000000000000000000000000000000000
--- a/qemu-command-Generate-netdev-command-line-via-JSON-c.patch
+++ /dev/null
@@ -1,354 +0,0 @@
-From 0ab9df24cbe5b6cfd2aa259aaaef2f8fb2696ce2 Mon Sep 17 00:00:00 2001
-From: Peter Krempa <pkrempa@redhat.com>
-Date: Thu, 14 May 2020 22:50:59 +0200
-Subject: [PATCH 10/18] qemu: command: Generate -netdev command line via
- JSON->cmdline conversion
-
-The 'netdev_add' command was recently formally described in qemu via the
-QMP schema. This means that it also requires the arguments to be
-properly formatted. Our current approach is to generate the command line
-and then use qemuMonitorJSONKeywordStringToJSON to get the JSON
-properties for the monitor. This will not work if we need to pass some
-fields as numbers or booleans.
-
-In this step we re-do internals of qemuBuildHostNetStr to format a JSON
-object which is converted back via virQEMUBuildNetdevCommandlineFromJSON
-to the equivalent command line. This will later allow fixing of the
-monitor code to use the JSON object directly rather than rely on the
-conversion.
-
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Eric Blake <eblake@redhat.com>
----
- src/qemu/qemu_command.c | 163 +++++++++++++++++++++++++---------------
- src/qemu/qemu_command.h |  12 +--
- src/qemu/qemu_hotplug.c |  13 +++-
- 3 files changed, 119 insertions(+), 69 deletions(-)
-
-diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
-index 688c9db851..141657b3e4 100644
---- a/src/qemu/qemu_command.c
-+++ b/src/qemu/qemu_command.c
-@@ -3910,7 +3910,7 @@ qemuBuildNicDevStr(virDomainDefPtr def,
- }
- 
- 
--char *
-+virJSONValuePtr
- qemuBuildHostNetStr(virDomainNetDefPtr net,
-                     char **tapfd,
-                     size_t tapfdSize,
-@@ -3919,10 +3919,11 @@ qemuBuildHostNetStr(virDomainNetDefPtr net,
-                     const char *slirpfd)
- {
-     bool is_tap = false;
--    g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
-     virDomainNetType netType = virDomainNetGetActualType(net);
-     size_t i;
- 
-+    g_autoptr(virJSONValue) netprops = NULL;
-+
-     if (net->script && netType != VIR_DOMAIN_NET_TYPE_ETHERNET) {
-         virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-                        _("scripts are not supported on interfaces of type %s"),
-@@ -3940,54 +3941,75 @@ qemuBuildHostNetStr(virDomainNetDefPtr net,
-     case VIR_DOMAIN_NET_TYPE_NETWORK:
-     case VIR_DOMAIN_NET_TYPE_DIRECT:
-     case VIR_DOMAIN_NET_TYPE_ETHERNET:
--        virBufferAddLit(&buf, "tap,");
-+        if (virJSONValueObjectCreate(&netprops, "s:type", "tap", NULL) < 0)
-+            return NULL;
-+
-         /* for one tapfd 'fd=' shall be used,
-          * for more than one 'fds=' is the right choice */
-         if (tapfdSize == 1) {
--            virBufferAsprintf(&buf, "fd=%s,", tapfd[0]);
-+            if (virJSONValueObjectAdd(netprops, "s:fd", tapfd[0], NULL) < 0)
-+                return NULL;
-         } else {
--            virBufferAddLit(&buf, "fds=");
--            for (i = 0; i < tapfdSize; i++) {
--                if (i)
--                    virBufferAddChar(&buf, ':');
--                virBufferAdd(&buf, tapfd[i], -1);
--            }
--            virBufferAddChar(&buf, ',');
-+            g_auto(virBuffer) fdsbuf = VIR_BUFFER_INITIALIZER;
-+
-+            for (i = 0; i < tapfdSize; i++)
-+                virBufferAsprintf(&fdsbuf, "%s:", tapfd[i]);
-+
-+            virBufferTrim(&fdsbuf, ":");
-+
-+            if (virJSONValueObjectAdd(netprops,
-+                                      "s:fds", virBufferCurrentContent(&fdsbuf),
-+                                      NULL) < 0)
-+                return NULL;
-         }
-+
-         is_tap = true;
-         break;
- 
-     case VIR_DOMAIN_NET_TYPE_CLIENT:
--        virBufferAsprintf(&buf, "socket,connect=%s:%d,",
--                          net->data.socket.address,
--                          net->data.socket.port);
-+        if (virJSONValueObjectCreate(&netprops, "s:type", "socket", NULL) < 0 ||
-+            virJSONValueObjectAppendStringPrintf(netprops, "connect", "%s:%d",
-+                                                 net->data.socket.address,
-+                                                 net->data.socket.port) < 0)
-+            return NULL;
-         break;
- 
-     case VIR_DOMAIN_NET_TYPE_SERVER:
--        virBufferAsprintf(&buf, "socket,listen=%s:%d,",
--                          NULLSTR_EMPTY(net->data.socket.address),
--                          net->data.socket.port);
-+        if (virJSONValueObjectCreate(&netprops, "s:type", "socket", NULL) < 0 ||
-+            virJSONValueObjectAppendStringPrintf(netprops, "listen", "%s:%d",
-+                                                 NULLSTR_EMPTY(net->data.socket.address),
-+                                                 net->data.socket.port) < 0)
-+            return NULL;
-         break;
- 
-     case VIR_DOMAIN_NET_TYPE_MCAST:
--        virBufferAsprintf(&buf, "socket,mcast=%s:%d,",
--                          net->data.socket.address,
--                          net->data.socket.port);
-+        if (virJSONValueObjectCreate(&netprops, "s:type", "socket", NULL) < 0 ||
-+            virJSONValueObjectAppendStringPrintf(netprops, "mcast", "%s:%d",
-+                                                 net->data.socket.address,
-+                                                 net->data.socket.port) < 0)
-+            return NULL;
-         break;
- 
-     case VIR_DOMAIN_NET_TYPE_UDP:
--        virBufferAsprintf(&buf, "socket,udp=%s:%d,localaddr=%s:%d,",
--                          net->data.socket.address,
--                          net->data.socket.port,
--                          net->data.socket.localaddr,
--                          net->data.socket.localport);
-+        if (virJSONValueObjectCreate(&netprops, "s:type", "socket", NULL) < 0 ||
-+            virJSONValueObjectAppendStringPrintf(netprops, "udp", "%s:%d",
-+                                                 net->data.socket.address,
-+                                                 net->data.socket.port) < 0 ||
-+            virJSONValueObjectAppendStringPrintf(netprops, "localaddr", "%s:%d",
-+                                                 net->data.socket.localaddr,
-+                                                 net->data.socket.localport) < 0)
-+            return NULL;
-         break;
- 
-     case VIR_DOMAIN_NET_TYPE_USER:
-         if (slirpfd) {
--            virBufferAsprintf(&buf, "socket,fd=%s,", slirpfd);
-+            if (virJSONValueObjectCreate(&netprops, "s:type", "socket", NULL) < 0 ||
-+                virJSONValueObjectAppendString(netprops, "fd", slirpfd) < 0)
-+                return NULL;
-         } else {
--            virBufferAddLit(&buf, "user,");
-+            if (virJSONValueObjectCreate(&netprops, "s:type", "user", NULL) < 0)
-+                return NULL;
-+
-             for (i = 0; i < net->guestIP.nips; i++) {
-                 const virNetDevIPAddr *ip = net->guestIP.ips[i];
-                 g_autofree char *addr = NULL;
-@@ -3996,29 +4018,40 @@ qemuBuildHostNetStr(virDomainNetDefPtr net,
-                     return NULL;
- 
-                 if (VIR_SOCKET_ADDR_IS_FAMILY(&ip->address, AF_INET)) {
--                    virBufferAsprintf(&buf, "net=%s", addr);
-+                    g_autofree char *ipv4netaddr = NULL;
-+
-                     if (ip->prefix)
--                        virBufferAsprintf(&buf, "/%u", ip->prefix);
--                    virBufferAddChar(&buf, ',');
-+                        ipv4netaddr = g_strdup_printf("%s/%u", addr, ip->prefix);
-+                    else
-+                        ipv4netaddr = g_strdup(addr);
-+
-+                    if (virJSONValueObjectAppendString(netprops, "net", ipv4netaddr) < 0)
-+                        return NULL;
-                 } else if (VIR_SOCKET_ADDR_IS_FAMILY(&ip->address, AF_INET6)) {
--                    virBufferAsprintf(&buf, "ipv6-prefix=%s,", addr);
--                    if (ip->prefix)
--                        virBufferAsprintf(&buf, "ipv6-prefixlen=%u,", ip->prefix);
-+                    if (virJSONValueObjectAppendString(netprops, "ipv6-prefix", addr) < 0)
-+                        return NULL;
-+                    if (ip->prefix &&
-+                        virJSONValueObjectAppendNumberUlong(netprops, "ipv6-prefixlen",
-+                                                            ip->prefix) < 0)
-+                        return NULL;
-                 }
-             }
-         }
-         break;
- 
-     case VIR_DOMAIN_NET_TYPE_INTERNAL:
--        virBufferAddLit(&buf, "user,");
-+        if (virJSONValueObjectCreate(&netprops, "s:type", "user", NULL) < 0)
-+            return NULL;
-         break;
- 
-     case VIR_DOMAIN_NET_TYPE_VHOSTUSER:
--        virBufferAsprintf(&buf, "vhost-user,chardev=char%s,",
--                          net->info.alias);
--        if (net->driver.virtio.queues > 1)
--            virBufferAsprintf(&buf, "queues=%u,",
--                              net->driver.virtio.queues);
-+        if (virJSONValueObjectCreate(&netprops, "s:type", "vhost-user", NULL) < 0 ||
-+            virJSONValueObjectAppendStringPrintf(netprops, "chardev", "char%s", net->info.alias) < 0)
-+            return NULL;
-+
-+        if (net->driver.virtio.queues > 1 &&
-+            virJSONValueObjectAppendNumberUlong(netprops, "queues", net->driver.virtio.queues) < 0)
-+            return NULL;
-         break;
- 
-     case VIR_DOMAIN_NET_TYPE_HOSTDEV:
-@@ -4027,31 +4060,38 @@ qemuBuildHostNetStr(virDomainNetDefPtr net,
-         break;
-     }
- 
--    virBufferAsprintf(&buf, "id=host%s,", net->info.alias);
-+    if (virJSONValueObjectAppendStringPrintf(netprops, "id", "host%s", net->info.alias) < 0)
-+        return NULL;
- 
-     if (is_tap) {
-         if (vhostfdSize) {
--            virBufferAddLit(&buf, "vhost=on,");
-+            if (virJSONValueObjectAppendBoolean(netprops, "vhost", true) < 0)
-+                return NULL;
-+
-             if (vhostfdSize == 1) {
--                virBufferAsprintf(&buf, "vhostfd=%s,", vhostfd[0]);
-+                if (virJSONValueObjectAdd(netprops, "s:vhostfd", vhostfd[0], NULL) < 0)
-+                    return NULL;
-             } else {
--                virBufferAddLit(&buf, "vhostfds=");
--                for (i = 0; i < vhostfdSize; i++) {
--                    if (i)
--                        virBufferAddChar(&buf, ':');
--                    virBufferAdd(&buf, vhostfd[i], -1);
--                }
--                virBufferAddChar(&buf, ',');
-+                g_auto(virBuffer) fdsbuf = VIR_BUFFER_INITIALIZER;
-+
-+                for (i = 0; i < vhostfdSize; i++)
-+                    virBufferAsprintf(&fdsbuf, "%s:", vhostfd[i]);
-+
-+                virBufferTrim(&fdsbuf, ":");
-+
-+                if (virJSONValueObjectAdd(netprops,
-+                                          "s:vhostfds", virBufferCurrentContent(&fdsbuf),
-+                                          NULL) < 0)
-+                    return NULL;
-             }
-         }
--        if (net->tune.sndbuf_specified)
--            virBufferAsprintf(&buf, "sndbuf=%lu,", net->tune.sndbuf);
--    }
--
- 
--    virBufferTrim(&buf, ",");
-+        if (net->tune.sndbuf_specified &&
-+            virJSONValueObjectAppendNumberUlong(netprops, "sndbuf", net->tune.sndbuf) < 0)
-+            return NULL;
-+    }
- 
--    return virBufferContentAndReset(&buf);
-+    return g_steal_pointer(&netprops);
- }
- 
- 
-@@ -8006,6 +8046,7 @@ qemuBuildInterfaceCommandLine(virQEMUDriverPtr driver,
-     bool requireNicdev = false;
-     qemuSlirpPtr slirp;
-     size_t i;
-+    g_autoptr(virJSONValue) hostnetprops = NULL;
- 
- 
-     if (!bootindex)
-@@ -8209,11 +8250,15 @@ qemuBuildInterfaceCommandLine(virQEMUDriverPtr driver,
-     if (chardev)
-         virCommandAddArgList(cmd, "-chardev", chardev, NULL);
- 
--    if (!(host = qemuBuildHostNetStr(net,
--                                     tapfdName, tapfdSize,
--                                     vhostfdName, vhostfdSize,
--                                     slirpfdName)))
-+    if (!(hostnetprops = qemuBuildHostNetStr(net,
-+                                             tapfdName, tapfdSize,
-+                                             vhostfdName, vhostfdSize,
-+                                             slirpfdName)))
-         goto cleanup;
-+
-+    if (!(host = virQEMUBuildNetdevCommandlineFromJSON(hostnetprops)))
-+        goto cleanup;
-+
-     virCommandAddArgList(cmd, "-netdev", host, NULL);
- 
-     /* Possible combinations:
-diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h
-index 274084821b..00d9a9da8f 100644
---- a/src/qemu/qemu_command.h
-+++ b/src/qemu/qemu_command.h
-@@ -89,12 +89,12 @@ qemuBuildChrDeviceStr(char **deviceStr,
- char *
- qemuBuildChannelGuestfwdNetdevProps(virDomainChrDefPtr chr);
- 
--char *qemuBuildHostNetStr(virDomainNetDefPtr net,
--                          char **tapfd,
--                          size_t tapfdSize,
--                          char **vhostfd,
--                          size_t vhostfdSize,
--                          const char *slirpfd);
-+virJSONValuePtr qemuBuildHostNetStr(virDomainNetDefPtr net,
-+                                    char **tapfd,
-+                                    size_t tapfdSize,
-+                                    char **vhostfd,
-+                                    size_t vhostfdSize,
-+                                    const char *slirpfd);
- 
- /* Current, best practice */
- char *qemuBuildNicDevStr(virDomainDefPtr def,
-diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
-index ee97397235..1877aef1b0 100644
---- a/src/qemu/qemu_hotplug.c
-+++ b/src/qemu/qemu_hotplug.c
-@@ -54,6 +54,7 @@
- #include "virstoragefile.h"
- #include "virstring.h"
- #include "virtime.h"
-+#include "virqemu.h"
- 
- #define VIR_FROM_THIS VIR_FROM_QEMU
- 
-@@ -1157,6 +1158,7 @@ qemuDomainAttachNetDevice(virQEMUDriverPtr driver,
-     size_t vhostfdSize = 0;
-     size_t queueSize = 0;
-     g_autofree char *nicstr = NULL;
-+    g_autoptr(virJSONValue) netprops = NULL;
-     g_autofree char *netstr = NULL;
-     int ret = -1;
-     bool releaseaddr = false;
-@@ -1382,10 +1384,13 @@ qemuDomainAttachNetDevice(virQEMUDriverPtr driver,
-     for (i = 0; i < vhostfdSize; i++)
-         vhostfdName[i] = g_strdup_printf("vhostfd-%s%zu", net->info.alias, i);
- 
--    if (!(netstr = qemuBuildHostNetStr(net,
--                                       tapfdName, tapfdSize,
--                                       vhostfdName, vhostfdSize,
--                                       slirpfdName)))
-+    if (!(netprops = qemuBuildHostNetStr(net,
-+                                         tapfdName, tapfdSize,
-+                                         vhostfdName, vhostfdSize,
-+                                         slirpfdName)))
-+        goto cleanup;
-+
-+    if (!(netstr = virQEMUBuildNetdevCommandlineFromJSON(netprops)))
-         goto cleanup;
- 
-     qemuDomainObjEnterMonitor(driver, vm);
--- 
-2.23.0.windows.1
-
diff --git a/qemu-command-Use-JSON-for-QAPIfied-object-directly.patch b/qemu-command-Use-JSON-for-QAPIfied-object-directly.patch
deleted file mode 100644
index f39a38d67e3c10d6ae5d85450e9f57529c9ca2f2..0000000000000000000000000000000000000000
--- a/qemu-command-Use-JSON-for-QAPIfied-object-directly.patch
+++ /dev/null
@@ -1,371 +0,0 @@
-From b43ddd42069c503980ad0d8b3439e70cf10e3323 Mon Sep 17 00:00:00 2001
-From: Yan Wang <wangyan122@huawei.com>
-Date: Thu, 24 Mar 2022 12:56:50 +0800
-Subject: [PATCH 14/16] qemu: command: Use JSON for QAPIfied -object directly
-
-Skip the lossy conversion to legacy commandline arguments by using the
-JSON props directly when -object is QAPIfied. This avoids issues with
-conversion of bitmaps and also allows validation of the generated JSON
-against the QMP schema in the tests.
-
-Since the new approach is triggered by a qemu capability the code
-from 'virQEMUBuildObjectCommandlineFromJSON' in util/virqemu.c was moved
-to 'qemuBuildObjectCommandlineFromJSON' in qemu/qemu_command.c which has
-the virQEMUCaps type.
-
-Some functions needed to be modified to propagate qemuCaps.
-
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-Signed-off-by: Yan Wang <wangyan122@huawei.com>
----
- src/libvirt_private.syms |  1 -
- src/qemu/qemu_command.c  | 94 +++++++++++++++++++++++++++-------------
- src/util/virqemu.c       | 24 ----------
- src/util/virqemu.h       |  3 --
- 4 files changed, 65 insertions(+), 57 deletions(-)
-
-diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
-index 861a4892be..997039868e 100644
---- a/src/libvirt_private.syms
-+++ b/src/libvirt_private.syms
-@@ -2905,7 +2905,6 @@ virQEMUBuildCommandLineJSONArrayBitmap;
- virQEMUBuildCommandLineJSONArrayNumbered;
- virQEMUBuildDriveCommandlineFromJSON;
- virQEMUBuildNetdevCommandlineFromJSON;
--virQEMUBuildObjectCommandlineFromJSON;
- virQEMUBuildQemuImgKeySecretOpts;
- 
- 
-diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
-index fd3b0baaf8..27b2eef8e5 100644
---- a/src/qemu/qemu_command.c
-+++ b/src/qemu/qemu_command.c
-@@ -190,6 +190,32 @@ VIR_ENUM_IMPL(qemuNumaPolicy,
-               "interleave",
- );
- 
-+ 
-+static int
-+qemuBuildObjectCommandlineFromJSON(virBuffer *buf,
-+                                   virJSONValue *props,
-+                                   virQEMUCaps *qemuCaps)
-+{
-+    const char *type = virJSONValueObjectGetString(props, "qom-type");
-+    const char *alias = virJSONValueObjectGetString(props, "id");
-+
-+    if (!type || !alias) {
-+        virReportError(VIR_ERR_INTERNAL_ERROR,
-+                       _("missing 'type'(%s) or 'alias'(%s) field of QOM 'object'"),
-+                       NULLSTR(type), NULLSTR(alias));
-+        return -1;
-+    }
-+
-+    if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_OBJECT_QAPIFIED)) {
-+        return virJSONValueToBuffer(props, buf, false);
-+    } else {
-+        virBufferAsprintf(buf, "%s,", type);
-+
-+        return virQEMUBuildCommandLineJSON(props, buf, "qom-type", false,
-+                                           virQEMUBuildCommandLineJSONArrayBitmap);
-+    }
-+}
-+
- 
- /**
-  * qemuBuildMasterKeyCommandLine:
-@@ -236,7 +262,7 @@ qemuBuildMasterKeyCommandLine(virCommandPtr cmd,
-                                      NULL) < 0)
-         return -1;
- 
--    if (virQEMUBuildObjectCommandlineFromJSON(&buf, props) < 0)
-+    if (qemuBuildObjectCommandlineFromJSON(&buf, props, priv->qemuCaps) < 0)
-         return -1;
- 
-     virCommandAddArg(cmd, "-object");
-@@ -722,6 +748,7 @@ qemuBuildSecretInfoProps(qemuDomainSecretInfoPtr secinfo,
-  * qemuBuildObjectSecretCommandLine:
-  * @cmd: the command to modify
-  * @secinfo: pointer to the secret info object
-+ * @qemuCaps: qemu capabilities
-  *
-  * If the secinfo is available and associated with an AES secret,
-  * then format the command line for the secret object. This object
-@@ -732,7 +759,8 @@ qemuBuildSecretInfoProps(qemuDomainSecretInfoPtr secinfo,
-  */
- static int
- qemuBuildObjectSecretCommandLine(virCommandPtr cmd,
--                                 qemuDomainSecretInfoPtr secinfo)
-+                                 qemuDomainSecretInfoPtr secinfo,
-+                                 virQEMUCaps *qemuCaps)
- {
-     g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
-     g_autoptr(virJSONValue) props = NULL;
-@@ -740,7 +768,7 @@ qemuBuildObjectSecretCommandLine(virCommandPtr cmd,
-     if (qemuBuildSecretInfoProps(secinfo, &props) < 0)
-         return -1;
- 
--    if (virQEMUBuildObjectCommandlineFromJSON(&buf, props) < 0)
-+    if (qemuBuildObjectCommandlineFromJSON(&buf, props, qemuCaps) < 0)
-         return -1;
- 
-     virCommandAddArg(cmd, "-object");
-@@ -761,13 +789,14 @@ qemuBuildObjectSecretCommandLine(virCommandPtr cmd,
-  */
- static int
- qemuBuildDiskSecinfoCommandLine(virCommandPtr cmd,
--                                qemuDomainSecretInfoPtr secinfo)
-+                                qemuDomainSecretInfoPtr secinfo,
-+                                virQEMUCaps *qemuCaps)
- {
-     /* Not necessary for non AES secrets */
-     if (!secinfo || secinfo->type != VIR_DOMAIN_SECRET_INFO_TYPE_AES)
-         return 0;
- 
--    return qemuBuildObjectSecretCommandLine(cmd, secinfo);
-+    return qemuBuildObjectSecretCommandLine(cmd, secinfo, qemuCaps);
- }
- 
- 
-@@ -929,7 +958,7 @@ qemuBuildTLSx509CommandLine(virCommandPtr cmd,
-                                      certEncSecretAlias, qemuCaps, &props) < 0)
-         return -1;
- 
--    if (virQEMUBuildObjectCommandlineFromJSON(&buf, props) < 0)
-+    if (qemuBuildObjectCommandlineFromJSON(&buf, props, qemuCaps) < 0)
-         return -1;
- 
-     virCommandAddArg(cmd, "-object");
-@@ -2388,14 +2417,15 @@ qemuBuildFloppyCommandLineControllerOptions(virCommandPtr cmd,
- 
- static int
- qemuBuildObjectCommandline(virCommandPtr cmd,
--                           virJSONValuePtr objProps)
-+                           virJSONValuePtr objProps,
-+                           virQEMUCaps *qemuCaps)
- {
-     g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
- 
-     if (!objProps)
-         return 0;
- 
--    if (virQEMUBuildObjectCommandlineFromJSON(&buf, objProps) < 0)
-+    if (qemuBuildObjectCommandlineFromJSON(&buf, objProps, qemuCaps) < 0)
-         return -1;
- 
-     virCommandAddArg(cmd, "-object");
-@@ -2407,15 +2437,16 @@ qemuBuildObjectCommandline(virCommandPtr cmd,
- 
- static int
- qemuBuildBlockStorageSourceAttachDataCommandline(virCommandPtr cmd,
--                                                 qemuBlockStorageSourceAttachDataPtr data)
-+                                                 qemuBlockStorageSourceAttachDataPtr data,
-+                                                 virQEMUCaps *qemuCaps)
- {
-     char *tmp;
- 
--    if (qemuBuildObjectCommandline(cmd, data->prmgrProps) < 0 ||
--        qemuBuildObjectCommandline(cmd, data->authsecretProps) < 0 ||
--        qemuBuildObjectCommandline(cmd, data->encryptsecretProps) < 0 ||
--        qemuBuildObjectCommandline(cmd, data->httpcookiesecretProps) < 0 ||
--        qemuBuildObjectCommandline(cmd, data->tlsProps) < 0)
-+    if (qemuBuildObjectCommandline(cmd, data->prmgrProps, qemuCaps) < 0 ||
-+        qemuBuildObjectCommandline(cmd, data->authsecretProps, qemuCaps) < 0 ||
-+        qemuBuildObjectCommandline(cmd, data->encryptsecretProps, qemuCaps) < 0 ||
-+        qemuBuildObjectCommandline(cmd, data->httpcookiesecretProps, qemuCaps) < 0 ||
-+        qemuBuildObjectCommandline(cmd, data->tlsProps, qemuCaps) < 0)
-         return -1;
- 
-     if (data->driveCmd)
-@@ -2478,7 +2509,8 @@ qemuBuildDiskSourceCommandLine(virCommandPtr cmd,
- 
-     for (i = data->nsrcdata; i > 0; i--) {
-         if (qemuBuildBlockStorageSourceAttachDataCommandline(cmd,
--                                                             data->srcdata[i - 1]) < 0)
-+                                                             data->srcdata[i - 1],
-+                                                             qemuCaps) < 0)
-             return -1;
-     }
- 
-@@ -3630,7 +3662,7 @@ qemuBuildMemoryCellBackendStr(virDomainDefPtr def,
-                                           priv, def, &mem, false)) < 0)
-         return -1;
- 
--    if (virQEMUBuildObjectCommandlineFromJSON(buf, props) < 0)
-+    if (qemuBuildObjectCommandlineFromJSON(buf, props, priv->qemuCaps) < 0)
-         return -1;
- 
-     return rc;
-@@ -3659,7 +3691,7 @@ qemuBuildMemoryDimmBackendStr(virBufferPtr buf,
-                                     priv, def, mem, true) < 0)
-         return -1;
- 
--    if (virQEMUBuildObjectCommandlineFromJSON(buf, props) < 0)
-+    if (qemuBuildObjectCommandlineFromJSON(buf, props, priv->qemuCaps) < 0)
-         return -1;
- 
-     return 0;
-@@ -5289,7 +5321,8 @@ qemuBuildChrChardevStr(virLogManagerPtr logManager,
-              * functions can just check the config fields */
-             if (chrSourcePriv && chrSourcePriv->secinfo) {
-                 if (qemuBuildObjectSecretCommandLine(cmd,
--                                                     chrSourcePriv->secinfo) < 0)
-+                                                     chrSourcePriv->secinfo,
-+                                                     qemuCaps) < 0)
-                     return NULL;
- 
-                 tlsCertEncSecAlias = chrSourcePriv->secinfo->s.aes.alias;
-@@ -5488,7 +5521,7 @@ qemuBuildHostdevCommandLine(virCommandPtr cmd,
- 
-                 if (qemuBuildDiskSecinfoCommandLine(cmd, srcPriv ?
-                                                     srcPriv->secinfo :
--                                                    NULL) < 0)
-+                                                    NULL, qemuCaps) < 0)
-                     return -1;
-             }
- 
-@@ -5861,7 +5894,7 @@ qemuBuildRNGCommandLine(virLogManagerPtr logManager,
-         if (qemuBuildRNGBackendProps(rng, qemuCaps, &props) < 0)
-             return -1;
- 
--        rc = virQEMUBuildObjectCommandlineFromJSON(&buf, props);
-+        rc = qemuBuildObjectCommandlineFromJSON(&buf, props, qemuCaps);
- 
-         if (rc < 0)
-             return -1;
-@@ -7381,7 +7414,8 @@ qemuBuildMemCommandLine(virCommandPtr cmd,
- 
- static int
- qemuBuildIOThreadCommandLine(virCommandPtr cmd,
--                             const virDomainDef *def)
-+                             const virDomainDef *def,
-+                             virQEMUCaps *qemuCaps)
- {
-     size_t i;
- 
-@@ -7396,7 +7430,7 @@ qemuBuildIOThreadCommandLine(virCommandPtr cmd,
-         if (qemuMonitorCreateObjectProps(&props, "iothread", alias, NULL) < 0)
-             return -1;
- 
--        if (virQEMUBuildObjectCommandlineFromJSON(&buf, props) < 0)
-+        if (qemuBuildObjectCommandlineFromJSON(&buf, props, qemuCaps) < 0)
-             return -1;
- 
-         virCommandAddArg(cmd, "-object");
-@@ -7662,7 +7696,8 @@ qemuBuildGraphicsVNCCommandLine(virQEMUDriverConfigPtr cfg,
- 
-             if (gfxPriv->secinfo) {
-                 if (qemuBuildObjectSecretCommandLine(cmd,
--                                                     gfxPriv->secinfo) < 0)
-+                                                     gfxPriv->secinfo,
-+                                                     qemuCaps) < 0)
-                     return -1;
-                 secretAlias = gfxPriv->secinfo->s.aes.alias;
-             }
-@@ -8688,7 +8723,7 @@ qemuBuildShmemCommandLine(virLogManagerPtr logManager,
-         if (!(memProps = qemuBuildShmemBackendMemProps(shmem)))
-             return -1;
- 
--        rc = virQEMUBuildObjectCommandlineFromJSON(&buf, memProps);
-+        rc = qemuBuildObjectCommandlineFromJSON(&buf, memProps, qemuCaps);
- 
-         if (rc < 0)
-             return -1;
-@@ -9425,7 +9460,7 @@ qemuBuildSEVCommandLine(virDomainObjPtr vm, virCommandPtr cmd,
-                                      NULL) < 0)
-         return -1;
- 
--    if (virQEMUBuildObjectCommandlineFromJSON(&buf, props) < 0)
-+    if (qemuBuildObjectCommandlineFromJSON(&buf, props, priv->qemuCaps) < 0)
-         return -1;
- 
-     virCommandAddArg(cmd, "-object");
-@@ -9611,7 +9646,7 @@ qemuBuildManagedPRCommandLine(virCommandPtr cmd,
-     if (!(props = qemuBuildPRManagedManagerInfoProps(priv)))
-         return -1;
- 
--    if (virQEMUBuildObjectCommandlineFromJSON(&buf, props) < 0)
-+    if (qemuBuildObjectCommandlineFromJSON(&buf, props, priv->qemuCaps) < 0)
-         return -1;
- 
-     virCommandAddArg(cmd, "-object");
-@@ -9635,7 +9670,8 @@ qemuBuildPflashBlockdevOne(virCommandPtr cmd,
- 
-     for (i = data->nsrcdata; i > 0; i--) {
-         if (qemuBuildBlockStorageSourceAttachDataCommandline(cmd,
--                                                             data->srcdata[i - 1]) < 0)
-+                                                             data->srcdata[i - 1],
-+                                                             qemuCaps) < 0)
-             return -1;
-     }
- 
-@@ -9700,7 +9736,7 @@ qemuBuildDBusVMStateCommandLine(virCommandPtr cmd,
-     if (!(props = qemuBuildDBusVMStateInfoProps(driver, vm)))
-         return -1;
- 
--    if (virQEMUBuildObjectCommandlineFromJSON(&buf, props) < 0)
-+    if (qemuBuildObjectCommandlineFromJSON(&buf, props, priv->qemuCaps) < 0)
-         return -1;
- 
-     virCommandAddArg(cmd, "-object");
-@@ -9975,7 +10011,7 @@ qemuBuildCommandLine(virQEMUDriverPtr driver,
-     if (qemuBuildSmpCommandLine(cmd, def, qemuCaps) < 0)
-         return NULL;
- 
--    if (qemuBuildIOThreadCommandLine(cmd, def) < 0)
-+    if (qemuBuildIOThreadCommandLine(cmd, def, qemuCaps) < 0)
-         return NULL;
- 
-     if (virDomainNumaGetNodeCount(def->numa) &&
-diff --git a/src/util/virqemu.c b/src/util/virqemu.c
-index c2a14c9194..c331443b00 100644
---- a/src/util/virqemu.c
-+++ b/src/util/virqemu.c
-@@ -319,30 +319,6 @@ virQEMUBuildNetdevCommandlineFromJSON(virJSONValuePtr props,
- }
- 
- 
--int
--virQEMUBuildObjectCommandlineFromJSON(virBufferPtr buf,
--                                      virJSONValuePtr objprops)
--{
--    const char *type = virJSONValueObjectGetString(objprops, "qom-type");
--    const char *alias = virJSONValueObjectGetString(objprops, "id");
--
--    if (!type || !alias) {
--        virReportError(VIR_ERR_INTERNAL_ERROR,
--                       _("missing 'type'(%s) or 'alias'(%s) field of QOM 'object'"),
--                       NULLSTR(type), NULLSTR(alias));
--        return -1;
--    }
--
--    virBufferAsprintf(buf, "%s,", type);
--
--    if (virQEMUBuildCommandLineJSON(objprops, buf, "qom-type", false,
--                                    virQEMUBuildCommandLineJSONArrayBitmap) < 0)
--        return -1;
--
--    return 0;
--}
--
--
- char *
- virQEMUBuildDriveCommandlineFromJSON(virJSONValuePtr srcdef)
- {
-diff --git a/src/util/virqemu.h b/src/util/virqemu.h
-index b1296cb657..963ca03576 100644
---- a/src/util/virqemu.h
-+++ b/src/util/virqemu.h
-@@ -53,9 +53,6 @@ char *
- virQEMUBuildNetdevCommandlineFromJSON(virJSONValuePtr props,
-                                       bool rawjson);
- 
--int virQEMUBuildObjectCommandlineFromJSON(virBufferPtr buf,
--                                          virJSONValuePtr objprops);
--
- char *virQEMUBuildDriveCommandlineFromJSON(virJSONValuePtr src);
- 
- void virQEMUBuildBufferEscapeComma(virBufferPtr buf, const char *str);
--- 
-2.27.0
-
diff --git a/qemu-do-crash-safe-creation-of-NVRAM-file.patch b/qemu-do-crash-safe-creation-of-NVRAM-file.patch
deleted file mode 100644
index fcf0311e94933b3b366070283cf69707e02cab30..0000000000000000000000000000000000000000
--- a/qemu-do-crash-safe-creation-of-NVRAM-file.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From c96afef6693dfbf783abf5dfa3b60c588920e201 Mon Sep 17 00:00:00 2001
-From: jiangdawei15 <jiangdawei15@huawei.com>
-Date: Thu, 11 Aug 2022 20:57:49 +0800
-Subject: [PATCH 08/22] qemu: do crash safe creation of NVRAM file
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-If we crash part way through writing the NVRAM file we end up with an
-unusable NVRAM on file. To avoid this we need to write to a temporary
-file and fsync(2) at the end, then rename to the real NVRAM file path.
-
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
----
- src/qemu/qemu_process.c | 26 ++++++++++++++++++++++----
- 1 file changed, 22 insertions(+), 4 deletions(-)
-
-diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
-index b240149f7a..48d39ba97c 100644
---- a/src/qemu/qemu_process.c
-+++ b/src/qemu/qemu_process.c
-@@ -4697,7 +4697,8 @@ qemuPrepareNVRAM(virQEMUDriverConfigPtr cfg,
-     bool created = false;
-     const char *master_nvram_path;
-     ssize_t r;
--
-+    g_autofree char *tmp_dst_path = NULL;
-+    
-     if (!loader || !loader->nvram || virFileExists(loader->nvram))
-         return 0;
- 
-@@ -4726,7 +4727,9 @@ qemuPrepareNVRAM(virQEMUDriverConfigPtr cfg,
-                              master_nvram_path);
-         goto cleanup;
-     }
--    if ((dstFD = virFileOpenAs(loader->nvram,
-+    
-+    tmp_dst_path = g_strdup_printf("%s.tmp", loader->nvram);
-+    if ((dstFD = virFileOpenAs(tmp_dst_path,                           
-                                O_WRONLY | O_CREAT | O_EXCL,
-                                S_IRUSR | S_IWUSR,
-                                cfg->user, cfg->group, 0)) < 0) {
-@@ -4750,7 +4753,7 @@ qemuPrepareNVRAM(virQEMUDriverConfigPtr cfg,
-         if (safewrite(dstFD, buf, r) < 0) {
-             virReportSystemError(errno,
-                                  _("Unable to write to file '%s'"),
--                                 loader->nvram);
-+                                 tmp_dst_path);
-             goto cleanup;
-         }
-     } while (r);
-@@ -4761,9 +4764,24 @@ qemuPrepareNVRAM(virQEMUDriverConfigPtr cfg,
-                              master_nvram_path);
-         goto cleanup;
-     }
-+
-+    if (g_fsync(dstFD) < 0) {
-+        virReportSystemError(errno,
-+                             _("cannot sync file '%s'"),
-+                             tmp_dst_path);
-+        goto cleanup;
-+    }
-+
-     if (VIR_CLOSE(dstFD) < 0) {
-         virReportSystemError(errno,
-                              _("Unable to close file '%s'"),
-+                             tmp_dst_path);
-+        goto cleanup;
-+    }
-+
-+    if (rename(tmp_dst_path, loader->nvram) < 0) {
-+        virReportSystemError(errno,
-+                             _("Unable to replace '%s'"),
-                              loader->nvram);
-         goto cleanup;
-     }
-@@ -4774,7 +4792,7 @@ qemuPrepareNVRAM(virQEMUDriverConfigPtr cfg,
-      * copy the file content. Roll back. */
-     if (ret < 0) {
-         if (created)
--            unlink(loader->nvram);
-+            unlink(tmp_dst_path);
-     }
- 
-     VIR_FORCE_CLOSE(srcFD);
--- 
-2.33.0
-
diff --git a/qemu-don-t-shutdown-event-thread-in-monitor-EOF-call.patch b/qemu-don-t-shutdown-event-thread-in-monitor-EOF-call.patch
deleted file mode 100644
index 56202bacefd59b68a48c4b87337b0eeef6aa4848..0000000000000000000000000000000000000000
--- a/qemu-don-t-shutdown-event-thread-in-monitor-EOF-call.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 30121d9c7797f6bbd60caba5feaeed90b3602cce Mon Sep 17 00:00:00 2001
-From: Nikolay Shirokovskiy <nshirokovskiy@virtuozzo.com>
-Date: Thu, 23 Jul 2020 10:10:26 +0300
-Subject: [PATCH 011/108] qemu: don't shutdown event thread in monitor EOF
- callback
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This hunk was introduced in [1] in order to avoid loosing
-events from monitor on stopping qemu process. But as explained
-in [2] on destroy we won't get neither EOF nor any other
-events as monitor is just closed. In case of crash/shutdown
-we won't get any more events as well and qemuDomainObjStopWorker
-will be called by qemuProcessStop eventually. Thus let's
-remove qemuDomainObjStopWorker from qemuProcessHandleMonitorEOF
-as it is not useful anymore.
-
-[1] e6afacb0f: qemu: start/stop an event loop thread for domains
-[2] d2954c072: qemu: ensure domain event thread is always stopped
-
-Signed-off-by: Nikolay Shirokovskiy <nshirokovskiy@virtuozzo.com>
-Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
-Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
-(cherry picked from commit 5c0cd375d1d1659ae3a5db0ce3e26e5570123dff)
----
- src/qemu/qemu_process.c | 3 ---
- 1 file changed, 3 deletions(-)
-
-diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
-index 74bb9613bc..890603f66b 100644
---- a/src/qemu/qemu_process.c
-+++ b/src/qemu/qemu_process.c
-@@ -325,9 +325,6 @@ qemuProcessHandleMonitorEOF(qemuMonitorPtr mon,
-     qemuDomainDestroyNamespace(driver, vm);
- 
-  cleanup:
--    /* Now we got EOF we're not expecting more I/O, so we
--     * can finally kill the event thread */
--    qemuDomainObjStopWorker(vm);
-     virObjectUnlock(vm);
- }
- 
--- 
-2.33.0
-
diff --git a/qemu-firmware-check-virJSONValueObjectGet-return-val.patch b/qemu-firmware-check-virJSONValueObjectGet-return-val.patch
deleted file mode 100644
index 3345929a2ddb66ec84f75be8de2f2475e41fbedf..0000000000000000000000000000000000000000
--- a/qemu-firmware-check-virJSONValueObjectGet-return-val.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From b57ac69c89f0e591e74029f7fded5177fe6452c2 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
-Date: Tue, 22 Sep 2020 23:22:06 +0200
-Subject: [PATCH 038/108] qemu: firmware: check virJSONValueObjectGet return
- value
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-If the mapping is not present, we should not try to
-access its elements.
-
-Signed-off-by: Ján Tomko <jtomko@redhat.com>
-Fixes: 8b5b80f4c5f7342eedce0747469223387ab709ef
-Reviewed-by: Peter Krempa <pkrempa@redhat.com>
-(cherry picked from commit 8e12a0b8fac6b9662e5c9e17afdcedb5df944eb0)
----
- src/qemu/qemu_firmware.c | 9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/src/qemu/qemu_firmware.c b/src/qemu/qemu_firmware.c
-index 0d2439bba1..595e93fe19 100644
---- a/src/qemu/qemu_firmware.c
-+++ b/src/qemu/qemu_firmware.c
-@@ -434,10 +434,17 @@ qemuFirmwareMappingParse(const char *path,
-                          virJSONValuePtr doc,
-                          qemuFirmwarePtr fw)
- {
--    virJSONValuePtr mapping = virJSONValueObjectGet(doc, "mapping");
-+    virJSONValuePtr mapping;
-     const char *deviceStr;
-     int tmp;
- 
-+    if (!(mapping = virJSONValueObjectGet(doc, "mapping"))) {
-+        virReportError(VIR_ERR_INTERNAL_ERROR,
-+                       _("missing mapping in '%s'"),
-+                       path);
-+        return -1;
-+    }
-+
-     if (!(deviceStr = virJSONValueObjectGetString(mapping, "device"))) {
-         virReportError(VIR_ERR_INTERNAL_ERROR,
-                        _("missing device type in '%s'"),
--- 
-2.33.0
-
diff --git a/libvirt-qemu-fix-a-concurrent-operation-situation.patch b/qemu-fix-a-concurrent-operation-situation.patch
similarity index 51%
rename from libvirt-qemu-fix-a-concurrent-operation-situation.patch
rename to qemu-fix-a-concurrent-operation-situation.patch
index 4d6531b17d690305fcbb58c8c6f72c25fe6044d3..80dbd796d95a445843779810c5d9ef90f1fd2b27 100644
--- a/libvirt-qemu-fix-a-concurrent-operation-situation.patch
+++ b/qemu-fix-a-concurrent-operation-situation.patch
@@ -1,7 +1,7 @@
-From d6cf1204db14d2ba76b640268f253d2ea6f0c131 Mon Sep 17 00:00:00 2001
+From 9874c09393d9bff08b98e21e7931f8dcf15e89d6 Mon Sep 17 00:00:00 2001
 From: Feng Ni <fengni@huawei.com>
 Date: Wed, 15 Apr 2020 11:28:41 +0800
-Subject: qemu: fix a concurrent operation situation
+Subject: [PATCH] qemu: fix a concurrent operation situation
 
 Migrate vm and shutdown in guestos, interface do not return occasionally.
 In function qemuMigrationSrcNBDStorageCopy, it may be alays in while loop
@@ -14,21 +14,21 @@ Signed-off-by: Xu Yandong <xuyandong2@huawei.com>
  1 file changed, 5 insertions(+)
 
 diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
-index 8a1801d..65b47ec 100644
+index f9c34b72e8..7ae1cd7051 100644
 --- a/src/qemu/qemu_migration.c
 +++ b/src/qemu/qemu_migration.c
-@@ -1048,6 +1048,11 @@ qemuMigrationSrcNBDStorageCopy(virQEMUDriverPtr driver,
+@@ -1250,6 +1250,11 @@ qemuMigrationSrcNBDStorageCopy(virQEMUDriver *driver,
          if (rv < 0)
              return -1;
  
-+        if (!virDomainObjIsActive(vm)) {
-+            VIR_ERROR(_("domain is no longer running, migrate will end"));
-+            return -1;
-+        }
++	if (!virDomainObjIsActive(vm)) {
++	    VIR_ERROR(_("domain is no longer running, migrate will end"));
++	    return -1;
++	}
 +
-         if (priv->job.abortJob) {
-             priv->job.current->status = QEMU_DOMAIN_JOB_STATUS_CANCELED;
-             virReportError(VIR_ERR_OPERATION_ABORTED, _("%s: %s"),
+         if (vm->job->abortJob) {
+             vm->job->current->status = VIR_DOMAIN_JOB_STATUS_CANCELED;
+             virReportError(VIR_ERR_OPERATION_ABORTED, _("%1$s: %2$s"),
 -- 
-2.23.0
+2.27.0
 
diff --git a/qemu-fix-bad-indentation-for-qemuDomainNVRAMPathForm.patch b/qemu-fix-bad-indentation-for-qemuDomainNVRAMPathForm.patch
deleted file mode 100644
index a8f22d4bdf0fa0818e96e2def9550aadaac0179c..0000000000000000000000000000000000000000
--- a/qemu-fix-bad-indentation-for-qemuDomainNVRAMPathForm.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 0d04ea0e49ea1632a8991d24d03f044993047eaf Mon Sep 17 00:00:00 2001
-From: wangmeiyang <wangmeiyang_yewu@cmss.chinamobile.com>
-Date: Wed, 23 Nov 2022 17:08:11 +0800
-Subject: [PATCH 04/23] qemu: fix bad indentation for qemuDomainNVRAMPathFormat
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-cherry-pick from 7dd53b125a880e3d67403ac345589c37dd137f08
-
-Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
-Signed-off-by: Meiyang Wang <wangmeiyang@cmss.chinamobile.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
----
- src/qemu/qemu_domain.c | 4 ++--
- src/qemu/qemu_domain.h | 4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
-index 834af89a1e..c315717c8a 100644
---- a/src/qemu/qemu_domain.c
-+++ b/src/qemu/qemu_domain.c
-@@ -16994,8 +16994,8 @@ qemuDomainDiskIsMissingLocalOptional(virDomainDiskDefPtr disk)
- 
- void
- qemuDomainNVRAMPathFormat(virQEMUDriverConfigPtr cfg,
--                            virDomainDefPtr def,
--                            char **path)
-+                          virDomainDefPtr def,
-+                          char **path)
- {
-     *path = g_strdup_printf("%s/%s_VARS.fd", cfg->nvramDir, def->name);
- }
-diff --git a/src/qemu/qemu_domain.h b/src/qemu/qemu_domain.h
-index 678ddab624..164fb36f0c 100644
---- a/src/qemu/qemu_domain.h
-+++ b/src/qemu/qemu_domain.h
-@@ -1260,8 +1260,8 @@ qemuDomainDiskIsMissingLocalOptional(virDomainDiskDefPtr disk);
- 
- void
- qemuDomainNVRAMPathFormat(virQEMUDriverConfigPtr cfg,
--                            virDomainDefPtr def,
--                            char **path);
-+                          virDomainDefPtr def,
-+                          char **path);
- 
- void
- qemuDomainNVRAMPathGenerate(virQEMUDriverConfigPtr cfg,
--- 
-2.27.0
-
diff --git a/qemu-fix-conversion-specifier-in-qemuBuildVsockDevPr.patch b/qemu-fix-conversion-specifier-in-qemuBuildVsockDevPr.patch
deleted file mode 100644
index 28cf111a047c8f5bdff6c7507233d11eba8b7d17..0000000000000000000000000000000000000000
--- a/qemu-fix-conversion-specifier-in-qemuBuildVsockDevPr.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From f80fccdd500f6d77bee4fe6e24cb61d3266f38da Mon Sep 17 00:00:00 2001
-From: Xu Zheng <xuzheng_yewu@cmss.chinamobile.com>
-Date: Thu, 24 Nov 2022 15:41:29 +0800
-Subject: [PATCH 15/23] qemu: fix conversion specifier in
- qemuBuildVsockDevProps
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-vhostfd is a signed integer.
-
-cherry-pick from 045072ee3ad0643254c8cb55bd47c878ddbee084
-
-Signed-off-by: Ján Tomko <jtomko@redhat.com>
-Signed-off-by: Xu Zheng <xuzheng_yewu@cmss.chinamobile.com>
-Reviewed-by: Peter Krempa <pkrempa@redhat.com>
----
- src/qemu/qemu_command.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
-index 42f6e10b33..7bd24f042c 100644
---- a/src/qemu/qemu_command.c
-+++ b/src/qemu/qemu_command.c
-@@ -9882,7 +9882,7 @@ qemuBuildVsockDevStr(virDomainDefPtr def,
- 
-     virBufferAsprintf(&buf, ",id=%s", vsock->info.alias);
-     virBufferAsprintf(&buf, ",guest-cid=%u", vsock->guest_cid);
--    virBufferAsprintf(&buf, ",vhostfd=%s%u", fdprefix, priv->vhostfd);
-+    virBufferAsprintf(&buf, ",vhostfd=%s%d", fdprefix, priv->vhostfd);
-     if (qemuBuildDeviceAddressStr(&buf, def, &vsock->info, qemuCaps) < 0)
-         return NULL;
- 
--- 
-2.27.0
-
diff --git a/qemu-fix-crash-in-qemuDomainSetBlkioParameters-witho.patch b/qemu-fix-crash-in-qemuDomainSetBlkioParameters-witho.patch
deleted file mode 100644
index 74ad8df35366cc0cefd0a2d2ce5150e835d45ea2..0000000000000000000000000000000000000000
--- a/qemu-fix-crash-in-qemuDomainSetBlkioParameters-witho.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From a5fc7d4f76779c242d78ecf78317ff68c330b78b Mon Sep 17 00:00:00 2001
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Tue, 11 Aug 2020 15:56:54 +0200
-Subject: [PATCH 065/108] qemu: fix crash in qemuDomainSetBlkioParameters
- without cgroups
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-If we don't have cgroups available and user tries to update blkio
-parameters for running VM it will crash.
-
-It should have been protected by the virCgroupHasController() check but
-it was never called if the API was executed without any flags.
-
-We call virDomainObjGetDefs() which sets `def` and `persistentDef` based
-on the flags and these two variables should be used to figure out if we
-need to update LIVE, CONFIG or both states.
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1808293
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit a6886aafacaf25d1ce667ae961264ae1eb69900f)
----
- 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 508d246146..41e9bff17b 100644
---- a/src/qemu/qemu_driver.c
-+++ b/src/qemu/qemu_driver.c
-@@ -9380,7 +9380,7 @@ qemuDomainSetBlkioParameters(virDomainPtr dom,
-     if (virDomainObjGetDefs(vm, flags, &def, &persistentDef) < 0)
-         goto endjob;
- 
--    if (flags & VIR_DOMAIN_AFFECT_LIVE) {
-+    if (def) {
-         if (!virCgroupHasController(priv->cgroup, VIR_CGROUP_CONTROLLER_BLKIO)) {
-             virReportError(VIR_ERR_OPERATION_INVALID, "%s",
-                            _("blkio cgroup isn't mounted"));
--- 
-2.33.0
-
diff --git a/qemu-fix-domain-start-with-corrupted-save-file.patch b/qemu-fix-domain-start-with-corrupted-save-file.patch
deleted file mode 100644
index b2354a06c8c161e4efcb1d269c8c447ed605d212..0000000000000000000000000000000000000000
--- a/qemu-fix-domain-start-with-corrupted-save-file.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 8dcea1141c60ebc7c7a292b8112ca74a0ad56c46 Mon Sep 17 00:00:00 2001
-From: tangbin <tangbin_yewu@cmss.chinamobile.com>
-Date: Wed, 23 Nov 2022 15:03:37 +0200
-Subject: [PATCH 03/23] qemu: fix domain start with corrupted save file
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Commit 21ad56e932 introduced a regression where a VM with a corrupted
-save image file would fail to start on the first attempt. This was
-caused by returning a wrong return code as 'fd' was abused to also hold
-the return code.
-
-Since it's easy to miss this nuance, introduce a 'ret' variable for the
-return code and return it' value in the error section.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1791522
-
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Reviewed-by: Pavel Mores <pmores@redhat.com>
-
-Signed-off-by: tangbin <tangbin_yewu@cmss.chinamobile.com>
-(cherry-pick from f76a57182046da59af5547a1c02094dc9d61ad88)
----
- src/qemu/qemu_driver.c | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
-index a3617b4d73..10ddbba325 100644
---- a/src/qemu/qemu_driver.c
-+++ b/src/qemu/qemu_driver.c
-@@ -6587,6 +6587,7 @@ qemuDomainSaveImageOpen(virQEMUDriverPtr driver,
-                         bool unlink_corrupt)
- {
-     int fd = -1;
-+    int ret = -1;
-     virQEMUSaveDataPtr data = NULL;
-     virQEMUSaveHeaderPtr header;
-     virDomainDefPtr def = NULL;
-@@ -6622,7 +6623,7 @@ qemuDomainSaveImageOpen(virQEMUDriverPtr driver,
-                                      _("cannot remove corrupt file: %s"),
-                                      path);
-             } else {
--                fd = -3;
-+                ret = -3;
-             }
-         } else {
-             virReportError(VIR_ERR_OPERATION_FAILED,
-@@ -6643,7 +6644,7 @@ qemuDomainSaveImageOpen(virQEMUDriverPtr driver,
-                                          _("cannot remove corrupt file: %s"),
-                                          path);
-                 } else {
--                    fd = -3;
-+                    ret = -3;
-                 }
-                 goto error;
-             }
-@@ -6712,7 +6713,7 @@ qemuDomainSaveImageOpen(virQEMUDriverPtr driver,
-     virDomainDefFree(def);
-     virQEMUSaveDataFree(data);
-     VIR_FORCE_CLOSE(fd);
--    return -1;
-+    return ret;
- }
- 
- static int ATTRIBUTE_NONNULL(4) ATTRIBUTE_NONNULL(5) ATTRIBUTE_NONNULL(6)
--- 
-2.27.0
-
diff --git a/qemu-fix-formatting-of-pflash-readonly-attribute.patch b/qemu-fix-formatting-of-pflash-readonly-attribute.patch
deleted file mode 100644
index 4769b95e31a3a700e4d3a803358647a53825bdaa..0000000000000000000000000000000000000000
--- a/qemu-fix-formatting-of-pflash-readonly-attribute.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 678c5195c496ee02d46554f0e80216b20928358e Mon Sep 17 00:00:00 2001
-From: jiangdawei15 <jiangdawei15@huawei.com>
-Date: Thu, 18 Aug 2022 20:43:49 +0800
-Subject: [PATCH 09/22] qemu: fix formatting of pflash readonly attribute
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-When the <loader> had an explicit readonly='no' attribute we
-accidentally still marked the plfash as readonly due to the
-bad conversion from virTristateBool to bool. This was missed
-because the test cases run with no capabilities set and thus
-are validated the -drive approach for pflash configuration,
-not the -blockdev approach.
-
-This affected the following config:
-
-  <os>
-    <loader readonly='no' type='pflash'>/var/lib/libvirt/qemu/nvram/test-bios.fd</loader>
-  </os>
-
-for the sake of completeness, we also add a test XML config
-with no readonly attribute at all, to demonstrate that the
-default for pflash is intended to be r/w.
-
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
----
- src/qemu/qemu_domain.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
-index bf09ad517b..c4c3bb57ac 100644
---- a/src/qemu/qemu_domain.c
-+++ b/src/qemu/qemu_domain.c
-@@ -17166,7 +17166,8 @@ qemuDomainInitializePflashStorageSource(virDomainObjPtr vm)
-     pflash0->type = VIR_STORAGE_TYPE_FILE;
-     pflash0->format = VIR_STORAGE_FILE_RAW;
-     pflash0->path = g_strdup(def->os.loader->path);
--    pflash0->readonly = def->os.loader->readonly;
-+    pflash0->readonly = false;
-+    virTristateBoolToBool(def->os.loader->readonly, &pflash0->readonly);
-     pflash0->nodeformat = g_strdup("libvirt-pflash0-format");
-     pflash0->nodestorage = g_strdup("libvirt-pflash0-storage");
- 
--- 
-2.33.0
-
diff --git a/qemu-fix-memleak-in-qemuDomainAttachDeviceLive.patch b/qemu-fix-memleak-in-qemuDomainAttachDeviceLive.patch
deleted file mode 100644
index a7bea0820fd9a3ba8a8bb4548c1198e9cf5de920..0000000000000000000000000000000000000000
--- a/qemu-fix-memleak-in-qemuDomainAttachDeviceLive.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From d1c3b60ebbfe0fad5372cf2940b366f00548a4fe Mon Sep 17 00:00:00 2001
-From: tangbinzy <tangbin_yewu@cmss.chinamobile.com>
-Date: Wed, 23 Nov 2022 10:00:57 +0000
-Subject: [PATCH 07/23] qemu: fix memleak in qemuDomainAttachDeviceLive()
- During disk hot plugging, qemuDomainAttachDeviceLive() adds the new disk to
- the device list of the VM object. However, hot plugging cdroms and floppies
- only updates the src variable of the original disk device, so the newly
- generated disk object needs to be freed.
-
-Signed-off-by: Jin Yan <jinyan12@huawei.com>
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-
-Signed-off-by: tangbin <tangbin_yewu@cmss.chinamobile.com>
-(cherry-pick from 2f470a4fb1edbe2da702e398314b9db201bb991e)
----
- src/qemu/qemu_hotplug.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
-index d7bcb6a99f..c9347bac04 100644
---- a/src/qemu/qemu_hotplug.c
-+++ b/src/qemu/qemu_hotplug.c
-@@ -1115,6 +1115,7 @@ qemuDomainAttachDeviceDiskLive(virQEMUDriverPtr driver,
-             return -1;
- 
-         disk->src = NULL;
-+        virDomainDiskDefFree(disk);
-         return 0;
-     }
- 
--- 
-2.27.0
-
diff --git a/qemu-fix-null-string-specifier-argument-in-qemuDomai.patch b/qemu-fix-null-string-specifier-argument-in-qemuDomai.patch
deleted file mode 100644
index 5f1015d40076975149bf98b9a93d5d6232281bed..0000000000000000000000000000000000000000
--- a/qemu-fix-null-string-specifier-argument-in-qemuDomai.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From be8bbeb7368db79f3a2e0502a772daf951089357 Mon Sep 17 00:00:00 2001
-From: wangmeiyang <wangmeiyang_yewu@cmss.chinamobile.com>
-Date: Wed, 23 Nov 2022 14:46:20 +0800
-Subject: [PATCH 02/23] qemu: fix null string specifier argument in
- qemuDomainBlockJobAbort
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Detected by gcc 11 -Wformat-overflow:
-../../src/qemu/qemu_driver.c: In function ‘qemuDomainBlockJobAbort’:
-../../src/util/virerror.h:176:5: warning: ‘%s’ directive argument is null [-Wformat-overflow=]
-  176 |     virReportErrorHelper(VIR_FROM_THIS, code, __FILE__, \
-      |     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  177 |                          __FUNCTION__, __LINE__, __VA_ARGS__)
-      |                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-../../src/qemu/qemu_driver.c:14475:17: note: in expansion of macro ‘virReportError’
-14475 |                 virReportError(VIR_ERR_OPERATION_FAILED,
-      |                 ^~~~~~~~~~~~~~
-../../src/qemu/qemu_driver.c:14476:73: note: format string is defined here
-14476 |                                _("block job '%s' failed while pivoting: %s"),
-      |                                                                         ^~
-cherry-pick from 8c6fa38efca52adabec48989fd6e4244a44859a5
-
-Signed-off-by: Scott Davis <scott.davis@starlab.io>
-Signed-off-by: Meiyang Wang <wangmeiyang@cmss.chinamobile.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/qemu/qemu_driver.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
-index a3617b4d73..167b74acfd 100644
---- a/src/qemu/qemu_driver.c
-+++ b/src/qemu/qemu_driver.c
-@@ -17590,13 +17590,13 @@ qemuDomainBlockJobAbort(virDomainPtr dom,
-         if (pivot &&
-             job->state == QEMU_BLOCKJOB_STATE_FAILED) {
-             if (job->errmsg) {
--                virReportError(VIR_ERR_OPERATION_FAILED,
--                               _("block job '%s' failed while pivoting"),
--                               job->name);
--            } else {
-                 virReportError(VIR_ERR_OPERATION_FAILED,
-                                _("block job '%s' failed while pivoting: %s"),
-                                job->name, job->errmsg);
-+            } else {
-+                virReportError(VIR_ERR_OPERATION_FAILED,
-+                               _("block job '%s' failed while pivoting"),
-+                               job->name);
-             }
- 
-             ret = -1;
--- 
-2.27.0
-
diff --git a/qemu-fix-one-more-race-on-undefining-and-create.patch b/qemu-fix-one-more-race-on-undefining-and-create.patch
deleted file mode 100644
index bd12cdbb63844368606f661aaf76a7e84704e4fc..0000000000000000000000000000000000000000
--- a/qemu-fix-one-more-race-on-undefining-and-create.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 046ca6d0b6c80dc233e530c31156a808ae63893a Mon Sep 17 00:00:00 2001
-From: huangkai <huangkai101@huawei.com>
-Date: Mon, 15 Aug 2022 09:32:36 +0800
-Subject: [PATCH 17/22] qemu: fix one more race on undefining and create
-
-[1] closes gap in virDomainObjListRemove so that concurrent thread can
-not step in and obtain the domain while domain is temporary unlocked. But
-there is another gap exist:
-
-thread B - executes create API
-thread C - executes undefine API
-
-- thread A executes some job on domain
-- threads B and C obtains domain from list and wait for job condition
-- thread A finishes its job and C grabs job condition, removes domain
-  from list and finishes
-- thread B grabs job condition and start the domain, unfortunately
-  is not in the list already
-
-[1] commit c7d1c139ca3402e875002753952e80ce8054374e
-Author: Martin Kletzander <mkletzan@redhat.com>
-Date:   Thu Dec 11 11:14:08 2014 +0100
-
-    qemu: avoid rare race when undefining domain
-
-Signed-off-by: Nikolay Shirokovskiy <nshirokovskiy@openvz.org>
-Reviewed-by: Martin Kletzander <mkletzan@redhat.com>
----
- src/qemu/qemu_domain.c | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
-index c4c3bb57ac..70835e4efd 100644
---- a/src/qemu/qemu_domain.c
-+++ b/src/qemu/qemu_domain.c
-@@ -9860,6 +9860,16 @@ qemuDomainObjBeginJobInternal(virQEMUDriverPtr driver,
-     if (!nested && !qemuDomainNestedJobAllowed(priv, job))
-         goto retry;
- 
-+    if (obj->removing) {
-+        char uuidstr[VIR_UUID_STRING_BUFLEN];
-+
-+        virUUIDFormat(obj->def->uuid, uuidstr);
-+        virReportError(VIR_ERR_NO_DOMAIN,
-+                       _("no domain with matching uuid '%s' (%s)"),
-+                       uuidstr, obj->def->name);
-+        goto cleanup;
-+    }
-+    
-     ignore_value(virTimeMillisNow(&now));
- 
-     if (job) {
--- 
-2.33.0
-
diff --git a/qemu-fix-qemuMigrationSrcCleanup-to-use-qemuMigratio.patch b/qemu-fix-qemuMigrationSrcCleanup-to-use-qemuMigratio.patch
deleted file mode 100644
index f262bb6bcafd8fc9a9b35dff6b955ba9b4843595..0000000000000000000000000000000000000000
--- a/qemu-fix-qemuMigrationSrcCleanup-to-use-qemuMigratio.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From ba60a52c9d6ca7b3729ebf22bb72f6156a02b3b4 Mon Sep 17 00:00:00 2001
-From: Nikolay Shirokovskiy <nshirokovskiy@virtuozzo.com>
-Date: Tue, 18 Aug 2020 11:01:40 +0300
-Subject: [PATCH 071/108] qemu: fix qemuMigrationSrcCleanup to use
- qemuMigrationJobFinish
-
-qemuMigrationSrcCleanup uses qemuDomainObjDiscardAsyncJob currently. But
-discard does not reduce jobs_queued counter so it leaks. Also discard does not
-notify other threads that job condition is available. Discard does reset nested
-job but nested job is not possible in this conditions.
-
-Signed-off-by: Nikolay Shirokovskiy <nshirokovskiy@virtuozzo.com>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
-(cherry picked from commit 7e34d9a9e076ea0bd550268ad4830f53a8466f3e)
----
- 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 32be433e93..c461156075 100644
---- a/src/qemu/qemu_migration.c
-+++ b/src/qemu/qemu_migration.c
-@@ -2022,7 +2022,7 @@ qemuMigrationSrcCleanup(virDomainObjPtr vm,
-     switch ((qemuMigrationJobPhase) priv->job.phase) {
-     case QEMU_MIGRATION_PHASE_BEGIN3:
-         /* just forget we were about to migrate */
--        qemuDomainObjDiscardAsyncJob(driver, vm);
-+        qemuMigrationJobFinish(driver, vm);
-         break;
- 
-     case QEMU_MIGRATION_PHASE_PERFORM3_DONE:
-@@ -2032,7 +2032,7 @@ qemuMigrationSrcCleanup(virDomainObjPtr vm,
-         qemuMigrationParamsReset(driver, vm, QEMU_ASYNC_JOB_MIGRATION_OUT,
-                                  priv->job.migParams, priv->job.apiFlags);
-         /* clear the job and let higher levels decide what to do */
--        qemuDomainObjDiscardAsyncJob(driver, vm);
-+        qemuMigrationJobFinish(driver, vm);
-         break;
- 
-     case QEMU_MIGRATION_PHASE_PERFORM3:
--- 
-2.33.0
-
diff --git a/qemu-implement-vhost-user-blk-support.patch b/qemu-implement-vhost-user-blk-support.patch
deleted file mode 100644
index 05aceed77da2ca3be6f761e8a27bd37185fb6d2e..0000000000000000000000000000000000000000
--- a/qemu-implement-vhost-user-blk-support.patch
+++ /dev/null
@@ -1,566 +0,0 @@
-From e07709c7275349eac376660c08bacc6d18f28ff8 Mon Sep 17 00:00:00 2001
-From: Luo Yifan <luoyifan_yewu@cmss.chinamobile.com>
-Date: Wed, 30 Nov 2022 18:13:37 +0800
-Subject: [PATCH 17/24] qemu: implement vhost-user-blk support
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Implements QEMU support for vhost-user-blk together with live
-hotplug/unplug.
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Reviewed-by: Peter Krempa <pkrempa@redhat.com>
-(cherry picked from commit d763466edc6e8d4965fb42092c6e8f4296acf6c6)
-Signed-off-by: Luo Yifan <luoyifan_yewu@cmss.chinamobile.com>
----
- src/qemu/qemu_block.c                         | 40 ++++++++
- src/qemu/qemu_block.h                         |  7 ++
- src/qemu/qemu_command.c                       | 93 +++++++++++++++++--
- src/qemu/qemu_command.h                       |  6 ++
- src/qemu/qemu_domain.c                        | 13 +++
- src/qemu/qemu_driver.c                        | 66 +++++++++++++
- src/qemu/qemu_hotplug.c                       | 12 ++-
- .../disk-vhostuser.x86_64-latest.args         | 40 ++++++++
- tests/qemuxml2argvtest.c                      |  1 +
- 9 files changed, 268 insertions(+), 10 deletions(-)
- create mode 100644 tests/qemuxml2argvdata/disk-vhostuser.x86_64-latest.args
-
-diff --git a/src/qemu/qemu_block.c b/src/qemu/qemu_block.c
-index 8bd6238238..0b7f2f6874 100644
---- a/src/qemu/qemu_block.c
-+++ b/src/qemu/qemu_block.c
-@@ -1553,6 +1553,8 @@ qemuBlockStorageSourceAttachDataFree(qemuBlockStorageSourceAttachDataPtr data)
-     VIR_FREE(data->httpcookiesecretAlias);
-     VIR_FREE(data->driveCmd);
-     VIR_FREE(data->driveAlias);
-+    VIR_FREE(data->chardevAlias);
-+    VIR_FREE(data->chardevCmd);
-     VIR_FREE(data);
- }
- 
-@@ -1719,6 +1721,13 @@ qemuBlockStorageSourceAttachApply(qemuMonitorPtr mon,
-         data->driveAdded = true;
-     }
- 
-+    if (data->chardevDef) {
-+        if (qemuMonitorAttachCharDev(mon, data->chardevAlias, data->chardevDef) < 0)
-+            return -1;
-+
-+        data->chardevAdded = true;
-+    }
-+
-     return 0;
- }
- 
-@@ -1741,6 +1750,13 @@ qemuBlockStorageSourceAttachRollback(qemuMonitorPtr mon,
- 
-     virErrorPreserveLast(&orig_err);
- 
-+    if (data->chardevAdded) {
-+        if (qemuMonitorDetachCharDev(mon, data->chardevAlias) < 0) {
-+            VIR_WARN("Unable to remove chardev %s after failed " "qemuMonitorAddDevice",
-+                     data->chardevAlias);
-+        }
-+    }
-+
-     if (data->driveAdded) {
-         if (qemuMonitorDriveDel(mon, data->driveAlias) < 0)
-             VIR_WARN("Unable to remove drive %s (%s) after failed "
-@@ -1904,6 +1920,30 @@ qemuBlockStorageSourceChainDetachPrepareDrive(virStorageSourcePtr src,
-     return g_steal_pointer(&data);
- }
- 
-+/**
-+ * qemuBlockStorageSourceChainDetachPrepareChardev
-+ * @src: storage source chain to remove
-+ *
-+ * Prepares qemuBlockStorageSourceChainDataPtr for detaching @src and its
-+ * backingStore if -chardev was used.
-+ */
-+qemuBlockStorageSourceChainDataPtr
-+qemuBlockStorageSourceChainDetachPrepareChardev(char *chardevAlias)
-+{
-+    g_autoptr(qemuBlockStorageSourceAttachData) backend = NULL;
-+    g_autoptr(qemuBlockStorageSourceChainData) data = NULL;
-+
-+    data = g_new0(qemuBlockStorageSourceChainData, 1);
-+    backend = g_new0(qemuBlockStorageSourceAttachData, 1);
-+
-+    backend->chardevAlias = chardevAlias;
-+    backend->chardevAdded = true;
-+
-+    if (VIR_APPEND_ELEMENT(data->srcdata, data->nsrcdata, backend) < 0)
-+        return NULL;
-+
-+    return g_steal_pointer(&data);
-+}
- 
- /**
-  * qemuBlockStorageSourceChainAttach:
-diff --git a/src/qemu/qemu_block.h b/src/qemu/qemu_block.h
-index 2ad2ce1a1f..862572e028 100644
---- a/src/qemu/qemu_block.h
-+++ b/src/qemu/qemu_block.h
-@@ -94,6 +94,11 @@ struct qemuBlockStorageSourceAttachData {
-     char *driveAlias;
-     bool driveAdded;
- 
-+    virDomainChrSourceDefPtr chardevDef;
-+    char *chardevAlias;
-+    char *chardevCmd;
-+    bool chardevAdded;
-+
-     virJSONValuePtr authsecretProps;
-     char *authsecretAlias;
- 
-@@ -153,6 +158,8 @@ qemuBlockStorageSourceChainDetachPrepareBlockdev(virStorageSourcePtr src);
- qemuBlockStorageSourceChainDataPtr
- qemuBlockStorageSourceChainDetachPrepareDrive(virStorageSourcePtr src,
-                                               char *driveAlias);
-+qemuBlockStorageSourceChainDataPtr
-+qemuBlockStorageSourceChainDetachPrepareChardev(char *chardevAlias);
- 
- int
- qemuBlockStorageSourceChainAttach(qemuMonitorPtr mon,
-diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
-index bc62843783..4b12be6ede 100644
---- a/src/qemu/qemu_command.c
-+++ b/src/qemu/qemu_command.c
-@@ -2152,9 +2152,16 @@ qemuBuildDiskDeviceStr(const virDomainDef *def,
-         break;
- 
-     case VIR_DOMAIN_DISK_BUS_VIRTIO:
--        if (qemuBuildVirtioDevStr(&opt, "virtio-blk", qemuCaps,
--                                  VIR_DOMAIN_DEVICE_DISK, disk) < 0) {
--            return NULL;
-+        if (virStorageSourceGetActualType(disk->src) == VIR_STORAGE_TYPE_VHOST_USER) {
-+            if (qemuBuildVirtioDevStr(&opt, "vhost-user-blk", qemuCaps,
-+                                      VIR_DOMAIN_DEVICE_DISK, disk) < 0) {
-+                return NULL;
-+            }
-+        } else {
-+            if (qemuBuildVirtioDevStr(&opt, "virtio-blk", qemuCaps,
-+                                      VIR_DOMAIN_DEVICE_DISK, disk) < 0) {
-+                return NULL;
-+            }
-         }
- 
-         if (disk->iothread)
-@@ -2231,11 +2238,17 @@ qemuBuildDiskDeviceStr(const virDomainDef *def,
-         virQEMUCapsGet(qemuCaps, QEMU_CAPS_DISK_SHARE_RW))
-         virBufferAddLit(&opt, ",share-rw=on");
- 
--    if (qemuDomainDiskGetBackendAlias(disk, qemuCaps, &backendAlias) < 0)
--        return NULL;
-+    if (virStorageSourceGetActualType(disk->src) == VIR_STORAGE_TYPE_VHOST_USER) {
-+        backendAlias = qemuDomainGetVhostUserChrAlias(disk->info.alias);
- 
--    if (backendAlias)
--        virBufferAsprintf(&opt, ",drive=%s", backendAlias);
-+        virBufferAsprintf(&opt, ",chardev=%s", backendAlias);
-+    } else {
-+        if (qemuDomainDiskGetBackendAlias(disk, qemuCaps, &backendAlias) < 0)
-+            return NULL;
-+
-+        if (backendAlias)
-+            virBufferAsprintf(&opt, ",drive=%s", backendAlias);
-+    }
- 
-     virBufferAsprintf(&opt, ",id=%s", disk->info.alias);
-     if (bootindex)
-@@ -2453,6 +2466,9 @@ qemuBuildBlockStorageSourceAttachDataCommandline(virCommandPtr cmd,
-     if (data->driveCmd)
-         virCommandAddArgList(cmd, "-drive", data->driveCmd, NULL);
- 
-+    if (data->chardevCmd)
-+        virCommandAddArgList(cmd, "-chardev", data->chardevCmd, NULL);
-+
-     if (data->storageProps) {
-         if (!(tmp = virJSONValueToString(data->storageProps, false)))
-             return -1;
-@@ -2492,7 +2508,10 @@ qemuBuildDiskSourceCommandLine(virCommandPtr cmd,
-     g_autofree char *copyOnReadPropsStr = NULL;
-     size_t i;
- 
--    if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_BLOCKDEV)) {
-+    if (virStorageSourceGetActualType(disk->src) == VIR_STORAGE_TYPE_VHOST_USER) {
-+        if (!(data = qemuBuildStorageSourceChainAttachPrepareChardev(disk)))
-+            return -1;
-+    } else if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_BLOCKDEV)) {
-         if (virStorageSourceIsEmpty(disk->src))
-             return 0;
- 
-@@ -10437,6 +10456,39 @@ qemuBuildStorageSourceAttachPrepareDrive(virDomainDiskDefPtr disk,
- }
- 
- 
-+/**
-+ * qemuBuildStorageSourceAttachPrepareChardev:
-+ * @src: disk source to prepare
-+ *
-+ * Prepare qemuBlockStorageSourceAttachDataPtr for vhost-user disk
-+ * to be used with -chardev.
-+ */
-+qemuBlockStorageSourceAttachDataPtr
-+qemuBuildStorageSourceAttachPrepareChardev(virDomainDiskDefPtr disk)
-+{
-+    g_autoptr(qemuBlockStorageSourceAttachData) data = NULL;
-+    g_auto(virBuffer) chardev = VIR_BUFFER_INITIALIZER;
-+
-+    data = g_new0(qemuBlockStorageSourceAttachData, 1);
-+
-+    data->chardevDef = disk->src->vhostuser;
-+    data->chardevAlias = qemuDomainGetVhostUserChrAlias(disk->info.alias);
-+
-+    virBufferAddLit(&chardev, "socket");
-+    virBufferAsprintf(&chardev, ",id=%s", data->chardevAlias);
-+    virBufferAddLit(&chardev, ",path=");
-+    virQEMUBuildBufferEscapeComma(&chardev, disk->src->vhostuser->data.nix.path);
-+
-+    qemuBuildChrChardevReconnectStr(&chardev,
-+                                    &disk->src->vhostuser->data.nix.reconnect);
-+
-+    if (!(data->chardevCmd = virBufferContentAndReset(&chardev)))
-+        return NULL;
-+
-+    return g_steal_pointer(&data);
-+}
-+
-+
- /**
-  * qemuBuildStorageSourceAttachPrepareCommon:
-  * @src: storage source
-@@ -10513,6 +10565,31 @@ qemuBuildStorageSourceChainAttachPrepareDrive(virDomainDiskDefPtr disk,
- }
- 
- 
-+/**
-+ * qemuBuildStorageSourceChainAttachPrepareChardev:
-+ * @src: disk definition
-+ *
-+ * Prepares qemuBlockStorageSourceChainDataPtr for attaching a vhost-user
-+ * disk's backend via -chardev.
-+ */
-+qemuBlockStorageSourceChainDataPtr
-+qemuBuildStorageSourceChainAttachPrepareChardev(virDomainDiskDefPtr disk)
-+{
-+    g_autoptr(qemuBlockStorageSourceAttachData) elem = NULL;
-+    g_autoptr(qemuBlockStorageSourceChainData) data = NULL;
-+
-+    data = g_new0(qemuBlockStorageSourceChainData, 1);
-+
-+    if (!(elem = qemuBuildStorageSourceAttachPrepareChardev(disk)))
-+        return NULL;
-+
-+    if (VIR_APPEND_ELEMENT(data->srcdata, data->nsrcdata, elem) < 0)
-+        return NULL;
-+
-+    return g_steal_pointer(&data);
-+}
-+
-+
- static int
- qemuBuildStorageSourceChainAttachPrepareBlockdevOne(qemuBlockStorageSourceChainData *data,
-                                                     virStorageSourcePtr src,
-diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h
-index 4b1c2103c5..283aaf358c 100644
---- a/src/qemu/qemu_command.h
-+++ b/src/qemu/qemu_command.h
-@@ -115,6 +115,10 @@ qemuBlockStorageSourceAttachDataPtr
- qemuBuildStorageSourceAttachPrepareDrive(virDomainDiskDefPtr disk,
-                                          const virDomainDef *def,
-                                          virQEMUCapsPtr qemuCaps);
-+
-+qemuBlockStorageSourceAttachDataPtr
-+qemuBuildStorageSourceAttachPrepareChardev(virDomainDiskDefPtr disk);
-+
- int
- qemuBuildStorageSourceAttachPrepareCommon(virStorageSourcePtr src,
-                                           qemuBlockStorageSourceAttachDataPtr data,
-@@ -126,6 +130,8 @@ qemuBuildStorageSourceChainAttachPrepareDrive(virDomainDiskDefPtr disk,
-                                               const virDomainDef *def,
-                                               virQEMUCapsPtr qemuCaps);
- 
-+qemuBlockStorageSourceChainDataPtr
-+qemuBuildStorageSourceChainAttachPrepareChardev(virDomainDiskDefPtr disk);
- 
- qemuBlockStorageSourceChainDataPtr
- qemuBuildStorageSourceChainAttachPrepareBlockdev(virStorageSourcePtr top,
-diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
-index c315717c8a..b2ac1d37cc 100644
---- a/src/qemu/qemu_domain.c
-+++ b/src/qemu/qemu_domain.c
-@@ -7250,6 +7250,14 @@ qemuDomainDeviceDefValidateDisk(const virDomainDiskDef *disk,
-         return -1;
-     }
- 
-+    if (disk->src->type == VIR_STORAGE_TYPE_VHOST_USER) {
-+        if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VHOST_USER_BLK)) {
-+            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-+                           _("vhostuser disk is not supported with this QEMU binary"));
-+            return -1;
-+        }
-+    }
-+
-     for (n = disk->src; virStorageSourceIsBacking(n); n = n->backingStore) {
-         if (qemuDomainValidateStorageSource(n, qemuCaps) < 0)
-             return -1;
-@@ -16767,6 +16775,11 @@ qemuDomainPrepareDiskSource(virDomainDiskDefPtr disk,
-                             qemuDomainObjPrivatePtr priv,
-                             virQEMUDriverConfigPtr cfg)
- {
-+    /* Nothing to prepare as it will use -chardev instead
-+     * of -blockdev/-drive option. */
-+    if (disk->src->type == VIR_STORAGE_TYPE_VHOST_USER)
-+        return 0;
-+
-     qemuDomainPrepareDiskCachemode(disk);
- 
-     /* set default format for storage pool based disks */
-diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
-index b2ad021e4d..1791e3c902 100644
---- a/src/qemu/qemu_driver.c
-+++ b/src/qemu/qemu_driver.c
-@@ -10707,6 +10707,12 @@ qemuDomainBlockResize(virDomainPtr dom,
-         goto endjob;
-     }
- 
-+    if (virStorageSourceGetActualType(disk->src) == VIR_STORAGE_TYPE_VHOST_USER) {
-+        virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s",
-+                       _("block resize is not supported for vhostuser disk"));
-+        goto endjob;
-+    }
-+
-     /* qcow2 and qed must be sized on 512 byte blocks/sectors,
-      * so adjust size if necessary to round up.
-      */
-@@ -10798,6 +10804,12 @@ qemuDomainBlocksStatsGather(virQEMUDriverPtr driver,
-             goto cleanup;
-         }
- 
-+        if (virStorageSourceGetActualType(disk->src) == VIR_STORAGE_TYPE_VHOST_USER) {
-+            virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s",
-+                           _("block stats are not supported for vhostuser disk"));
-+            goto cleanup;
-+        }
-+
-         if (blockdev) {
-             entryname = QEMU_DOMAIN_DISK_PRIVATE(disk)->qomName;
-         } else {
-@@ -10854,6 +10866,10 @@ qemuDomainBlocksStatsGather(virQEMUDriverPtr driver,
-             disk = vm->def->disks[i];
-             entryname = disk->info.alias;
- 
-+            /* No stats to report for vhost-user disk */
-+            if (virStorageSourceGetActualType(disk->src) == VIR_STORAGE_TYPE_VHOST_USER)
-+                continue;
-+
-             if (blockdev)
-                 entryname = QEMU_DOMAIN_DISK_PRIVATE(disk)->qomName;
- 
-@@ -11483,6 +11499,12 @@ qemuDomainBlockPeek(virDomainPtr dom,
-     if (!(disk = qemuDomainDiskByName(vm->def, path)))
-         goto cleanup;
- 
-+    if (virStorageSourceGetActualType(disk->src) == VIR_STORAGE_TYPE_VHOST_USER) {
-+        virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s",
-+                       _("peeking is not supported for vhostuser disk"));
-+        goto cleanup;
-+    }
-+
-     if (disk->src->format != VIR_STORAGE_FILE_RAW) {
-         virReportError(VIR_ERR_OPERATION_UNSUPPORTED,
-                        _("peeking is only supported for disk with 'raw' format not '%s'"),
-@@ -11840,6 +11862,12 @@ qemuDomainGetBlockInfo(virDomainPtr dom,
-         goto endjob;
-     }
- 
-+    if (virStorageSourceGetActualType(disk->src) == VIR_STORAGE_TYPE_VHOST_USER) {
-+        virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s",
-+                       _("block info is not supported for vhostuser disk"));
-+        goto endjob;
-+    }
-+
-     if (virStorageSourceIsEmpty(disk->src)) {
-         virReportError(VIR_ERR_INVALID_ARG,
-                        _("disk '%s' does not currently have a source assigned"),
-@@ -18882,6 +18910,19 @@ typedef enum {
- } qemuBlockIoTuneSetFlags;
- 
- 
-+static bool
-+qemuDomainDiskBlockIoTuneIsSupported(virStorageSourcePtr src)
-+{
-+    if (virStorageSourceGetActualType(src) == VIR_STORAGE_TYPE_VHOST_USER) {
-+        virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-+                       _("a block I/O throttling is not supported for vhostuser disk"));
-+        return false;
-+    }
-+
-+    return true;
-+}
-+
-+
- /* If the user didn't specify bytes limits, inherit previous values;
-  * likewise if the user didn't specify iops limits.  */
- static int
-@@ -19250,6 +19291,9 @@ qemuDomainSetBlockIoTune(virDomainPtr dom,
-         if (!(disk = qemuDomainDiskByName(def, path)))
-             goto endjob;
- 
-+        if (!qemuDomainDiskBlockIoTuneIsSupported(disk->src))
-+            goto endjob;
-+
-         if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV)) {
-             qdevid = QEMU_DOMAIN_DISK_PRIVATE(disk)->qomName;
-         } else {
-@@ -19257,6 +19301,9 @@ qemuDomainSetBlockIoTune(virDomainPtr dom,
-                 goto endjob;
-         }
- 
-+        if (!qemuDomainDiskBlockIoTuneIsSupported(conf_disk->src))
-+            goto endjob;
-+
-         cur_info = qemuDomainFindGroupBlockIoTune(def, disk, &info);
- 
-         if (qemuDomainSetBlockIoTuneDefaults(&info, cur_info,
-@@ -19440,6 +19487,9 @@ qemuDomainGetBlockIoTune(virDomainPtr dom,
-         if (!(disk = qemuDomainDiskByName(def, path)))
-             goto endjob;
- 
-+        if (!qemuDomainDiskBlockIoTuneIsSupported(disk->src))
-+            goto endjob;
-+
-         if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV)) {
-             qdevid = QEMU_DOMAIN_DISK_PRIVATE(disk)->qomName;
-         } else {
-@@ -19461,6 +19511,10 @@ qemuDomainGetBlockIoTune(virDomainPtr dom,
-                            path);
-             goto endjob;
-         }
-+
-+        if (!qemuDomainDiskBlockIoTuneIsSupported(disk->src))
-+            goto endjob;
-+
-         reply = disk->blkdeviotune;
- 
-         /* Group name needs to be copied since qemuMonitorGetBlockIoThrottle
-@@ -21389,6 +21443,12 @@ qemuDomainGetStatsBlockExportDisk(virDomainDiskDefPtr disk,
-         VIR_INFO("optional disk '%s' source file is missing, "
-                  "skip getting stats", disk->dst);
- 
-+        return qemuDomainGetStatsBlockExportHeader(disk, disk->src, *recordnr,
-+                                                   params);
-+    }
-+
-+    /* vhost-user disk doesn't support getting block stats */
-+    if (virStorageSourceGetActualType(disk->src) == VIR_STORAGE_TYPE_VHOST_USER) {
-         if (qemuDomainGetStatsBlockExportHeader(disk, disk->src, *recordnr,
-                                                 params) < 0) {
-             return -1;
-@@ -22638,6 +22698,12 @@ qemuDomainSetBlockThreshold(virDomainPtr dom,
-     if (!(src = qemuDomainGetStorageSourceByDevstr(dev, vm->def)))
-         goto endjob;
- 
-+    if (virStorageSourceGetActualType(src) == VIR_STORAGE_TYPE_VHOST_USER) {
-+        virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s",
-+                       _("setting device threshold is not supported for vhostuser disk"));
-+        goto endjob;
-+    }
-+
-     if (!src->nodestorage &&
-         qemuBlockNodeNamesDetect(driver, vm, QEMU_ASYNC_JOB_NONE) < 0)
-         goto endjob;
-diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
-index c9347bac04..cb571c3161 100644
---- a/src/qemu/qemu_hotplug.c
-+++ b/src/qemu/qemu_hotplug.c
-@@ -702,7 +702,10 @@ qemuDomainAttachDiskGeneric(virQEMUDriverPtr driver,
-     if (qemuDomainPrepareDiskSource(disk, priv, cfg) < 0)
-         goto cleanup;
- 
--    if (blockdev) {
-+    if (virStorageSourceGetActualType(disk->src) == VIR_STORAGE_TYPE_VHOST_USER) {
-+        if (!(data = qemuBuildStorageSourceChainAttachPrepareChardev(disk)))
-+            goto cleanup;
-+    } else if (blockdev) {
-         if (disk->copy_on_read == VIR_TRISTATE_SWITCH_ON) {
-             if (!(corProps = qemuBlockStorageGetCopyOnReadProps(disk)))
-                 goto cleanup;
-@@ -4280,7 +4283,12 @@ qemuDomainRemoveDiskDevice(virQEMUDriverPtr driver,
-               disk->info.alias, vm, vm->def->name);
- 
- 
--    if (blockdev) {
-+    if (virStorageSourceGetActualType(disk->src) == VIR_STORAGE_TYPE_VHOST_USER) {
-+        char *chardevAlias = qemuDomainGetVhostUserChrAlias(disk->info.alias);
-+
-+        if (!(diskBackend = qemuBlockStorageSourceChainDetachPrepareChardev(chardevAlias)))
-+            goto cleanup;
-+    } else if (blockdev) {
-         corAlias = g_strdup(diskPriv->nodeCopyOnRead);
- 
-         if (diskPriv->blockjob) {
-diff --git a/tests/qemuxml2argvdata/disk-vhostuser.x86_64-latest.args b/tests/qemuxml2argvdata/disk-vhostuser.x86_64-latest.args
-new file mode 100644
-index 0000000000..0a2b579e21
---- /dev/null
-+++ b/tests/qemuxml2argvdata/disk-vhostuser.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 \
-+QEMU_AUDIO_DRV=none \
-+/usr/bin/qemu-system-x86_64 \
-+-name guest=QEMUGuest1,debug-threads=on \
-+-S \
-+-object secret,id=masterKey0,format=raw,\
-+file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
-+-machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-cpu qemu64 \
-+-m 214 \
-+-overcommit mem-lock=off \
-+-smp 1,sockets=1,cores=1,threads=1 \
-+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-+-display none \
-+-no-user-config \
-+-nodefaults \
-+-chardev socket,id=charmonitor,fd=1729,server,nowait \
-+-mon chardev=charmonitor,id=monitor,mode=control \
-+-rtc base=utc \
-+-no-shutdown \
-+-no-acpi \
-+-boot strict=on \
-+-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
-+-chardev socket,id=chr-vu-virtio-disk0,path=/tmp/vhost1.sock \
-+-device vhost-user-blk-pci,bus=pci.0,addr=0x2,chardev=chr-vu-virtio-disk0,\
-+id=virtio-disk0,bootindex=1 \
-+-chardev socket,id=chr-vu-virtio-disk1,path=/tmp/vhost1.sock,reconnect=10 \
-+-device vhost-user-blk-pci,bus=pci.0,addr=0x3,chardev=chr-vu-virtio-disk1,\
-+id=virtio-disk1 \
-+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 \
-+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\
-+resourcecontrol=deny \
-+-msg timestamp=on
-diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
-index e07d6cf398..7b117f5984 100644
---- a/tests/qemuxml2argvtest.c
-+++ b/tests/qemuxml2argvtest.c
-@@ -1209,6 +1209,7 @@ mymain(void)
-     VIR_FREE(driver.config->vxhsTLSx509certdir);
-     DO_TEST("disk-no-boot", NONE);
-     DO_TEST_CAPS_LATEST("disk-nvme");
-+    DO_TEST_CAPS_LATEST("disk-vhostuser");
-     DO_TEST_PARSE_ERROR("disk-device-lun-type-invalid",
-                         QEMU_CAPS_VIRTIO_SCSI);
-     DO_TEST_CAPS_LATEST_PARSE_ERROR("disk-attaching-partition-nosupport");
--- 
-2.27.0
-
diff --git a/qemu-monitor-Don-t-add-props-wrapper-if-qemu-has-QEM.patch b/qemu-monitor-Don-t-add-props-wrapper-if-qemu-has-QEM.patch
deleted file mode 100644
index cd8320ae28eb9c97d7fe0aa8a45172171a8d9d92..0000000000000000000000000000000000000000
--- a/qemu-monitor-Don-t-add-props-wrapper-if-qemu-has-QEM.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 25f25258f0574822834c459eb414eba217b23f23 Mon Sep 17 00:00:00 2001
-From: Peter Krempa <pkrempa@redhat.com>
-Date: Mon, 30 Nov 2020 18:30:46 +0100
-Subject: [PATCH 13/16] qemu: monitor: Don't add 'props' wrapper if qemu has
- QEMU_CAPS_OBJECT_QAPIFIED
-
-Set 'objectAddNoWrap' when the capability is present.
-
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
----
- src/qemu/qemu_monitor.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
-index dd1bf925b2..ec79fa6368 100644
---- a/src/qemu/qemu_monitor.c
-+++ b/src/qemu/qemu_monitor.c
-@@ -32,6 +32,7 @@
- #include "qemu_monitor_json.h"
- #include "qemu_domain.h"
- #include "qemu_process.h"
-+#include "qemu_capabilities.h"
- #include "virerror.h"
- #include "viralloc.h"
- #include "virlog.h"
-@@ -666,6 +667,7 @@ qemuMonitorOpenInternal(virDomainObjPtr vm,
-                         qemuMonitorCallbacksPtr cb,
-                         void *opaque)
- {
-+    qemuDomainObjPrivatePtr priv = vm->privateData;
-     qemuMonitorPtr mon;
-     g_autoptr(GError) gerr = NULL;
- 
-@@ -698,6 +700,9 @@ qemuMonitorOpenInternal(virDomainObjPtr vm,
-     mon->cb = cb;
-     mon->callbackOpaque = opaque;
- 
-+    if (priv)
-+        mon->objectAddNoWrap = virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_OBJECT_QAPIFIED);
-+
-     if (virSetCloseExec(mon->fd) < 0) {
-         virReportError(VIR_ERR_INTERNAL_ERROR,
-                        "%s", _("Unable to set monitor close-on-exec flag"));
--- 
-2.27.0
-
diff --git a/qemu-monitor-Make-wrapping-of-props-of-object-add-op.patch b/qemu-monitor-Make-wrapping-of-props-of-object-add-op.patch
deleted file mode 100644
index fa7174def210146c275fff773141256dd60d24cf..0000000000000000000000000000000000000000
--- a/qemu-monitor-Make-wrapping-of-props-of-object-add-op.patch
+++ /dev/null
@@ -1,198 +0,0 @@
-From 80b46d6712ab8393659cff7a02c7e447f4e084ad Mon Sep 17 00:00:00 2001
-From: Peter Krempa <pkrempa@redhat.com>
-Date: Mon, 30 Nov 2020 16:03:57 +0100
-Subject: [PATCH 11/16] qemu: monitor: Make wrapping of 'props' of 'object-add'
- optional
-
-Construct the JSON object which is used for object-add without the
-'props' wrapper and add the wrapper only in the monitor code.
-
-This simplifies the JSON->commandline generator in the first place and
-also prepares for upcoming qemu where 'props' will be removed.
-
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-Signed-off-by: Yan Wang <wangyan122@huawei.com>
----
- src/qemu/qemu_monitor.c | 68 +++++++++++++++++++++++++++++------------
- src/util/virqemu.c      | 34 ++++++---------------
- 2 files changed, 58 insertions(+), 44 deletions(-)
-
-diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
-index 188d7700a7..b7aa824f20 100644
---- a/src/qemu/qemu_monitor.c
-+++ b/src/qemu/qemu_monitor.c
-@@ -112,6 +112,9 @@ struct _qemuMonitor {
-     qemuMonitorReportDomainLogError logFunc;
-     void *logOpaque;
-     virFreeCallback logDestroy;
-+
-+    /* true if qemu no longer wants 'props' sub-object of object-add */
-+    bool objectAddNoWrap;
- };
- 
- /**
-@@ -2872,14 +2875,12 @@ qemuMonitorCreateObjectPropsWrap(const char *type,
-                                  const char *alias,
-                                  virJSONValuePtr *props)
- {
--    virJSONValuePtr ret;
- 
--    ignore_value(virJSONValueObjectCreate(&ret,
--                                          "s:qom-type", type,
--                                          "s:id", alias,
--                                          "A:props", props,
--                                          NULL));
--    return ret;
-+    if (virJSONValueObjectPrependString(*props, "id", alias) < 0 ||
-+        virJSONValueObjectPrependString(*props, "qom-type", type))
-+        return NULL;
-+
-+    return g_steal_pointer(props);
- }
- 
- 
-@@ -2899,26 +2900,28 @@ qemuMonitorCreateObjectProps(virJSONValuePtr *propsret,
-                              const char *alias,
-                              ...)
- {
--    virJSONValuePtr props = NULL;
--    int ret = -1;
-+    g_autoptr(virJSONValue) props = NULL;
-+    int rc;
-     va_list args;
- 
--    *propsret = NULL;
-+    if (virJSONValueObjectCreate(&props,
-+                                 "s:qom-type", type,
-+                                 "s:id", alias,
-+                                 NULL) < 0)
-+        return -1;
-+
- 
-     va_start(args, alias);
- 
--    if (virJSONValueObjectCreateVArgs(&props, args) < 0)
--        goto cleanup;
-+    rc = virJSONValueObjectAddVArgs(props, args);
- 
--    if (!(*propsret = qemuMonitorCreateObjectPropsWrap(type, alias, &props)))
--        goto cleanup;
-+    va_end(args);
- 
--    ret = 0;
-+    if (rc < 0)
-+        return -1;
- 
-- cleanup:
--    virJSONValueFree(props);
--    va_end(args);
--    return ret;
-+    *propsret = g_steal_pointer(&props);
-+    return 0;
- }
- 
- 
-@@ -2938,6 +2941,7 @@ qemuMonitorAddObject(qemuMonitorPtr mon,
-                      virJSONValuePtr *props,
-                      char **alias)
- {
-+    g_autoptr(virJSONValue) pr = NULL;
-     const char *type = NULL;
-     const char *id = NULL;
-     g_autofree char *aliasCopy = NULL;
-@@ -2965,7 +2969,31 @@ qemuMonitorAddObject(qemuMonitorPtr mon,
-     if (alias)
-         aliasCopy = g_strdup(id);
- 
--    if (qemuMonitorJSONAddObject(mon, props) < 0)
-+    if (mon->objectAddNoWrap) {
-+        pr = g_steal_pointer(props);
-+    } else {
-+        /* we need to create a wrapper which has the 'qom-type' and 'id' and
-+         * store everything else under a 'props' sub-object */
-+        g_autoptr(virJSONValue) typeobj = NULL;
-+        g_autoptr(virJSONValue) idobj = NULL;
-+
-+        ignore_value(virJSONValueObjectRemoveKey(*props, "qom-type", &typeobj));
-+        ignore_value(virJSONValueObjectRemoveKey(*props, "id", &idobj));
-+
-+        if (!virJSONValueObjectGetKey(*props, 0)) {
-+            virJSONValueFree(*props);
-+            *props = NULL;
-+        }
-+
-+        if (virJSONValueObjectCreate(&pr,
-+                                     "s:qom-type", type,
-+                                     "s:id", id,
-+                                     "A:props", props,
-+                                     NULL) < 0)
-+            return -1;
-+    }
-+
-+    if (qemuMonitorJSONAddObject(mon, &pr) < 0)
-         return -1;
- 
-     if (alias)
-diff --git a/src/util/virqemu.c b/src/util/virqemu.c
-index 321ddeb7e3..c2a14c9194 100644
---- a/src/util/virqemu.c
-+++ b/src/util/virqemu.c
-@@ -319,12 +319,13 @@ virQEMUBuildNetdevCommandlineFromJSON(virJSONValuePtr props,
- }
- 
- 
--static int
--virQEMUBuildObjectCommandlineFromJSONInternal(virBufferPtr buf,
--                                              const char *type,
--                                              const char *alias,
--                                              virJSONValuePtr props)
-+int
-+virQEMUBuildObjectCommandlineFromJSON(virBufferPtr buf,
-+                                      virJSONValuePtr objprops)
- {
-+    const char *type = virJSONValueObjectGetString(objprops, "qom-type");
-+    const char *alias = virJSONValueObjectGetString(objprops, "id");
-+
-     if (!type || !alias) {
-         virReportError(VIR_ERR_INTERNAL_ERROR,
-                        _("missing 'type'(%s) or 'alias'(%s) field of QOM 'object'"),
-@@ -332,31 +333,16 @@ virQEMUBuildObjectCommandlineFromJSONInternal(virBufferPtr buf,
-         return -1;
-     }
- 
--    virBufferAsprintf(buf, "%s,id=%s", type, alias);
-+    virBufferAsprintf(buf, "%s,", type);
- 
--    if (props) {
--        virBufferAddLit(buf, ",");
--        if (virQEMUBuildCommandLineJSON(props, buf, NULL, false,
--                                virQEMUBuildCommandLineJSONArrayBitmap) < 0)
--            return -1;
--    }
-+    if (virQEMUBuildCommandLineJSON(objprops, buf, "qom-type", false,
-+                                    virQEMUBuildCommandLineJSONArrayBitmap) < 0)
-+        return -1;
- 
-     return 0;
- }
- 
- 
--int
--virQEMUBuildObjectCommandlineFromJSON(virBufferPtr buf,
--                                      virJSONValuePtr objprops)
--{
--    const char *type = virJSONValueObjectGetString(objprops, "qom-type");
--    const char *alias = virJSONValueObjectGetString(objprops, "id");
--    virJSONValuePtr props = virJSONValueObjectGetObject(objprops, "props");
--
--    return virQEMUBuildObjectCommandlineFromJSONInternal(buf, type, alias, props);
--}
--
--
- char *
- virQEMUBuildDriveCommandlineFromJSON(virJSONValuePtr srcdef)
- {
--- 
-2.27.0
-
diff --git a/qemu-qemuDomainPMSuspendAgent-Don-t-assign-to-ret-in.patch b/qemu-qemuDomainPMSuspendAgent-Don-t-assign-to-ret-in.patch
deleted file mode 100644
index 4544b924ddb159f2ea8ad1f7a0d2b2f9fecae383..0000000000000000000000000000000000000000
--- a/qemu-qemuDomainPMSuspendAgent-Don-t-assign-to-ret-in.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From dadf7e1307010e426a79f5c7133ad4d654f377f6 Mon Sep 17 00:00:00 2001
-From: Erik Skultety <eskultet@redhat.com>
-Date: Fri, 11 Sep 2020 14:44:27 +0200
-Subject: [PATCH 028/108] qemu: qemuDomainPMSuspendAgent: Don't assign to 'ret'
- in a conditional
-
-When the guest agent isn't running, we still report success on a PM
-suspend action even though we logged an error correctly, this is because
-we poisoned the 'ret' value a few lines above.
-
-Fixes: a663a860819287e041c3de672aad1d8543098ecc
-
-Signed-off-by: Erik Skultety <eskultet@redhat.com>
-(cherry picked from commit 9824a82198d97c40ff0e8f423888a7b9ccf5b301)
----
- 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 7be84c88b2..25ca453d76 100644
---- a/src/qemu/qemu_driver.c
-+++ b/src/qemu/qemu_driver.c
-@@ -19893,7 +19893,7 @@ qemuDomainPMSuspendAgent(virQEMUDriverPtr driver,
-     if (qemuDomainObjBeginAgentJob(driver, vm, QEMU_AGENT_JOB_MODIFY) < 0)
-         return -1;
- 
--    if ((ret = virDomainObjCheckActive(vm)) < 0)
-+    if (virDomainObjCheckActive(vm) < 0)
-         goto endjob;
- 
-     if (!qemuDomainAgentAvailable(vm, true))
--- 
-2.33.0
-
diff --git a/qemu-qemuDomainPMSuspendForDuration-Check-availabili.patch b/qemu-qemuDomainPMSuspendForDuration-Check-availabili.patch
deleted file mode 100644
index 1c4bcae4c2a89defc47a6cd7f5a3cd564363aa00..0000000000000000000000000000000000000000
--- a/qemu-qemuDomainPMSuspendForDuration-Check-availabili.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 77e9a026af8db5641ed200cd6d111f2d6901b14f Mon Sep 17 00:00:00 2001
-From: Lin Ma <morecache@gmail.com>
-Date: Fri, 11 Sep 2020 15:06:08 +0800
-Subject: [PATCH 039/108] qemu: qemuDomainPMSuspendForDuration: Check
- availability of agent
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-It requires a guest agent configured and running in the domain's guest
-OS, So check qemu agent during qemuDomainPMSuspendForDuration().
-
-Signed-off-by: Lin Ma <lma@suse.de>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Signed-off-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 308ec831bb153e69035850e0a45346fb417da913)
----
- src/qemu/qemu_driver.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
-index 25ca453d76..e53ba2bc93 100644
---- a/src/qemu/qemu_driver.c
-+++ b/src/qemu/qemu_driver.c
-@@ -19943,6 +19943,9 @@ qemuDomainPMSuspendForDuration(virDomainPtr dom,
-     if (virDomainPMSuspendForDurationEnsureACL(dom->conn, vm->def) < 0)
-         goto cleanup;
- 
-+    if (!qemuDomainAgentAvailable(vm, true))
-+        goto cleanup;
-+
-     /*
-      * The case we want to handle here is when QEMU has the API (i.e.
-      * QEMU_CAPS_QUERY_CURRENT_MACHINE is set). Otherwise, do not interfere
--- 
-2.33.0
-
diff --git a/qemu-snapshot-Collect-query-named-block-nodes-prior-.patch b/qemu-snapshot-Collect-query-named-block-nodes-prior-.patch
deleted file mode 100644
index a7fb39407dfccd90973e9098fb26bc544bc51c09..0000000000000000000000000000000000000000
--- a/qemu-snapshot-Collect-query-named-block-nodes-prior-.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-From 4187eb187649c95038325b39a5132c578d8ab820 Mon Sep 17 00:00:00 2001
-From: Peter Krempa <pkrempa@redhat.com>
-Date: Fri, 31 Jul 2020 15:23:56 +0200
-Subject: [PATCH 041/108] qemu: snapshot: Collect 'query-named-block-nodes'
- prior to memory migration
-
-When doing an external snapshot we migrate memory to a file as a form of
-taking the memory state. This creates a problem as qemu deactivates all
-active bitmaps after a successful migration. This means that calling
-'query-named-block-nodes' will return an empty list of bitmaps for
-devices. We use the bitmap list to propagate the active bitmaps into the
-overlay files being created which is required for backups to work after
-a snapshot. Since we wouldn't propagate anything a subsequent backup
-will fail with:
-
-invalid argument: missing or broken bitmap 'testchck' for disk 'vda'
-
-To fix this, we can simply collect the bitmap list prior to the
-migration.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1862472
-
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Eric Blake <eblake@redhat.com>
-(cherry picked from commit 00bb850eb065eca0c65dda212c039bc76774453f)
----
- src/qemu/qemu_driver.c | 17 +++++++++++------
- 1 file changed, 11 insertions(+), 6 deletions(-)
-
-diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
-index e53ba2bc93..508d246146 100644
---- a/src/qemu/qemu_driver.c
-+++ b/src/qemu/qemu_driver.c
-@@ -15416,6 +15416,7 @@ static int
- qemuDomainSnapshotCreateDiskActive(virQEMUDriverPtr driver,
-                                    virDomainObjPtr vm,
-                                    virDomainMomentObjPtr snap,
-+                                   virHashTablePtr blockNamedNodeData,
-                                    unsigned int flags,
-                                    virQEMUDriverConfigPtr cfg,
-                                    qemuDomainAsyncJob asyncJob)
-@@ -15429,17 +15430,12 @@ qemuDomainSnapshotCreateDiskActive(virQEMUDriverPtr driver,
-     qemuDomainSnapshotDiskDataPtr diskdata = NULL;
-     size_t ndiskdata = 0;
-     bool blockdev =  virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_BLOCKDEV);
--    g_autoptr(virHashTable) blockNamedNodeData = NULL;
- 
-     if (virDomainObjCheckActive(vm) < 0)
-         return -1;
- 
-     actions = virJSONValueNewArray();
- 
--    if (blockdev &&
--        !(blockNamedNodeData = qemuBlockGetNamedNodeData(vm, asyncJob)))
--        return -1;
--
-     /* prepare a list of objects to use in the vm definition so that we don't
-      * have to roll back later */
-     if (qemuDomainSnapshotDiskPrepare(driver, vm, snap, cfg, reuse, blockdev,
-@@ -15506,6 +15502,7 @@ qemuDomainSnapshotCreateActiveExternal(virQEMUDriverPtr driver,
-     int compressed;
-     g_autoptr(virCommand) compressor = NULL;
-     virQEMUSaveDataPtr data = NULL;
-+    g_autoptr(virHashTable) blockNamedNodeData = NULL;
- 
-     /* If quiesce was requested, then issue a freeze command, and a
-      * counterpart thaw command when it is actually sent to agent.
-@@ -15560,6 +15557,13 @@ qemuDomainSnapshotCreateActiveExternal(virQEMUDriverPtr 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, QEMU_ASYNC_JOB_SNAPSHOT)))
-+        goto cleanup;
-+
-     /* do the memory snapshot if necessary */
-     if (memory) {
-         /* check if migration is possible */
-@@ -15604,7 +15608,8 @@ qemuDomainSnapshotCreateActiveExternal(virQEMUDriverPtr driver,
- 
-     /* the domain is now paused if a memory snapshot was requested */
- 
--    if ((ret = qemuDomainSnapshotCreateDiskActive(driver, vm, snap, flags, cfg,
-+    if ((ret = qemuDomainSnapshotCreateDiskActive(driver, vm, snap,
-+                                                  blockNamedNodeData, flags, cfg,
-                                                   QEMU_ASYNC_JOB_SNAPSHOT)) < 0)
-         goto cleanup;
- 
--- 
-2.33.0
-
diff --git a/qemu-tpm-Pass-logfile-to-swtpm_setup-for-incoming-mi.patch b/qemu-tpm-Pass-logfile-to-swtpm_setup-for-incoming-mi.patch
deleted file mode 100644
index 8bd6453aec295b154ed8900eb4eac39476676ea9..0000000000000000000000000000000000000000
--- a/qemu-tpm-Pass-logfile-to-swtpm_setup-for-incoming-mi.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 92e7bc7ac09d5e62f7ff612be3f2e07beb86e67d Mon Sep 17 00:00:00 2001
-From: qihao <qihao@cmss.chinamobile.com>
-Date: Wed, 15 Mar 2023 10:56:44 +0800
-Subject: [PATCH] qemu: tpm: Pass --logfile to swtpm_setup for incoming
- migration
-
-cheery-pick from cc21979fae736768db92d0c060ea732ed857327e
-
-Good to have for debugging in case something wrong happens during
-incoming migration.
-
-Signed-off-by: Eiichi Tsukata <eiichi.tsukata@nutanix.com>
-Signed-off-by: qihao_yewu <qihao_yewu@cmss.chinamobile.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
----
- src/qemu/qemu_tpm.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/qemu/qemu_tpm.c b/src/qemu/qemu_tpm.c
-index 601d5cf4e9..5d783f2afc 100644
---- a/src/qemu/qemu_tpm.c
-+++ b/src/qemu/qemu_tpm.c
-@@ -505,6 +505,7 @@ qemuTPMEmulatorRunSetup(const char *storagepath,
-     } else {
-         virCommandAddArgList(cmd,
-                              "--tpm-state", storagepath,
-+                             "--logfile", logfile,
-                              "--overwrite",
-                              NULL);
-     }
--- 
-2.25.1
-
diff --git a/qemuBlockJobEventProcess-Always-clear-mirrorState-wh.patch b/qemuBlockJobEventProcess-Always-clear-mirrorState-wh.patch
deleted file mode 100644
index 2b79936eb43453d08679643fdf75219326f84091..0000000000000000000000000000000000000000
--- a/qemuBlockJobEventProcess-Always-clear-mirrorState-wh.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 7f41d4ce90e7bdb26388a8ce98c20a229acc5cc9 Mon Sep 17 00:00:00 2001
-From: Peter Krempa <pkrempa@redhat.com>
-Date: Mon, 11 Jan 2021 10:42:15 +0100
-Subject: [PATCH 083/108] qemuBlockJobEventProcess: Always clear 'mirrorState'
- when a job finishes
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-When a block job is terminated we should clear the 'mirrorState' and
-'mirrorJob' variables so that stale values are not present prior to a
-new job.
-
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 202d61db4870468a02817e64fefb5ede06b8a59a)
----
- src/qemu/qemu_blockjob.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/qemu/qemu_blockjob.c b/src/qemu/qemu_blockjob.c
-index b4431b54f5..bac064b53a 100644
---- a/src/qemu/qemu_blockjob.c
-+++ b/src/qemu/qemu_blockjob.c
-@@ -1634,6 +1634,10 @@ qemuBlockJobEventProcess(virQEMUDriverPtr driver,
-     case QEMU_BLOCKJOB_STATE_FAILED:
-     case QEMU_BLOCKJOB_STATE_CANCELLED:
-     case QEMU_BLOCKJOB_STATE_CONCLUDED:
-+        if (job->disk) {
-+            job->disk->mirrorState = VIR_DOMAIN_DISK_MIRROR_STATE_NONE;
-+            job->disk->mirrorJob = VIR_DOMAIN_BLOCK_JOB_TYPE_UNKNOWN;
-+        }
-         qemuBlockJobEventProcessConcluded(job, driver, vm, asyncJob);
-         break;
- 
--- 
-2.33.0
-
diff --git a/qemuBlockJobProcessEventCompletedPull-Add-backingSto.patch b/qemuBlockJobProcessEventCompletedPull-Add-backingSto.patch
deleted file mode 100644
index 9113a4b4286e1b62e2ad7c221b60f60b89061182..0000000000000000000000000000000000000000
--- a/qemuBlockJobProcessEventCompletedPull-Add-backingSto.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 6c7c9aab6d5dd9fd836e19990bb63d5ef47871c2 Mon Sep 17 00:00:00 2001
-From: Peter Krempa <pkrempa@redhat.com>
-Date: Mon, 12 Apr 2021 17:42:23 +0200
-Subject: [PATCH 058/108] qemuBlockJobProcessEventCompletedPull: Add
- backingStore terminators if base is NULL
-
-When doing a blockpull with NULL base the full contents of the disk are
-pulled into the topmost image which then becomes fully self-contained.
-
-qemuBlockJobProcessEventCompletedPull doesn't install the backing chain
-terminators though, although it's guaranteed that there will be no
-backing chain behind disk->src.
-
-Add the terminators for completness and for disabling backing chain
-detection on further boots.
-
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit b4d020790642fa4d7b8a6783b81d5d9d73cbe3d9)
----
- src/qemu/qemu_blockjob.c | 13 ++++++++++++-
- 1 file changed, 12 insertions(+), 1 deletion(-)
-
-diff --git a/src/qemu/qemu_blockjob.c b/src/qemu/qemu_blockjob.c
-index 049afdd71a..ea82ce95eb 100644
---- a/src/qemu/qemu_blockjob.c
-+++ b/src/qemu/qemu_blockjob.c
-@@ -958,6 +958,7 @@ qemuBlockJobProcessEventCompletedPull(virQEMUDriverPtr driver,
-                                       qemuBlockJobDataPtr job,
-                                       qemuDomainAsyncJob asyncJob)
- {
-+    virStorageSource *base = NULL;
-     virStorageSourcePtr baseparent = NULL;
-     virDomainDiskDefPtr cfgdisk = NULL;
-     virStorageSourcePtr cfgbase = NULL;
-@@ -979,8 +980,11 @@ qemuBlockJobProcessEventCompletedPull(virQEMUDriverPtr driver,
-         return;
- 
-     if (job->data.pull.base) {
-+        base = job->data.pull.base;
-+
-         if (cfgdisk)
-             cfgbase = cfgdisk->src->backingStore;
-+
-         for (n = job->disk->src->backingStore; n && n != job->data.pull.base; n = n->backingStore) {
-             /* find the image on top of 'base' */
- 
-@@ -991,10 +995,17 @@ qemuBlockJobProcessEventCompletedPull(virQEMUDriverPtr driver,
- 
-             baseparent = n;
-         }
-+    } else {
-+        /* create terminators for the chain; since we are pulling everything
-+         * into the top image the chain is automatically considered terminated */
-+        base = virStorageSourceNew();
-+
-+        if (cfgdisk)
-+            cfgbase = virStorageSourceNew();
-     }
- 
-     tmp = job->disk->src->backingStore;
--    job->disk->src->backingStore = job->data.pull.base;
-+    job->disk->src->backingStore = base;
-     if (baseparent)
-         baseparent->backingStore = NULL;
-     qemuBlockJobEventProcessConcludedRemoveChain(driver, vm, asyncJob, tmp);
--- 
-2.33.0
-
diff --git a/qemuBlockJobProcessEventCompletedPull-Avoid-dangling.patch b/qemuBlockJobProcessEventCompletedPull-Avoid-dangling.patch
deleted file mode 100644
index a3c5104f387f0aee75601f310515982792b079b0..0000000000000000000000000000000000000000
--- a/qemuBlockJobProcessEventCompletedPull-Avoid-dangling.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 86bc1ce2b3518c375eaba5d838709af8f52c4165 Mon Sep 17 00:00:00 2001
-From: Peter Krempa <pkrempa@redhat.com>
-Date: Mon, 12 Apr 2021 17:24:22 +0200
-Subject: [PATCH 057/108] qemuBlockJobProcessEventCompletedPull: Avoid dangling
- pointer after blockpull
-
-When doing a full block pull job (base == NULL) and the config XML
-contains a compatible disk, the completer function would leave a
-dangling pointer in 'cfgdisk->src->backingStore' as cfgdisk->src would
-be set to the value of 'cfgbase' which was always set to
-'cfgdisk->src->backingStore'.
-
-This is wrong though since for the live definition XML we set the
-respective counterpart to 'job->data.pull.base' which is NULL in the
-above scenario.
-
-This leads to a invalid pointer read when saving the config XML and may
-end up in a crash.
-
-Resolve it by setting 'cfgbase' only when 'job->data.pull.base' is
-non-NULL.
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1946918
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
-(cherry picked from commit 46e748aa02cbd5923fa4b500352f528de35dc665)
----
- src/qemu/qemu_blockjob.c | 7 +++----
- 1 file changed, 3 insertions(+), 4 deletions(-)
-
-diff --git a/src/qemu/qemu_blockjob.c b/src/qemu/qemu_blockjob.c
-index 21a043d369..049afdd71a 100644
---- a/src/qemu/qemu_blockjob.c
-+++ b/src/qemu/qemu_blockjob.c
-@@ -971,10 +971,7 @@ qemuBlockJobProcessEventCompletedPull(virQEMUDriverPtr driver,
-     if (!job->disk)
-         return;
- 
--    if ((cfgdisk = qemuBlockJobGetConfigDisk(vm, job->disk, job->data.pull.base)))
--        cfgbase = cfgdisk->src->backingStore;
--
--    if (!cfgdisk)
-+    if (!(cfgdisk = qemuBlockJobGetConfigDisk(vm, job->disk, job->data.pull.base)))
-         qemuBlockJobClearConfigChain(vm, job->disk);
- 
-     /* when pulling if 'base' is right below the top image we don't have to modify it */
-@@ -982,6 +979,8 @@ qemuBlockJobProcessEventCompletedPull(virQEMUDriverPtr driver,
-         return;
- 
-     if (job->data.pull.base) {
-+        if (cfgdisk)
-+            cfgbase = cfgdisk->src->backingStore;
-         for (n = job->disk->src->backingStore; n && n != job->data.pull.base; n = n->backingStore) {
-             /* find the image on top of 'base' */
- 
--- 
-2.33.0
-
diff --git a/qemuBuildChannelChrDeviceStr-Remove-formatting-of-pr.patch b/qemuBuildChannelChrDeviceStr-Remove-formatting-of-pr.patch
deleted file mode 100644
index 6f175ece3e639b36099f3d44827a0ad8e15ead7c..0000000000000000000000000000000000000000
--- a/qemuBuildChannelChrDeviceStr-Remove-formatting-of-pr.patch
+++ /dev/null
@@ -1,152 +0,0 @@
-From f0b20bfdd5e0967da8b98a1c66649c23a94b3d3c Mon Sep 17 00:00:00 2001
-From: Peter Krempa <pkrempa@redhat.com>
-Date: Thu, 14 May 2020 13:01:59 +0200
-Subject: [PATCH 07/18] qemuBuildChannelChrDeviceStr: Remove formatting of
- properties for -netdev
-
-The output of the function is fed as argument to '-device' command line
-argument or 'device_add' monitor command except for 'guestfwd' channels
-where it needs to be fed to -netdev/netdev_add. This is confusing and
-error prone. Split it up since the caller needs to know which
-command/option to use anyways, so the caller can call the appropriate
-function without any magic.
-
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Eric Blake <eblake@redhat.com>
----
- src/qemu/qemu_command.c | 36 ++++++++++++++++++++----------------
- src/qemu/qemu_command.h |  3 +++
- src/qemu/qemu_hotplug.c | 18 +++++++++++++-----
- 3 files changed, 36 insertions(+), 21 deletions(-)
-
-diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
-index 579e78ea75..056a74fb60 100644
---- a/src/qemu/qemu_command.c
-+++ b/src/qemu/qemu_command.c
-@@ -8872,7 +8872,7 @@ qemuBuildChannelsCommandLine(virLogManagerPtr logManager,
- 
-         switch ((virDomainChrChannelTargetType) channel->targetType) {
-         case VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_GUESTFWD:
--            if (qemuBuildChrDeviceStr(&netdevstr, def, channel, qemuCaps) < 0)
-+            if (!(netdevstr = qemuBuildChannelGuestfwdNetdevProps(channel)))
-                 return -1;
-             virCommandAddArgList(cmd, "-netdev", netdevstr, NULL);
-             break;
-@@ -10140,36 +10140,40 @@ qemuBuildParallelChrDeviceStr(char **deviceStr,
-     return 0;
- }
- 
--static int
--qemuBuildChannelChrDeviceStr(char **deviceStr,
--                             const virDomainDef *def,
--                             virDomainChrDefPtr chr)
-+
-+char *
-+qemuBuildChannelGuestfwdNetdevProps(virDomainChrDefPtr chr)
- {
--    int ret = -1;
-     g_autofree char *addr = NULL;
-     int port;
- 
--    switch ((virDomainChrChannelTargetType)chr->targetType) {
--    case VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_GUESTFWD:
-+    if (!(addr = virSocketAddrFormat(chr->target.addr)))
-+        return NULL;
- 
--        addr = virSocketAddrFormat(chr->target.addr);
--        if (!addr)
--            return ret;
--        port = virSocketAddrGetPort(chr->target.addr);
-+    port = virSocketAddrGetPort(chr->target.addr);
-+
-+    return g_strdup_printf("user,guestfwd=tcp:%s:%i-chardev:char%s,id=%s",
-+                           addr, port, chr->info.alias, chr->info.alias);
-+}
- 
--        *deviceStr = g_strdup_printf("user,guestfwd=tcp:%s:%i-chardev:char%s,id=%s",
--                                     addr, port, chr->info.alias, chr->info.alias);
--        break;
- 
-+static int
-+qemuBuildChannelChrDeviceStr(char **deviceStr,
-+                             const virDomainDef *def,
-+                             virDomainChrDefPtr chr)
-+{
-+    switch ((virDomainChrChannelTargetType)chr->targetType) {
-     case VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_VIRTIO:
-         if (!(*deviceStr = qemuBuildVirtioSerialPortDevStr(def, chr)))
-             return -1;
-         break;
- 
-+    case VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_GUESTFWD:
-+        /* guestfwd is as a netdev handled separately */
-     case VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_XEN:
-     case VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_NONE:
-     case VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_LAST:
--        return ret;
-+        return -1;
-     }
- 
-     return 0;
-diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h
-index bc3ba44fb3..274084821b 100644
---- a/src/qemu/qemu_command.h
-+++ b/src/qemu/qemu_command.h
-@@ -86,6 +86,9 @@ qemuBuildChrDeviceStr(char **deviceStr,
-                       virDomainChrDefPtr chr,
-                       virQEMUCapsPtr qemuCaps);
- 
-+char *
-+qemuBuildChannelGuestfwdNetdevProps(virDomainChrDefPtr chr);
-+
- char *qemuBuildHostNetStr(virDomainNetDefPtr net,
-                           char **tapfd,
-                           size_t tapfdSize,
-diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
-index 60d0729f1e..ee97397235 100644
---- a/src/qemu/qemu_hotplug.c
-+++ b/src/qemu/qemu_hotplug.c
-@@ -2108,6 +2108,7 @@ int qemuDomainAttachChrDevice(virQEMUDriverPtr driver,
-     virErrorPtr orig_err;
-     virDomainDefPtr vmdef = vm->def;
-     g_autofree char *devstr = NULL;
-+    g_autofree char *netdevstr = NULL;
-     virDomainChrSourceDefPtr dev = chr->source;
-     g_autofree char *charAlias = NULL;
-     bool chardevAttached = false;
-@@ -2146,8 +2147,13 @@ int qemuDomainAttachChrDevice(virQEMUDriverPtr driver,
-         goto cleanup;
-     teardowncgroup = true;
- 
--    if (qemuBuildChrDeviceStr(&devstr, vmdef, chr, priv->qemuCaps) < 0)
--        goto cleanup;
-+    if (guestfwd) {
-+        if (!(netdevstr = qemuBuildChannelGuestfwdNetdevProps(chr)))
-+            goto cleanup;
-+    } else {
-+        if (qemuBuildChrDeviceStr(&devstr, vmdef, chr, priv->qemuCaps) < 0)
-+            goto cleanup;
-+    }
- 
-     if (!(charAlias = qemuAliasChardevFromDevAlias(chr->info.alias)))
-         goto cleanup;
-@@ -2166,11 +2172,13 @@ int qemuDomainAttachChrDevice(virQEMUDriverPtr driver,
-         goto exit_monitor;
-     chardevAttached = true;
- 
--    if (guestfwd) {
--        if (qemuMonitorAddNetdev(priv->mon, devstr,
-+    if (netdevstr) {
-+        if (qemuMonitorAddNetdev(priv->mon, netdevstr,
-                                  NULL, NULL, 0, NULL, NULL, 0, -1, NULL) < 0)
-             goto exit_monitor;
--    } else {
-+    }
-+
-+    if (devstr) {
-         if (qemuMonitorAddDevice(priv->mon, devstr) < 0)
-             goto exit_monitor;
-     }
--- 
-2.23.0.windows.1
-
diff --git a/qemuBuildChannelGuestfwdNetdevProps-Convert-to-gener.patch b/qemuBuildChannelGuestfwdNetdevProps-Convert-to-gener.patch
deleted file mode 100644
index b3608a17f76f41bbb2c0910c26987a928c6550ef..0000000000000000000000000000000000000000
--- a/qemuBuildChannelGuestfwdNetdevProps-Convert-to-gener.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-From 17e751be222dd86959f71afda2fca8b0ed09f55b Mon Sep 17 00:00:00 2001
-From: Peter Krempa <pkrempa@redhat.com>
-Date: Fri, 15 May 2020 09:46:08 +0200
-Subject: [PATCH 11/18] qemuBuildChannelGuestfwdNetdevProps: Convert to
- generating JSON props
-
-Syntax of guestfwd channel also needs to be modified to conform to the
-QAPI schema.
-
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Eric Blake <eblake@redhat.com>
----
- src/qemu/qemu_command.c | 37 +++++++++++++++++++++++++++++++------
- src/qemu/qemu_command.h |  2 +-
- src/qemu/qemu_hotplug.c |  6 +++++-
- 3 files changed, 37 insertions(+), 8 deletions(-)
-
-diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
-index 141657b3e4..bd78bfb31b 100644
---- a/src/qemu/qemu_command.c
-+++ b/src/qemu/qemu_command.c
-@@ -8903,6 +8903,7 @@ qemuBuildChannelsCommandLine(virLogManagerPtr logManager,
-     for (i = 0; i < def->nchannels; i++) {
-         virDomainChrDefPtr channel = def->channels[i];
-         g_autofree char *chardevstr = NULL;
-+        g_autoptr(virJSONValue) netdevprops = NULL;
-         g_autofree char *netdevstr = NULL;
- 
-         if (!(chardevstr = qemuBuildChrChardevStr(logManager, secManager,
-@@ -8917,8 +8918,12 @@ qemuBuildChannelsCommandLine(virLogManagerPtr logManager,
- 
-         switch ((virDomainChrChannelTargetType) channel->targetType) {
-         case VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_GUESTFWD:
--            if (!(netdevstr = qemuBuildChannelGuestfwdNetdevProps(channel)))
-+            if (!(netdevprops = qemuBuildChannelGuestfwdNetdevProps(channel)))
-                 return -1;
-+
-+            if (!(netdevstr = virQEMUBuildNetdevCommandlineFromJSON(netdevprops)))
-+                return -1;
-+
-             virCommandAddArgList(cmd, "-netdev", netdevstr, NULL);
-             break;
- 
-@@ -10186,19 +10191,39 @@ qemuBuildParallelChrDeviceStr(char **deviceStr,
- }
- 
- 
--char *
-+virJSONValuePtr
- qemuBuildChannelGuestfwdNetdevProps(virDomainChrDefPtr chr)
- {
-+    g_autoptr(virJSONValue) guestfwdarr = virJSONValueNewArray();
-+    g_autoptr(virJSONValue) guestfwdstrobj = virJSONValueNewObject();
-     g_autofree char *addr = NULL;
--    int port;
-+    virJSONValuePtr ret = NULL;
- 
-     if (!(addr = virSocketAddrFormat(chr->target.addr)))
-         return NULL;
- 
--    port = virSocketAddrGetPort(chr->target.addr);
-+    /* this may seem weird, but qemu indeed decided that 'guestfwd' parameter
-+     * is an array of objects which have just one member named 'str' which
-+     * contains the description */
-+    if (virJSONValueObjectAppendStringPrintf(guestfwdstrobj, "str",
-+                                             "tcp:%s:%i-chardev:char%s",
-+                                             addr,
-+                                             virSocketAddrGetPort(chr->target.addr),
-+                                             chr->info.alias) < 0)
-+        return NULL;
-+
-+    if (virJSONValueArrayAppend(guestfwdarr, guestfwdstrobj) < 0)
-+        return NULL;
-+    guestfwdstrobj = NULL;
- 
--    return g_strdup_printf("user,guestfwd=tcp:%s:%i-chardev:char%s,id=%s",
--                           addr, port, chr->info.alias, chr->info.alias);
-+    if (virJSONValueObjectCreate(&ret,
-+                                 "s:type", "user",
-+                                 "a:guestfwd", &guestfwdarr,
-+                                 "s:id", chr->info.alias,
-+                                 NULL) < 0)
-+        return NULL;
-+
-+    return ret;
- }
- 
- 
-diff --git a/src/qemu/qemu_command.h b/src/qemu/qemu_command.h
-index 00d9a9da8f..1e6b23ba05 100644
---- a/src/qemu/qemu_command.h
-+++ b/src/qemu/qemu_command.h
-@@ -86,7 +86,7 @@ qemuBuildChrDeviceStr(char **deviceStr,
-                       virDomainChrDefPtr chr,
-                       virQEMUCapsPtr qemuCaps);
- 
--char *
-+virJSONValuePtr
- qemuBuildChannelGuestfwdNetdevProps(virDomainChrDefPtr chr);
- 
- virJSONValuePtr qemuBuildHostNetStr(virDomainNetDefPtr net,
-diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
-index 1877aef1b0..24a898166d 100644
---- a/src/qemu/qemu_hotplug.c
-+++ b/src/qemu/qemu_hotplug.c
-@@ -2113,6 +2113,7 @@ int qemuDomainAttachChrDevice(virQEMUDriverPtr driver,
-     virErrorPtr orig_err;
-     virDomainDefPtr vmdef = vm->def;
-     g_autofree char *devstr = NULL;
-+    g_autoptr(virJSONValue) netdevprops = NULL;
-     g_autofree char *netdevstr = NULL;
-     virDomainChrSourceDefPtr dev = chr->source;
-     g_autofree char *charAlias = NULL;
-@@ -2153,7 +2154,10 @@ int qemuDomainAttachChrDevice(virQEMUDriverPtr driver,
-     teardowncgroup = true;
- 
-     if (guestfwd) {
--        if (!(netdevstr = qemuBuildChannelGuestfwdNetdevProps(chr)))
-+        if (!(netdevprops = qemuBuildChannelGuestfwdNetdevProps(chr)))
-+            goto cleanup;
-+
-+        if (!(netdevstr = virQEMUBuildNetdevCommandlineFromJSON(netdevprops)))
-             goto cleanup;
-     } else {
-         if (qemuBuildChrDeviceStr(&devstr, vmdef, chr, priv->qemuCaps) < 0)
--- 
-2.23.0.windows.1
-
diff --git a/qemuBuildChannelsCommandLine-Extract-common-formatti.patch b/qemuBuildChannelsCommandLine-Extract-common-formatti.patch
deleted file mode 100644
index 8fe7f9358eece44d909434a15aca18333030ee9e..0000000000000000000000000000000000000000
--- a/qemuBuildChannelsCommandLine-Extract-common-formatti.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 31c32f8d76a447899ff4a5c551c06a2888814111 Mon Sep 17 00:00:00 2001
-From: Peter Krempa <pkrempa@redhat.com>
-Date: Thu, 14 May 2020 12:51:21 +0200
-Subject: [PATCH 06/18] qemuBuildChannelsCommandLine: Extract common formatting
- of 'chardev'
-
-Both active branches create the same backend chardev. Since there is no
-other case, extract it before the switch so that we don't have to
-duplicate it.
-
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Eric Blake <eblake@redhat.com>
----
- src/qemu/qemu_command.c | 32 +++++++++++---------------------
- 1 file changed, 11 insertions(+), 21 deletions(-)
-
-diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
-index 7c4db11ae2..579e78ea75 100644
---- a/src/qemu/qemu_command.c
-+++ b/src/qemu/qemu_command.c
-@@ -8857,37 +8857,27 @@ qemuBuildChannelsCommandLine(virLogManagerPtr logManager,
- 
-     for (i = 0; i < def->nchannels; i++) {
-         virDomainChrDefPtr channel = def->channels[i];
--        char *devstr;
-+        g_autofree char *chardevstr = NULL;
-+        g_autofree char *netdevstr = NULL;
- 
--        switch ((virDomainChrChannelTargetType) channel->targetType) {
--        case VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_GUESTFWD:
--            if (!(devstr = qemuBuildChrChardevStr(logManager, secManager,
-+        if (!(chardevstr = qemuBuildChrChardevStr(logManager, secManager,
-                                                   cmd, cfg, def,
-                                                   channel->source,
-                                                   channel->info.alias,
-                                                   qemuCaps, cdevflags)))
--                return -1;
--            virCommandAddArg(cmd, "-chardev");
--            virCommandAddArg(cmd, devstr);
--            VIR_FREE(devstr);
-+            return -1;
- 
--            if (qemuBuildChrDeviceStr(&devstr, def, channel, qemuCaps) < 0)
-+        virCommandAddArg(cmd, "-chardev");
-+        virCommandAddArg(cmd, chardevstr);
-+
-+        switch ((virDomainChrChannelTargetType) channel->targetType) {
-+        case VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_GUESTFWD:
-+            if (qemuBuildChrDeviceStr(&netdevstr, def, channel, qemuCaps) < 0)
-                 return -1;
--            virCommandAddArgList(cmd, "-netdev", devstr, NULL);
--            VIR_FREE(devstr);
-+            virCommandAddArgList(cmd, "-netdev", netdevstr, NULL);
-             break;
- 
-         case VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_VIRTIO:
--            if (!(devstr = qemuBuildChrChardevStr(logManager, secManager,
--                                                  cmd, cfg, def,
--                                                  channel->source,
--                                                  channel->info.alias,
--                                                  qemuCaps, cdevflags)))
--                return -1;
--            virCommandAddArg(cmd, "-chardev");
--            virCommandAddArg(cmd, devstr);
--            VIR_FREE(devstr);
--
-             if (qemuBuildChrDeviceCommandLine(cmd, def, channel, qemuCaps) < 0)
-                 return -1;
-             break;
--- 
-2.23.0.windows.1
-
diff --git a/qemuBuildChannelsCommandLine-Use-typecasted-switch-f.patch b/qemuBuildChannelsCommandLine-Use-typecasted-switch-f.patch
deleted file mode 100644
index 44dbd6c9c7967a0f02a941bf5323cba4d1da79b4..0000000000000000000000000000000000000000
--- a/qemuBuildChannelsCommandLine-Use-typecasted-switch-f.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 2aac11e296b60464c0ef4870879b6e75d5e0ee46 Mon Sep 17 00:00:00 2001
-From: Peter Krempa <pkrempa@redhat.com>
-Date: Thu, 14 May 2020 12:32:55 +0200
-Subject: [PATCH 05/18] qemuBuildChannelsCommandLine: Use typecasted switch for
- channel type
-
-Cover all cases of the enum.
-
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Eric Blake <eblake@redhat.com>
----
- src/qemu/qemu_command.c | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
-index c3ad041959..7c4db11ae2 100644
---- a/src/qemu/qemu_command.c
-+++ b/src/qemu/qemu_command.c
-@@ -8859,7 +8859,7 @@ qemuBuildChannelsCommandLine(virLogManagerPtr logManager,
-         virDomainChrDefPtr channel = def->channels[i];
-         char *devstr;
- 
--        switch (channel->targetType) {
-+        switch ((virDomainChrChannelTargetType) channel->targetType) {
-         case VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_GUESTFWD:
-             if (!(devstr = qemuBuildChrChardevStr(logManager, secManager,
-                                                   cmd, cfg, def,
-@@ -8891,6 +8891,11 @@ qemuBuildChannelsCommandLine(virLogManagerPtr logManager,
-             if (qemuBuildChrDeviceCommandLine(cmd, def, channel, qemuCaps) < 0)
-                 return -1;
-             break;
-+
-+        case VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_XEN:
-+        case VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_NONE:
-+        case VIR_DOMAIN_CHR_CHANNEL_TARGET_TYPE_LAST:
-+            return -1;
-         }
-     }
- 
--- 
-2.23.0.windows.1
-
diff --git a/qemuBuildHostNetStr-Stop-using-ipv6-net-convenience-.patch b/qemuBuildHostNetStr-Stop-using-ipv6-net-convenience-.patch
deleted file mode 100644
index eb150b05992f19b99924f67fe76bbd55b7cf52e8..0000000000000000000000000000000000000000
--- a/qemuBuildHostNetStr-Stop-using-ipv6-net-convenience-.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From ed5210b67f18478af5669976abb6b61c3bd576e0 Mon Sep 17 00:00:00 2001
-From: Peter Krempa <pkrempa@redhat.com>
-Date: Thu, 14 May 2020 12:02:55 +0200
-Subject: [PATCH 09/18] qemuBuildHostNetStr: Stop using 'ipv6-net' convenience
- argument
-
-In qemu the argument of 'ipv6-net' is split up into 'ipv6-prefix' and
-'ipv6-prefixlen'. Additionally now that 'netdev_add' was qapified, only
-the real properties are allowed. Switch to using them explicitly.
-
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Eric Blake <eblake@redhat.com>
----
- src/qemu/qemu_command.c                   | 20 ++++++++++----------
- tests/qemuxml2argvdata/net-user-addr.args |  3 ++-
- 2 files changed, 12 insertions(+), 11 deletions(-)
-
-diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
-index 056a74fb60..688c9db851 100644
---- a/src/qemu/qemu_command.c
-+++ b/src/qemu/qemu_command.c
-@@ -3991,20 +3991,20 @@ qemuBuildHostNetStr(virDomainNetDefPtr net,
-             for (i = 0; i < net->guestIP.nips; i++) {
-                 const virNetDevIPAddr *ip = net->guestIP.ips[i];
-                 g_autofree char *addr = NULL;
--                const char *prefix = "";
- 
-                 if (!(addr = virSocketAddrFormat(&ip->address)))
-                     return NULL;
- 
--                if (VIR_SOCKET_ADDR_IS_FAMILY(&ip->address, AF_INET))
--                    prefix = "net=";
--                if (VIR_SOCKET_ADDR_IS_FAMILY(&ip->address, AF_INET6))
--                    prefix = "ipv6-net=";
--
--                virBufferAsprintf(&buf, "%s%s", prefix, addr);
--                if (ip->prefix)
--                    virBufferAsprintf(&buf, "/%u", ip->prefix);
--                virBufferAddChar(&buf, ',');
-+                if (VIR_SOCKET_ADDR_IS_FAMILY(&ip->address, AF_INET)) {
-+                    virBufferAsprintf(&buf, "net=%s", addr);
-+                    if (ip->prefix)
-+                        virBufferAsprintf(&buf, "/%u", ip->prefix);
-+                    virBufferAddChar(&buf, ',');
-+                } else if (VIR_SOCKET_ADDR_IS_FAMILY(&ip->address, AF_INET6)) {
-+                    virBufferAsprintf(&buf, "ipv6-prefix=%s,", addr);
-+                    if (ip->prefix)
-+                        virBufferAsprintf(&buf, "ipv6-prefixlen=%u,", ip->prefix);
-+                }
-             }
-         }
-         break;
-diff --git a/tests/qemuxml2argvdata/net-user-addr.args b/tests/qemuxml2argvdata/net-user-addr.args
-index 6cc82d9e62..5f1de305e0 100644
---- a/tests/qemuxml2argvdata/net-user-addr.args
-+++ b/tests/qemuxml2argvdata/net-user-addr.args
-@@ -27,6 +27,7 @@ server,nowait \
- -usb \
- -drive file=/dev/HostVG/QEMUGuest1,format=raw,if=none,id=drive-ide0-0-0 \
- -device ide-hd,bus=ide.0,unit=0,drive=drive-ide0-0-0,id=ide0-0-0,bootindex=1 \
---netdev user,net=172.17.2.0/24,ipv6-net=2001:db8:ac10:fd01::/64,id=hostnet0 \
-+-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
--- 
-2.23.0.windows.1
-
diff --git a/qemuBuildNumaArgStr-Switch-order-of-if-and-for.patch b/qemuBuildNumaArgStr-Switch-order-of-if-and-for.patch
deleted file mode 100644
index dfa4cec840cec28e82281aa552fc1f6e43d69c0d..0000000000000000000000000000000000000000
--- a/qemuBuildNumaArgStr-Switch-order-of-if-and-for.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 6a0f76d72b231bf0baacf70d715aad387476ac98 Mon Sep 17 00:00:00 2001
-From: xiaojin Yang <yangxiaojin2@huawei.com>
-Date: Fri, 11 Mar 2022 16:03:02 +0800
-Subject: [PATCH 7/8] qemuBuildNumaArgStr: Switch order of if() and for()
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-When building -numa command line there is a for() loop that
-builds '-numa memdev=' for each guest NUMA node. And also
-records in a local variable whether any of memory-object-*
-backends must be used to satisfy desired config. Well, instead of
-checking in each iteration whether corresponding capabilities are
-set, we can do swap if() and for() and check only once.
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-
-Signed-off-by: Xiaojin Yang <yangxiaojin2@huawei.com>
----
- src/qemu/qemu_command.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
-index dae6b5a7f9..f9b6d56209 100644
---- a/src/qemu/qemu_command.c
-+++ b/src/qemu/qemu_command.c
-@@ -7419,11 +7419,11 @@ qemuBuildNumaArgStr(virQEMUDriverConfigPtr cfg,
- 
-     /* using of -numa memdev= cannot be combined with -numa mem=, thus we
-      * need to check which approach to use */
--    for (i = 0; i < ncells; i++) {
--        if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_OBJECT_MEMORY_RAM) ||
--            virQEMUCapsGet(qemuCaps, QEMU_CAPS_OBJECT_MEMORY_FILE) ||
--            virQEMUCapsGet(qemuCaps, QEMU_CAPS_OBJECT_MEMORY_MEMFD)) {
-+    if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_OBJECT_MEMORY_RAM) ||
-+        virQEMUCapsGet(qemuCaps, QEMU_CAPS_OBJECT_MEMORY_FILE) ||
-+        virQEMUCapsGet(qemuCaps, QEMU_CAPS_OBJECT_MEMORY_MEMFD)) {
- 
-+        for (i = 0; i < ncells; i++) {
-             if ((rc = qemuBuildMemoryCellBackendStr(def, cfg, i, priv,
-                                                     &nodeBackends[i])) < 0)
-                 goto cleanup;
--- 
-2.27.0
-
diff --git a/qemuBuildNumaArgStr-Use-modern-numa-memdev-if-old-nu.patch b/qemuBuildNumaArgStr-Use-modern-numa-memdev-if-old-nu.patch
deleted file mode 100644
index 6ac3f80adab41fccf061db8367a702ad6e7962cf..0000000000000000000000000000000000000000
--- a/qemuBuildNumaArgStr-Use-modern-numa-memdev-if-old-nu.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From a6fccda9f1637a3464e812a16c2cd1f12d5b213d Mon Sep 17 00:00:00 2001
-From: xiaojin Yang <yangxiaojin2@huawei.com>
-Date: Fri, 11 Mar 2022 16:04:38 +0800
-Subject: [PATCH 8/8] qemuBuildNumaArgStr: Use modern -numa memdev= if old
- -numa mem= is unsupported
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-In previous commit we started tracking whether QEMU supports
-'-numa mem='. This is tied to the machine type because migration
-from '-numa mem=' to '-numa memdev' is impossible (or vice
-versa). But since it's tied to a machine type (where migration
-from one to another is also unsupported) we can allow QEMU to get
-rid of the deprecated command line.
-
-Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1783355
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-
-Signed-off-by: Xiaojin Yang <yangxiaojin2@huawei.com>
----
- src/qemu/qemu_command.c | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
-index f9b6d56209..f8331a7455 100644
---- a/src/qemu/qemu_command.c
-+++ b/src/qemu/qemu_command.c
-@@ -7414,6 +7414,11 @@ qemuBuildNumaArgStr(virQEMUDriverConfigPtr cfg,
-     if (!virDomainNumatuneNodesetIsAvailable(def->numa, priv->autoNodeset))
-         goto cleanup;
- 
-+    if (!virQEMUCapsGetMachineNumaMemSupported(qemuCaps,
-+                                               def->virtType,
-+                                               def->os.machine))
-+        needBackend = true;
-+
-     if (VIR_ALLOC_N(nodeBackends, ncells) < 0)
-         goto cleanup;
- 
-@@ -7431,6 +7436,11 @@ qemuBuildNumaArgStr(virQEMUDriverConfigPtr cfg,
-             if (rc == 0)
-                 needBackend = true;
-         }
-+    } else if (needBackend) {
-+        virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-+                       _("NUMA without specified memory backing is not "
-+                         "supported with this QEMU binary"));
-+        goto cleanup;
-     }
- 
-     if (!needBackend &&
--- 
-2.27.0
-
diff --git a/qemuDomainAttachHostPCIDevice-Fix-coding-style.patch b/qemuDomainAttachHostPCIDevice-Fix-coding-style.patch
deleted file mode 100644
index 1d3f4e445ff8badc2735e71c109a86e365c7d34b..0000000000000000000000000000000000000000
--- a/qemuDomainAttachHostPCIDevice-Fix-coding-style.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 80f671d083a7508a2b3cabdf3d6c102137ee0616 Mon Sep 17 00:00:00 2001
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Tue, 25 Jan 2022 10:48:36 +0100
-Subject: [PATCH 04/22] qemuDomainAttachHostPCIDevice: Fix coding style
-
-Our coding style requires that a body of an if() longer than two
-lines is wrapped in a curly braces. There's one offender in
-qemuDomainAttachHostPCIDevice(). Fortunately, there was no
-functional problem because one of the lines is a comment.
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
----
- src/qemu/qemu_hotplug.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
-index cb571c3161..e13879cde3 100644
---- a/src/qemu/qemu_hotplug.c
-+++ b/src/qemu/qemu_hotplug.c
-@@ -1619,9 +1619,10 @@ qemuDomainAttachHostPCIDevice(virQEMUDriverPtr driver,
-     if (qemuAssignDeviceHostdevAlias(vm->def, &info->alias, -1) < 0)
-         goto error;
- 
--    if (qemuDomainIsPSeries(vm->def))
-+    if (qemuDomainIsPSeries(vm->def)) {
-         /* Isolation groups are only relevant for pSeries guests */
-         qemuDomainFillDeviceIsolationGroup(vm->def, &dev);
-+    }
- 
-     if (qemuDomainEnsurePCIAddress(vm, &dev, driver) < 0)
-         goto error;
--- 
-2.33.0
-
diff --git a/qemuDomainCheckpointLoad-Don-t-align-disks-when-rest.patch b/qemuDomainCheckpointLoad-Don-t-align-disks-when-rest.patch
deleted file mode 100644
index c57589283a04e7e37328aebf703de97e463a01d5..0000000000000000000000000000000000000000
--- a/qemuDomainCheckpointLoad-Don-t-align-disks-when-rest.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From cbf2d9410c289757cc0607ece2aafd5ea8e6c219 Mon Sep 17 00:00:00 2001
-From: Peter Krempa <pkrempa@redhat.com>
-Date: Tue, 8 Dec 2020 16:16:08 +0100
-Subject: [PATCH 023/108] qemuDomainCheckpointLoad: Don't align disks when
- restoring config from disk
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The alignment step is not really necessary once we've done it already
-since we fully populate the definition. In case of checkpoints it was a
-relic necessary for populating the 'idx' to match checkpoint disk to
-definition disk, but that was already removed.
-
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit f40a72a32e47c248d5002a765913fa8f547960de)
----
- src/qemu/qemu_driver.c | 15 ++++-----------
- 1 file changed, 4 insertions(+), 11 deletions(-)
-
-diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
-index 196b301751..7be84c88b2 100644
---- a/src/qemu/qemu_driver.c
-+++ b/src/qemu/qemu_driver.c
-@@ -539,18 +539,11 @@ qemuDomainCheckpointLoad(virDomainObjPtr vm,
-             continue;
-         }
- 
--        def = virDomainCheckpointDefParseString(xmlStr,
--                                                qemu_driver->xmlopt,
--                                                priv->qemuCaps,
--                                                flags);
--        if (!def || virDomainCheckpointAlignDisks(def) < 0) {
--            /* Nothing we can do here, skip this one */
--            virReportError(VIR_ERR_INTERNAL_ERROR,
--                           _("Failed to parse checkpoint XML from file '%s'"),
--                           fullpath);
--            virObjectUnref(def);
-+        if (!(def = virDomainCheckpointDefParseString(xmlStr,
-+                                                      qemu_driver->xmlopt,
-+                                                      priv->qemuCaps,
-+                                                      flags)))
-             continue;
--        }
- 
-         chk = virDomainCheckpointAssignDef(vm->checkpoints, def);
-         if (chk == NULL)
--- 
-2.33.0
-
diff --git a/qemuDomainPinIOThread-Update-live-definition-after-p.patch b/qemuDomainPinIOThread-Update-live-definition-after-p.patch
deleted file mode 100644
index f9d6bb8aef60349015b79d559e1d7b7417b988b9..0000000000000000000000000000000000000000
--- a/qemuDomainPinIOThread-Update-live-definition-after-p.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From f98761b13ec88aa506987f3d112a9f41f14d6dfb Mon Sep 17 00:00:00 2001
-From: Bihong Yu <yubihong@huawei.com>
-Date: Tue, 18 Jan 2022 10:08:03 +0100
-Subject: [PATCH 03/22] qemuDomainPinIOThread: Update live definition after
- process pinning
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Update live definition after process pinning, Otherwise we'll
-keep using the new pinning value even if it can't be applied to
-the thread.
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2040555
-
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
-Signed-off-by: Bihong Yu <yubihong@huawei.com>
----
- src/qemu/qemu_driver.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
-index 8b19be46f1..32b3ef3cf1 100644
---- a/src/qemu/qemu_driver.c
-+++ b/src/qemu/qemu_driver.c
-@@ -5719,10 +5719,6 @@ qemuDomainPinIOThread(virDomainPtr dom,
-         if (!(cpumask = virBitmapNewData(cpumap, maplen)))
-             goto endjob;
- 
--        virBitmapFree(iothrid->cpumask);
--        iothrid->cpumask = cpumask;
--        iothrid->autofill = false;
--
-         /* Configure the corresponding cpuset cgroup before set affinity. */
-         if (virCgroupHasController(priv->cgroup,
-                                    VIR_CGROUP_CONTROLLER_CPUSET)) {
-@@ -5740,6 +5736,10 @@ qemuDomainPinIOThread(virDomainPtr dom,
-         if (virProcessSetAffinity(iothrid->thread_id, pcpumap) < 0)
-             goto endjob;
- 
-+        virBitmapFree(iothrid->cpumask);
-+        iothrid->cpumask = cpumask;
-+        iothrid->autofill = false;
-+
-         if (virDomainObjSave(vm, driver->xmlopt, cfg->stateDir) < 0)
-             goto endjob;
- 
--- 
-2.33.0
-
diff --git a/qemuFirmwareFillDomain-Fill-NVRAM-template-on-migrat.patch b/qemuFirmwareFillDomain-Fill-NVRAM-template-on-migrat.patch
deleted file mode 100644
index 56ef0d3b885e2fde236505282dd14d2943857ef2..0000000000000000000000000000000000000000
--- a/qemuFirmwareFillDomain-Fill-NVRAM-template-on-migrat.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 44943efe8465f60315d3fb54a935d1ea190ee4fb Mon Sep 17 00:00:00 2001
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Tue, 8 Sep 2020 17:42:09 +0200
-Subject: [PATCH 026/108] qemuFirmwareFillDomain: Fill NVRAM template on
- migration too
-
-In 8e1804f9f66 I've tried to fix the following use case: domain
-is started with path to UEFI only and relies on libvirt to figure
-out corresponding NVRAM template to create a per-domain copy
-from. The fix consisted of having a check tailored exactly for
-this use case and if it's hit then using FW autoselection to
-figure it out. Unfortunately, the NVRAM template is not saved in
-the inactive XML (well, the domain might be transient anyway).
-Then, as a part of that check we see whether the per-domain copy
-doesn't exist already and if it does then no template is looked
-up hence no template will appear in the live XML.
-
-This works, until the domain is migrated. At the destination, the
-per-domain copy will not exist so we need to know the template to
-create the per-domain copy from. But we don't even get to the
-check because we are not starting a fresh new domain and thus the
-qemuFirmwareFillDomain() function quits early.
-
-The solution is to switch order of these two checks. That is
-evaluate the check for the old style before checking flags.
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1852910
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Andrea Bolognani <abologna@redhat.com>
-(cherry picked from commit c43622f06e295edcb9cedf33583f0bd18fb04b10)
----
- src/qemu/qemu_firmware.c | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/src/qemu/qemu_firmware.c b/src/qemu/qemu_firmware.c
-index bd251c05fc..0d2439bba1 100644
---- a/src/qemu/qemu_firmware.c
-+++ b/src/qemu/qemu_firmware.c
-@@ -1229,9 +1229,6 @@ qemuFirmwareFillDomain(virQEMUDriverPtr driver,
-     size_t i;
-     int ret = -1;
- 
--    if (!(flags & VIR_QEMU_PROCESS_START_NEW))
--        return 0;
--
-     /* Fill in FW paths if either os.firmware is enabled, or
-      * loader path was provided with no nvram varstore. */
-     if (def->os.firmware == VIR_DOMAIN_OS_DEF_FIRMWARE_NONE) {
-@@ -1247,6 +1244,11 @@ qemuFirmwareFillDomain(virQEMUDriverPtr driver,
-         /* ... then we want to consult JSON FW descriptors first,
-          * but we don't want to fail if we haven't found a match. */
-         needResult = false;
-+    } else {
-+        /* Domain has FW autoselection enabled => do nothing if
-+         * we are not starting it from scratch. */
-+        if (!(flags & VIR_QEMU_PROCESS_START_NEW))
-+            return 0;
-     }
- 
-     if ((nfirmwares = qemuFirmwareFetchParsedConfigs(driver->privileged,
--- 
-2.33.0
-
diff --git a/qemuMigrationSrcNBDStorageCopyReady-Use-ready-state-.patch b/qemuMigrationSrcNBDStorageCopyReady-Use-ready-state-.patch
deleted file mode 100644
index 6343e2777357763594a98ef5627beef4a23e8007..0000000000000000000000000000000000000000
--- a/qemuMigrationSrcNBDStorageCopyReady-Use-ready-state-.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From b82b8815939b3704f28ece92d056e68eac92ab28 Mon Sep 17 00:00:00 2001
-From: Peter Krempa <pkrempa@redhat.com>
-Date: Mon, 11 Jan 2021 10:40:43 +0100
-Subject: [PATCH 082/108] qemuMigrationSrcNBDStorageCopyReady: Use ready-state
- of mirror from qemuBlockJobData
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Use the per-job state to determine when the non-shared-storage mirror is
-complete rather than the per-disk definition one. The qemuBlockJobData
-is a newer approach and is always cleared after the blockjob is
-terminated while the 'mirrorState' variable in the definition of the
-disk may be left over. In such case the disk mirror would be considered
-complete prematurely.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1889131
-
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit a09c421e3e5969582ed0a5cf9a132ecbfd9794d2)
----
- src/qemu/qemu_migration.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
-index c461156075..d86325881e 100644
---- a/src/qemu/qemu_migration.c
-+++ b/src/qemu/qemu_migration.c
-@@ -539,10 +539,10 @@ qemuMigrationSrcNBDStorageCopyReady(virDomainObjPtr vm,
-             return -1;
-         }
- 
--        virObjectUnref(job);
--
--        if (disk->mirrorState != VIR_DOMAIN_DISK_MIRROR_STATE_READY)
-+        if (job->state != VIR_DOMAIN_BLOCK_JOB_READY)
-             notReady++;
-+
-+        virObjectUnref(job);
-     }
- 
-     if (notReady) {
--- 
-2.33.0
-
diff --git a/qemuMigrationSrcRun-Don-t-jump-to-exit_monitor-from-.patch b/qemuMigrationSrcRun-Don-t-jump-to-exit_monitor-from-.patch
deleted file mode 100644
index 41b196983c6d81c3b1e9e390ada348a94ceb8f99..0000000000000000000000000000000000000000
--- a/qemuMigrationSrcRun-Don-t-jump-to-exit_monitor-from-.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 2885ef9779a57a964b5d9212702ec06d0ba5573b Mon Sep 17 00:00:00 2001
-From: Peter Krempa <pkrempa@redhat.com>
-Date: Mon, 1 Mar 2021 14:52:03 +0100
-Subject: [PATCH 019/108] qemuMigrationSrcRun: Don't jump to 'exit_monitor'
- from outside of the monitor
-
-Failure of 'qemuMigrationSetDBusVMState' would jump to 'exit_monitor'
-but the function isn't called inside of the monitor context.
-
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
-(cherry picked from commit 568d7358ab2c106cefc7b42cd80fb9155d4bb72a)
----
- src/qemu/qemu_migration.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
-index cd40a886e3..30b92dfb87 100644
---- a/src/qemu/qemu_migration.c
-+++ b/src/qemu/qemu_migration.c
-@@ -3637,7 +3637,7 @@ qemuMigrationSrcRun(virQEMUDriverPtr driver,
-     }
- 
-     if (qemuMigrationSetDBusVMState(driver, vm) < 0)
--        goto exit_monitor;
-+        goto error;
- 
-     /* Before EnterMonitor, since already qemuProcessStopCPUs does that */
-     if (!(flags & VIR_MIGRATE_LIVE) &&
--- 
-2.33.0
-
diff --git a/qemuMigrationSrcWaitForSpice-Remove-return-value.patch b/qemuMigrationSrcWaitForSpice-Remove-return-value.patch
deleted file mode 100644
index 3c69c959b75fc02a3b7e7cceaaced0fbd4c4c2e8..0000000000000000000000000000000000000000
--- a/qemuMigrationSrcWaitForSpice-Remove-return-value.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From bd8b565057cacc69a0c0c4b2463ffab6c0cf395e Mon Sep 17 00:00:00 2001
-From: jipengfei <jipengfei_yewu@cmss.chinamobile.com>
-Date: Fri, 25 Nov 2022 02:19:55 +0800
-Subject: [PATCH 23/23] qemuMigrationSrcWaitForSpice: Remove return value
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-cherry-pick from b76c58081c69a8775dd46b014611b28f6ed2a1b2
-
-The only caller doesn't check the return value and actually doesn't have
-one either. Remove the return value and adjust return statements.
-
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-Signed-off-by: jipengfei <jipengfei_yewu@cmss.chinamobile.com>
-Reviewed-by: Erik Skultety <eskultet@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/qemu/qemu_migration.c | 7 +++----
- 1 file changed, 3 insertions(+), 4 deletions(-)
-
-diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
-index d86325881e..1c48138ce3 100644
---- a/src/qemu/qemu_migration.c
-+++ b/src/qemu/qemu_migration.c
-@@ -1426,20 +1426,19 @@ qemuMigrationAnyPostcopyFailed(virQEMUDriverPtr driver,
- }
- 
- 
--static int
-+static void
- qemuMigrationSrcWaitForSpice(virDomainObjPtr vm)
- {
-     qemuDomainObjPrivatePtr priv = vm->privateData;
- 
-     if (!priv->job.spiceMigration)
--        return 0;
-+        return;
- 
-     VIR_DEBUG("Waiting for SPICE to finish migration");
-     while (!priv->job.spiceMigrated && !priv->job.abortJob) {
-         if (virDomainObjWait(vm) < 0)
--            return -1;
-+            return;
-     }
--    return 0;
- }
- 
- 
--- 
-2.27.0
-
diff --git a/qemuMonitorAddNetdev-Convert-to-the-native-JSON-prop.patch b/qemuMonitorAddNetdev-Convert-to-the-native-JSON-prop.patch
deleted file mode 100644
index a7c69b15ec82b7d3dcea2eaa6242631b85b2448b..0000000000000000000000000000000000000000
--- a/qemuMonitorAddNetdev-Convert-to-the-native-JSON-prop.patch
+++ /dev/null
@@ -1,198 +0,0 @@
-From 2d555c8e864c8ba7dbc7a22e37712b70b59e5293 Mon Sep 17 00:00:00 2001
-From: Peter Krempa <pkrempa@redhat.com>
-Date: Fri, 15 May 2020 11:36:28 +0200
-Subject: [PATCH 12/18] qemuMonitorAddNetdev: Convert to the native JSON props
- object
-
-Now that all code paths generate JSON props we can remove the conversion
-to command line arguments and back in the monitor code.
-
-Note that the test which is removed in this commit will be replaced by a
-stronger testsuite later.
-
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Eric Blake <eblake@redhat.com>
----
- src/qemu/qemu_hotplug.c      | 14 +++-----------
- src/qemu/qemu_monitor.c      |  8 ++++----
- src/qemu/qemu_monitor.h      |  2 +-
- src/qemu/qemu_monitor_json.c | 15 +++------------
- src/qemu/qemu_monitor_json.h |  2 +-
- tests/qemumonitorjsontest.c  |  2 --
- 6 files changed, 12 insertions(+), 31 deletions(-)
-
-diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
-index 24a898166d..d7bcb6a99f 100644
---- a/src/qemu/qemu_hotplug.c
-+++ b/src/qemu/qemu_hotplug.c
-@@ -1159,7 +1159,6 @@ qemuDomainAttachNetDevice(virQEMUDriverPtr driver,
-     size_t queueSize = 0;
-     g_autofree char *nicstr = NULL;
-     g_autoptr(virJSONValue) netprops = NULL;
--    g_autofree char *netstr = NULL;
-     int ret = -1;
-     bool releaseaddr = false;
-     bool iface_connected = false;
-@@ -1390,9 +1389,6 @@ qemuDomainAttachNetDevice(virQEMUDriverPtr driver,
-                                          slirpfdName)))
-         goto cleanup;
- 
--    if (!(netstr = virQEMUBuildNetdevCommandlineFromJSON(netprops)))
--        goto cleanup;
--
-     qemuDomainObjEnterMonitor(driver, vm);
- 
-     if (actualType == VIR_DOMAIN_NET_TYPE_VHOSTUSER) {
-@@ -1404,7 +1400,7 @@ qemuDomainAttachNetDevice(virQEMUDriverPtr driver,
-         charDevPlugged = true;
-     }
- 
--    if (qemuMonitorAddNetdev(priv->mon, netstr,
-+    if (qemuMonitorAddNetdev(priv->mon, &netprops,
-                              tapfd, tapfdName, tapfdSize,
-                              vhostfd, vhostfdName, vhostfdSize,
-                              slirpfd, slirpfdName) < 0) {
-@@ -2114,7 +2110,6 @@ int qemuDomainAttachChrDevice(virQEMUDriverPtr driver,
-     virDomainDefPtr vmdef = vm->def;
-     g_autofree char *devstr = NULL;
-     g_autoptr(virJSONValue) netdevprops = NULL;
--    g_autofree char *netdevstr = NULL;
-     virDomainChrSourceDefPtr dev = chr->source;
-     g_autofree char *charAlias = NULL;
-     bool chardevAttached = false;
-@@ -2156,9 +2151,6 @@ int qemuDomainAttachChrDevice(virQEMUDriverPtr driver,
-     if (guestfwd) {
-         if (!(netdevprops = qemuBuildChannelGuestfwdNetdevProps(chr)))
-             goto cleanup;
--
--        if (!(netdevstr = virQEMUBuildNetdevCommandlineFromJSON(netdevprops)))
--            goto cleanup;
-     } else {
-         if (qemuBuildChrDeviceStr(&devstr, vmdef, chr, priv->qemuCaps) < 0)
-             goto cleanup;
-@@ -2181,8 +2173,8 @@ int qemuDomainAttachChrDevice(virQEMUDriverPtr driver,
-         goto exit_monitor;
-     chardevAttached = true;
- 
--    if (netdevstr) {
--        if (qemuMonitorAddNetdev(priv->mon, netdevstr,
-+    if (netdevprops) {
-+        if (qemuMonitorAddNetdev(priv->mon, &netdevprops,
-                                  NULL, NULL, 0, NULL, NULL, 0, -1, NULL) < 0)
-             goto exit_monitor;
-     }
-diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
-index cc62948c9c..9f4432ab3a 100644
---- a/src/qemu/qemu_monitor.c
-+++ b/src/qemu/qemu_monitor.c
-@@ -2667,7 +2667,7 @@ qemuMonitorCloseFileHandle(qemuMonitorPtr mon,
- 
- int
- qemuMonitorAddNetdev(qemuMonitorPtr mon,
--                     const char *netdevstr,
-+                     virJSONValuePtr *props,
-                      int *tapfd, char **tapfdName, int tapfdSize,
-                      int *vhostfd, char **vhostfdName, int vhostfdSize,
-                      int slirpfd, char *slirpfdName)
-@@ -2675,10 +2675,10 @@ qemuMonitorAddNetdev(qemuMonitorPtr mon,
-     int ret = -1;
-     size_t i = 0, j = 0;
- 
--    VIR_DEBUG("netdevstr=%s tapfd=%p tapfdName=%p tapfdSize=%d"
-+    VIR_DEBUG("props=%p tapfd=%p tapfdName=%p tapfdSize=%d"
-               "vhostfd=%p vhostfdName=%p vhostfdSize=%d"
-               "slirpfd=%d slirpfdName=%s",
--              netdevstr, tapfd, tapfdName, tapfdSize,
-+              props, tapfd, tapfdName, tapfdSize,
-               vhostfd, vhostfdName, vhostfdSize, slirpfd, slirpfdName);
- 
-     QEMU_CHECK_MONITOR(mon);
-@@ -2696,7 +2696,7 @@ qemuMonitorAddNetdev(qemuMonitorPtr mon,
-         qemuMonitorSendFileHandle(mon, slirpfdName, slirpfd) < 0)
-         goto cleanup;
- 
--    ret = qemuMonitorJSONAddNetdev(mon, netdevstr);
-+    ret = qemuMonitorJSONAddNetdev(mon, props);
- 
-  cleanup:
-     if (ret < 0) {
-diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
-index 68e21dcaee..7a3240f00a 100644
---- a/src/qemu/qemu_monitor.h
-+++ b/src/qemu/qemu_monitor.h
-@@ -881,7 +881,7 @@ int qemuMonitorCloseFileHandle(qemuMonitorPtr mon,
-                                const char *fdname);
- 
- int qemuMonitorAddNetdev(qemuMonitorPtr mon,
--                         const char *netdevstr,
-+                         virJSONValuePtr *props,
-                          int *tapfd, char **tapfdName, int tapfdSize,
-                          int *vhostfd, char **vhostfdName, int vhostfdSize,
-                          int slirpfd, char *slirpfdName);
-diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
-index e6b5c7140e..c1d92b2009 100644
---- a/src/qemu/qemu_monitor_json.c
-+++ b/src/qemu/qemu_monitor_json.c
-@@ -3993,23 +3993,14 @@ int qemuMonitorJSONCloseFileHandle(qemuMonitorPtr mon,
- 
- int
- qemuMonitorJSONAddNetdev(qemuMonitorPtr mon,
--                         const char *netdevstr)
-+                         virJSONValuePtr *props)
- {
-     g_autoptr(virJSONValue) cmd = NULL;
-     g_autoptr(virJSONValue) reply = NULL;
--    g_autoptr(virJSONValue) args = NULL;
--
--    cmd = qemuMonitorJSONMakeCommand("netdev_add", NULL);
--    if (!cmd)
--        return -1;
--
--    args = qemuMonitorJSONKeywordStringToJSON(netdevstr, "type");
--    if (!args)
--        return -1;
-+    virJSONValuePtr pr = g_steal_pointer(props);
- 
--    if (virJSONValueObjectAppend(cmd, "arguments", args) < 0)
-+    if (!(cmd = qemuMonitorJSONMakeCommandInternal("netdev_add", pr)))
-         return -1;
--    args = NULL; /* obj owns reference to args now */
- 
-     if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
-         return -1;
-diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h
-index 05a46b4fe2..dd25e5d6e6 100644
---- a/src/qemu/qemu_monitor_json.h
-+++ b/src/qemu/qemu_monitor_json.h
-@@ -210,7 +210,7 @@ int qemuMonitorJSONCloseFileHandle(qemuMonitorPtr mon,
-                                    const char *fdname);
- 
- int qemuMonitorJSONAddNetdev(qemuMonitorPtr mon,
--                             const char *netdevstr);
-+                             virJSONValuePtr *props);
- 
- int qemuMonitorJSONRemoveNetdev(qemuMonitorPtr mon,
-                                 const char *alias);
-diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c
-index 472775a3cf..2ec143f476 100644
---- a/tests/qemumonitorjsontest.c
-+++ b/tests/qemumonitorjsontest.c
-@@ -1308,7 +1308,6 @@ GEN_TEST_FUNC(qemuMonitorJSONDump, "dummy_protocol", "elf",
-               true)
- GEN_TEST_FUNC(qemuMonitorJSONGraphicsRelocate, VIR_DOMAIN_GRAPHICS_TYPE_SPICE,
-               "localhost", 12345, 12346, "certsubjectval")
--GEN_TEST_FUNC(qemuMonitorJSONAddNetdev, "id=net0,type=test")
- GEN_TEST_FUNC(qemuMonitorJSONRemoveNetdev, "net0")
- GEN_TEST_FUNC(qemuMonitorJSONDelDevice, "ide0")
- GEN_TEST_FUNC(qemuMonitorJSONAddDevice, "some_dummy_devicestr")
-@@ -3192,7 +3191,6 @@ mymain(void)
-     DO_TEST_GEN(qemuMonitorJSONMigrate);
-     DO_TEST_GEN(qemuMonitorJSONDump);
-     DO_TEST_GEN(qemuMonitorJSONGraphicsRelocate);
--    DO_TEST_GEN(qemuMonitorJSONAddNetdev);
-     DO_TEST_GEN(qemuMonitorJSONRemoveNetdev);
-     DO_TEST_GEN(qemuMonitorJSONDelDevice);
-     DO_TEST_GEN(qemuMonitorJSONAddDevice);
--- 
-2.23.0.windows.1
-
diff --git a/qemuMonitorAddObject-Fix-semantics-of-alias.patch b/qemuMonitorAddObject-Fix-semantics-of-alias.patch
deleted file mode 100644
index 3edfd536b85df091915e29b82f9bba5deb8d1f5e..0000000000000000000000000000000000000000
--- a/qemuMonitorAddObject-Fix-semantics-of-alias.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From cf227a71451c95d2e5db3d0d79f108caf086234f Mon Sep 17 00:00:00 2001
-From: Peter Krempa <pkrempa@redhat.com>
-Date: Mon, 30 Nov 2020 16:21:18 +0100
-Subject: [PATCH 04/16] qemuMonitorAddObject: Fix semantics of @alias
-
-The callers of qemuMonitorAddObject rely on the fact that @alias is
-filled only when the object is added successfully. This is documented
-but the code didn't behave like that.
-
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
----
- src/qemu/qemu_monitor.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
-index 0447b609fd..f573292e37 100644
---- a/src/qemu/qemu_monitor.c
-+++ b/src/qemu/qemu_monitor.c
-@@ -2966,11 +2966,14 @@ qemuMonitorAddObject(qemuMonitorPtr mon,
-     if (alias)
-         tmp = g_strdup(id);
- 
--    ret = qemuMonitorJSONAddObject(mon, props);
-+    if (qemuMonitorJSONAddObject(mon, props) < 0)
-+        goto cleanup;
- 
-     if (alias)
-         *alias = g_steal_pointer(&tmp);
- 
-+    ret = 0;
-+
-  cleanup:
-     VIR_FREE(tmp);
-     virJSONValueFree(*props);
--- 
-2.27.0
-
diff --git a/qemuMonitorAddObject-Refactor-cleanup.patch b/qemuMonitorAddObject-Refactor-cleanup.patch
deleted file mode 100644
index 98ac3d46dadcd4116d0773f30bb7a6f9a0e2e4a4..0000000000000000000000000000000000000000
--- a/qemuMonitorAddObject-Refactor-cleanup.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From a9516cceecbf98e34619e2978192f50665d82528 Mon Sep 17 00:00:00 2001
-From: Peter Krempa <pkrempa@redhat.com>
-Date: Mon, 30 Nov 2020 16:23:55 +0100
-Subject: [PATCH 05/16] qemuMonitorAddObject: Refactor cleanup
-
-Remove freeing/clearing of @props as the function doesn't guarantee that
-it happens on success, rename the variable hodling copy of the alias and
-use g_autofree to automatically free it and remove the cleanup label as
-well as 'ret' variable.
-
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
----
- src/qemu/qemu_monitor.c | 23 ++++++++---------------
- 1 file changed, 8 insertions(+), 15 deletions(-)
-
-diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
-index f573292e37..188d7700a7 100644
---- a/src/qemu/qemu_monitor.c
-+++ b/src/qemu/qemu_monitor.c
-@@ -2940,13 +2940,12 @@ qemuMonitorAddObject(qemuMonitorPtr mon,
- {
-     const char *type = NULL;
-     const char *id = NULL;
--    char *tmp = NULL;
--    int ret = -1;
-+    g_autofree char *aliasCopy = NULL;
- 
-     if (!*props) {
-         virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-                        _("object props can't be NULL"));
--        goto cleanup;
-+        return -1;
-     }
- 
-     type = virJSONValueObjectGetString(*props, "qom-type");
-@@ -2954,31 +2953,25 @@ qemuMonitorAddObject(qemuMonitorPtr mon,
- 
-     VIR_DEBUG("type=%s id=%s", NULLSTR(type), NULLSTR(id));
- 
--    QEMU_CHECK_MONITOR_GOTO(mon, cleanup);
-+    QEMU_CHECK_MONITOR(mon);
- 
-     if (!id || !type) {
-         virReportError(VIR_ERR_INTERNAL_ERROR,
-                        _("missing alias or qom-type for qemu object '%s'"),
-                        NULLSTR(type));
--        goto cleanup;
-+        return -1;
-     }
- 
-     if (alias)
--        tmp = g_strdup(id);
-+        aliasCopy = g_strdup(id);
- 
-     if (qemuMonitorJSONAddObject(mon, props) < 0)
--        goto cleanup;
-+        return -1;
- 
-     if (alias)
--        *alias = g_steal_pointer(&tmp);
--
--    ret = 0;
-+        *alias = g_steal_pointer(&aliasCopy);
- 
-- cleanup:
--    VIR_FREE(tmp);
--    virJSONValueFree(*props);
--    *props = NULL;
--    return ret;
-+    return 0;
- }
- 
- 
--- 
-2.27.0
-
diff --git a/qemuMonitorCreateObjectPropsWrap-Open-code-in-qemuBu.patch b/qemuMonitorCreateObjectPropsWrap-Open-code-in-qemuBu.patch
deleted file mode 100644
index c9c284cc34e7de0de6c24c06df3f5f08ff28d5e9..0000000000000000000000000000000000000000
--- a/qemuMonitorCreateObjectPropsWrap-Open-code-in-qemuBu.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From dc2f20399a4ceb0781a5ffca31c251c98579f34d Mon Sep 17 00:00:00 2001
-From: Peter Krempa <pkrempa@redhat.com>
-Date: Mon, 30 Nov 2020 17:08:46 +0100
-Subject: [PATCH 12/16] qemuMonitorCreateObjectPropsWrap: Open-code in
- qemuBuildMemoryBackendProps
-
-There's just one caller left. Since qemuBuildMemoryBackendProps is too
-complex to be modified for now, just move the adding of 'id' and 'qom'
-type directly into the function.
-
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
----
- src/qemu/qemu_command.c |  6 ++++--
- src/qemu/qemu_monitor.c | 15 ---------------
- src/qemu/qemu_monitor.h |  4 ----
- 3 files changed, 4 insertions(+), 21 deletions(-)
-
-diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
-index be51400928..fd3b0baaf8 100644
---- a/src/qemu/qemu_command.c
-+++ b/src/qemu/qemu_command.c
-@@ -3596,10 +3596,12 @@ qemuBuildMemoryBackendProps(virJSONValuePtr *backendProps,
-         rc = 0;
-     }
- 
--    if (!(*backendProps = qemuMonitorCreateObjectPropsWrap(backendType, alias,
--                                                           &props)))
-+    if (virJSONValueObjectPrependString(props, "id", alias) < 0 ||
-+        virJSONValueObjectPrependString(props, "qom-type", backendType) < 0)
-         return -1;
- 
-+    *backendProps = g_steal_pointer(&props);
-+
-     return rc;
- }
- 
-diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
-index b7aa824f20..dd1bf925b2 100644
---- a/src/qemu/qemu_monitor.c
-+++ b/src/qemu/qemu_monitor.c
-@@ -2870,21 +2870,6 @@ qemuMonitorAddDeviceArgs(qemuMonitorPtr mon,
- }
- 
- 
--virJSONValuePtr
--qemuMonitorCreateObjectPropsWrap(const char *type,
--                                 const char *alias,
--                                 virJSONValuePtr *props)
--{
--
--    if (virJSONValueObjectPrependString(*props, "id", alias) < 0 ||
--        virJSONValueObjectPrependString(*props, "qom-type", type))
--        return NULL;
--
--    return g_steal_pointer(props);
--}
--
--
--
- /**
-  * qemuMonitorCreateObjectProps:
-  * @propsret: returns full object properties
-diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
-index 561417f6c1..73c8af9e78 100644
---- a/src/qemu/qemu_monitor.h
-+++ b/src/qemu/qemu_monitor.h
-@@ -919,10 +919,6 @@ int qemuMonitorAddDeviceWithFd(qemuMonitorPtr mon,
- int qemuMonitorDelDevice(qemuMonitorPtr mon,
-                          const char *devalias);
- 
--virJSONValuePtr qemuMonitorCreateObjectPropsWrap(const char *type,
--                                                 const char *alias,
--                                                 virJSONValuePtr *props);
--
- int qemuMonitorCreateObjectProps(virJSONValuePtr *propsret,
-                                  const char *type,
-                                  const char *alias,
--- 
-2.27.0
-
diff --git a/qemuMonitorJSON-Add-Remove-Netdev-Refactor-cleanup.patch b/qemuMonitorJSON-Add-Remove-Netdev-Refactor-cleanup.patch
deleted file mode 100644
index a851f75f418c8362bd218f0ce5c8fdc683c45b60..0000000000000000000000000000000000000000
--- a/qemuMonitorJSON-Add-Remove-Netdev-Refactor-cleanup.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-From 3e1026fb3619aae6b1be4879797474d10d22a54c Mon Sep 17 00:00:00 2001
-From: Peter Krempa <pkrempa@redhat.com>
-Date: Fri, 15 May 2020 11:16:32 +0200
-Subject: [PATCH 08/18] qemuMonitorJSON(Add|Remove)Netdev: Refactor cleanup
-
-Use automatic pointer cleanup for virJSONValuePtrs to get rid of the
-cleanup label and ret variable.
-
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Eric Blake <eblake@redhat.com>
----
- src/qemu/qemu_monitor_json.c | 52 +++++++++++++++---------------------
- 1 file changed, 22 insertions(+), 30 deletions(-)
-
-diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
-index ef25764a98..e6b5c7140e 100644
---- a/src/qemu/qemu_monitor_json.c
-+++ b/src/qemu/qemu_monitor_json.c
-@@ -3991,13 +3991,13 @@ int qemuMonitorJSONCloseFileHandle(qemuMonitorPtr mon,
- }
- 
- 
--int qemuMonitorJSONAddNetdev(qemuMonitorPtr mon,
--                             const char *netdevstr)
-+int
-+qemuMonitorJSONAddNetdev(qemuMonitorPtr mon,
-+                         const char *netdevstr)
- {
--    int ret = -1;
--    virJSONValuePtr cmd = NULL;
--    virJSONValuePtr reply = NULL;
--    virJSONValuePtr args = NULL;
-+    g_autoptr(virJSONValue) cmd = NULL;
-+    g_autoptr(virJSONValue) reply = NULL;
-+    g_autoptr(virJSONValue) args = NULL;
- 
-     cmd = qemuMonitorJSONMakeCommand("netdev_add", NULL);
-     if (!cmd)
-@@ -4005,49 +4005,41 @@ int qemuMonitorJSONAddNetdev(qemuMonitorPtr mon,
- 
-     args = qemuMonitorJSONKeywordStringToJSON(netdevstr, "type");
-     if (!args)
--        goto cleanup;
-+        return -1;
- 
-     if (virJSONValueObjectAppend(cmd, "arguments", args) < 0)
--        goto cleanup;
-+        return -1;
-     args = NULL; /* obj owns reference to args now */
- 
-     if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
--        goto cleanup;
-+        return -1;
- 
-     if (qemuMonitorJSONCheckError(cmd, reply) < 0)
--        goto cleanup;
-+        return -1;
- 
--    ret = 0;
-- cleanup:
--    virJSONValueFree(args);
--    virJSONValueFree(cmd);
--    virJSONValueFree(reply);
--    return ret;
-+    return 0;
- }
- 
- 
--int qemuMonitorJSONRemoveNetdev(qemuMonitorPtr mon,
--                                const char *alias)
-+int
-+qemuMonitorJSONRemoveNetdev(qemuMonitorPtr mon,
-+                            const char *alias)
- {
--    int ret = -1;
--    virJSONValuePtr cmd = qemuMonitorJSONMakeCommand("netdev_del",
--                                                     "s:id", alias,
--                                                     NULL);
--    virJSONValuePtr reply = NULL;
-+    g_autoptr(virJSONValue) cmd = qemuMonitorJSONMakeCommand("netdev_del",
-+                                                             "s:id", alias,
-+                                                             NULL);
-+    g_autoptr(virJSONValue) reply = NULL;
-+
-     if (!cmd)
-         return -1;
- 
-     if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
--        goto cleanup;
-+        return -1;
- 
-     if (qemuMonitorJSONCheckError(cmd, reply) < 0)
--        goto cleanup;
-+        return -1;
- 
--    ret = 0;
-- cleanup:
--    virJSONValueFree(cmd);
--    virJSONValueFree(reply);
--    return ret;
-+    return 0;
- }
- 
- 
--- 
-2.23.0.windows.1
-
diff --git a/qemuMonitorJSONAddObject-Take-double-pointer-for-pro.patch b/qemuMonitorJSONAddObject-Take-double-pointer-for-pro.patch
deleted file mode 100644
index 14df45a2db515e8ca02183fcb1dd33b97e8dbf7f..0000000000000000000000000000000000000000
--- a/qemuMonitorJSONAddObject-Take-double-pointer-for-pro.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From 717b22f34cf5ce58be5a5223a29546e8c46e0365 Mon Sep 17 00:00:00 2001
-From: Peter Krempa <pkrempa@redhat.com>
-Date: Mon, 30 Nov 2020 15:32:14 +0100
-Subject: [PATCH 02/16] qemuMonitorJSONAddObject: Take double pointer for
- @props
-
-Prepare for a refactor of qemuMonitorJSONMakeCommandInternal.
-
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
----
- src/qemu/qemu_monitor.c      | 3 +--
- src/qemu/qemu_monitor_json.c | 5 +++--
- src/qemu/qemu_monitor_json.h | 2 +-
- 3 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
-index 58a8741bb8..0447b609fd 100644
---- a/src/qemu/qemu_monitor.c
-+++ b/src/qemu/qemu_monitor.c
-@@ -2966,8 +2966,7 @@ qemuMonitorAddObject(qemuMonitorPtr mon,
-     if (alias)
-         tmp = g_strdup(id);
- 
--    ret = qemuMonitorJSONAddObject(mon, *props);
--    *props = NULL;
-+    ret = qemuMonitorJSONAddObject(mon, props);
- 
-     if (alias)
-         *alias = g_steal_pointer(&tmp);
-diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
-index 03af998cb0..ce7f35e2ca 100644
---- a/src/qemu/qemu_monitor_json.c
-+++ b/src/qemu/qemu_monitor_json.c
-@@ -4427,12 +4427,13 @@ qemuMonitorJSONAddDevice(qemuMonitorPtr mon,
- 
- int
- qemuMonitorJSONAddObject(qemuMonitorPtr mon,
--                         virJSONValuePtr props)
-+                         virJSONValuePtr *props)
- {
-     g_autoptr(virJSONValue) cmd = NULL;
-     g_autoptr(virJSONValue) reply = NULL;
-+    virJSONValuePtr pr = g_steal_pointer(props);
- 
--    if (!(cmd = qemuMonitorJSONMakeCommandInternal("object-add", props)))
-+    if (!(cmd = qemuMonitorJSONMakeCommandInternal("object-add", pr)))
-         return -1;
- 
-     if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
-diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h
-index af52372a93..2c0e3ec07a 100644
---- a/src/qemu/qemu_monitor_json.h
-+++ b/src/qemu/qemu_monitor_json.h
-@@ -234,7 +234,7 @@ int qemuMonitorJSONDelDevice(qemuMonitorPtr mon,
-                              const char *devalias);
- 
- int qemuMonitorJSONAddObject(qemuMonitorPtr mon,
--                             virJSONValuePtr props);
-+                             virJSONValuePtr *props);
- 
- int qemuMonitorJSONDelObject(qemuMonitorPtr mon,
-                              const char *objalias,
--- 
-2.27.0
-
diff --git a/qemuMonitorJSONMakeCommandInternal-Clear-arguments-w.patch b/qemuMonitorJSONMakeCommandInternal-Clear-arguments-w.patch
deleted file mode 100644
index 3455852c757de70945351fa3fff2ed78cd36cd33..0000000000000000000000000000000000000000
--- a/qemuMonitorJSONMakeCommandInternal-Clear-arguments-w.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-From 18bcc450bbd6db8b124a8e6e218bde9846e5c3d5 Mon Sep 17 00:00:00 2001
-From: Yan Wang <wangyan122@huawei.com>
-Date: Thu, 24 Mar 2022 12:10:30 +0800
-Subject: [PATCH 03/16] :qemuMonitorJSONMakeCommandInternal: Clear @arguments
- when stolen
-
-All callers of qemuMonitorJSONMakeCommandInternal will benefit from
-making @arguments a double pointer and passing it to
-virJSONValueObjectCreate directly which will clear it if it steals the
-value.
-
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-Signed-off-by: Yan Wang <wangyan122@huawei.com>
----
- src/qemu/qemu_monitor_json.c | 27 ++++++++++-----------------
- 1 file changed, 10 insertions(+), 17 deletions(-)
-
-diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
-index ce7f35e2ca..cc6644c9c3 100644
---- a/src/qemu/qemu_monitor_json.c
-+++ b/src/qemu/qemu_monitor_json.c
-@@ -546,20 +546,18 @@ qemuMonitorJSONTransactionAdd(virJSONValuePtr actions,
-  *
-  * Create a JSON object used on the QMP monitor to call a command.
-  *
-- * Note that @arguments is always consumed and should not be referenced after
-- * the call to this function.
-+ * Note that @arguments is consumed and cleared.
-  */
- static virJSONValuePtr
- qemuMonitorJSONMakeCommandInternal(const char *cmdname,
--                                   virJSONValuePtr arguments)
-+                                   virJSONValuePtr *arguments)
- {
-     virJSONValuePtr ret = NULL;
- 
-     ignore_value(virJSONValueObjectCreate(&ret,
-                                           "s:execute", cmdname,
--                                          "A:arguments", &arguments, NULL));
-+                                          "A:arguments", arguments, NULL));
- 
--    virJSONValueFree(arguments);
-     return ret;
- }
- 
-@@ -569,7 +567,7 @@ qemuMonitorJSONMakeCommand(const char *cmdname,
-                            ...)
- {
-     virJSONValuePtr obj = NULL;
--    virJSONValuePtr jargs = NULL;
-+    g_autoptr(virJSONValue) jargs = NULL;
-     va_list args;
- 
-     va_start(args, cmdname);
-@@ -577,7 +575,7 @@ qemuMonitorJSONMakeCommand(const char *cmdname,
-     if (virJSONValueObjectCreateVArgs(&jargs, args) < 0)
-         goto cleanup;
- 
--    obj = qemuMonitorJSONMakeCommandInternal(cmdname, jargs);
-+    obj = qemuMonitorJSONMakeCommandInternal(cmdname, &jargs);
- 
-  cleanup:
-     va_end(args);
-@@ -3469,9 +3467,8 @@ qemuMonitorJSONSetMigrationParams(qemuMonitorPtr mon,
- {
-     g_autoptr(virJSONValue) cmd = NULL;
-     g_autoptr(virJSONValue) reply = NULL;
--    virJSONValuePtr par = g_steal_pointer(params);
- 
--    if (!(cmd = qemuMonitorJSONMakeCommandInternal("migrate-set-parameters", par)))
-+    if (!(cmd = qemuMonitorJSONMakeCommandInternal("migrate-set-parameters", params)))
-         return -1;
- 
-     if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
-@@ -3998,9 +3995,8 @@ qemuMonitorJSONAddNetdev(qemuMonitorPtr mon,
- {
-     g_autoptr(virJSONValue) cmd = NULL;
-     g_autoptr(virJSONValue) reply = NULL;
--    virJSONValuePtr pr = g_steal_pointer(props);
- 
--    if (!(cmd = qemuMonitorJSONMakeCommandInternal("netdev_add", pr)))
-+    if (!(cmd = qemuMonitorJSONMakeCommandInternal("netdev_add", props)))
-         return -1;
- 
-     if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
-@@ -4431,9 +4427,8 @@ qemuMonitorJSONAddObject(qemuMonitorPtr mon,
- {
-     g_autoptr(virJSONValue) cmd = NULL;
-     g_autoptr(virJSONValue) reply = NULL;
--    virJSONValuePtr pr = g_steal_pointer(props);
- 
--    if (!(cmd = qemuMonitorJSONMakeCommandInternal("object-add", pr)))
-+    if (!(cmd = qemuMonitorJSONMakeCommandInternal("object-add", props)))
-         return -1;
- 
-     if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
-@@ -8812,9 +8807,8 @@ qemuMonitorJSONBlockdevAdd(qemuMonitorPtr mon,
- {
-     g_autoptr(virJSONValue) cmd = NULL;
-     g_autoptr(virJSONValue) reply = NULL;
--    virJSONValuePtr pr = g_steal_pointer(props);
- 
--    if (!(cmd = qemuMonitorJSONMakeCommandInternal("blockdev-add", pr)))
-+    if (!(cmd = qemuMonitorJSONMakeCommandInternal("blockdev-add", props)))
-         return -1;
- 
-     if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
-@@ -8833,9 +8827,8 @@ qemuMonitorJSONBlockdevReopen(qemuMonitorPtr mon,
- {
-     g_autoptr(virJSONValue) cmd = NULL;
-     g_autoptr(virJSONValue) reply = NULL;
--    virJSONValuePtr pr = g_steal_pointer(props);
- 
--    if (!(cmd = qemuMonitorJSONMakeCommandInternal("blockdev-reopen", pr)))
-+    if (!(cmd = qemuMonitorJSONMakeCommandInternal("blockdev-reopen", props)))
-         return -1;
- 
-     if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
--- 
-2.27.0
-
diff --git a/qemuMonitorJSONSetMigrationParams-Take-double-pointe.patch b/qemuMonitorJSONSetMigrationParams-Take-double-pointe.patch
deleted file mode 100644
index c9c369639aba726aef917ff49144ecd7ebd8de0e..0000000000000000000000000000000000000000
--- a/qemuMonitorJSONSetMigrationParams-Take-double-pointe.patch
+++ /dev/null
@@ -1,118 +0,0 @@
-From 3c3f616a826b5c0cd1a01faafa2f1f6c71494e05 Mon Sep 17 00:00:00 2001
-From: Peter Krempa <pkrempa@redhat.com>
-Date: Mon, 30 Nov 2020 15:17:34 +0100
-Subject: [PATCH 01/16] qemuMonitorJSONSetMigrationParams: Take double pointer
- for @params
-
-This allows simplification of the caller as well as will enable a later
-refactor of qemuMonitorJSONMakeCommandInternal.
-
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
----
- src/qemu/qemu_migration_params.c |  9 +++------
- src/qemu/qemu_monitor.c          | 11 +++--------
- src/qemu/qemu_monitor.h          |  2 +-
- src/qemu/qemu_monitor_json.c     |  5 +++--
- src/qemu/qemu_monitor_json.h     |  2 +-
- 5 files changed, 11 insertions(+), 18 deletions(-)
-
-diff --git a/src/qemu/qemu_migration_params.c b/src/qemu/qemu_migration_params.c
-index 6953badcfe..df9d5d205a 100644
---- a/src/qemu/qemu_migration_params.c
-+++ b/src/qemu/qemu_migration_params.c
-@@ -880,12 +880,9 @@ qemuMigrationParamsApply(virQEMUDriverPtr driver,
-     if (!(params = qemuMigrationParamsToJSON(migParams)))
-         goto cleanup;
- 
--    if (virJSONValueObjectKeysNumber(params) > 0) {
--        rc = qemuMonitorSetMigrationParams(priv->mon, params);
--        params = NULL;
--        if (rc < 0)
--            goto cleanup;
--    }
-+    if (virJSONValueObjectKeysNumber(params) > 0 &&
-+        qemuMonitorSetMigrationParams(priv->mon, &params) < 0)
-+        goto cleanup;
- 
-     ret = 0;
- 
-diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
-index 9f4432ab3a..58a8741bb8 100644
---- a/src/qemu/qemu_monitor.c
-+++ b/src/qemu/qemu_monitor.c
-@@ -2463,22 +2463,17 @@ qemuMonitorGetMigrationParams(qemuMonitorPtr mon,
-  * @mon: Pointer to the monitor object.
-  * @params: Migration parameters.
-  *
-- * The @params object is consumed and should not be referenced by the caller
-- * after this function returns.
-+ * The @params object is consumed and cleared on success and some errors.
-  *
-  * Returns 0 on success, -1 on error.
-  */
- int
- qemuMonitorSetMigrationParams(qemuMonitorPtr mon,
--                              virJSONValuePtr params)
-+                              virJSONValuePtr *params)
- {
--    QEMU_CHECK_MONITOR_GOTO(mon, error);
-+    QEMU_CHECK_MONITOR(mon);
- 
-     return qemuMonitorJSONSetMigrationParams(mon, params);
--
-- error:
--    virJSONValueFree(params);
--    return -1;
- }
- 
- 
-diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
-index 83a33b5b0f..561417f6c1 100644
---- a/src/qemu/qemu_monitor.h
-+++ b/src/qemu/qemu_monitor.h
-@@ -754,7 +754,7 @@ int qemuMonitorSetMigrationCacheSize(qemuMonitorPtr mon,
- int qemuMonitorGetMigrationParams(qemuMonitorPtr mon,
-                                   virJSONValuePtr *params);
- int qemuMonitorSetMigrationParams(qemuMonitorPtr mon,
--                                  virJSONValuePtr params);
-+                                  virJSONValuePtr *params);
- 
- typedef enum {
-     QEMU_MONITOR_MIGRATION_STATUS_INACTIVE,
-diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
-index 199b73eafe..03af998cb0 100644
---- a/src/qemu/qemu_monitor_json.c
-+++ b/src/qemu/qemu_monitor_json.c
-@@ -3465,12 +3465,13 @@ qemuMonitorJSONGetMigrationParams(qemuMonitorPtr mon,
- 
- int
- qemuMonitorJSONSetMigrationParams(qemuMonitorPtr mon,
--                                  virJSONValuePtr params)
-+                                  virJSONValuePtr *params)
- {
-     g_autoptr(virJSONValue) cmd = NULL;
-     g_autoptr(virJSONValue) reply = NULL;
-+    virJSONValuePtr par = g_steal_pointer(params);
- 
--    if (!(cmd = qemuMonitorJSONMakeCommandInternal("migrate-set-parameters", params)))
-+    if (!(cmd = qemuMonitorJSONMakeCommandInternal("migrate-set-parameters", par)))
-         return -1;
- 
-     if (qemuMonitorJSONCommand(mon, cmd, &reply) < 0)
-diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h
-index dd25e5d6e6..af52372a93 100644
---- a/src/qemu/qemu_monitor_json.h
-+++ b/src/qemu/qemu_monitor_json.h
-@@ -142,7 +142,7 @@ int qemuMonitorJSONSetMigrationCacheSize(qemuMonitorPtr mon,
- int qemuMonitorJSONGetMigrationParams(qemuMonitorPtr mon,
-                                       virJSONValuePtr *params);
- int qemuMonitorJSONSetMigrationParams(qemuMonitorPtr mon,
--                                      virJSONValuePtr params);
-+                                      virJSONValuePtr *params);
- 
- int qemuMonitorJSONGetMigrationStats(qemuMonitorPtr mon,
-                                      qemuMonitorMigrationStatsPtr stats,
--- 
-2.27.0
-
diff --git a/qemuOpenFileAs-Move-into-util-virqemu.c.patch b/qemuOpenFileAs-Move-into-util-virqemu.c.patch
deleted file mode 100644
index dca1f1971001de903197a6407a26d38969431030..0000000000000000000000000000000000000000
--- a/qemuOpenFileAs-Move-into-util-virqemu.c.patch
+++ /dev/null
@@ -1,366 +0,0 @@
-From 0e2911af2a1d9022c3ad9eeb9df78a27bf35474e Mon Sep 17 00:00:00 2001
-From: Peter Krempa <pkrempa@redhat.com>
-Date: Thu, 16 Jul 2020 10:51:21 +0200
-Subject: [PATCH 093/108] qemuOpenFileAs: Move into util/virqemu.c
-
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-(cherry picked from commit 43620689794507308fbd3def6992a68ee2f8fa97)
----
- src/libvirt_private.syms |   1 +
- src/qemu/qemu_driver.c   | 138 ++-------------------------------------
- src/util/virqemu.c       | 130 ++++++++++++++++++++++++++++++++++++
- src/util/virqemu.h       |   7 ++
- 4 files changed, 144 insertions(+), 132 deletions(-)
-
-diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
-index 4d54c5e42f..14ad7ecde3 100644
---- a/src/libvirt_private.syms
-+++ b/src/libvirt_private.syms
-@@ -2906,6 +2906,7 @@ virQEMUBuildCommandLineJSONArrayNumbered;
- virQEMUBuildDriveCommandlineFromJSON;
- virQEMUBuildNetdevCommandlineFromJSON;
- virQEMUBuildQemuImgKeySecretOpts;
-+virQEMUFileOpenAs;
- 
- 
- # util/virrandom.h
-diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
-index 5f6543d8e8..13fc6e034d 100644
---- a/src/qemu/qemu_driver.c
-+++ b/src/qemu/qemu_driver.c
-@@ -148,11 +148,6 @@ static int qemuDomainObjStart(virConnectPtr conn,
- static int qemuDomainManagedSaveLoad(virDomainObjPtr vm,
-                                      void *opaque);
- 
--static int qemuOpenFileAs(uid_t fallback_uid, gid_t fallback_gid,
--                          bool dynamicOwnership,
--                          const char *path, int oflags,
--                          bool *needUnlink);
--
- static virQEMUDriverPtr qemu_driver;
- 
- /* Looks up the domain object from snapshot and unlocks the
-@@ -3066,129 +3061,8 @@ qemuOpenFile(virQEMUDriverPtr driver,
-         (virParseOwnershipIds(seclabel->label, &user, &group) < 0))
-         return -1;
- 
--    return qemuOpenFileAs(user, group, dynamicOwnership,
--                          path, oflags, needUnlink);
--}
--
--static int
--qemuOpenFileAs(uid_t fallback_uid, gid_t fallback_gid,
--               bool dynamicOwnership,
--               const char *path, int oflags,
--               bool *needUnlink)
--{
--    struct stat sb;
--    bool is_reg = true;
--    bool need_unlink = false;
--    unsigned int vfoflags = 0;
--    int fd = -1;
--    int path_shared = virFileIsSharedFS(path);
--    uid_t uid = geteuid();
--    gid_t gid = getegid();
--
--    /* path might be a pre-existing block dev, in which case
--     * we need to skip the create step, and also avoid unlink
--     * in the failure case */
--    if (oflags & O_CREAT) {
--        need_unlink = true;
--
--        /* Don't force chown on network-shared FS
--         * as it is likely to fail. */
--        if (path_shared <= 0 || dynamicOwnership)
--            vfoflags |= VIR_FILE_OPEN_FORCE_OWNER;
--
--        if (stat(path, &sb) == 0) {
--            /* It already exists, we don't want to delete it on error */
--            need_unlink = false;
--
--            is_reg = !!S_ISREG(sb.st_mode);
--            /* If the path is regular file which exists
--             * already and dynamic_ownership is off, we don't
--             * want to change its ownership, just open it as-is */
--            if (is_reg && !dynamicOwnership) {
--                uid = sb.st_uid;
--                gid = sb.st_gid;
--            }
--        }
--    }
--
--    /* First try creating the file as root */
--    if (!is_reg) {
--        if ((fd = open(path, oflags & ~O_CREAT)) < 0) {
--            fd = -errno;
--            goto error;
--        }
--    } else {
--        if ((fd = virFileOpenAs(path, oflags, S_IRUSR | S_IWUSR, uid, gid,
--                                vfoflags | VIR_FILE_OPEN_NOFORK)) < 0) {
--            /* If we failed as root, and the error was permission-denied
--               (EACCES or EPERM), assume it's on a network-connected share
--               where root access is restricted (eg, root-squashed NFS). If the
--               qemu user is non-root, just set a flag to
--               bypass security driver shenanigans, and retry the operation
--               after doing setuid to qemu user */
--            if ((fd != -EACCES && fd != -EPERM) || fallback_uid == geteuid())
--                goto error;
--
--            /* On Linux we can also verify the FS-type of the directory. */
--            switch (path_shared) {
--                case 1:
--                    /* it was on a network share, so we'll continue
--                     * as outlined above
--                     */
--                    break;
--
--                case -1:
--                    virReportSystemError(-fd, oflags & O_CREAT
--                                         ? _("Failed to create file "
--                                             "'%s': couldn't determine fs type")
--                                         : _("Failed to open file "
--                                             "'%s': couldn't determine fs type"),
--                                         path);
--                    goto cleanup;
--
--                case 0:
--                default:
--                    /* local file - log the error returned by virFileOpenAs */
--                    goto error;
--            }
--
--            /* If we created the file above, then we need to remove it;
--             * otherwise, the next attempt to create will fail. If the
--             * file had already existed before we got here, then we also
--             * don't want to delete it and allow the following to succeed
--             * or fail based on existing protections
--             */
--            if (need_unlink)
--                unlink(path);
--
--            /* Retry creating the file as qemu user */
--
--            /* Since we're passing different modes... */
--            vfoflags |= VIR_FILE_OPEN_FORCE_MODE;
--
--            if ((fd = virFileOpenAs(path, oflags,
--                                    S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP,
--                                    fallback_uid, fallback_gid,
--                                    vfoflags | VIR_FILE_OPEN_FORK)) < 0) {
--                virReportSystemError(-fd, oflags & O_CREAT
--                                     ? _("Error from child process creating '%s'")
--                                     : _("Error from child process opening '%s'"),
--                                     path);
--                goto cleanup;
--            }
--        }
--    }
-- cleanup:
--    if (needUnlink)
--        *needUnlink = need_unlink;
--    return fd;
--
-- error:
--    virReportSystemError(-fd, oflags & O_CREAT
--                         ? _("Failed to create file '%s'")
--                         : _("Failed to open file '%s'"),
--                         path);
--    goto cleanup;
-+    return virQEMUFileOpenAs(user, group, dynamicOwnership,
-+                             path, oflags, needUnlink);
- }
- 
- 
-@@ -3251,9 +3125,9 @@ qemuDomainSaveMemory(virQEMUDriverPtr driver,
-         }
-     }
- 
--    fd = qemuOpenFileAs(cfg->user, cfg->group, false, path,
--                        O_WRONLY | O_TRUNC | O_CREAT | directFlag,
--                        &needUnlink);
-+    fd = virQEMUFileOpenAs(cfg->user, cfg->group, false, path,
-+                           O_WRONLY | O_TRUNC | O_CREAT | directFlag,
-+                           &needUnlink);
-     if (fd < 0)
-         goto cleanup;
- 
-@@ -3829,7 +3703,7 @@ doCoreDump(virQEMUDriverPtr driver,
-     /* Core dumps usually imply last-ditch analysis efforts are
-      * desired, so we intentionally do not unlink even if a file was
-      * created.  */
--    if ((fd = qemuOpenFileAs(cfg->user, cfg->group, false, path,
-+    if ((fd = virQEMUFileOpenAs(cfg->user, cfg->group, false, path,
-                              O_CREAT | O_TRUNC | O_WRONLY | directFlag,
-                              NULL)) < 0)
-         goto cleanup;
-diff --git a/src/util/virqemu.c b/src/util/virqemu.c
-index c331443b00..6afafa9c3c 100644
---- a/src/util/virqemu.c
-+++ b/src/util/virqemu.c
-@@ -22,12 +22,18 @@
- 
- #include <config.h>
- 
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+#include <fcntl.h>
-+#include <unistd.h>
-+
- #include "virbuffer.h"
- #include "virerror.h"
- #include "virlog.h"
- #include "virqemu.h"
- #include "virstring.h"
- #include "viralloc.h"
-+#include "virfile.h"
- 
- #define VIR_FROM_THIS VIR_FROM_NONE
- 
-@@ -408,3 +414,127 @@ virQEMUBuildQemuImgKeySecretOpts(virBufferPtr buf,
-         virBufferAddLit(buf, ",");
-     }
- }
-+
-+
-+int
-+virQEMUFileOpenAs(uid_t fallback_uid,
-+                  gid_t fallback_gid,
-+                  bool dynamicOwnership,
-+                  const char *path,
-+                  int oflags,
-+                  bool *needUnlink)
-+{
-+    struct stat sb;
-+    bool is_reg = true;
-+    bool need_unlink = false;
-+    unsigned int vfoflags = 0;
-+    int fd = -1;
-+    int path_shared = virFileIsSharedFS(path);
-+    uid_t uid = geteuid();
-+    gid_t gid = getegid();
-+
-+    /* path might be a pre-existing block dev, in which case
-+     * we need to skip the create step, and also avoid unlink
-+     * in the failure case */
-+    if (oflags & O_CREAT) {
-+        need_unlink = true;
-+
-+        /* Don't force chown on network-shared FS
-+         * as it is likely to fail. */
-+        if (path_shared <= 0 || dynamicOwnership)
-+            vfoflags |= VIR_FILE_OPEN_FORCE_OWNER;
-+
-+        if (stat(path, &sb) == 0) {
-+            /* It already exists, we don't want to delete it on error */
-+            need_unlink = false;
-+
-+            is_reg = !!S_ISREG(sb.st_mode);
-+            /* If the path is regular file which exists
-+             * already and dynamic_ownership is off, we don't
-+             * want to change its ownership, just open it as-is */
-+            if (is_reg && !dynamicOwnership) {
-+                uid = sb.st_uid;
-+                gid = sb.st_gid;
-+            }
-+        }
-+    }
-+
-+    /* First try creating the file as root */
-+    if (!is_reg) {
-+        if ((fd = open(path, oflags & ~O_CREAT)) < 0) {
-+            fd = -errno;
-+            goto error;
-+        }
-+    } else {
-+        if ((fd = virFileOpenAs(path, oflags, S_IRUSR | S_IWUSR, uid, gid,
-+                                vfoflags | VIR_FILE_OPEN_NOFORK)) < 0) {
-+            /* If we failed as root, and the error was permission-denied
-+               (EACCES or EPERM), assume it's on a network-connected share
-+               where root access is restricted (eg, root-squashed NFS). If the
-+               qemu user is non-root, just set a flag to
-+               bypass security driver shenanigans, and retry the operation
-+               after doing setuid to qemu user */
-+            if ((fd != -EACCES && fd != -EPERM) || fallback_uid == geteuid())
-+                goto error;
-+
-+            /* On Linux we can also verify the FS-type of the directory. */
-+            switch (path_shared) {
-+                case 1:
-+                    /* it was on a network share, so we'll continue
-+                     * as outlined above
-+                     */
-+                    break;
-+
-+                case -1:
-+                    virReportSystemError(-fd, oflags & O_CREAT
-+                                         ? _("Failed to create file "
-+                                             "'%s': couldn't determine fs type")
-+                                         : _("Failed to open file "
-+                                             "'%s': couldn't determine fs type"),
-+                                         path);
-+                    goto cleanup;
-+
-+                case 0:
-+                default:
-+                    /* local file - log the error returned by virFileOpenAs */
-+                    goto error;
-+            }
-+
-+            /* If we created the file above, then we need to remove it;
-+             * otherwise, the next attempt to create will fail. If the
-+             * file had already existed before we got here, then we also
-+             * don't want to delete it and allow the following to succeed
-+             * or fail based on existing protections
-+             */
-+            if (need_unlink)
-+                unlink(path);
-+
-+            /* Retry creating the file as qemu user */
-+
-+            /* Since we're passing different modes... */
-+            vfoflags |= VIR_FILE_OPEN_FORCE_MODE;
-+
-+            if ((fd = virFileOpenAs(path, oflags,
-+                                    S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP,
-+                                    fallback_uid, fallback_gid,
-+                                    vfoflags | VIR_FILE_OPEN_FORK)) < 0) {
-+                virReportSystemError(-fd, oflags & O_CREAT
-+                                     ? _("Error from child process creating '%s'")
-+                                     : _("Error from child process opening '%s'"),
-+                                     path);
-+                goto cleanup;
-+            }
-+        }
-+    }
-+ cleanup:
-+    if (needUnlink)
-+        *needUnlink = need_unlink;
-+    return fd;
-+
-+ error:
-+    virReportSystemError(-fd, oflags & O_CREAT
-+                         ? _("Failed to create file '%s'")
-+                         : _("Failed to open file '%s'"),
-+                         path);
-+    goto cleanup;
-+}
-diff --git a/src/util/virqemu.h b/src/util/virqemu.h
-index 963ca03576..b545598e2c 100644
---- a/src/util/virqemu.h
-+++ b/src/util/virqemu.h
-@@ -60,3 +60,10 @@ void virQEMUBuildQemuImgKeySecretOpts(virBufferPtr buf,
-                                       virStorageEncryptionInfoDefPtr enc,
-                                       const char *alias)
-     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2) ATTRIBUTE_NONNULL(3);
-+
-+int virQEMUFileOpenAs(uid_t fallback_uid,
-+                      gid_t fallback_gid,
-+                      bool dynamicOwnership,
-+                      const char *path,
-+                      int oflags,
-+                      bool *needUnlink);
--- 
-2.33.0
-
diff --git a/qemu_agent-Rework-domain-object-locking-when-opening.patch b/qemu_agent-Rework-domain-object-locking-when-opening.patch
deleted file mode 100644
index 4de850ad281b24385ea9e71e1d89f20b952d2458..0000000000000000000000000000000000000000
--- a/qemu_agent-Rework-domain-object-locking-when-opening.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From 72585ff4f5b94de910b27ff22780aa1736d1770e Mon Sep 17 00:00:00 2001
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Wed, 27 Oct 2021 13:38:05 +0200
-Subject: [PATCH 103/108] qemu_agent: Rework domain object locking when opening
- agent
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Just like qemuMonitorOpen(), hold the domain object locked
-throughout the whole time of qemuConnectAgent() and unlock it
-only for a brief time of actual connect() (because this is the
-only part that has a potential of blocking).
-
-The reason is that qemuAgentOpen() does access domain object
-(well, its privateData) AND also at least one argument (@context)
-depends on domain object. Accessing these without the lock is
-potentially dangerous.
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1845468#c12
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 108e131a3df529ff4e0f3a33a30b37cea7a62e26)
----
- src/qemu/qemu_agent.c   | 3 +++
- src/qemu/qemu_process.c | 4 ----
- 2 files changed, 3 insertions(+), 4 deletions(-)
-
-diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c
-index 31d3268d42..1cd745c88e 100644
---- a/src/qemu/qemu_agent.c
-+++ b/src/qemu/qemu_agent.c
-@@ -709,7 +709,10 @@ qemuAgentOpen(virDomainObjPtr vm,
-         goto cleanup;
-     }
- 
-+    virObjectUnlock(vm);
-     agent->fd = qemuAgentOpenUnix(config->data.nix.path);
-+    virObjectLock(vm);
-+
-     if (agent->fd == -1)
-         goto cleanup;
- 
-diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
-index bf5375bcde..360c4fcbb1 100644
---- a/src/qemu/qemu_process.c
-+++ b/src/qemu/qemu_process.c
-@@ -234,16 +234,12 @@ qemuConnectAgent(virQEMUDriverPtr driver, virDomainObjPtr vm)
-      * deleted while the agent is active */
-     virObjectRef(vm);
- 
--    virObjectUnlock(vm);
--
-     agent = qemuAgentOpen(vm,
-                           config->source,
-                           virEventThreadGetContext(priv->eventThread),
-                           &agentCallbacks,
-                           virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_VSERPORT_CHANGE));
- 
--    virObjectLock(vm);
--
-     if (agent == NULL)
-         virObjectUnref(vm);
- 
--- 
-2.33.0
-
diff --git a/qemu_alias-introduce-qemuDomainGetVhostUserAlias-hel.patch b/qemu_alias-introduce-qemuDomainGetVhostUserAlias-hel.patch
deleted file mode 100644
index 62c789ebc64ea7d09739bbf1d0be1d8a238b1542..0000000000000000000000000000000000000000
--- a/qemu_alias-introduce-qemuDomainGetVhostUserAlias-hel.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From 3c0064480e35b794992cb66ed904d60b5d143d9a Mon Sep 17 00:00:00 2001
-From: Luo Yifan <luoyifan_yewu@cmss.chinamobile.com>
-Date: Wed, 30 Nov 2022 18:13:36 +0800
-Subject: [PATCH 13/24] qemu_alias: introduce qemuDomainGetVhostUserAlias
- helper
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Reviewed-by: Peter Krempa <pkrempa@redhat.com>
-(cherry picked from commit 6799cc3ada6830c5e4beac0cb770671466d7768a)
-Signed-off-by: Luo Yifan <luoyifan_yewu@cmss.chinamobile.com>
----
- src/qemu/qemu_alias.c   | 6 ++++++
- src/qemu/qemu_alias.h   | 2 ++
- src/qemu/qemu_command.c | 8 +++++---
- 3 files changed, 13 insertions(+), 3 deletions(-)
-
-diff --git a/src/qemu/qemu_alias.c b/src/qemu/qemu_alias.c
-index b0ea62af39..cfc6985c5a 100644
---- a/src/qemu/qemu_alias.c
-+++ b/src/qemu/qemu_alias.c
-@@ -836,3 +836,9 @@ qemuDomainGetDBusVMStateAlias(void)
- {
-     return "dbus-vmstate0";
- }
-+
-+char *
-+qemuDomainGetVhostUserChrAlias(const char *devalias)
-+{
-+    return g_strdup_printf("chr-vu-%s", devalias);
-+}
-diff --git a/src/qemu/qemu_alias.h b/src/qemu/qemu_alias.h
-index 239747beb1..fc4bdf35fa 100644
---- a/src/qemu/qemu_alias.h
-+++ b/src/qemu/qemu_alias.h
-@@ -97,3 +97,5 @@ const char *qemuDomainGetManagedPRAlias(void);
- char *qemuDomainGetUnmanagedPRAlias(const char *parentalias);
- 
- const char *qemuDomainGetDBusVMStateAlias(void);
-+
-+char *qemuDomainGetVhostUserChrAlias(const char *devalias);
-diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
-index 7bd24f042c..9157008b73 100644
---- a/src/qemu/qemu_command.c
-+++ b/src/qemu/qemu_command.c
-@@ -2633,7 +2633,7 @@ qemuBuildVHostUserFsCommandLine(virCommandPtr cmd,
-     g_autofree char *chardev_alias = NULL;
-     g_auto(virBuffer) opt = VIR_BUFFER_INITIALIZER;
- 
--    chardev_alias = g_strdup_printf("chr-vu-%s", fs->info.alias);
-+    chardev_alias = qemuDomainGetVhostUserChrAlias(fs->info.alias);
- 
-     virCommandAddArg(cmd, "-chardev");
-     virBufferAddLit(&opt, "socket");
-@@ -4603,9 +4603,10 @@ qemuBuildDeviceVideoStr(const virDomainDef *def,
-                 virBufferAsprintf(&buf, ",max_outputs=%u", video->heads);
-         }
-     } else if (video->backend == VIR_DOMAIN_VIDEO_BACKEND_TYPE_VHOSTUSER) {
-+        g_autofree char *alias = qemuDomainGetVhostUserChrAlias(video->info.alias);
-         if (video->heads)
-             virBufferAsprintf(&buf, ",max_outputs=%u", video->heads);
--        virBufferAsprintf(&buf, ",chardev=chr-vu-%s", video->info.alias);
-+        virBufferAsprintf(&buf, ",chardev=%s", alias);
-     } else if (video->type == VIR_DOMAIN_VIDEO_TYPE_VIRTIO) {
-         if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_GPU_MAX_OUTPUTS)) {
-             if (video->heads)
-@@ -4724,6 +4725,7 @@ qemuBuildVhostUserChardevStr(const char *alias,
-                              int *fd,
-                              virCommandPtr cmd)
- {
-+    g_autofree char *chardev_alias = qemuDomainGetVhostUserChrAlias(alias);
-     char *chardev = NULL;
- 
-     if (*fd == -1) {
-@@ -4732,7 +4734,7 @@ qemuBuildVhostUserChardevStr(const char *alias,
-         return NULL;
-     }
- 
--    chardev = g_strdup_printf("socket,id=chr-vu-%s,fd=%d", alias, *fd);
-+    chardev = g_strdup_printf("socket,id=%s,fd=%d", chardev_alias, *fd);
- 
-     virCommandPassFD(cmd, *fd, VIR_COMMAND_PASS_FD_CLOSE_PARENT);
-     *fd = -1;
--- 
-2.27.0
-
diff --git a/qemu_capabilities-Don-t-leak-str-in-virQEMUCapsLoadM.patch b/qemu_capabilities-Don-t-leak-str-in-virQEMUCapsLoadM.patch
deleted file mode 100644
index 01383ee73080b12a1dab1676130c545fd1b167fe..0000000000000000000000000000000000000000
--- a/qemu_capabilities-Don-t-leak-str-in-virQEMUCapsLoadM.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 0069becf07a5a9751b5ee202af928e4398c7fca9 Mon Sep 17 00:00:00 2001
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Tue, 9 Feb 2021 16:29:39 +0100
-Subject: [PATCH 088/108] qemu_capabilities: Don't leak @str in
- virQEMUCapsLoadMachines()
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-If parsing "maxCpus" attribute of <machine/> element fails an
-error is printed but the corresponding string is not freed. While
-it is very unlikely to happen (parsed XML is not user provided
-and we are the ones generating it), it is possible. Instead of
-freeing the variable in the error path explicitly, let's declare
-it as g_autofree. And while I'm at it, let's bring it into the
-loop where it's used.
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 71609477a21c100d7ce6ef00c97c11093f3405bc)
----
- src/qemu/qemu_capabilities.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
-index 2931d0c190..790b67add3 100644
---- a/src/qemu/qemu_capabilities.c
-+++ b/src/qemu/qemu_capabilities.c
-@@ -3936,7 +3936,6 @@ virQEMUCapsLoadMachines(virQEMUCapsAccelPtr caps,
- {
-     g_autofree char *xpath = g_strdup_printf("./machine[@type='%s']", typeStr);
-     g_autofree xmlNodePtr *nodes = NULL;
--    char *str = NULL;
-     size_t i;
-     int n;
- 
-@@ -3954,6 +3953,8 @@ virQEMUCapsLoadMachines(virQEMUCapsAccelPtr caps,
-         return -1;
- 
-     for (i = 0; i < n; i++) {
-+        g_autofree char *str = NULL;
-+
-         if (!(caps->machineTypes[i].name = virXMLPropString(nodes[i], "name"))) {
-             virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-                            _("missing machine name in QEMU capabilities cache"));
--- 
-2.33.0
-
diff --git a/qemu_capabilities-Fix-incorrect-alignment.patch b/qemu_capabilities-Fix-incorrect-alignment.patch
deleted file mode 100644
index ceb157d50c68e7b56afa57883828130b0c9c6278..0000000000000000000000000000000000000000
--- a/qemu_capabilities-Fix-incorrect-alignment.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From a5c093b432f5b195e2ceab61ee03e5e2f246c13f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Hyman=20Huang=28=E9=BB=84=E5=8B=87=29?=
- <huangy81@chinatelecom.cn>
-Date: Mon, 5 Dec 2022 06:23:29 -0500
-Subject: [PATCH 1/7] qemu_capabilities: Fix incorrect alignment
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Hyman Huang(黄勇) <huangy81@chinatelecom.cn>
----
- src/qemu/qemu_capabilities.c | 8 ++++----
- src/qemu/qemu_capabilities.h | 2 +-
- 2 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
-index 239c34393f..d78d8f1431 100644
---- a/src/qemu/qemu_capabilities.c
-+++ b/src/qemu/qemu_capabilities.c
-@@ -569,10 +569,10 @@ VIR_ENUM_IMPL(virQEMUCaps,
-               "blockdev-reopen",
-               "storage.werror",
- 
--	          "migration-param.bandwidth",
--	          "migration-param.downtime",
--	          "migration-param.xbzrle-cache-size",
--
-+              /* 360 */
-+              "migration-param.bandwidth",
-+              "migration-param.downtime",
-+              "migration-param.xbzrle-cache-size",
-               "object.qapified",
-               "vhost-user-blk",
-     );
-diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
-index a4e90d8dd5..165cacca3c 100644
---- a/src/qemu/qemu_capabilities.h
-+++ b/src/qemu/qemu_capabilities.h
-@@ -550,10 +550,10 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
-     QEMU_CAPS_BLOCKDEV_REOPEN, /* 'blockdev-reopen' qmp command is supported */
-     QEMU_CAPS_STORAGE_WERROR, /* virtio-blk,scsi-hd.werror */
- 
-+    /* 360 */
-     QEMU_CAPS_MIGRATION_PARAM_BANDWIDTH, /* max-bandwidth field in migrate-set-parameters */
-     QEMU_CAPS_MIGRATION_PARAM_DOWNTIME, /* downtime-limit field in migrate-set-parameters */
-     QEMU_CAPS_MIGRATION_PARAM_XBZRLE_CACHE_SIZE, /* xbzrle-cache-size field in migrate-set-parameters */
--
-     QEMU_CAPS_OBJECT_QAPIFIED, /* parameters for object-add are formally described */
-     QEMU_CAPS_DEVICE_VHOST_USER_BLK, /* -device vhost-user-blk */
- 
--- 
-2.27.0
-
diff --git a/qemu_capabilities-Introduce-QEMU_CAPS_CALC_DIRTY_RAT.patch b/qemu_capabilities-Introduce-QEMU_CAPS_CALC_DIRTY_RAT.patch
deleted file mode 100644
index ddac30395046c071e0e93fe890d5f18db2759a0f..0000000000000000000000000000000000000000
--- a/qemu_capabilities-Introduce-QEMU_CAPS_CALC_DIRTY_RAT.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From 14088d9c72f7b2d383fcc8a74f3f8ada913f5703 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Hyman=20Huang=28=E9=BB=84=E5=8B=87=29?=
- <huangy81@chinatelecom.cn>
-Date: Mon, 5 Dec 2022 06:34:56 -0500
-Subject: [PATCH 3/7] qemu_capabilities: Introduce QEMU_CAPS_CALC_DIRTY_RATE
- capability
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-calc-dirty-rate command was introduced since qemu >=5.2.0.
-Introduce QEMU_CAPS_CALC_DIRTY_RATE capability definition.
-
-Signed-off-by: Hyman Huang(黄勇) <huangy81@chinatelecom.cn>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
----
- src/qemu/qemu_capabilities.c | 4 ++++
- src/qemu/qemu_capabilities.h | 3 +++
- 2 files changed, 7 insertions(+)
-
-diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
-index d78d8f1431..c9b0a6c191 100644
---- a/src/qemu/qemu_capabilities.c
-+++ b/src/qemu/qemu_capabilities.c
-@@ -575,6 +575,9 @@ VIR_ENUM_IMPL(virQEMUCaps,
-               "migration-param.xbzrle-cache-size",
-               "object.qapified",
-               "vhost-user-blk",
-+
-+              /* 365 */
-+              "calc-dirty-rate",
-     );
- 
- 
-@@ -1144,6 +1147,7 @@ struct virQEMUCapsStringFlags virQEMUCapsCommands[] = {
-     { "block-dirty-bitmap-merge", QEMU_CAPS_BITMAP_MERGE },
-     { "query-cpu-model-baseline", QEMU_CAPS_QUERY_CPU_MODEL_BASELINE },
-     { "query-cpu-model-comparison", QEMU_CAPS_QUERY_CPU_MODEL_COMPARISON },
-+    { "calc-dirty-rate", QEMU_CAPS_CALC_DIRTY_RATE },
- };
- 
- struct virQEMUCapsStringFlags virQEMUCapsMigration[] = {
-diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
-index 165cacca3c..6245072fc3 100644
---- a/src/qemu/qemu_capabilities.h
-+++ b/src/qemu/qemu_capabilities.h
-@@ -557,6 +557,9 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
-     QEMU_CAPS_OBJECT_QAPIFIED, /* parameters for object-add are formally described */
-     QEMU_CAPS_DEVICE_VHOST_USER_BLK, /* -device vhost-user-blk */
- 
-+    /* 365 */
-+    QEMU_CAPS_CALC_DIRTY_RATE, /* accepts calc-dirty-rate */
-+
-     QEMU_CAPS_LAST /* this must always be the last item */
- } virQEMUCapsFlags;
- 
--- 
-2.27.0
-
diff --git a/qemu_capabilities-Introduce-QEMU_CAPS_DIRTYRATE_MODE.patch b/qemu_capabilities-Introduce-QEMU_CAPS_DIRTYRATE_MODE.patch
deleted file mode 100644
index fdf6a9ef6a84be327c2e0057dd8aad8d8263daca..0000000000000000000000000000000000000000
--- a/qemu_capabilities-Introduce-QEMU_CAPS_DIRTYRATE_MODE.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 5f7ef309cdd7237f945f43a29dab50fc61a4d1d0 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Hyman=20Huang=28=E9=BB=84=E5=8B=87=29?=
- <huangy81@chinatelecom.cn>
-Date: Mon, 5 Dec 2022 06:54:11 -0500
-Subject: [PATCH 5/7] qemu_capabilities: Introduce QEMU_CAPS_DIRTYRATE_MODE
- capability
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-mode option of calc-dirty-rate command since qemu >=6.2.0.
-Introduce QEMU_CAPS_DIRTYRATE_MODE capability definition.
-
-Signed-off-by: Hyman Huang(黄勇) <huangy81@chinatelecom.cn>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
----
- src/qemu/qemu_capabilities.c | 2 ++
- src/qemu/qemu_capabilities.h | 1 +
- 2 files changed, 3 insertions(+)
-
-diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
-index c9b0a6c191..2e9f2025ba 100644
---- a/src/qemu/qemu_capabilities.c
-+++ b/src/qemu/qemu_capabilities.c
-@@ -578,6 +578,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
- 
-               /* 365 */
-               "calc-dirty-rate",
-+              "dirtyrate-param.mode",
-     );
- 
- 
-@@ -1160,6 +1161,7 @@ struct virQEMUCapsStringFlags virQEMUCapsEvents[] = {
-     { "VSERPORT_CHANGE", QEMU_CAPS_VSERPORT_CHANGE },
-     { "BLOCK_WRITE_THRESHOLD", QEMU_CAPS_BLOCK_WRITE_THRESHOLD },
-     { "DUMP_COMPLETED", QEMU_CAPS_DUMP_COMPLETED },
-+    { "calc-dirty-rate/arg-type/mode", QEMU_CAPS_DIRTYRATE_MODE },
- };
- 
- struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = {
-diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
-index 6245072fc3..00682eb52c 100644
---- a/src/qemu/qemu_capabilities.h
-+++ b/src/qemu/qemu_capabilities.h
-@@ -559,6 +559,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
- 
-     /* 365 */
-     QEMU_CAPS_CALC_DIRTY_RATE, /* accepts calc-dirty-rate */
-+    QEMU_CAPS_DIRTYRATE_MODE , /* calc-dirty-rate accepts mode parameter */
- 
-     QEMU_CAPS_LAST /* this must always be the last item */
- } virQEMUCapsFlags;
--- 
-2.27.0
-
diff --git a/qemu_capabilities-introduce-vhost-user-blk-capabilit.patch b/qemu_capabilities-introduce-vhost-user-blk-capabilit.patch
deleted file mode 100644
index 8bb632f0988a61bfbc1e990de900aa28b6e0c380..0000000000000000000000000000000000000000
--- a/qemu_capabilities-introduce-vhost-user-blk-capabilit.patch
+++ /dev/null
@@ -1,378 +0,0 @@
-From 8814b1949fd108c82e800abd40e48f4fe331908d Mon Sep 17 00:00:00 2001
-From: Luo Yifan <luoyifan_yewu@cmss.chinamobile.com>
-Date: Wed, 30 Nov 2022 18:13:36 +0800
-Subject: [PATCH 16/24] qemu_capabilities: introduce vhost-user-blk capability
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Reviewed-by: Peter Krempa <pkrempa@redhat.com>
-(cherry picked from commit c8b0d5b0ad21925729ba88fa297d3b74a57ffa04)
-Signed-off-by: Luo Yifan <luoyifan_yewu@cmss.chinamobile.com>
----
- src/qemu/qemu_capabilities.c                       | 2 ++
- src/qemu/qemu_capabilities.h                       | 1 +
- tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 1 +
- tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml   | 1 +
- tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml   | 1 +
- tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml  | 1 +
- tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml    | 1 +
- tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml  | 1 +
- tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml  | 1 +
- tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml    | 1 +
- tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml   | 1 +
- tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml    | 1 +
- tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml   | 1 +
- tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml  | 1 +
- tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml    | 1 +
- tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml  | 1 +
- tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml  | 1 +
- tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml    | 1 +
- tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml   | 1 +
- tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml   | 1 +
- tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml  | 1 +
- tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml    | 1 +
- tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml    | 1 +
- tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml   | 1 +
- tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml  | 1 +
- tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml    | 1 +
- tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml   | 1 +
- 27 files changed, 28 insertions(+)
-
-diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
-index 790b67add3..239c34393f 100644
---- a/src/qemu/qemu_capabilities.c
-+++ b/src/qemu/qemu_capabilities.c
-@@ -574,6 +574,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
- 	          "migration-param.xbzrle-cache-size",
- 
-               "object.qapified",
-+              "vhost-user-blk",
-     );
- 
- 
-@@ -1296,6 +1297,7 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = {
-     { "rng-builtin", QEMU_CAPS_OBJECT_RNG_BUILTIN },
-     { "tpm-spapr", QEMU_CAPS_DEVICE_TPM_SPAPR },
-     { "vhost-user-fs-device", QEMU_CAPS_DEVICE_VHOST_USER_FS },
-+    { "vhost-user-blk", QEMU_CAPS_DEVICE_VHOST_USER_BLK },
- };
- 
- static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsVirtioBalloon[] = {
-diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
-index ffb366f84a..a4e90d8dd5 100644
---- a/src/qemu/qemu_capabilities.h
-+++ b/src/qemu/qemu_capabilities.h
-@@ -555,6 +555,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
-     QEMU_CAPS_MIGRATION_PARAM_XBZRLE_CACHE_SIZE, /* xbzrle-cache-size field in migrate-set-parameters */
- 
-     QEMU_CAPS_OBJECT_QAPIFIED, /* parameters for object-add are formally described */
-+    QEMU_CAPS_DEVICE_VHOST_USER_BLK, /* -device vhost-user-blk */
- 
-     QEMU_CAPS_LAST /* this must always be the last item */
- } virQEMUCapsFlags;
-diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
-index fddbfebddd..17efe68fca 100644
---- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
-+++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
-@@ -159,6 +159,7 @@
-   <flag name='migration-param.bandwidth'/>
-   <flag name='migration-param.downtime'/>
-   <flag name='migration-param.xbzrle-cache-size'/>
-+  <flag name='vhost-user-blk'/>
-   <version>2012000</version>
-   <kvmVersion>0</kvmVersion>
-   <microcodeVersion>61700289</microcodeVersion>
-diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
-index 148b928520..8de40ac2f3 100644
---- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
-+++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
-@@ -157,6 +157,7 @@
-   <flag name='migration-param.bandwidth'/>
-   <flag name='migration-param.downtime'/>
-   <flag name='migration-param.xbzrle-cache-size'/>
-+  <flag name='vhost-user-blk'/>
-   <version>2011090</version>
-   <kvmVersion>0</kvmVersion>
-   <microcodeVersion>42900289</microcodeVersion>
-diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
-index 2b1301d234..047e40e8f5 100644
---- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
-+++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
-@@ -129,6 +129,7 @@
-   <flag name='migration-param.bandwidth'/>
-   <flag name='migration-param.downtime'/>
-   <flag name='migration-param.xbzrle-cache-size'/>
-+  <flag name='vhost-user-blk'/>
-   <version>2012000</version>
-   <kvmVersion>0</kvmVersion>
-   <microcodeVersion>39100289</microcodeVersion>
-diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
-index 125346ffd7..8e85160640 100644
---- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
-+++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
-@@ -201,6 +201,7 @@
-   <flag name='migration-param.bandwidth'/>
-   <flag name='migration-param.downtime'/>
-   <flag name='migration-param.xbzrle-cache-size'/>
-+  <flag name='vhost-user-blk'/>
-   <version>2011090</version>
-   <kvmVersion>0</kvmVersion>
-   <microcodeVersion>43100289</microcodeVersion>
-diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
-index b4b9d7ee01..13d8630fdb 100644
---- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
-+++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
-@@ -159,6 +159,7 @@
-   <flag name='migration-param.bandwidth'/>
-   <flag name='migration-param.downtime'/>
-   <flag name='migration-param.xbzrle-cache-size'/>
-+  <flag name='vhost-user-blk'/>
-   <version>2012050</version>
-   <kvmVersion>0</kvmVersion>
-   <microcodeVersion>42900239</microcodeVersion>
-diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
-index 14550b8c7f..8428d86d81 100644
---- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
-+++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
-@@ -99,6 +99,7 @@
-   <flag name='migration-param.bandwidth'/>
-   <flag name='migration-param.downtime'/>
-   <flag name='migration-param.xbzrle-cache-size'/>
-+  <flag name='vhost-user-blk'/>
-   <version>3000000</version>
-   <kvmVersion>0</kvmVersion>
-   <microcodeVersion>0</microcodeVersion>
-diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
-index 1479b2bb2d..90b95a6ac7 100644
---- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
-+++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
-@@ -99,6 +99,7 @@
-   <flag name='migration-param.bandwidth'/>
-   <flag name='migration-param.downtime'/>
-   <flag name='migration-param.xbzrle-cache-size'/>
-+  <flag name='vhost-user-blk'/>
-   <version>3000000</version>
-   <kvmVersion>0</kvmVersion>
-   <microcodeVersion>0</microcodeVersion>
-diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
-index 96984d2bc3..a34621af95 100644
---- a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
-+++ b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
-@@ -132,6 +132,7 @@
-   <flag name='migration-param.bandwidth'/>
-   <flag name='migration-param.downtime'/>
-   <flag name='migration-param.xbzrle-cache-size'/>
-+  <flag name='vhost-user-blk'/>
-   <version>3000000</version>
-   <kvmVersion>0</kvmVersion>
-   <microcodeVersion>39100239</microcodeVersion>
-diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
-index f936f502c3..d1fe99c084 100644
---- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
-+++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
-@@ -207,6 +207,7 @@
-   <flag name='migration-param.bandwidth'/>
-   <flag name='migration-param.downtime'/>
-   <flag name='migration-param.xbzrle-cache-size'/>
-+  <flag name='vhost-user-blk'/>
-   <version>3000000</version>
-   <kvmVersion>0</kvmVersion>
-   <microcodeVersion>43100239</microcodeVersion>
-diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
-index e1bc4beddb..b1cabb4b25 100644
---- a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
-+++ b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
-@@ -164,6 +164,7 @@
-   <flag name='migration-param.bandwidth'/>
-   <flag name='migration-param.downtime'/>
-   <flag name='migration-param.xbzrle-cache-size'/>
-+  <flag name='vhost-user-blk'/>
-   <version>3000091</version>
-   <kvmVersion>0</kvmVersion>
-   <microcodeVersion>42900240</microcodeVersion>
-diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
-index f462022fb5..189ff2eccc 100644
---- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
-+++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
-@@ -210,6 +210,7 @@
-   <flag name='migration-param.bandwidth'/>
-   <flag name='migration-param.downtime'/>
-   <flag name='migration-param.xbzrle-cache-size'/>
-+  <flag name='vhost-user-blk'/>
-   <version>3000092</version>
-   <kvmVersion>0</kvmVersion>
-   <microcodeVersion>43100240</microcodeVersion>
-diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
-index 963c991d5e..51dadfb6b5 100644
---- a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
-+++ b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
-@@ -173,6 +173,7 @@
-   <flag name='migration-param.bandwidth'/>
-   <flag name='migration-param.downtime'/>
-   <flag name='migration-param.xbzrle-cache-size'/>
-+  <flag name='vhost-user-blk'/>
-   <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 2062fd0a90..6110f43f72 100644
---- a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
-+++ b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
-@@ -178,6 +178,7 @@
-   <flag name='migration-param.bandwidth'/>
-   <flag name='migration-param.downtime'/>
-   <flag name='migration-param.xbzrle-cache-size'/>
-+  <flag name='vhost-user-blk'/>
-   <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 3bd809f824..7dce580f7a 100644
---- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
-+++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
-@@ -174,6 +174,7 @@
-   <flag name='migration-param.bandwidth'/>
-   <flag name='migration-param.downtime'/>
-   <flag name='migration-param.xbzrle-cache-size'/>
-+  <flag name='vhost-user-blk'/>
-   <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 b0ad30460b..8e19ca0d2b 100644
---- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
-+++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
-@@ -174,6 +174,7 @@
-   <flag name='migration-param.bandwidth'/>
-   <flag name='migration-param.downtime'/>
-   <flag name='migration-param.xbzrle-cache-size'/>
-+  <flag name='vhost-user-blk'/>
-   <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 44e527f570..4bb9269619 100644
---- a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
-+++ b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
-@@ -140,6 +140,7 @@
-   <flag name='migration-param.bandwidth'/>
-   <flag name='migration-param.downtime'/>
-   <flag name='migration-param.xbzrle-cache-size'/>
-+  <flag name='vhost-user-blk'/>
-   <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 ab43924eaa..c5e5ad831d 100644
---- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
-+++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
-@@ -215,6 +215,7 @@
-   <flag name='migration-param.bandwidth'/>
-   <flag name='migration-param.downtime'/>
-   <flag name='migration-param.xbzrle-cache-size'/>
-+  <flag name='vhost-user-blk'/>
-   <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 aff2c6fcad..2088a7ad87 100644
---- a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
-+++ b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
-@@ -221,6 +221,7 @@
-   <flag name='migration-param.bandwidth'/>
-   <flag name='migration-param.downtime'/>
-   <flag name='migration-param.xbzrle-cache-size'/>
-+  <flag name='vhost-user-blk'/>
-   <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 6aa36bac54..90b538c0d2 100644
---- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
-+++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
-@@ -183,6 +183,7 @@
-   <flag name='migration-param.bandwidth'/>
-   <flag name='migration-param.downtime'/>
-   <flag name='migration-param.xbzrle-cache-size'/>
-+  <flag name='vhost-user-blk'/>
-   <version>4001050</version>
-   <kvmVersion>0</kvmVersion>
-   <microcodeVersion>61700242</microcodeVersion>
-diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
-index 871dc41579..a78fe3b8cd 100644
---- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
-+++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
-@@ -183,6 +183,7 @@
-   <flag name='migration-param.bandwidth'/>
-   <flag name='migration-param.downtime'/>
-   <flag name='migration-param.xbzrle-cache-size'/>
-+  <flag name='vhost-user-blk'/>
-   <version>4001050</version>
-   <kvmVersion>0</kvmVersion>
-   <microcodeVersion>42900242</microcodeVersion>
-diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
-index d007ae65d6..2a2b52e081 100644
---- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
-+++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
-@@ -142,6 +142,7 @@
-   <flag name='migration-param.bandwidth'/>
-   <flag name='migration-param.downtime'/>
-   <flag name='migration-param.xbzrle-cache-size'/>
-+  <flag name='vhost-user-blk'/>
-   <version>4001050</version>
-   <kvmVersion>0</kvmVersion>
-   <microcodeVersion>39100242</microcodeVersion>
-diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
-index 383aa10f49..2efef26fdf 100644
---- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
-+++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
-@@ -227,6 +227,7 @@
-   <flag name='migration-param.bandwidth'/>
-   <flag name='migration-param.downtime'/>
-   <flag name='migration-param.xbzrle-cache-size'/>
-+  <flag name='vhost-user-blk'/>
-   <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 af282f33c1..e4b06b850b 100644
---- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
-+++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
-@@ -188,6 +188,7 @@
-   <flag name='migration-param.bandwidth'/>
-   <flag name='migration-param.downtime'/>
-   <flag name='migration-param.xbzrle-cache-size'/>
-+  <flag name='vhost-user-blk'/>
-   <version>4002050</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 6842b3c28a..236107fec8 100644
---- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
-+++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
-@@ -193,6 +193,7 @@
-   <flag name='migration-param.bandwidth'/>
-   <flag name='migration-param.downtime'/>
-   <flag name='migration-param.xbzrle-cache-size'/>
-+  <flag name='vhost-user-blk'/>
-   <version>4002050</version>
-   <kvmVersion>0</kvmVersion>
-   <microcodeVersion>42900241</microcodeVersion>
-diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
-index 577b96e6fa..9f7c960556 100644
---- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
-+++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
-@@ -230,6 +230,7 @@
-   <flag name='migration-param.bandwidth'/>
-   <flag name='migration-param.downtime'/>
-   <flag name='migration-param.xbzrle-cache-size'/>
-+  <flag name='vhost-user-blk'/>
-   <version>4002050</version>
-   <kvmVersion>0</kvmVersion>
-   <microcodeVersion>43100241</microcodeVersion>
--- 
-2.27.0
-
diff --git a/qemu_cgroup-Drop-ENOENT-special-case-for-RNG-devices.patch b/qemu_cgroup-Drop-ENOENT-special-case-for-RNG-devices.patch
deleted file mode 100644
index 7901bc107c70603068a1429a062fe9e8d900f45d..0000000000000000000000000000000000000000
--- a/qemu_cgroup-Drop-ENOENT-special-case-for-RNG-devices.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From fccb7c2ccec7fe9a831be04e589b5fb56a048828 Mon Sep 17 00:00:00 2001
-From: xuyinghao <xuyinghao2@huawei.com>
-Date: Tue, 9 Aug 2022 18:58:05 +0800
-Subject: [PATCH 13/22] qemu_cgroup: Drop ENOENT special case for RNG devices
-
-Description: When allowing or denying RNG device in CGroups there's a special check if the backend device exists (errno == ENOENT) in which case success is returned to caller. This is in contrast with the rest of the functions and in fact wrong too - if the backend device doesn't exist then QEMU will fail opening it. Might as well signal error here.
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
----
- src/qemu/qemu_cgroup.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c
-index aa721df100..c30ede7394 100644
---- a/src/qemu/qemu_cgroup.c
-+++ b/src/qemu/qemu_cgroup.c
-@@ -667,9 +667,9 @@ qemuSetupRNGCgroup(virDomainObjPtr vm,
-         virDomainAuditCgroupPath(vm, priv->cgroup, "allow",
-                                  rng->source.file,
-                                  "rw", rv);
--        if (rv < 0 &&
--            !virLastErrorIsSystemErrno(ENOENT))
-+        if (rv < 0) {
-             return -1;
-+        }
-     }
- 
-     return 0;
-@@ -694,9 +694,9 @@ qemuTeardownRNGCgroup(virDomainObjPtr vm,
-         virDomainAuditCgroupPath(vm, priv->cgroup, "deny",
-                                  rng->source.file,
-                                  "rw", rv);
--        if (rv < 0 &&
--            !virLastErrorIsSystemErrno(ENOENT))
-+        if (rv < 0) {
-             return -1;
-+        }
-     }
- 
-     return 0;
--- 
-2.33.0
-
diff --git a/qemu_command-Don-t-validate-accelerator-when-buildin.patch b/qemu_command-Don-t-validate-accelerator-when-buildin.patch
deleted file mode 100644
index 6a940237373353f55f6e76dacae49ed33bd4c8e5..0000000000000000000000000000000000000000
--- a/qemu_command-Don-t-validate-accelerator-when-buildin.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From d048a83b990b08cc3709d6c4a505877533a4d189 Mon Sep 17 00:00:00 2001
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Fri, 5 Nov 2021 09:33:45 +0100
-Subject: [PATCH 1/2] qemu_command: Don't validate accelerator when building
- cmd line
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The domain accelerator was validated in qemuValidateDomainDef()
-which calls virQEMUCapsIsVirtTypeSupported() which reports proper
-error if QEMU is not capable of KVM/TCG. There is no point in
-doing the validation again when building command line.
-
-cherry-pick from 69f2f632994c8f8b51f0d0e4be0f674054619654
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Signed-off-by: Hyman Huang(黄勇) <huangy81@chinatelecom.cn>
-Tested-by: Kashyap Chamarthy <kchamart@redhat.com>
-Reviewed-by: Peter Krempa <pkrempa@redhat.com>
----
- src/qemu/qemu_command.c | 9 +--------
- 1 file changed, 1 insertion(+), 8 deletions(-)
-
-diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
-index 42f6e10b33..b009890e35 100644
---- a/src/qemu/qemu_command.c
-+++ b/src/qemu/qemu_command.c
-@@ -7084,15 +7084,8 @@ qemuBuildMachineCommandLine(virCommandPtr cmd,
-     case VIR_DOMAIN_VIRT_BHYVE:
-     case VIR_DOMAIN_VIRT_VZ:
-     case VIR_DOMAIN_VIRT_NONE:
--        virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
--                       _("the QEMU binary does not support %s"),
--                       virDomainVirtTypeToString(def->virtType));
--        return -1;
--
-     case VIR_DOMAIN_VIRT_LAST:
--    default:
--        virReportEnumRangeError(virDomainVirtType, def->virtType);
--        return -1;
-+        break;
-     }
- 
-     /* To avoid the collision of creating USB controllers when calling
--- 
-2.27.0
-
diff --git a/qemu_command-remove-redundant-scsi-option-in-vhost-u.patch b/qemu_command-remove-redundant-scsi-option-in-vhost-u.patch
deleted file mode 100644
index 89c71de994ca99f22a0839f4aae0b67bb8d6de88..0000000000000000000000000000000000000000
--- a/qemu_command-remove-redundant-scsi-option-in-vhost-u.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From e9bfac2ed7631cca625d18f0a4a4a2644e2f14c6 Mon Sep 17 00:00:00 2001
-From: Luo Yifan <luoyifan_yewu@cmss.chinamobile.com>
-Date: Wed, 30 Nov 2022 18:13:37 +0800
-Subject: [PATCH 18/24] qemu_command: remove redundant scsi option in
- vhost-user-blk
-
-There is no scsi property for qemu vhost-user-blk device, so we disable
-formatting scsi property for vhost-user-blk device, and leave the property for
-vhost-blk device as is.
-
-Signed-off-by: Luo Yifan <luoyifan_yewu@cmss.chinamobile.com>
----
- src/qemu/qemu_command.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
-index 4b12be6ede..1e44291a8a 100644
---- a/src/qemu/qemu_command.c
-+++ b/src/qemu/qemu_command.c
-@@ -2173,7 +2173,8 @@ qemuBuildDiskDeviceStr(const virDomainDef *def,
-             virBufferAsprintf(&opt, ",event_idx=%s",
-                               virTristateSwitchTypeToString(disk->event_idx));
-         }
--        if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_BLK_SCSI)) {
-+        if (virStorageSourceGetActualType(disk->src) != VIR_STORAGE_TYPE_VHOST_USER &&
-+            virQEMUCapsGet(qemuCaps, QEMU_CAPS_VIRTIO_BLK_SCSI)) {
-             /* if sg_io is true but the scsi option isn't supported,
-              * that means it's just always on in this version of qemu.
-              */
--- 
-2.27.0
-
diff --git a/qemu_conf-Fix-double-free-problem-for-cfg-firmwares.patch b/qemu_conf-Fix-double-free-problem-for-cfg-firmwares.patch
deleted file mode 100644
index 981acc4e6af64b2d67d035b9d62974b8941cc61a..0000000000000000000000000000000000000000
--- a/qemu_conf-Fix-double-free-problem-for-cfg-firmwares.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From e3a594f1a3914d545d51413801516e9d75450fa6 Mon Sep 17 00:00:00 2001
-From: Tuguoyi <tu.guoyi@h3c.com>
-Date: Tue, 24 Nov 2020 03:12:00 +0000
-Subject: [PATCH 022/108] qemu_conf: Fix double free problem for cfg->firmwares
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-cfg->firmwares still points to the original memory address after being
-freed by virFirmwareFreeList(). As cfg get freed, it will be freed again
-even if cfg->nfirmwares=0 which eventually lead to crash.
-
-The patch fix it by setting cfg->firmwares to NULL explicitly after
-virFirmwareFreeList() returns
-
-Signed-off-by: Guoyi Tu<tu.guoyi@h3c.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit c4f4e195a14c86b7daff2c45f1cbfd23ac16aaa8)
----
- src/qemu/qemu_conf.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/qemu/qemu_conf.c b/src/qemu/qemu_conf.c
-index bd96ccb78e..da2a1bdfe4 100644
---- a/src/qemu/qemu_conf.c
-+++ b/src/qemu/qemu_conf.c
-@@ -811,6 +811,7 @@ virQEMUDriverConfigLoadNVRAMEntry(virQEMUDriverConfigPtr cfg,
-         VIR_AUTOSTRINGLIST fwList = NULL;
- 
-         virFirmwareFreeList(cfg->firmwares, cfg->nfirmwares);
-+        cfg->firmwares = NULL;
- 
-         if (qemuFirmwareFetchConfigs(&fwList, privileged) < 0)
-             return -1;
--- 
-2.33.0
-
diff --git a/qemu_driver-Acquire-MODIFY-job-in-qemuDomainStartDir.patch b/qemu_driver-Acquire-MODIFY-job-in-qemuDomainStartDir.patch
deleted file mode 100644
index 7cdc5d48b4c885a77c17dd64059e90cb5c6fd46a..0000000000000000000000000000000000000000
--- a/qemu_driver-Acquire-MODIFY-job-in-qemuDomainStartDir.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 3030fc4e45964c3f7dec3dfe1646be703a4a398e Mon Sep 17 00:00:00 2001
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Mon, 29 Mar 2021 13:53:50 +0200
-Subject: [PATCH 2/7] qemu_driver: Acquire MODIFY job in
- qemuDomainStartDirtyRateCalc()
-
-This API talks to QEMU and changes its internal state. Therefore,
-it should acquire QEMU_JOB_MODIFY instead of QEMU_JOB_QUERY.
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
----
- src/qemu/qemu_driver.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
-index 1791e3c902..62806da86a 100644
---- a/src/qemu/qemu_driver.c
-+++ b/src/qemu/qemu_driver.c
-@@ -23332,7 +23332,7 @@ qemuDomainStartDirtyRateCalc(virDomainPtr dom,
-     if (virDomainStartDirtyRateCalcEnsureACL(dom->conn, vm->def) < 0)
-         goto cleanup;
- 
--    if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_QUERY) < 0)
-+    if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0)
-         goto cleanup;
- 
-     if (!virDomainObjIsActive(vm)) {
--- 
-2.27.0
-
diff --git a/qemu_driver-Add-mode-parameter-to-qemuDomainStartDir.patch b/qemu_driver-Add-mode-parameter-to-qemuDomainStartDir.patch
deleted file mode 100644
index 69a395fdb88772bb25c76669756293b1104b2473..0000000000000000000000000000000000000000
--- a/qemu_driver-Add-mode-parameter-to-qemuDomainStartDir.patch
+++ /dev/null
@@ -1,146 +0,0 @@
-From 56e4777e883bb3c11f4951848080104a2098277f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Hyman=20Huang=28=E9=BB=84=E5=8B=87=29?=
- <huangy81@chinatelecom.cn>
-Date: Mon, 5 Dec 2022 07:05:23 -0500
-Subject: [PATCH 7/7] qemu_driver: Add mode parameter to
- qemuDomainStartDirtyRateCalc
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Add mode parameter to qemuDomainStartDirtyRateCalc API, 'mode'
-option of 'calc-dirty-rate' command was introduced since
-qemu >= 6.2.
-
-Signed-off-by: Hyman Huang(黄勇) <huangy81@chinatelecom.cn>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
----
- src/qemu/qemu_driver.c       |  3 ++-
- src/qemu/qemu_monitor.c      |  5 +++--
- src/qemu/qemu_monitor.h      | 17 ++++++++++++++++-
- src/qemu/qemu_monitor_json.c | 14 +++++++++++++-
- src/qemu/qemu_monitor_json.h |  3 ++-
- 5 files changed, 36 insertions(+), 6 deletions(-)
-
-diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
-index 19d32b5fa3..8b19be46f1 100644
---- a/src/qemu/qemu_driver.c
-+++ b/src/qemu/qemu_driver.c
-@@ -23312,6 +23312,7 @@ qemuDomainStartDirtyRateCalc(virDomainPtr dom,
-     virQEMUDriverPtr driver = dom->conn->privateData;
-     virDomainObjPtr vm;
-     qemuDomainObjPrivatePtr priv;
-+    qemuMonitorDirtyRateCalcMode mode = QEMU_MONITOR_DIRTYRATE_CALC_MODE_PAGE_SAMPLING;
-     int ret = -1;
- 
-     virCheckFlags(0, -1);
-@@ -23354,7 +23355,7 @@ qemuDomainStartDirtyRateCalc(virDomainPtr dom,
-     VIR_DEBUG("Calculate dirty rate in next %d seconds", seconds);
- 
-     qemuDomainObjEnterMonitor(driver, vm);
--    ret = qemuMonitorStartDirtyRateCalc(priv->mon, seconds);
-+    ret = qemuMonitorStartDirtyRateCalc(priv->mon, seconds, mode);
- 
-     if (qemuDomainObjExitMonitor(driver, vm) < 0)
-         ret = -1;
-diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
-index 05855c0ae9..04592fdcd5 100644
---- a/src/qemu/qemu_monitor.c
-+++ b/src/qemu/qemu_monitor.c
-@@ -4646,13 +4646,14 @@ qemuMonitorTransactionBackup(virJSONValuePtr actions,
- 
- int
- qemuMonitorStartDirtyRateCalc(qemuMonitorPtr mon,
--                              int seconds)
-+                              int seconds,
-+                              qemuMonitorDirtyRateCalcMode mode)
- {
-     VIR_DEBUG("seconds=%d", seconds);
- 
-     QEMU_CHECK_MONITOR(mon);
- 
--    return qemuMonitorJSONStartDirtyRateCalc(mon, seconds);
-+    return qemuMonitorJSONStartDirtyRateCalc(mon, seconds, mode);
- }
- 
- 
-diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
-index 9c797d5ff5..4f9b70d820 100644
---- a/src/qemu/qemu_monitor.h
-+++ b/src/qemu/qemu_monitor.h
-@@ -1426,9 +1426,24 @@ qemuMonitorTransactionBackup(virJSONValuePtr actions,
-                              const char *bitmap,
-                              qemuMonitorTransactionBackupSyncMode syncmode);
- 
-+/**
-+ * qemuMonitorDirtyRateCalcMode:
-+ *
-+ * Dirty page rate calculation mode used during measurement.
-+ */
-+typedef enum {
-+    QEMU_MONITOR_DIRTYRATE_CALC_MODE_PAGE_SAMPLING = 0,
-+    QEMU_MONITOR_DIRTYRATE_CALC_MODE_DIRTY_BITMAP,
-+    QEMU_MONITOR_DIRTYRATE_CALC_MODE_DIRTY_RING,
-+    QEMU_MONITOR_DIRTYRATE_CALC_MODE_LAST,
-+} qemuMonitorDirtyRateCalcMode;
-+
-+VIR_ENUM_DECL(qemuMonitorDirtyRateCalcMode);
-+
- int
- qemuMonitorStartDirtyRateCalc(qemuMonitorPtr mon,
--                              int seconds);
-+                              int seconds,
-+                              qemuMonitorDirtyRateCalcMode mode);
- 
- typedef struct _qemuMonitorDirtyRateInfo qemuMonitorDirtyRateInfo;
- typedef qemuMonitorDirtyRateInfo *qemuMonitorDirtyRateInfoPtr;
-diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
-index 3ec7fc84f5..a1617cdfed 100644
---- a/src/qemu/qemu_monitor_json.c
-+++ b/src/qemu/qemu_monitor_json.c
-@@ -9375,15 +9375,27 @@ qemuMonitorJSONGetJobInfo(qemuMonitorPtr mon,
-     return 0;
- }
- 
-+VIR_ENUM_IMPL(qemuMonitorDirtyRateCalcMode,
-+              QEMU_MONITOR_DIRTYRATE_CALC_MODE_LAST,
-+              "page-sampling",
-+              "dirty-bitmap",
-+              "dirty-ring");
-+
- int
- qemuMonitorJSONStartDirtyRateCalc(qemuMonitorPtr mon,
--                                  int seconds)
-+                                  int seconds,
-+                                  qemuMonitorDirtyRateCalcMode mode)
- {
-     g_autoptr(virJSONValue) cmd = NULL;
-     g_autoptr(virJSONValue) reply = NULL;
-+    const char *modestr = NULL;
-+
-+    if (mode != QEMU_MONITOR_DIRTYRATE_CALC_MODE_PAGE_SAMPLING)
-+       modestr = qemuMonitorDirtyRateCalcModeTypeToString(mode);
- 
-     if (!(cmd = qemuMonitorJSONMakeCommand("calc-dirty-rate",
-                                            "i:calc-time", seconds,
-+                                           "S:mode", modestr,
-                                            NULL)))
-         return -1;
- 
-diff --git a/src/qemu/qemu_monitor_json.h b/src/qemu/qemu_monitor_json.h
-index 531ff59a00..3fc67c4668 100644
---- a/src/qemu/qemu_monitor_json.h
-+++ b/src/qemu/qemu_monitor_json.h
-@@ -694,7 +694,8 @@ int qemuMonitorJSONSetDBusVMStateIdList(qemuMonitorPtr mon,
- 
- int
- qemuMonitorJSONStartDirtyRateCalc(qemuMonitorPtr mon,
--                                  int seconds);
-+                                  int seconds,
-+                                  qemuMonitorDirtyRateCalcMode mode);
- 
- int
- qemuMonitorJSONQueryDirtyRate(qemuMonitorPtr mon,
--- 
-2.27.0
-
diff --git a/qemu_driver-Fix-indentation-in-qemuDomainGetStatsVcp.patch b/qemu_driver-Fix-indentation-in-qemuDomainGetStatsVcp.patch
deleted file mode 100644
index ca9cd38905924959ee1e0a70ffe3cdcf8442249e..0000000000000000000000000000000000000000
--- a/qemu_driver-Fix-indentation-in-qemuDomainGetStatsVcp.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 97fce13e1086431f9f16c976706ee30daf297d51 Mon Sep 17 00:00:00 2001
-From: Xu Zheng <xuzheng_yewu@cmss.chinamobile.com>
-Date: Thu, 24 Nov 2022 17:22:37 +0800
-Subject: [PATCH 17/23] qemu_driver: Fix indentation in qemuDomainGetStatsVcpu
-
-cherry-pick from d057b0bfc48e31f5c4d27830d2f91ed4f1d7180c
-Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
-Signed-off-by: Xu Zheng <xuzheng_yewu@cmss.chinamobile.com>
----
- src/qemu/qemu_driver.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
-index 1f70178c88..854b56a563 100644
---- a/src/qemu/qemu_driver.c
-+++ b/src/qemu/qemu_driver.c
-@@ -21043,9 +21043,9 @@ qemuDomainGetStatsVcpu(virQEMUDriverPtr driver,
- 
-     if (HAVE_JOB(privflags) && virDomainObjIsActive(dom) &&
-         qemuDomainRefreshVcpuHalted(driver, dom, QEMU_ASYNC_JOB_NONE) < 0) {
--            /* it's ok to be silent and go ahead, because halted vcpu info
--             * wasn't here from the beginning */
--            virResetLastError();
-+        /* it's ok to be silent and go ahead, because halted vcpu info
-+         * wasn't here from the beginning */
-+        virResetLastError();
-     }
- 
-     if (qemuDomainHelperGetVcpus(dom, cpuinfo, cpuwait,
--- 
-2.27.0
-
diff --git a/qemu_driver-Probe-capability-before-calculating-dirt.patch b/qemu_driver-Probe-capability-before-calculating-dirt.patch
deleted file mode 100644
index 29157b53e0cd1656245b192d9b9ef1d84eeffd65..0000000000000000000000000000000000000000
--- a/qemu_driver-Probe-capability-before-calculating-dirt.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 7889fb1123cbe6aca437797005b8b18b3d5ae93a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Hyman=20Huang=28=E9=BB=84=E5=8B=87=29?=
- <huangy81@chinatelecom.cn>
-Date: Sun, 20 Feb 2022 21:28:09 +0800
-Subject: [PATCH 4/7] qemu_driver: Probe capability before calculating dirty
- page rate
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Probing QEMU_CAPS_CALC_DIRTY_RATE capability in advance
-in case of failure when calculating dirty page rate.
-
-Signed-off-by: Hyman Huang(黄勇) <huangy81@chinatelecom.cn>
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
----
- src/qemu/qemu_driver.c | 11 ++++++++++-
- 1 file changed, 10 insertions(+), 1 deletion(-)
-
-diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
-index 62806da86a..19d32b5fa3 100644
---- a/src/qemu/qemu_driver.c
-+++ b/src/qemu/qemu_driver.c
-@@ -23332,6 +23332,16 @@ qemuDomainStartDirtyRateCalc(virDomainPtr dom,
-     if (virDomainStartDirtyRateCalcEnsureACL(dom->conn, vm->def) < 0)
-         goto cleanup;
- 
-+    if (virDomainObjCheckActive(vm) < 0)
-+        goto cleanup;
-+
-+    priv = vm->privateData;
-+    if (!virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_CALC_DIRTY_RATE)) {
-+        virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s",
-+                       _("QEMU does not support calculating dirty page rate"));
-+        goto cleanup;
-+    }
-+
-     if (qemuDomainObjBeginJob(driver, vm, QEMU_JOB_MODIFY) < 0)
-         goto cleanup;
- 
-@@ -23343,7 +23353,6 @@ qemuDomainStartDirtyRateCalc(virDomainPtr dom,
- 
-     VIR_DEBUG("Calculate dirty rate in next %d seconds", seconds);
- 
--    priv = vm->privateData;
-     qemuDomainObjEnterMonitor(driver, vm);
-     ret = qemuMonitorStartDirtyRateCalc(priv->mon, seconds);
- 
--- 
-2.27.0
-
diff --git a/qemu_driver-increase-recorded-counter-for-disk-block.patch b/qemu_driver-increase-recorded-counter-for-disk-block.patch
deleted file mode 100644
index 89da739d8ed792a45da40fc342a4f2ea9efe8075..0000000000000000000000000000000000000000
--- a/qemu_driver-increase-recorded-counter-for-disk-block.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From e50bf97d633e467750cae0f573bd1d1b398c8bc0 Mon Sep 17 00:00:00 2001
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Wed, 3 Feb 2021 16:28:40 +0100
-Subject: [PATCH 087/108] qemu_driver: increase recorded counter for disk block
- stats
-
-Commit <318d807a0bd3372b634d1952b559c5c627ccfa5b> added a fix to skip
-most of the block stat code to not log error message for missing storage
-sources but forgot to increase the recordnr counter.
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-(cherry picked from commit 02ffd9909cf432b2aa52e5ae81beb188a372901d)
----
- src/qemu/qemu_driver.c | 10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
-index 41e9bff17b..5f6543d8e8 100644
---- a/src/qemu/qemu_driver.c
-+++ b/src/qemu/qemu_driver.c
-@@ -21510,8 +21510,14 @@ qemuDomainGetStatsBlockExportDisk(virDomainDiskDefPtr disk,
-         VIR_INFO("optional disk '%s' source file is missing, "
-                  "skip getting stats", disk->dst);
- 
--        return qemuDomainGetStatsBlockExportHeader(disk, disk->src, *recordnr,
--                                                   params);
-+        if (qemuDomainGetStatsBlockExportHeader(disk, disk->src, *recordnr,
-+                                                params) < 0) {
-+            return -1;
-+        }
-+
-+        (*recordnr)++;
-+
-+        return 0;
-     }
- 
-     for (n = disk->src; virStorageSourceIsBacking(n); n = n->backingStore) {
--- 
-2.33.0
-
diff --git a/qemu_interface-Fix-cfg-refcounting-in-qemuInterfaceP.patch b/qemu_interface-Fix-cfg-refcounting-in-qemuInterfaceP.patch
deleted file mode 100644
index f5fb32c7b07fb5cc6ea831a75aba9e131fd4b389..0000000000000000000000000000000000000000
--- a/qemu_interface-Fix-cfg-refcounting-in-qemuInterfaceP.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 2edb23f8ce178fc3c8e166854ef056cbf2caeda6 Mon Sep 17 00:00:00 2001
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Fri, 4 Sep 2020 08:55:39 +0200
-Subject: [PATCH 056/108] qemu_interface: Fix @cfg refcounting in
- qemuInterfacePrepareSlirp()
-
-In the qemuInterfacePrepareSlirp() function, the qemu driver
-config is obtained (via virQEMUDriverGetConfig()), but it is
-never unrefed leading to mangled refcounter.
-
-Fixes: 9145b3f1cc334e946b3f9ea45d6c24c868301e6f
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Laine Stump <laine@redhat.com>
-(cherry picked from commit 5befe4ee184d137b7fa8a7efee83aa4a03d7d293)
----
- src/qemu/qemu_interface.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/qemu/qemu_interface.c b/src/qemu/qemu_interface.c
-index 2b24c73d65..77c890a165 100644
---- a/src/qemu/qemu_interface.c
-+++ b/src/qemu/qemu_interface.c
-@@ -634,7 +634,7 @@ qemuSlirpPtr
- qemuInterfacePrepareSlirp(virQEMUDriverPtr driver,
-                           virDomainNetDefPtr net)
- {
--    virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver);
-+    g_autoptr(virQEMUDriverConfig) cfg = virQEMUDriverGetConfig(driver);
-     g_autoptr(qemuSlirp) slirp = NULL;
-     size_t i;
- 
--- 
-2.33.0
-
diff --git a/qemu_migration_cookie-Rename-ret-in-qemuDomainExtrac.patch b/qemu_migration_cookie-Rename-ret-in-qemuDomainExtrac.patch
deleted file mode 100644
index 74a7d073aa59e8c152c30cc84997b4030bbc1f1e..0000000000000000000000000000000000000000
--- a/qemu_migration_cookie-Rename-ret-in-qemuDomainExtrac.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From b054dea7aa794414e7245721178937ab989596b2 Mon Sep 17 00:00:00 2001
-From: wangjinlei <wangjinlei_yewu@cmss.chinamobile.com>
-Date: Tue, 29 Aug 2023 19:30:40 +0800
-Subject: [PATCH] qemu_migration_cookie: Rename ret in
- qemuDomainExtractTLSSubject
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-We use 'ret' for storing values to be returned from a function. Return
-values from called functions that are not supposed to be returned
-further are usually called 'rv' (or 'rc').
-
-upstream commit: d116f187c69c3eefa9bfeafaf7242009f2adf531
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/qemu/qemu_migration_cookie.c | 14 +++++++-------
- 1 file changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/src/qemu/qemu_migration_cookie.c b/src/qemu/qemu_migration_cookie.c
-index 1d88ac1d22..0a0ac11d88 100644
---- a/src/qemu/qemu_migration_cookie.c
-+++ b/src/qemu/qemu_migration_cookie.c
-@@ -138,7 +138,7 @@ qemuDomainExtractTLSSubject(const char *certdir)
-     char *pemdata = NULL;
-     gnutls_datum_t pemdatum;
-     gnutls_x509_crt_t cert;
--    int ret;
-+    int rc;
-     size_t subjectlen;
- 
-     certfile = g_strdup_printf("%s/server-cert.pem", certdir);
-@@ -149,22 +149,22 @@ qemuDomainExtractTLSSubject(const char *certdir)
-         goto error;
-     }
- 
--    ret = gnutls_x509_crt_init(&cert);
--    if (ret < 0) {
-+    rc = gnutls_x509_crt_init(&cert);
-+    if (rc < 0) {
-         virReportError(VIR_ERR_INTERNAL_ERROR,
-                        _("cannot initialize cert object: %s"),
--                       gnutls_strerror(ret));
-+                       gnutls_strerror(rc));
-         goto error;
-     }
- 
-     pemdatum.data = (unsigned char *)pemdata;
-     pemdatum.size = strlen(pemdata);
- 
--    ret = gnutls_x509_crt_import(cert, &pemdatum, GNUTLS_X509_FMT_PEM);
--    if (ret < 0) {
-+    rc = gnutls_x509_crt_import(cert, &pemdatum, GNUTLS_X509_FMT_PEM);
-+    if (rc < 0) {
-         virReportError(VIR_ERR_INTERNAL_ERROR,
-                        _("cannot load cert data from %s: %s"),
--                       certfile, gnutls_strerror(ret));
-+                       certfile, gnutls_strerror(rc));
-         goto error;
-     }
- 
--- 
-2.27.0
-
diff --git a/qemu_monitor-Document-qemuMonitorUnregister.patch b/qemu_monitor-Document-qemuMonitorUnregister.patch
deleted file mode 100644
index 72180b927ef355712870012e862752592e94f7c4..0000000000000000000000000000000000000000
--- a/qemu_monitor-Document-qemuMonitorUnregister.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 2f1767779710fbc82479ee1d2bc9fce4c49e7c8b Mon Sep 17 00:00:00 2001
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Wed, 24 Feb 2021 13:55:33 +0100
-Subject: [PATCH 015/108] qemu_monitor: Document qemuMonitorUnregister()
-
-The most important bit is that the caller is expected to pass
-locked monitor.
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Andrea Bolognani <abologna@redhat.com>
-(cherry picked from commit 6458b9d94a1d5da62e46ac0b10f92aca103c27ab)
----
- src/qemu/qemu_monitor.c | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/src/qemu/qemu_monitor.c b/src/qemu/qemu_monitor.c
-index ec79fa6368..c98edbd254 100644
---- a/src/qemu/qemu_monitor.c
-+++ b/src/qemu/qemu_monitor.c
-@@ -842,6 +842,13 @@ qemuMonitorRegister(qemuMonitorPtr mon)
- }
- 
- 
-+/**
-+ * qemuMonitorUnregister:
-+ * @mon: monitor object
-+ *
-+ * Unregister monitor from the event loop. The monitor object
-+ * must be locked before calling this function.
-+ */
- void
- qemuMonitorUnregister(qemuMonitorPtr mon)
- {
--- 
-2.33.0
-
diff --git a/qemu_process-Release-domain-seclabel-later-in-qemuPr.patch b/qemu_process-Release-domain-seclabel-later-in-qemuPr.patch
deleted file mode 100644
index 2cfe8a661f62e8a9efcf9699cb6adde8610f8952..0000000000000000000000000000000000000000
--- a/qemu_process-Release-domain-seclabel-later-in-qemuPr.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 667ac7026fdf98ab9fe4158aa101026fb9dc40c8 Mon Sep 17 00:00:00 2001
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Wed, 9 Dec 2020 11:06:29 +0100
-Subject: [PATCH 089/108] qemu_process: Release domain seclabel later in
- qemuProcessStop()
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Some secdrivers (typically SELinux driver) generate unique
-dynamic seclabel for each domain (unless a static one is
-requested in domain XML). This is achieved by calling
-qemuSecurityGenLabel() from qemuProcessPrepareDomain() which
-allocates unique seclabel and stores it in domain def->seclabels.
-The counterpart is qemuSecurityReleaseLabel() which releases the
-label and removes it from def->seclabels. Problem is, that with
-current code the qemuProcessStop() may still want to use the
-seclabel after it was released, e.g. when it wants to restore the
-label of a disk mirror.
-
-What is happening now, is that in qemuProcessStop() the
-qemuSecurityReleaseLabel() is called, which removes the SELinux
-seclabel from def->seclabels, yada yada yada and eventually
-qemuSecurityRestoreImageLabel() is called. This bubbles down to
-virSecuritySELinuxRestoreImageLabelSingle() which find no SELinux
-seclabel (using virDomainDefGetSecurityLabelDef()) and this
-returns early doing nothing.
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1751664
-Fixes: 8fa0374c5b8e834fcbdeae674cc6cc9e6bf9019f
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
-(cherry picked from commit 5ac2439a831037c2a861566cad1980b0a2f2907f)
----
- src/qemu/qemu_process.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
-index 890603f66b..bf5375bcde 100644
---- a/src/qemu/qemu_process.c
-+++ b/src/qemu/qemu_process.c
-@@ -7449,8 +7449,6 @@ void qemuProcessStop(virQEMUDriverPtr driver,
-         qemuSecurityRestoreAllLabel(driver, vm,
-                                     !!(flags & VIR_QEMU_PROCESS_STOP_MIGRATED));
- 
--    qemuSecurityReleaseLabel(driver->securityManager, vm->def);
--
-     for (i = 0; i < vm->def->ndisks; i++) {
-         virDomainDeviceDef dev;
-         virDomainDiskDefPtr disk = vm->def->disks[i];
-@@ -7625,6 +7623,8 @@ void qemuProcessStop(virQEMUDriverPtr driver,
-         }
-     }
- 
-+    qemuSecurityReleaseLabel(driver->securityManager, vm->def);
-+
-     /* clear all private data entries which are no longer needed */
-     qemuDomainObjPrivateDataClear(priv);
- 
--- 
-2.33.0
-
diff --git a/qemu_security-Complete-renaming-of-virSecurityManage.patch b/qemu_security-Complete-renaming-of-virSecurityManage.patch
deleted file mode 100644
index 0b8b0ef315b27f37bfd6a1d2fc2fbfb1ff1ba93a..0000000000000000000000000000000000000000
--- a/qemu_security-Complete-renaming-of-virSecurityManage.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From ab52cf0ea29a263db426fec813946daab2ad9b27 Mon Sep 17 00:00:00 2001
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Tue, 30 Jun 2020 22:02:19 +0200
-Subject: [PATCH 006/108] qemu_security: Complete renaming of
- virSecurityManagerSetAllLabel() argument
-
-Just like in the previous commit, the stdin_path argument of
-virSecurityManagerSetAllLabel() is renamed to incomingPath.
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Erik Skultety <eskultet@redhat.com>
-(cherry picked from commit 77ef11845696ee971d4a285eb344136113b1e6f2)
----
- src/qemu/qemu_security.c | 4 ++--
- src/qemu/qemu_security.h | 2 +-
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/qemu/qemu_security.c b/src/qemu/qemu_security.c
-index 484fc34552..e7f38cb69b 100644
---- a/src/qemu/qemu_security.c
-+++ b/src/qemu/qemu_security.c
-@@ -32,7 +32,7 @@ VIR_LOG_INIT("qemu.qemu_process");
- int
- qemuSecuritySetAllLabel(virQEMUDriverPtr driver,
-                         virDomainObjPtr vm,
--                        const char *stdin_path,
-+                        const char *incomingPath,
-                         bool migrated)
- {
-     int ret = -1;
-@@ -47,7 +47,7 @@ qemuSecuritySetAllLabel(virQEMUDriverPtr driver,
- 
-     if (virSecurityManagerSetAllLabel(driver->securityManager,
-                                       vm->def,
--                                      stdin_path,
-+                                      incomingPath,
-                                       priv->chardevStdioLogd,
-                                       migrated) < 0)
-         goto cleanup;
-diff --git a/src/qemu/qemu_security.h b/src/qemu/qemu_security.h
-index c8516005ac..89dca61c3a 100644
---- a/src/qemu/qemu_security.h
-+++ b/src/qemu/qemu_security.h
-@@ -26,7 +26,7 @@
- 
- int qemuSecuritySetAllLabel(virQEMUDriverPtr driver,
-                             virDomainObjPtr vm,
--                            const char *stdin_path,
-+                            const char *incomingPath,
-                             bool migrated);
- 
- void qemuSecurityRestoreAllLabel(virQEMUDriverPtr driver,
--- 
-2.33.0
-
diff --git a/qemu_tpm-Generate-log-file-path-among-with-storage-p.patch b/qemu_tpm-Generate-log-file-path-among-with-storage-p.patch
deleted file mode 100644
index 1b6c853656eb954a7ac8f08d9e53d1d0a13032e4..0000000000000000000000000000000000000000
--- a/qemu_tpm-Generate-log-file-path-among-with-storage-p.patch
+++ /dev/null
@@ -1,149 +0,0 @@
-From 85a1643f583a46b1fc3a01d5c2e87ba6262be586 Mon Sep 17 00:00:00 2001
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Wed, 24 Feb 2021 17:28:42 +0100
-Subject: [PATCH 5/6] qemu_tpm: Generate log file path among with storage path
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-When starting a guest with TPM of type='emulator' an external
-process is started with it (swtpm) to emulate TPM. This external
-process is passed path to a log file via --logfile. The path to
-the log file is generated in qemuTPMEmulatorPrepareHost() which
-works, until the daemon is restarted. The problem is that the
-path is not stored in private data or anywhere inside live XML
-and thus later, when qemuExtTPMStop() is called (when shutting
-off the guest) the stored logpath is NULL and thus its seclabel
-is not cleaned up (see virSecuritySELinuxRestoreTPMLabels()).
-
-Fortunately, qemuExtDevicesStop() (which calls qemuExtTPMStop()
-eventually) does call qemuExtDevicesInitPaths() where the log
-path can be generated again.
-
-Basically, tpm->data.emulator.storagepath is generated in
-qemuExtTPMInitPaths() and its seclabels are restored properly,
-and this commit move logfile onto the same level.
-
-This means, that the log path doesn't have to be generated in
-qemuExtDevicesStart() because it was already done in
-qemuExtDevicesPrepareHost().
-
-This change also renders @vmname argument of
-qemuTPMEmulatorPrepareHost() unused and thus is removed.
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1769196
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Signed-off-by: yezengruan <yezengruan@huawei.com>
----
- src/qemu/qemu_extdevice.c |  6 +++---
- src/qemu/qemu_tpm.c       | 22 ++++++++++++++--------
- 2 files changed, 17 insertions(+), 11 deletions(-)
-
-diff --git a/src/qemu/qemu_extdevice.c b/src/qemu/qemu_extdevice.c
-index 5a31b4d66e..025929cbcc 100644
---- a/src/qemu/qemu_extdevice.c
-+++ b/src/qemu/qemu_extdevice.c
-@@ -133,6 +133,9 @@ qemuExtDevicesPrepareHost(virQEMUDriverPtr driver,
-     virDomainDefPtr def = vm->def;
-     size_t i;
- 
-+    if (qemuExtDevicesInitPaths(driver, def) < 0)
-+        return -1;
-+
-     if (def->tpm &&
-         qemuExtTPMPrepareHost(driver, def) < 0)
-         return -1;
-@@ -170,9 +173,6 @@ qemuExtDevicesStart(virQEMUDriverPtr driver,
-     virDomainDefPtr def = vm->def;
-     size_t i;
- 
--    if (qemuExtDevicesInitPaths(driver, def) < 0)
--        return -1;
--
-     for (i = 0; i < def->nvideos; i++) {
-         virDomainVideoDefPtr video = def->videos[i];
- 
-diff --git a/src/qemu/qemu_tpm.c b/src/qemu/qemu_tpm.c
-index eb155b92b0..601d5cf4e9 100644
---- a/src/qemu/qemu_tpm.c
-+++ b/src/qemu/qemu_tpm.c
-@@ -200,11 +200,15 @@ qemuTPMCreateEmulatorSocket(const char *swtpmStateDir,
-  * @tpm: TPM definition for an emulator type
-  * @swtpmStorageDir: the general swtpm storage dir which is used as a base
-  *                   directory for creating VM specific directories
-+ * @logDir: directory where swtpm writes its logs into
-+ * @vmname: name of the VM
-  * @uuid: the UUID of the VM
-  */
- static int
- qemuTPMEmulatorInitPaths(virDomainTPMDefPtr tpm,
-                          const char *swtpmStorageDir,
-+                         const char *logDir,
-+                         const char *vmname,
-                          const unsigned char *uuid)
- {
-     char uuidstr[VIR_UUID_STRING_BUFLEN];
-@@ -217,6 +221,11 @@ qemuTPMEmulatorInitPaths(virDomainTPMDefPtr tpm,
-                                              tpm->version)))
-         return -1;
- 
-+    if (!tpm->data.emulator.logfile) {
-+        tpm->data.emulator.logfile = qemuTPMCreateEmulatorLogPath(logDir,
-+                                                                  vmname);
-+    }
-+
-     return 0;
- }
- 
-@@ -273,7 +282,6 @@ qemuTPMEmulatorGetPid(const char *swtpmStateDir,
-  *
-  * @tpm: tpm definition
-  * @logDir: directory where swtpm writes its logs into
-- * @vmname: name of the VM
-  * @swtpm_user: uid to run the swtpm with
-  * @swtpm_group: gid to run the swtpm with
-  * @swtpmStateDir: directory for swtpm's persistent state
-@@ -287,7 +295,6 @@ qemuTPMEmulatorGetPid(const char *swtpmStateDir,
- static int
- qemuTPMEmulatorPrepareHost(virDomainTPMDefPtr tpm,
-                            const char *logDir,
--                           const char *vmname,
-                            uid_t swtpm_user,
-                            gid_t swtpm_group,
-                            const char *swtpmStateDir,
-@@ -306,10 +313,6 @@ qemuTPMEmulatorPrepareHost(virDomainTPMDefPtr tpm,
-                      VIR_DIR_CREATE_ALLOW_EXIST) < 0)
-         return -1;
- 
--    /* create logfile name ... */
--    if (!tpm->data.emulator.logfile)
--        tpm->data.emulator.logfile = qemuTPMCreateEmulatorLogPath(logDir, vmname);
--
-     if (!virFileExists(tpm->data.emulator.logfile) &&
-         virFileTouch(tpm->data.emulator.logfile, 0644) < 0) {
-         return -1;
-@@ -704,7 +707,10 @@ qemuExtTPMInitPaths(virQEMUDriverPtr driver,
- 
-     switch (def->tpm->type) {
-     case VIR_DOMAIN_TPM_TYPE_EMULATOR:
--        return qemuTPMEmulatorInitPaths(def->tpm, cfg->swtpmStorageDir,
-+        return qemuTPMEmulatorInitPaths(def->tpm,
-+                                        cfg->swtpmStorageDir,
-+                                        cfg->swtpmLogDir,
-+                                        def->name,
-                                         def->uuid);
-     case VIR_DOMAIN_TPM_TYPE_PASSTHROUGH:
-     case VIR_DOMAIN_TPM_TYPE_LAST:
-@@ -729,7 +735,7 @@ qemuExtTPMPrepareHost(virQEMUDriverPtr driver,
-             return -1;
- 
-         return qemuTPMEmulatorPrepareHost(def->tpm, cfg->swtpmLogDir,
--                                          def->name, cfg->swtpm_user,
-+                                          cfg->swtpm_user,
-                                           cfg->swtpm_group,
-                                           cfg->swtpmStateDir, cfg->user,
-                                           shortName);
--- 
-2.27.0
-
diff --git a/qemu_tpm-Move-logfile-path-generation-into-a-separat.patch b/qemu_tpm-Move-logfile-path-generation-into-a-separat.patch
deleted file mode 100644
index 858d21b030e85b90f3ce1a50d7a98706114d3435..0000000000000000000000000000000000000000
--- a/qemu_tpm-Move-logfile-path-generation-into-a-separat.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From bad37cab00ef58f11028246fd2e302f768302dba Mon Sep 17 00:00:00 2001
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Thu, 25 Feb 2021 11:41:08 +0100
-Subject: [PATCH 4/6] qemu_tpm: Move logfile path generation into a separate
- function
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Strictly not needed, but the rest of paths is generated in
-separate functions. Helps with code readability.
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Signed-off-by: yezengruan <yezengruan@huawei.com>
----
- src/qemu/qemu_tpm.c | 17 ++++++++++++++++-
- 1 file changed, 16 insertions(+), 1 deletion(-)
-
-diff --git a/src/qemu/qemu_tpm.c b/src/qemu/qemu_tpm.c
-index 58dfdf689a..eb155b92b0 100644
---- a/src/qemu/qemu_tpm.c
-+++ b/src/qemu/qemu_tpm.c
-@@ -82,6 +82,21 @@ qemuTPMCreateEmulatorStoragePath(const char *swtpmStorageDir,
- }
- 
- 
-+/**
-+ * qemuTPMCreateEmulatorLogPath:
-+ * @logDir: directory where swtpm writes its logs into
-+ * @vmname: name of the VM
-+ *
-+ * Create the swtpm's log path.
-+ */
-+static char*
-+qemuTPMCreateEmulatorLogPath(const char *logDir,
-+                             const char *vmname)
-+{
-+    return g_strdup_printf("%s/%s-swtpm.log", logDir, vmname);
-+}
-+
-+
- /*
-  * qemuTPMEmulatorInitStorage
-  *
-@@ -293,7 +308,7 @@ qemuTPMEmulatorPrepareHost(virDomainTPMDefPtr tpm,
- 
-     /* create logfile name ... */
-     if (!tpm->data.emulator.logfile)
--        tpm->data.emulator.logfile = g_strdup_printf("%s/%s-swtpm.log", logDir, vmname);
-+        tpm->data.emulator.logfile = qemuTPMCreateEmulatorLogPath(logDir, vmname);
- 
-     if (!virFileExists(tpm->data.emulator.logfile) &&
-         virFileTouch(tpm->data.emulator.logfile, 0644) < 0) {
--- 
-2.27.0
-
diff --git a/qemuxml2-argv-xml-data-x86-kvm-32-on-64-Add-machine-.patch b/qemuxml2-argv-xml-data-x86-kvm-32-on-64-Add-machine-.patch
deleted file mode 100644
index c7d19da13a50ee9f71d450d384256b3adaf7e144..0000000000000000000000000000000000000000
--- a/qemuxml2-argv-xml-data-x86-kvm-32-on-64-Add-machine-.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 4821323a523c8a5b34aab61c913ed7b13deada27 Mon Sep 17 00:00:00 2001
-From: Bihong Yu <yubihong@huawei.com>
-Date: Thu, 13 Jan 2022 16:14:42 +0100
-Subject: [PATCH 02/13] qemuxml2(argv|xml)data: x86-kvm-32-on-64: Add machine
- type
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The machine type doesn't change the test result and prevents tests being
-changed every time we are about to update real capabilities to a new
-qemu.
-
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Signed-off-by: Bihong Yu <yubihong@huawei.com>
----
- tests/qemuxml2argvdata/x86-kvm-32-on-64.xml | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/qemuxml2argvdata/x86-kvm-32-on-64.xml b/tests/qemuxml2argvdata/x86-kvm-32-on-64.xml
-index 37f53bf2af..35ddbd0630 100644
---- a/tests/qemuxml2argvdata/x86-kvm-32-on-64.xml
-+++ b/tests/qemuxml2argvdata/x86-kvm-32-on-64.xml
-@@ -3,7 +3,7 @@
-   <uuid>d091ea82-29e6-2e34-3005-f02617b36e87</uuid>
-   <memory unit='KiB'>4194304</memory>
-   <os>
--    <type arch='i686'>hvm</type>
-+    <type arch='i686' machine='pc'>hvm</type>
-   </os>
-   <devices>
-     <emulator>/usr/bin/qemu-system-x86_64</emulator>
--- 
-2.33.0
-
diff --git a/qemuxml2argvtest-Add-QAPI-QMP-schema-validation-for-.patch b/qemuxml2argvtest-Add-QAPI-QMP-schema-validation-for-.patch
deleted file mode 100644
index c61e2ac7442f428f7ba27105114c7d0a82d9f79b..0000000000000000000000000000000000000000
--- a/qemuxml2argvtest-Add-QAPI-QMP-schema-validation-for-.patch
+++ /dev/null
@@ -1,181 +0,0 @@
-From 63e167446b11121a0e375ad28375b6f5a44a5d95 Mon Sep 17 00:00:00 2001
-From: Peter Krempa <pkrempa@redhat.com>
-Date: Fri, 15 May 2020 14:33:10 +0200
-Subject: [PATCH 18/18] qemuxml2argvtest: Add QAPI/QMP schema validation for
- -blockdev and -netdev
-
-Our hotplug test cases are weak in comparison to the qemuxml2argvtest.
-Use all the the input data to also validate the arguments for -netdev
-and -blockdev against the appropriate commands of the QMP schema.
-
-Note that currently it's done just for the _CAPS versions of tests but
-commenting out a line in the test file allows to validate even cases
-which don't use real capabilities.
-
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Eric Blake <eblake@redhat.com>
----
- tests/Makefile.am        |  2 +-
- tests/qemuxml2argvtest.c | 76 ++++++++++++++++++++++++++++++++++++++++
- tests/testutilsqemu.c    |  5 +++
- tests/testutilsqemu.h    |  1 +
- 4 files changed, 83 insertions(+), 1 deletion(-)
-
-diff --git a/tests/Makefile.am b/tests/Makefile.am
-index ada5b8fc57..e5440906d1 100644
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -569,7 +569,7 @@ qemuxml2argvtest_SOURCES = \
- 	testutils.c testutils.h \
- 	virfilewrapper.c virfilewrapper.h \
- 	$(NULL)
--qemuxml2argvtest_LDADD = libqemutestdriver.la \
-+qemuxml2argvtest_LDADD = libqemutestdriver.la libqemumonitortestutils.la \
- 	$(LDADDS) $(LIBXML_LIBS)
- 
- libqemuxml2argvmock_la_SOURCES = \
-diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
-index 2217e2d81e..dc871d5698 100644
---- a/tests/qemuxml2argvtest.c
-+++ b/tests/qemuxml2argvtest.c
-@@ -18,6 +18,7 @@
- # include "qemu/qemu_migration.h"
- # include "qemu/qemu_process.h"
- # include "qemu/qemu_slirp.h"
-+# include "qemu/qemu_qapi.h"
- # include "datatypes.h"
- # include "conf/storage_conf.h"
- # include "cpu/cpu_map.h"
-@@ -26,6 +27,8 @@
- # include "virmock.h"
- # include "virfilewrapper.h"
- # include "configmake.h"
-+# include "testutilsqemuschema.h"
-+# include "qemu/qemu_monitor_json.h"
- 
- # define LIBVIRT_QEMU_CAPSPRIV_H_ALLOW
- # include "qemu/qemu_capspriv.h"
-@@ -481,6 +484,76 @@ testCompareXMLToArgvCreateArgs(virQEMUDriverPtr drv,
- }
- 
- 
-+static int
-+testCompareXMLToArgvValidateSchema(virQEMUDriverPtr drv,
-+                                   virDomainObjPtr vm,
-+                                   const char *migrateURI,
-+                                   struct testQemuInfo *info,
-+                                   unsigned int flags)
-+{
-+    VIR_AUTOSTRINGLIST args = NULL;
-+    size_t nargs = 0;
-+    size_t i;
-+    g_autoptr(virHashTable) schema = NULL;
-+    g_autoptr(virCommand) cmd = NULL;
-+
-+    if (info->schemafile)
-+        schema = testQEMUSchemaLoad(info->schemafile);
-+
-+    /* comment out with line comment to enable schema checking for non _CAPS tests
-+    if (!schema)
-+        schema = testQEMUSchemaLoadLatest(virArchToString(info->arch));
-+    // */
-+
-+    if (!schema)
-+        return 0;
-+
-+    if (!(cmd = testCompareXMLToArgvCreateArgs(drv, vm, migrateURI, info, flags,
-+                                               true)))
-+        return -1;
-+
-+    if (virCommandGetArgList(cmd, &args, &nargs) < 0)
-+        return -1;
-+
-+    for (i = 0; i < nargs; i++) {
-+        g_auto(virBuffer) debug = VIR_BUFFER_INITIALIZER;
-+        g_autoptr(virJSONValue) jsonargs = NULL;
-+
-+        if (STREQ(args[i], "-blockdev")) {
-+            if (!(jsonargs = virJSONValueFromString(args[i + 1])))
-+                return -1;
-+
-+            if (testQEMUSchemaValidateCommand("blockdev-add", jsonargs,
-+                                              schema, &debug) < 0) {
-+                VIR_TEST_VERBOSE("failed to validate -blockdev '%s' against QAPI schema: %s",
-+                                 args[i + 1], virBufferCurrentContent(&debug));
-+                return -1;
-+            }
-+
-+            i++;
-+        } else if (STREQ(args[i], "-netdev")) {
-+            if (!(jsonargs = virJSONValueFromString(args[i + 1])))
-+                return -1;
-+
-+            /* skip the validation for pre-QAPIfication cases */
-+            if (virQEMUQAPISchemaPathExists("netdev_add/arg-type/type/!string", schema))
-+                continue;
-+
-+            if (testQEMUSchemaValidateCommand("netdev_add", jsonargs,
-+                                              schema, &debug) < 0) {
-+                VIR_TEST_VERBOSE("failed to validate -netdev '%s' against QAPI schema: %s",
-+                                 args[i + 1], virBufferCurrentContent(&debug));
-+                return -1;
-+            }
-+
-+            i++;
-+        }
-+    }
-+
-+    return 0;
-+}
-+
-+
- static int
- testCompareXMLToArgv(const void *data)
- {
-@@ -582,6 +655,9 @@ testCompareXMLToArgv(const void *data)
-         goto cleanup;
-     }
- 
-+    if (testCompareXMLToArgvValidateSchema(&driver, vm, migrateURI, info, flags) < 0)
-+        goto cleanup;
-+
-     if (!(actualargv = virCommandToString(cmd, false)))
-         goto cleanup;
- 
-diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c
-index f3b4e2b3b2..bae1fa828b 100644
---- a/tests/testutilsqemu.c
-+++ b/tests/testutilsqemu.c
-@@ -767,6 +767,10 @@ testQemuInfoSetArgs(struct testQemuInfo *info,
-         if (stripmachinealiases)
-             virQEMUCapsStripMachineAliases(qemuCaps);
-         info->flags |= FLAG_REAL_CAPS;
-+
-+        /* provide path to the replies file for schema testing */
-+        capsfile[strlen(capsfile) - 3] = '\0';
-+        info->schemafile = g_strdup_printf("%sreplies", capsfile);
-     }
- 
-     if (!qemuCaps) {
-@@ -793,5 +797,6 @@ testQemuInfoClear(struct testQemuInfo *info)
- {
-     VIR_FREE(info->infile);
-     VIR_FREE(info->outfile);
-+    VIR_FREE(info->schemafile);
-     virObjectUnref(info->qemuCaps);
- }
-diff --git a/tests/testutilsqemu.h b/tests/testutilsqemu.h
-index edee6e450c..e7c5032012 100644
---- a/tests/testutilsqemu.h
-+++ b/tests/testutilsqemu.h
-@@ -64,6 +64,7 @@ struct testQemuInfo {
-     unsigned int flags;
-     unsigned int parseFlags;
-     virArch arch;
-+    char *schemafile;
- };
- 
- virCapsPtr testQemuCapsInit(void);
--- 
-2.23.0.windows.1
-
diff --git a/qemuxml2argvtest-disk-vhostuser-Add-invocation-for-q.patch b/qemuxml2argvtest-disk-vhostuser-Add-invocation-for-q.patch
deleted file mode 100644
index 6da1901b17893843e3018c6f3696a6bf152d2d87..0000000000000000000000000000000000000000
--- a/qemuxml2argvtest-disk-vhostuser-Add-invocation-for-q.patch
+++ /dev/null
@@ -1,187 +0,0 @@
-From d8e9a553365a70a7f3ed2286aa847064e6a77542 Mon Sep 17 00:00:00 2001
-From: Peter Krempa <pkrempa@redhat.com>
-Date: Thu, 13 Jan 2022 12:47:17 +0100
-Subject: [PATCH] qemuxml2argvtest: disk-vhostuser: Add invocation for qemu-4.2
-
-With qemu versions prior to qemu-5.0 we'll format 'scsi=off' for
-virtio-blk disks, but also for vhost-user-blk. This is a bug as it's not
-supported.
-
-Add a test case to show that wrong configuration is generated by adding
-running 'disk-vhostuser' test case on capabilities from qemu-4.2.
-
-For this to be possible it's required to enable shared memory via NUMA
-configuration as old QEMU's don't allow configuration of the default
-memory backend. This is achieved by adding a copy of the
-'disk-vhostuser' XML with NUMA enabled.
-
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
----
- .../disk-vhostuser-numa.x86_64-4.2.0.args     | 39 +++++++++++++++++++
- .../disk-vhostuser-numa.x86_64-latest.args    | 39 +++++++++++++++++++
- .../qemuxml2argvdata/disk-vhostuser-numa.xml  | 32 +++++++++++++++
- .../disk-vhostuser.x86_64-latest.args         |  3 +-
- tests/qemuxml2argvtest.c                      |  2 +
- 5 files changed, 113 insertions(+), 2 deletions(-)
- create mode 100644 tests/qemuxml2argvdata/disk-vhostuser-numa.x86_64-4.2.0.args
- create mode 100644 tests/qemuxml2argvdata/disk-vhostuser-numa.x86_64-latest.args
- create mode 100644 tests/qemuxml2argvdata/disk-vhostuser-numa.xml
-
-diff --git a/tests/qemuxml2argvdata/disk-vhostuser-numa.x86_64-4.2.0.args b/tests/qemuxml2argvdata/disk-vhostuser-numa.x86_64-4.2.0.args
-new file mode 100644
-index 0000000000..cf1a0fb53e
---- /dev/null
-+++ b/tests/qemuxml2argvdata/disk-vhostuser-numa.x86_64-4.2.0.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 \
-+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.2,usb=off,dump-guest-core=off \
-+-accel tcg \
-+-cpu qemu64 \
-+-m 14336 \
-+-overcommit mem-lock=off \
-+-smp 1,sockets=1,cores=1,threads=1 \
-+-object memory-backend-file,id=ram-node0,mem-path=/var/lib/libvirt/qemu/ram/libvirt/qemu/-1-QEMUGuest1/ram-node0,share=yes,size=15032385536 \
-+-numa node,nodeid=0,cpus=0,memdev=ram-node0 \
-+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-+-display none \
-+-no-user-config \
-+-nodefaults \
-+-chardev socket,id=charmonitor,fd=1729,server,nowait \
-+-mon chardev=charmonitor,id=monitor,mode=control \
-+-rtc base=utc \
-+-no-shutdown \
-+-no-acpi \
-+-boot strict=on \
-+-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
-+-chardev socket,id=chr-vu-virtio-disk0,path=/tmp/vhost1.sock \
-+-device vhost-user-blk-pci,bus=pci.0,addr=0x2,chardev=chr-vu-virtio-disk0,id=virtio-disk0,bootindex=1 \
-+-chardev socket,id=chr-vu-virtio-disk1,path=/tmp/vhost1.sock,reconnect=10 \
-+-device vhost-user-blk-pci,bus=pci.0,addr=0x3,chardev=chr-vu-virtio-disk1,id=virtio-disk1 \
-+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 \
-+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
-+-msg timestamp=on
-diff --git a/tests/qemuxml2argvdata/disk-vhostuser-numa.x86_64-latest.args b/tests/qemuxml2argvdata/disk-vhostuser-numa.x86_64-latest.args
-new file mode 100644
-index 0000000000..1bbc4250ca
---- /dev/null
-+++ b/tests/qemuxml2argvdata/disk-vhostuser-numa.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 \
-+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,usb=off,dump-guest-core=off \
-+-accel tcg \
-+-cpu qemu64 \
-+-m 14336 \
-+-overcommit mem-lock=off \
-+-smp 1,sockets=1,cores=1,threads=1 \
-+-object memory-backend-file,id=ram-node0,mem-path=/var/lib/libvirt/qemu/ram/libvirt/qemu/-1-QEMUGuest1/ram-node0,share=yes,size=15032385536 \
-+-numa node,nodeid=0,cpus=0,memdev=ram-node0 \
-+-uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
-+-display none \
-+-no-user-config \
-+-nodefaults \
-+-chardev socket,id=charmonitor,fd=1729,server,nowait \
-+-mon chardev=charmonitor,id=monitor,mode=control \
-+-rtc base=utc \
-+-no-shutdown \
-+-no-acpi \
-+-boot strict=on \
-+-device piix3-usb-uhci,id=usb,bus=pci.0,addr=0x1.0x2 \
-+-chardev socket,id=chr-vu-virtio-disk0,path=/tmp/vhost1.sock \
-+-device vhost-user-blk-pci,bus=pci.0,addr=0x2,chardev=chr-vu-virtio-disk0,id=virtio-disk0,bootindex=1 \
-+-chardev socket,id=chr-vu-virtio-disk1,path=/tmp/vhost1.sock,reconnect=10 \
-+-device vhost-user-blk-pci,bus=pci.0,addr=0x3,chardev=chr-vu-virtio-disk1,id=virtio-disk1 \
-+-device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 \
-+-sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,resourcecontrol=deny \
-+-msg timestamp=on
-diff --git a/tests/qemuxml2argvdata/disk-vhostuser-numa.xml b/tests/qemuxml2argvdata/disk-vhostuser-numa.xml
-new file mode 100644
-index 0000000000..56f2f1be85
---- /dev/null
-+++ b/tests/qemuxml2argvdata/disk-vhostuser-numa.xml
-@@ -0,0 +1,32 @@
-+<domain type='qemu'>
-+  <name>QEMUGuest1</name>
-+  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
-+  <memory unit='KiB'>219136</memory>
-+  <currentMemory unit='KiB'>219136</currentMemory>
-+  <vcpu placement='static'>1</vcpu>
-+  <cpu mode='custom' match='exact' check='none'>
-+    <model fallback='forbid'>qemu64</model>
-+    <numa>
-+      <cell id='0' cpus='0' memory='14680064' unit='KiB' memAccess='shared'/>
-+    </numa>
-+  </cpu>
-+  <os>
-+    <type arch='x86_64' machine='pc'>hvm</type>
-+  </os>
-+  <devices>
-+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
-+    <disk type='vhostuser' device='disk'>
-+      <driver name='qemu' type='raw'/>
-+      <source type='unix' path='/tmp/vhost1.sock'/>
-+      <target dev='vda' bus='virtio'/>
-+      <boot order='1'/>
-+    </disk>
-+    <disk type='vhostuser' device='disk'>
-+      <driver name='qemu' type='raw'/>
-+      <source type='unix' path='/tmp/vhost1.sock'>
-+        <reconnect enabled='yes' timeout='10'/>
-+      </source>
-+      <target dev='vdb' bus='virtio'/>
-+    </disk>
-+  </devices>
-+</domain>
-diff --git a/tests/qemuxml2argvdata/disk-vhostuser.x86_64-latest.args b/tests/qemuxml2argvdata/disk-vhostuser.x86_64-latest.args
-index a143b7cdc6..11e8a05d99 100644
---- a/tests/qemuxml2argvdata/disk-vhostuser.x86_64-latest.args
-+++ b/tests/qemuxml2argvdata/disk-vhostuser.x86_64-latest.args
-@@ -33,8 +33,7 @@ file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
- -device vhost-user-blk-pci,bus=pci.0,addr=0x2,chardev=chr-vu-virtio-disk0,\
- id=virtio-disk0,bootindex=1 \
- -chardev socket,id=chr-vu-virtio-disk1,path=/tmp/vhost1.sock,reconnect=10 \
---device vhost-user-blk-pci,bus=pci.0,addr=0x3,chardev=chr-vu-virtio-disk1,\
--id=virtio-disk1 \
-+-device vhost-user-blk-pci,bus=pci.0,addr=0x3,chardev=chr-vu-virtio-disk1,id=virtio-disk1 \
- -device virtio-balloon-pci,id=balloon0,bus=pci.0,addr=0x4 \
- -sandbox on,obsolete=deny,elevateprivileges=deny,spawn=deny,\
- resourcecontrol=deny \
-diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
-index 7b117f5984..d37969d065 100644
---- a/tests/qemuxml2argvtest.c
-+++ b/tests/qemuxml2argvtest.c
-@@ -1209,6 +1209,8 @@ mymain(void)
-     VIR_FREE(driver.config->vxhsTLSx509certdir);
-     DO_TEST("disk-no-boot", NONE);
-     DO_TEST_CAPS_LATEST("disk-nvme");
-+    DO_TEST_CAPS_VER("disk-vhostuser-numa", "4.2.0");
-+    DO_TEST_CAPS_LATEST("disk-vhostuser-numa");
-     DO_TEST_CAPS_LATEST("disk-vhostuser");
-     DO_TEST_PARSE_ERROR("disk-device-lun-type-invalid",
-                         QEMU_CAPS_VIRTIO_SCSI);
--- 
-2.33.0
-
diff --git a/remote-check-for-negative-array-lengths-before-alloc.patch b/remote-check-for-negative-array-lengths-before-alloc.patch
new file mode 100644
index 0000000000000000000000000000000000000000..f8def63d715e0a9f8c455b6551e6e69e72954074
--- /dev/null
+++ b/remote-check-for-negative-array-lengths-before-alloc.patch
@@ -0,0 +1,216 @@
+From 9085bbfb415baa258f58e79c56454a520c03d91f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
+Date: Fri, 15 Mar 2024 10:47:50 +0000
+Subject: [PATCH] remote: check for negative array lengths before allocation
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+While the C API entry points will validate non-negative lengths
+for various parameters, the RPC server de-serialization code
+will need to allocate memory for arrays before entering the C
+API. These allocations will thus happen before the non-negative
+length check is performed.
+
+Passing a negative length to the g_new0 function will usually
+result in a crash due to the negative length being treated as
+a huge positive number.
+
+This was found and diagnosed by ALT Linux Team with AFLplusplus.
+
+CVE-2024-2494
+Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
+Found-by: Alexandr Shashkin <dutyrok@altlinux.org>
+Co-developed-by: Alexander Kuznetsov <kuznetsovam@altlinux.org>
+Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
+---
+ src/remote/remote_daemon_dispatch.c | 65 +++++++++++++++++++++++++++++
+ src/rpc/gendispatch.pl              |  5 +++
+ 2 files changed, 70 insertions(+)
+
+diff --git a/src/remote/remote_daemon_dispatch.c b/src/remote/remote_daemon_dispatch.c
+index 7daf503b51..7542caa952 100644
+--- a/src/remote/remote_daemon_dispatch.c
++++ b/src/remote/remote_daemon_dispatch.c
+@@ -2291,6 +2291,10 @@ remoteDispatchDomainGetSchedulerParameters(virNetServer *server G_GNUC_UNUSED,
+     if (!conn)
+         goto cleanup;
+ 
++    if (args->nparams < 0) {
++        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("nparams must be non-negative"));
++        goto cleanup;
++    }
+     if (args->nparams > REMOTE_DOMAIN_SCHEDULER_PARAMETERS_MAX) {
+         virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("nparams too large"));
+         goto cleanup;
+@@ -2339,6 +2343,10 @@ remoteDispatchDomainGetSchedulerParametersFlags(virNetServer *server G_GNUC_UNUS
+     if (!conn)
+         goto cleanup;
+ 
++    if (args->nparams < 0) {
++        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("nparams must be non-negative"));
++        goto cleanup;
++    }
+     if (args->nparams > REMOTE_DOMAIN_SCHEDULER_PARAMETERS_MAX) {
+         virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("nparams too large"));
+         goto cleanup;
+@@ -2497,6 +2505,10 @@ remoteDispatchDomainBlockStatsFlags(virNetServer *server G_GNUC_UNUSED,
+         goto cleanup;
+     flags = args->flags;
+ 
++    if (args->nparams < 0) {
++        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("nparams must be non-negative"));
++        goto cleanup;
++    }
+     if (args->nparams > REMOTE_DOMAIN_BLOCK_STATS_PARAMETERS_MAX) {
+         virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("nparams too large"));
+         goto cleanup;
+@@ -2717,6 +2729,14 @@ remoteDispatchDomainGetVcpuPinInfo(virNetServer *server G_GNUC_UNUSED,
+     if (!(dom = get_nonnull_domain(conn, args->dom)))
+         goto cleanup;
+ 
++    if (args->ncpumaps < 0) {
++        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("ncpumaps must be non-negative"));
++        goto cleanup;
++    }
++    if (args->maplen < 0) {
++        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("maplen must be non-negative"));
++        goto cleanup;
++    }
+     if (args->ncpumaps > REMOTE_VCPUINFO_MAX) {
+         virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("ncpumaps > REMOTE_VCPUINFO_MAX"));
+         goto cleanup;
+@@ -2811,6 +2831,11 @@ remoteDispatchDomainGetEmulatorPinInfo(virNetServer *server G_GNUC_UNUSED,
+     if (!(dom = get_nonnull_domain(conn, args->dom)))
+         goto cleanup;
+ 
++    if (args->maplen < 0) {
++        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("maplen must be non-negative"));
++        goto cleanup;
++    }
++
+     /* Allocate buffers to take the results */
+     if (args->maplen > 0)
+         cpumaps = g_new0(unsigned char, args->maplen);
+@@ -2858,6 +2883,14 @@ remoteDispatchDomainGetVcpus(virNetServer *server G_GNUC_UNUSED,
+     if (!(dom = get_nonnull_domain(conn, args->dom)))
+         goto cleanup;
+ 
++    if (args->maxinfo < 0) {
++        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("maxinfo must be non-negative"));
++        goto cleanup;
++    }
++    if (args->maplen < 0) {
++        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("maxinfo must be non-negative"));
++        goto cleanup;
++    }
+     if (args->maxinfo > REMOTE_VCPUINFO_MAX) {
+         virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("maxinfo > REMOTE_VCPUINFO_MAX"));
+         goto cleanup;
+@@ -3096,6 +3129,10 @@ remoteDispatchDomainGetMemoryParameters(virNetServer *server G_GNUC_UNUSED,
+ 
+     flags = args->flags;
+ 
++    if (args->nparams < 0) {
++        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("nparams must be non-negative"));
++        goto cleanup;
++    }
+     if (args->nparams > REMOTE_DOMAIN_MEMORY_PARAMETERS_MAX) {
+         virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("nparams too large"));
+         goto cleanup;
+@@ -3156,6 +3193,10 @@ remoteDispatchDomainGetNumaParameters(virNetServer *server G_GNUC_UNUSED,
+ 
+     flags = args->flags;
+ 
++    if (args->nparams < 0) {
++        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("nparams must be non-negative"));
++        goto cleanup;
++    }
+     if (args->nparams > REMOTE_DOMAIN_NUMA_PARAMETERS_MAX) {
+         virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("nparams too large"));
+         goto cleanup;
+@@ -3216,6 +3257,10 @@ remoteDispatchDomainGetBlkioParameters(virNetServer *server G_GNUC_UNUSED,
+ 
+     flags = args->flags;
+ 
++    if (args->nparams < 0) {
++        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("nparams must be non-negative"));
++        goto cleanup;
++    }
+     if (args->nparams > REMOTE_DOMAIN_BLKIO_PARAMETERS_MAX) {
+         virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("nparams too large"));
+         goto cleanup;
+@@ -3277,6 +3322,10 @@ remoteDispatchNodeGetCPUStats(virNetServer *server G_GNUC_UNUSED,
+ 
+     flags = args->flags;
+ 
++    if (args->nparams < 0) {
++        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("nparams must be non-negative"));
++        goto cleanup;
++    }
+     if (args->nparams > REMOTE_NODE_CPU_STATS_MAX) {
+         virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("nparams too large"));
+         goto cleanup;
+@@ -3339,6 +3388,10 @@ remoteDispatchNodeGetMemoryStats(virNetServer *server G_GNUC_UNUSED,
+ 
+     flags = args->flags;
+ 
++    if (args->nparams < 0) {
++        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("nparams must be non-negative"));
++        goto cleanup;
++    }
+     if (args->nparams > REMOTE_NODE_MEMORY_STATS_MAX) {
+         virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("nparams too large"));
+         goto cleanup;
+@@ -3514,6 +3567,10 @@ remoteDispatchDomainGetBlockIoTune(virNetServer *server G_GNUC_UNUSED,
+     if (!conn)
+         goto cleanup;
+ 
++    if (args->nparams < 0) {
++        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("nparams must be non-negative"));
++        goto cleanup;
++    }
+     if (args->nparams > REMOTE_DOMAIN_BLOCK_IO_TUNE_PARAMETERS_MAX) {
+         virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("nparams too large"));
+         goto cleanup;
+@@ -5079,6 +5136,10 @@ remoteDispatchDomainGetInterfaceParameters(virNetServer *server G_GNUC_UNUSED,
+ 
+     flags = args->flags;
+ 
++    if (args->nparams < 0) {
++        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("nparams must be non-negative"));
++        goto cleanup;
++    }
+     if (args->nparams > REMOTE_DOMAIN_INTERFACE_PARAMETERS_MAX) {
+         virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("nparams too large"));
+         goto cleanup;
+@@ -5299,6 +5360,10 @@ remoteDispatchNodeGetMemoryParameters(virNetServer *server G_GNUC_UNUSED,
+ 
+     flags = args->flags;
+ 
++    if (args->nparams < 0) {
++        virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("nparams must be non-negative"));
++        goto cleanup;
++    }
+     if (args->nparams > REMOTE_NODE_MEMORY_PARAMETERS_MAX) {
+         virReportError(VIR_ERR_INTERNAL_ERROR, "%s", _("nparams too large"));
+         goto cleanup;
+diff --git a/src/rpc/gendispatch.pl b/src/rpc/gendispatch.pl
+index 5ce988c5ae..c5842dc796 100755
+--- a/src/rpc/gendispatch.pl
++++ b/src/rpc/gendispatch.pl
+@@ -1070,6 +1070,11 @@ elsif ($mode eq "server") {
+         print "\n";
+ 
+         if ($single_ret_as_list) {
++            print "    if (args->$single_ret_list_max_var < 0) {\n";
++            print "        virReportError(VIR_ERR_RPC,\n";
++            print "                       \"%s\", _(\"max$single_ret_list_name must be non-negative\"));\n";
++            print "        goto cleanup;\n";
++            print "    }\n";
+             print "    if (args->$single_ret_list_max_var > $single_ret_list_max_define) {\n";
+             print "        virReportError(VIR_ERR_RPC,\n";
+             print "                       \"%s\", _(\"max$single_ret_list_name > $single_ret_list_max_define\"));\n";
+-- 
+2.27.0
+
diff --git a/remote_daemon-Don-t-run-virStateCleanup-if-virStateR.patch b/remote_daemon-Don-t-run-virStateCleanup-if-virStateR.patch
deleted file mode 100644
index 65a8c246c8edb0feb262ee380b67a421221c2262..0000000000000000000000000000000000000000
--- a/remote_daemon-Don-t-run-virStateCleanup-if-virStateR.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From ffaa244c76d7baeccab1846b1cae8ca057718f03 Mon Sep 17 00:00:00 2001
-From: huangkai <huangkai101@huawei.com>
-Date: Sun, 14 Aug 2022 17:32:00 +0800
-Subject: [PATCH 18/22] remote_daemon: Don't run virStateCleanup() if
- virStateReload() is still running
-
-When a SIGHUP is received a thread is spawned that runs
-virStateReload(). However, if SIGINT is received while the former
-thread is still running then we may get into problematic
-situation: the cleanup code in main() sees drivers initialized
-and thus calls virStateCleanup(). So now we have two threads, one
-running virStateReload() the other virStateCleanup(). In this
-situation it's very likely that a race condition occurs and
-either of threads causes SIGSEGV.
-
-To fix this, unmark drivers as initialized in the
-virStateReload() thread for the time the function runs.
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2075837
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Martin Kletzander <mkletzan@redhat.com>
----
- src/remote/remote_daemon.c | 12 +++++++-----
- 1 file changed, 7 insertions(+), 5 deletions(-)
-
-diff --git a/src/remote/remote_daemon.c b/src/remote/remote_daemon.c
-index a1552800e9..cb93e39413 100644
---- a/src/remote/remote_daemon.c
-+++ b/src/remote/remote_daemon.c
-@@ -77,7 +77,7 @@ virNetSASLContextPtr saslCtxt = NULL;
- virNetServerProgramPtr remoteProgram = NULL;
- virNetServerProgramPtr qemuProgram = NULL;
- 
--volatile bool driversInitialized = false;
-+volatile gint driversInitialized = 0;
- 
- static void daemonErrorHandler(void *opaque G_GNUC_UNUSED,
-                                virErrorPtr err G_GNUC_UNUSED)
-@@ -469,7 +469,7 @@ static void daemonReloadHandler(virNetDaemonPtr dmn G_GNUC_UNUSED,
- {
-     virThread thr;
- 
--    if (!driversInitialized) {
-+    if (!g_atomic_int_compare_and_exchange(&driversInitialized, 1, 0)) {
-         VIR_WARN("Drivers are not initialized, reload ignored");
-         return;
-     }
-@@ -480,6 +480,9 @@ static void daemonReloadHandler(virNetDaemonPtr dmn G_GNUC_UNUSED,
-          * Not much we can do on error here except log it.
-          */
-         VIR_ERROR(_("Failed to create thread to handle daemon restart"));
-+        /* Drivers were initialized at the beginning, otherwise we wouldn't
-+         * even get here. */
-+        g_atomic_int_set(&driversInitialized, 1);
-     }
- }
- 
-@@ -606,7 +609,7 @@ static void daemonRunStateInit(void *opaque)
-         goto cleanup;
-     }
- 
--    driversInitialized = true;
-+    g_atomic_int_set(&driversInitialized, 1);
- 
- #ifdef WITH_DBUS
-     /* Tie the non-privileged daemons to the session/shutdown lifecycle */
-@@ -1206,10 +1209,9 @@ int main(int argc, char **argv) {
- 
-     virNetlinkEventServiceStopAll();
- 
--    if (driversInitialized) {
-+    if (g_atomic_int_compare_and_exchange(&driversInitialized, 1, 0)) {
-         /* NB: Possible issue with timing window between driversInitialized
-          * setting if virNetlinkEventServerStart fails */
--        driversInitialized = false;
-         virStateCleanup();
-     }
- 
--- 
-2.33.0
-
diff --git a/remote_driver-Restore-special-behavior-of-remoteDoma.patch b/remote_driver-Restore-special-behavior-of-remoteDoma.patch
new file mode 100644
index 0000000000000000000000000000000000000000..e05b7e36a830e5adaddf8f638145e4b49660d0a3
--- /dev/null
+++ b/remote_driver-Restore-special-behavior-of-remoteDoma.patch
@@ -0,0 +1,45 @@
+From 65298ef17e3c16a6eeb2ea33671fa26633a0a7d9 Mon Sep 17 00:00:00 2001
+From: Michal Privoznik <mprivozn@redhat.com>
+Date: Mon, 29 Jan 2024 10:07:05 +0100
+Subject: [PATCH] remote_driver: Restore special behavior of
+ remoteDomainGetBlockIoTune()
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+In v9.10.0-rc1~103 the remote driver was switched to g_auto() for
+client RPC return parameters. But whilst doing so a small bug
+slipped in: previously, when virDomainGetBlockIoTune() was called
+with *nparams == 0, the function set *nparams to the number of
+supported params and zero was returned (so that client can
+allocate memory and call the API second time). IOW - the usual,
+old style of APIs where we didn't want to allocate memory on
+caller's behalf. But because of this bug, a negative one is
+returned instead.
+
+Fixes: 501825011c1fe80f458820c7efe5a198e0af9be5
+Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+Reviewed-by: Ján Tomko <jtomko@redhat.com>
+
+ref: https://github.com/libvirt/libvirt/commit/3a3f73ea9f1925ca5e256fa54c5aa451ddeaa19e
+Signed-off-by: shenyage <shenyage1@huawei.com>
+---
+ src/remote/remote_driver.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
+index 25fae1cad6..a1a0edd7a2 100644
+--- a/src/remote/remote_driver.c
++++ b/src/remote/remote_driver.c
+@@ -2577,7 +2577,7 @@ static int remoteDomainGetBlockIoTune(virDomainPtr domain,
+      */
+     if (*nparams == 0) {
+         *nparams = ret.nparams;
+-        return -1;
++        return 0;
+     }
+ 
+     if (virTypedParamsDeserialize((struct _virTypedParameterRemote *) ret.params.params_val,
+-- 
+2.43.0.windows.1
+
diff --git a/rpc-Fix-memory-leak-of-fds.patch b/rpc-Fix-memory-leak-of-fds.patch
deleted file mode 100644
index bd806121016f436a203d4cdc0bce99cca125b193..0000000000000000000000000000000000000000
--- a/rpc-Fix-memory-leak-of-fds.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 88ddb9ae6bc020c5ce64f98a6a8e5823f48c885a Mon Sep 17 00:00:00 2001
-From: Peng Liang <liangpeng10@huawei.com>
-Date: Wed, 2 Mar 2022 17:22:05 +0800
-Subject: [PATCH 108/108] rpc: Fix memory leak of fds
-
-In virSystemdActivationClaimFDs, the memory of ent->fds has been stolen
-and stored in fds, but fds is never freed, which causes a memory leak.
-Fix it by declaring fds as g_autofree.
-
-Reported-by: Jie Tang <tangjie18@huawei.com>
-Signed-off-by: Peng Liang <liangpeng10@huawei.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-(cherry picked from commit 8a1915c4d6c33669dcb390d0708cb6e5d651770d)
----
- src/rpc/virnetserver.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/rpc/virnetserver.c b/src/rpc/virnetserver.c
-index 242052754f..26f3a5ec31 100644
---- a/src/rpc/virnetserver.c
-+++ b/src/rpc/virnetserver.c
-@@ -683,7 +683,7 @@ virNetServerAddServiceActivation(virNetServerPtr srv,
-                                  size_t max_queued_clients,
-                                  size_t nrequests_client_max)
- {
--    int *fds;
-+    g_autofree int *fds = NULL;
-     size_t nfds;
- 
-     if (act == NULL)
--- 
-2.33.0
-
diff --git a/rpc-add-support-for-filtering-acls-by-uint-params.patch b/rpc-add-support-for-filtering-acls-by-uint-params.patch
deleted file mode 100644
index 1c9b4e7ac03d1ba2c6d3409710bd3f217455421e..0000000000000000000000000000000000000000
--- a/rpc-add-support-for-filtering-acls-by-uint-params.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-From c0f2166a6c110043b55c484e69d716b1a7f64b64 Mon Sep 17 00:00:00 2001
-From: Jan Tomko <jtomko@redhat.com>
-Date: Wed, 14 Oct 2020 17:06:09 +0800
-Subject: [PATCH] rpc: add support for filtering @acls by uint params
-
-CVE-2020-25637
-
-Add a new field to @acl annotations for filtering by
-unsigned int parameters.
-
-Signed-off-by: Jan Tomko <jtomko@redhat.com>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
-
-cherry-pick from commit 50864dcda191eb35732dbd80fb6ca251a6bba923
-Signed-off-by: Jiajie Li <lijiajie11@huawei.com>
----
- src/remote/remote_protocol.x |  3 +++
- src/rpc/gendispatch.pl       | 21 ++++++++++++++++++++-
- 2 files changed, 23 insertions(+), 1 deletion(-)
-
-diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x
-index d4393680e9..5f3858c00c 100644
---- a/src/remote/remote_protocol.x
-+++ b/src/remote/remote_protocol.x
-@@ -3805,6 +3805,7 @@ enum remote_procedure {
-      *
-      * - @acl: <object>:<permission>
-      * - @acl: <object>:<permission>:<flagname>
-+     * - @acl: <object>:<permission>::<param>:<value>
-      *
-      *   Declare the access control requirements for the API. May be repeated
-      *   multiple times, if multiple rules are required.
-@@ -3814,6 +3815,8 @@ enum remote_procedure {
-      *     <permission> is one of the permissions in access/viraccessperm.h
-      *     <flagname> indicates the rule only applies if the named flag
-      *     is set in the API call
-+     *     <param> and <value> can be used to check an unsigned in parameter
-+     *     against value
-      *
-      * - @aclfilter: <object>:<permission>
-      *
-diff --git a/src/rpc/gendispatch.pl b/src/rpc/gendispatch.pl
-index 6feb1c8320..590a46ef66 100755
---- a/src/rpc/gendispatch.pl
-+++ b/src/rpc/gendispatch.pl
-@@ -2111,10 +2111,12 @@ elsif ($mode eq "client") {
-             my @acl;
-             foreach (@{$acl}) {
-                 my @bits = split /:/;
--                push @acl, { object => $bits[0], perm => $bits[1], flags => $bits[2] }
-+                push @acl, { object => $bits[0], perm => $bits[1], flags => $bits[2],
-+                             param => $bits[3], value => $bits[4] }
-             }
- 
-             my $checkflags = 0;
-+            my $paramtocheck = undef;
-             for (my $i = 1 ; $i <= $#acl ; $i++) {
-                 if ($acl[$i]->{object} ne $acl[0]->{object}) {
-                     die "acl for '$call->{ProcName}' cannot check different objects";
-@@ -2122,6 +2124,9 @@ elsif ($mode eq "client") {
-                 if (defined $acl[$i]->{flags} && length $acl[$i]->{flags}) {
-                     $checkflags = 1;
-                 }
-+                if (defined $acl[$i]->{param}) {
-+                    $paramtocheck = $acl[$i]->{param};
-+                }
-             }
- 
-             my $apiname = $prefix . $call->{ProcName};
-@@ -2157,6 +2162,9 @@ elsif ($mode eq "client") {
-             if ($checkflags) {
-                 push @argdecls, "unsigned int flags";
-             }
-+            if (defined $paramtocheck) {
-+                push @argdecls, "unsigned int " . $paramtocheck;
-+            }
- 
-             my $ret;
-             my $pass;
-@@ -2217,6 +2225,17 @@ elsif ($mode eq "client") {
-                         }
-                         print "        ";
-                     }
-+                    if (defined $acl->{param}) {
-+                        my $param = $acl->{param};
-+                        my $value = $acl->{value};
-+                        if ($value =~ /^\!/) {
-+                            $value = substr $value, 1;
-+                            print "($param != ($value)) &&\n";
-+                        } else {
-+                            print "($param == ($value)) &&\n";
-+                        }
-+                        print "        ";
-+                    }
-                     print "(rv = $method(" . join(", ", @argvars, $perm) . ")) <= 0) {\n";
-                     print "        virObjectUnref(mgr);\n";
-                     if ($action eq "Ensure") {
--- 
-2.23.0
-
diff --git a/rpc-avoid-crash-when-system-time-jump-back.patch b/rpc-avoid-crash-when-system-time-jump-back.patch
deleted file mode 100644
index 45e90f47becfc5951404261c4a383338bd65e514..0000000000000000000000000000000000000000
--- a/rpc-avoid-crash-when-system-time-jump-back.patch
+++ /dev/null
@@ -1,125 +0,0 @@
-From b5b384c02c67cde982e97e9de14093605f6e10ec Mon Sep 17 00:00:00 2001
-From: BiaoXiang Ye <yebiaoxiang@huawei.com>
-Date: Wed, 10 Feb 2021 05:58:05 +0000
-Subject: [PATCH 013/108] rpc: avoid crash when system time jump back
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
- Setting the system time backward would lead to a
- multiplication overflow in function virKeepAliveStart.
- The function virKeepAliveTimerInternal got the same bug too.
-
- Backtrace below:
- #0  0x0000ffffae898470 in raise () from /usr/lib64/libc.so.6
- #1  0x0000ffffae89981c in abort () from /usr/lib64/libc.so.6
- #2  0x0000ffffaf9a36a8 in __mulvsi3 () from /usr/lib64/libvirt.so.0
- #3  0x0000ffffaf8fd9e8 in virKeepAliveStart (ka=0xaaaaf954ce10, interval=interval entry=0,
-     count=count entry=0) at ../../src/rpc/virkeepalive.c:283
- #4  0x0000ffffaf908560 in virNetServerClientStartKeepAlive (client=0xaaaaf954cbe0)
-     at ../../src/rpc/virnetserverclient.c:1628
- #5  0x0000aaaac57eb6dc in remoteDispatchConnectSupportsFeature (server=0xaaaaf95309d0,
-     msg=0xaaaaf9549d90, ret=0xffff8c007fc0, args=0xffff8c002e70, rerr=0xffff9ea054a0,
-     client=0xaaaaf954cbe0) at ../../src/remote/remote_daemon_dispatch.c:5063
- #6  remoteDispatchConnectSupportsFeatureHelper (server=0xaaaaf95309d0, client=0xaaaaf954cbe0,
-     msg=0xaaaaf9549d90, rerr=0xffff9ea054a0, args=0xffff8c002e70, ret=0xffff8c007fc0)
-     at ./remote/remote_daemon_dispatch_stubs.h:3503
- #7  0x0000ffffaf9053a4 in virNetServerProgramDispatchCall(msg=0xaaaaf9549d90, client=0xaaaaf954cbe0,
-     server=0x0, prog=0xaaaaf953a170) at ../../src/rpc/virnetserverprogram.c:451
- #8  virNetServerProgramDispatch (prog=0xaaaaf953a170, server=0x0, server entry=0xaaaaf95309d0,
-     client=0xaaaaf954cbe0, msg=0xaaaaf9549d90) at ../../src/rpc/virnetserverprogram.c:306
- #9  0x0000ffffaf90a6bc in virNetServerProcessMsg (msg=<optimized out>, prog=<optimized out>,
-     client=<optimized out>, srv=0xaaaaf95309d0) at ../../src/rpc/virnetserver.c:137
- #10 virNetServerHandleJob (jobOpaque=0xaaaaf950df80, opaque=0xaaaaf95309d0)
-     at ../../src/rpc/virnetserver.c:154
- #11 0x0000ffffaf812e14 in virThreadPoolWorker (opaque=<optimized out>)
-     at ../../src/util/virthreadpool.c:163
- #12 0x0000ffffaf81237c in virThreadHelper (data=<optimized out>) at ../../src/util/virthread.c:246
- #13 0x0000ffffaea327ac in ?? () from /usr/lib64/libpthread.so.0
- #14 0x0000ffffae93747c in ?? () from /usr/lib64/libc.so.6
- (gdb) frame 3
- #3  0x0000ffffaf8fd9e8 in virKeepAliveStart (ka=0xaaaaf954ce10, interval=interval entry=0,
-     count=count entry=0) at ../../src/rpc/virkeepalive.c:283
- 283            timeout = ka->interval - delay;
- (gdb) list
- 278    now = time(NULL);
- 279    delay = now - ka->lastPacketReceived; <='delay' got a negative value
- 280    if (delay > ka->interval)
- 281        timeout = 0;
- 282    else
- 283        timeout = ka->interval - delay;
- 284    ka->intervalStart = now - (ka->interval - timeout);
- 285    ka->timer = virEventAddTimeout(timeout * 1000, virKeepAliveTimer, <= multiplication overflow
- 286                                   ka, virObjectFreeCallback);
- 287    if (ka->timer < 0)
- (gdb) p now
- $2 = 18288001
- (gdb) p ka->lastPacketReceived
- $3 = 1609430405
-
-Signed-off-by: BiaoXiang Ye <yebiaoxiang@huawei.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Signed-off-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 613e994af0e7b93dfc641aae1aa9ccaad0c837f3)
----
- src/rpc/virkeepalive.c | 15 ++++++++-------
- 1 file changed, 8 insertions(+), 7 deletions(-)
-
-diff --git a/src/rpc/virkeepalive.c b/src/rpc/virkeepalive.c
-index 860b91b6b1..119427eb03 100644
---- a/src/rpc/virkeepalive.c
-+++ b/src/rpc/virkeepalive.c
-@@ -40,8 +40,8 @@ struct _virKeepAlive {
-     int interval;
-     unsigned int count;
-     unsigned int countToDeath;
--    time_t lastPacketReceived;
--    time_t intervalStart;
-+    gint64 lastPacketReceived;
-+    gint64 intervalStart;
-     int timer;
- 
-     virKeepAliveSendFunc sendCB;
-@@ -113,7 +113,7 @@ static bool
- virKeepAliveTimerInternal(virKeepAlivePtr ka,
-                           virNetMessagePtr *msg)
- {
--    time_t now = time(NULL);
-+    gint64 now = g_get_monotonic_time() / G_USEC_PER_SEC;
-     int timeval;
- 
-     if (ka->interval <= 0 || ka->intervalStart == 0)
-@@ -231,9 +231,9 @@ virKeepAliveStart(virKeepAlivePtr ka,
-                   unsigned int count)
- {
-     int ret = -1;
--    time_t delay;
-+    gint64 delay;
-     int timeout;
--    time_t now;
-+    gint64 now;
- 
-     virObjectLock(ka);
- 
-@@ -270,7 +270,7 @@ virKeepAliveStart(virKeepAlivePtr ka,
-           "ka=%p client=%p interval=%d count=%u",
-           ka, ka->client, interval, count);
- 
--    now = time(NULL);
-+    now = g_get_monotonic_time() / G_USEC_PER_SEC;
-     delay = now - ka->lastPacketReceived;
-     if (delay > ka->interval)
-         timeout = 0;
-@@ -375,7 +375,8 @@ virKeepAliveCheckMessage(virKeepAlivePtr ka,
-     virObjectLock(ka);
- 
-     ka->countToDeath = ka->count;
--    ka->lastPacketReceived = ka->intervalStart = time(NULL);
-+    ka->intervalStart = g_get_monotonic_time() / G_USEC_PER_SEC;
-+    ka->lastPacketReceived = ka->intervalStart;
- 
-     if (msg->header.prog == KEEPALIVE_PROGRAM &&
-         msg->header.vers == KEEPALIVE_PROTOCOL_VERSION &&
--- 
-2.33.0
-
diff --git a/rpc-gendispatch-handle-empty-flags.patch b/rpc-gendispatch-handle-empty-flags.patch
deleted file mode 100644
index 25ff1b4538d6a609557b574d778474f65619616d..0000000000000000000000000000000000000000
--- a/rpc-gendispatch-handle-empty-flags.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 89fa75d69010e6d0d107b7025538fe14201da489 Mon Sep 17 00:00:00 2001
-From: Jan Tomko <jtomko@redhat.com>
-Date: Wed, 14 Oct 2020 16:38:07 +0800
-Subject: [PATCH] rpc: gendispatch: handle empty flags
-
-CVE-2020-25637
-
-Prepare for omission of the <flagname> in remote_protocol.x
-@acl annotations:
- @acl: <object>:<permission>:<flagname>
-so that we can add more field after, e.g.:
- @acl: <object>:<permission>::<field>
-
-Signed-off-by: Jan Tomko <jtomko@redhat.com>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
-
-cherry-pick from commit 955029bd0ad7ef96000f529ac38204a8f4a96401
-Signed-off-by: Jiajie Li <lijiajie11@huawei.com>
----
- src/rpc/gendispatch.pl | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/rpc/gendispatch.pl b/src/rpc/gendispatch.pl
-index 0b2ae59910..6feb1c8320 100755
---- a/src/rpc/gendispatch.pl
-+++ b/src/rpc/gendispatch.pl
-@@ -2119,7 +2119,7 @@ elsif ($mode eq "client") {
-                 if ($acl[$i]->{object} ne $acl[0]->{object}) {
-                     die "acl for '$call->{ProcName}' cannot check different objects";
-                 }
--                if (defined $acl[$i]->{flags}) {
-+                if (defined $acl[$i]->{flags} && length $acl[$i]->{flags}) {
-                     $checkflags = 1;
-                 }
-             }
-@@ -2207,7 +2207,7 @@ elsif ($mode eq "client") {
-                     my $method = "virAccessManagerCheck" . $object;
-                     my $space = ' ' x length($method);
-                     print "    if (";
--                    if (defined $acl->{flags}) {
-+                    if (defined $acl->{flags} && length $acl->{flags}) {
-                         my $flags = $acl->{flags};
-                         if ($flags =~ /^\!/) {
-                             $flags = substr $flags, 1;
--- 
-2.23.0
-
diff --git a/rpc-require-write-acl-for-guest-agent-in-virDomainIn.patch b/rpc-require-write-acl-for-guest-agent-in-virDomainIn.patch
deleted file mode 100644
index 2192ac1400feefbe6567ead553a43358c6e98107..0000000000000000000000000000000000000000
--- a/rpc-require-write-acl-for-guest-agent-in-virDomainIn.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-From 0747f83af62231476c2af0b9b8a25ebbaeba89c0 Mon Sep 17 00:00:00 2001
-From: Jan Tomko <jtomko@redhat.com>
-Date: Wed, 14 Oct 2020 17:18:29 +0800
-Subject: [PATCH] rpc: require write acl for guest agent in
- virDomainInterfaceAddresses
-
-CVE-2020-25637
-
-Add a requirement for domain:write if source is set to
-VIR_DOMAIN_INTERFACE_ADDRESSES_SRC_AGENT.
-
-Signed-off-by: Jan Tomko <jtomko@redhat.com>
-Reported-by: Ilja Van Sprundel <ivansprundel@ioactive.com>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
-
-cherry-pick from commit e4116eaa44cb366b59f7fe98f4b88d04c04970ad
-Signed-off-by: Jiajie Li <lijiajie11@huawei.com>
----
- src/libxl/libxl_driver.c     | 2 +-
- src/lxc/lxc_driver.c         | 2 +-
- src/qemu/qemu_driver.c       | 2 +-
- src/remote/remote_protocol.x | 1 +
- 4 files changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/src/libxl/libxl_driver.c b/src/libxl/libxl_driver.c
-index 980984b199..f07700b71c 100644
---- a/src/libxl/libxl_driver.c
-+++ b/src/libxl/libxl_driver.c
-@@ -6381,7 +6381,7 @@ libxlDomainInterfaceAddresses(virDomainPtr dom,
-     if (!(vm = libxlDomObjFromDomain(dom)))
-         goto cleanup;
- 
--    if (virDomainInterfaceAddressesEnsureACL(dom->conn, vm->def) < 0)
-+    if (virDomainInterfaceAddressesEnsureACL(dom->conn, vm->def, source) < 0)
-         goto cleanup;
- 
-     if (virDomainObjCheckActive(vm) < 0)
-diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c
-index 851894c459..71c7068bbf 100644
---- a/src/lxc/lxc_driver.c
-+++ b/src/lxc/lxc_driver.c
-@@ -1698,7 +1698,7 @@ lxcDomainInterfaceAddresses(virDomainPtr dom,
-     if (!(vm = lxcDomObjFromDomain(dom)))
-         goto cleanup;
- 
--    if (virDomainInterfaceAddressesEnsureACL(dom->conn, vm->def) < 0)
-+    if (virDomainInterfaceAddressesEnsureACL(dom->conn, vm->def, source) < 0)
-         goto cleanup;
- 
-     if (virDomainObjCheckActive(vm) < 0)
-diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
-index a0f6df2490..5901f922bf 100644
---- a/src/qemu/qemu_driver.c
-+++ b/src/qemu/qemu_driver.c
-@@ -22058,7 +22058,7 @@ qemuDomainInterfaceAddresses(virDomainPtr dom,
-     if (!(vm = qemuDomainObjFromDomain(dom)))
-         goto cleanup;
- 
--    if (virDomainInterfaceAddressesEnsureACL(dom->conn, vm->def) < 0)
-+    if (virDomainInterfaceAddressesEnsureACL(dom->conn, vm->def, source) < 0)
-         goto cleanup;
- 
-     if (virDomainObjCheckActive(vm) < 0)
-diff --git a/src/remote/remote_protocol.x b/src/remote/remote_protocol.x
-index 5f3858c00c..8b05082b61 100644
---- a/src/remote/remote_protocol.x
-+++ b/src/remote/remote_protocol.x
-@@ -6211,6 +6211,7 @@ enum remote_procedure {
-     /**
-      * @generate: none
-      * @acl: domain:read
-+     * @acl: domain:write::source:VIR_DOMAIN_INTERFACE_ADDRESSES_SRC_AGENT
-      */
-     REMOTE_PROC_DOMAIN_INTERFACE_ADDRESSES = 353,
- 
--- 
-2.23.0
-
diff --git a/rpc-socket-properly-call-virSetCloseExec.patch b/rpc-socket-properly-call-virSetCloseExec.patch
deleted file mode 100644
index 9c39133b70a49d1a24e7e622ff1eee978a008e7a..0000000000000000000000000000000000000000
--- a/rpc-socket-properly-call-virSetCloseExec.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 5bde58da3e35283dcbba97f4148db4b10a05ddcc Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
-Date: Tue, 22 Sep 2020 22:29:25 +0200
-Subject: [PATCH 031/108] rpc: socket: properly call virSetCloseExec
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-cppcheck reports:
-style: Argument 'fd<0' to function virSetCloseExec is always 0 [knownArgument]
-
-Signed-off-by: Ján Tomko <jtomko@redhat.com>
-Fixes: 4b9919af4024a6fbc3d4ee996d8a4c27dbc44285
-Reviewed-by: Peter Krempa <pkrempa@redhat.com>
-(cherry picked from commit 2e7849735fc9d51513250f2a8e5712459bf9df63)
----
- src/rpc/virnetsocket.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/rpc/virnetsocket.c b/src/rpc/virnetsocket.c
-index 553728984b..d2c2072e1c 100644
---- a/src/rpc/virnetsocket.c
-+++ b/src/rpc/virnetsocket.c
-@@ -1400,7 +1400,7 @@ int virNetSocketDupFD(virNetSocketPtr sock, bool cloexec)
-     }
- #ifndef F_DUPFD_CLOEXEC
-     if (cloexec &&
--        virSetCloseExec(fd < 0)) {
-+        virSetCloseExec(fd) < 0) {
-         int saveerr = errno;
-         closesocket(fd);
-         errno = saveerr;
--- 
-2.33.0
-
diff --git a/security-fix-SELinux-label-generation-logic.patch b/security-fix-SELinux-label-generation-logic.patch
deleted file mode 100644
index d8ec555ebb9959d32cc3ff95c1d9f407df0b2cb9..0000000000000000000000000000000000000000
--- a/security-fix-SELinux-label-generation-logic.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 1335976926666ba8fd3ef363e7b7cd46a09007fc Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
-Date: Mon, 28 Jun 2021 13:09:04 +0100
-Subject: [PATCH 2/2] security: fix SELinux label generation logic
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-A process can access a file if the set of MCS categories
-for the file is equal-to *or* a subset-of, the set of
-MCS categories for the process.
-
-If there are two VMs:
-
-  a) svirt_t:s0:c117
-  b) svirt_t:s0:c117,c720
-
-Then VM (b) is able to access files labelled for VM (a).
-
-IOW, we must discard case where the categories are equal
-because that is a subset of many other valid category pairs.
-
-Fixes: https://gitlab.com/libvirt/libvirt/-/issues/153
-CVE-2021-3631
-Reviewed-by: Peter Krempa <pkrempa@redhat.com>
-Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
----
- src/security/security_selinux.c | 10 +++++++++-
- 1 file changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c
-index 78ea618e63..c91c7ca484 100644
---- a/src/security/security_selinux.c
-+++ b/src/security/security_selinux.c
-@@ -391,7 +391,15 @@ virSecuritySELinuxMCSFind(virSecurityManagerPtr mgr,
-         VIR_DEBUG("Try cat %s:c%d,c%d", sens, c1 + catMin, c2 + catMin);
- 
-         if (c1 == c2) {
--            mcs = g_strdup_printf("%s:c%d", sens, catMin + c1);
-+            /*
-+             * A process can access a file if the set of MCS categories
-+             * for the file is equal-to *or* a subset-of, the set of
-+             * MCS categories for the process.
-+             *
-+             * IOW, we must discard case where the categories are equal
-+             * because that is a subset of other category pairs.
-+             */
-+            continue;
-         } else {
-             if (c1 > c2) {
-                 int t = c1;
--- 
-2.27.0
-
diff --git a/security_util-Don-t-error-on-macOS-when-getting-sett.patch b/security_util-Don-t-error-on-macOS-when-getting-sett.patch
deleted file mode 100644
index 2b66973f307f0fcc47f72a19cad2ce642675d3ac..0000000000000000000000000000000000000000
--- a/security_util-Don-t-error-on-macOS-when-getting-sett.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 4d7194ab0b86772ea1a25eaf0e5e7e69fa2ba5e9 Mon Sep 17 00:00:00 2001
-From: tangbinzy <tangbin_yewu@cmss.chinamobile.com>
-Date: Wed, 30 Nov 2022 07:32:05 +0000
-Subject: [PATCH 10/24] security_util: Don't error on macOS when 
- getting/setting/moving XATTRs There are three internal APIs implemented in
- this security_util file: virSecurityGetRememberedLabel(),
- virSecuritySetRememberedLabel() and virSecurityMoveRememberedLabel() for
- getting, setting and moving remembered seclabel. All three have a special
- return value of -2 when XATTRs are not supported (for whatever reason) and
- callers are expected to handle it gracefully. However, after my commit of
- v5.7.0-rc1~115 it may happen that one of the three functions returned -1 even
- though XATTRs are not supported (and thus -2 should have been returned).
-
-Fixes: 7cfb7aab573a031880a1f4fd20747843fea109ba
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Roman Bolshakov <r.bolshakov@yadro.com>
-Reviewed-by: Andrea Bolognani <abologna@redhat.com>
-
-Signed-off-by: tangbin <tangbin_yewu@cmss.chinamobile.com>
-(cherry-pick from d337543f06e43006869310adc3c0e60d76516ca9)
----
- src/security/security_util.c | 15 ++++++++++++---
- 1 file changed, 12 insertions(+), 3 deletions(-)
-
-diff --git a/src/security/security_util.c b/src/security/security_util.c
-index 4f661fd75e..5503f18ffb 100644
---- a/src/security/security_util.c
-+++ b/src/security/security_util.c
-@@ -272,8 +272,11 @@ virSecurityGetRememberedLabel(const char *name,
- 
-     *label = NULL;
- 
--    if (!(ref_name = virSecurityGetRefCountAttrName(name)))
-+    if (!(ref_name = virSecurityGetRefCountAttrName(name))) {
-+        if (errno == ENOSYS)
-+            return -2;
-         return -1;
-+    }
- 
-     if (virFileGetXAttrQuiet(path, ref_name, &value) < 0) {
-         if (errno == ENOSYS || errno == ENODATA || errno == ENOTSUP)
-@@ -367,8 +370,11 @@ virSecuritySetRememberedLabel(const char *name,
-     g_autofree char *value = NULL;
-     unsigned int refcount = 0;
- 
--    if (!(ref_name = virSecurityGetRefCountAttrName(name)))
-+    if (!(ref_name = virSecurityGetRefCountAttrName(name))) {
-+        if (errno == ENOSYS)
-+            return -2;
-         return -1;
-+    }
- 
-     if (virFileGetXAttrQuiet(path, ref_name, &value) < 0) {
-         if (errno == ENOSYS || errno == ENOTSUP) {
-@@ -455,8 +461,11 @@ virSecurityMoveRememberedLabel(const char *name,
- 
-     if (!(ref_name = virSecurityGetRefCountAttrName(name)) ||
-         !(attr_name = virSecurityGetAttrName(name)) ||
--        !(timestamp_name = virSecurityGetTimestampAttrName(name)))
-+        !(timestamp_name = virSecurityGetTimestampAttrName(name))) {
-+        if (errno == ENOSYS)
-+            return -2;
-         return -1;
-+    }
- 
-     if (virFileGetXAttrQuiet(src, ref_name, &ref_value) < 0) {
-         if (errno == ENOSYS || errno == ENOTSUP) {
--- 
-2.27.0
-
diff --git a/securityselinuxhelper-Fix-retval-of-setcon_raw-and-s.patch b/securityselinuxhelper-Fix-retval-of-setcon_raw-and-s.patch
deleted file mode 100644
index 317a523af2a10cea738d40ce296d34b2e6a99133..0000000000000000000000000000000000000000
--- a/securityselinuxhelper-Fix-retval-of-setcon_raw-and-s.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 6ba1a092489ff7dbef0919417789e4ec4a6798a4 Mon Sep 17 00:00:00 2001
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Mon, 10 May 2021 10:33:02 +0200
-Subject: [PATCH 053/108] securityselinuxhelper: Fix retval of setcon_raw() and
- security_disable()
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The securityselinuxhelper is a mock that's replacing libselinux
-APIs with our own implementation to achieve deterministic
-results. Our implementation uses env vars (among other things) to
-hold internal state. For instance, "FAKE_SELINUX_CONTEXT" and
-"FAKE_SELINUX_DISABLED" variables are used. However, as we were
-switching from setenv() to g_setenv() we also changed the set of
-possible retvals from setcon_raw() and security_disable().
-Previously, the retval of setenv() was used directly which
-returns 0 on success and -1 on error. But g_setenv() has
-different retval semantics: it returns 1 on success and 0 on
-error.
-
-This discrepancy can be observed by running viridentitytest where
-case #2 reports an error ("!") - because setcon_raw() returns 1.
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 4ce11062779cee3eaec0b75d862e3d7341ec3511)
----
- tests/securityselinuxhelper.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tests/securityselinuxhelper.c b/tests/securityselinuxhelper.c
-index 63b57261da..e2c1dc9e0a 100644
---- a/tests/securityselinuxhelper.c
-+++ b/tests/securityselinuxhelper.c
-@@ -145,7 +145,7 @@ int setcon_raw(const char *context)
-         errno = EINVAL;
-         return -1;
-     }
--    return g_setenv("FAKE_SELINUX_CONTEXT", context, TRUE);
-+    return g_setenv("FAKE_SELINUX_CONTEXT", context, TRUE) == TRUE ? 0 : -1;
- }
- 
- int setcon(const char *context)
-@@ -224,7 +224,7 @@ int security_disable(void)
-         return -1;
-     }
- 
--    return g_setenv("FAKE_SELINUX_DISABLED", "1", TRUE);
-+    return g_setenv("FAKE_SELINUX_DISABLED", "1", TRUE) == TRUE ? 0 : -1;
- }
- 
- int security_getenforce(void)
--- 
-2.33.0
-
diff --git a/selinux-Reflect-context_str-type-change.patch b/selinux-Reflect-context_str-type-change.patch
deleted file mode 100644
index 2ec7f9586817b3d304aa15b06a9256fbb21d7c6d..0000000000000000000000000000000000000000
--- a/selinux-Reflect-context_str-type-change.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 77403dd65dad4cc81a7f237642ff40d87479ae73 Mon Sep 17 00:00:00 2001
-From: mayunlong <mayunlong6@huawei.com>
-Date: Wed, 9 Aug 2023 21:03:21 +0800
-Subject: [PATCH] selinux: Reflect context_str() type change
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-As of [1]. libselinux changed the type of context_str() - it now
-returns a const string. Follow this change in our code base.
-
-1: https://github.com/SELinuxProject/selinux/commit/dd98fa322766760c4e1f029cf19d2515a583304f
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/security/security_selinux.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c
-index c91c7ca484..cb4dc3e101 100644
---- a/src/security/security_selinux.c
-+++ b/src/security/security_selinux.c
-@@ -541,7 +541,7 @@ static char *
- virSecuritySELinuxContextAddRange(char *src,
-                                   char *dst)
- {
--    char *str = NULL;
-+    const char *str = NULL;
-     char *ret = NULL;
-     context_t srccon = NULL;
-     context_t dstcon = NULL;
-@@ -582,7 +582,7 @@ virSecuritySELinuxGenNewContext(const char *basecontext,
- {
-     context_t context = NULL;
-     char *ret = NULL;
--    char *str;
-+    const char *str;
-     char *ourSecContext = NULL;
-     context_t ourContext = NULL;
- 
--- 
-2.41.0.windows.1
-
diff --git a/selinux-adapt-to-libselinux.patch b/selinux-adapt-to-libselinux.patch
deleted file mode 100644
index e6e188a29feadda3f154e59a2b339da167b71411..0000000000000000000000000000000000000000
--- a/selinux-adapt-to-libselinux.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 20fd0fb6b915363efecd2d108363995d8dea8e1a Mon Sep 17 00:00:00 2001
-From: mayunlong <mayunlong6@huawei.com>
-Date: Wed, 9 Aug 2023 16:20:46 +0800
-Subject: [PATCH] selinux: adapt to libselinux
-
-After libselinux is upgranded to version 3.5,
-the function context_str returns "const char *".
-As a result, the build fails. Now fix it.
-
-Signed-off-by:mayunlong <mayunlong6@huawei.com>
----
- src/security/security_selinux.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c
-index c91c7ca484..cb4dc3e101 100644
---- a/src/security/security_selinux.c
-+++ b/src/security/security_selinux.c
-@@ -541,7 +541,7 @@ static char *
- virSecuritySELinuxContextAddRange(char *src,
-                                   char *dst)
- {
--    char *str = NULL;
-+    const char *str = NULL;
-     char *ret = NULL;
-     context_t srccon = NULL;
-     context_t dstcon = NULL;
-@@ -582,7 +582,7 @@ virSecuritySELinuxGenNewContext(const char *basecontext,
- {
-     context_t context = NULL;
-     char *ret = NULL;
--    char *str;
-+    const char *str;
-     char *ourSecContext = NULL;
-     context_t ourContext = NULL;
- 
--- 
-2.41.0.windows.1
-
diff --git a/sockettest-Check-for-IPv4-in-IPv6-parsing-and-format.patch b/sockettest-Check-for-IPv4-in-IPv6-parsing-and-format.patch
deleted file mode 100644
index d8fe44f9a833d9e8ec08b06586d8f25e532811c7..0000000000000000000000000000000000000000
--- a/sockettest-Check-for-IPv4-in-IPv6-parsing-and-format.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 8dfa48d0b5b64ab8bbc78aabfea8252db38215c5 Mon Sep 17 00:00:00 2001
-From: xuyinghao <xuyinghao2@huawei.com>
-Date: Tue, 16 Aug 2022 19:36:03 +0800
-Subject: [PATCH 03/13] sockettest: Check for IPv4-in-IPv6 parsing and
- formatting
-
-There are two standards how IPv4 address in IPv6 can be expressed:
-
-  ::10.1.2.3
-  ::ffff:10.1.2.3
-
-The former is obsolete and the latter should be used instead [1]. Add test cases to our sockettest to exercise parsing/formatting of the valid address format.
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com
----
- tests/sockettest.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/tests/sockettest.c b/tests/sockettest.c
-index 29a565de40..b30bf0008f 100644
---- a/tests/sockettest.c
-+++ b/tests/sockettest.c
-@@ -373,12 +373,14 @@ mymain(void)
-     DO_TEST_PARSE_AND_CHECK_FORMAT("127.2", "127.2.0.0", AF_INET, false);
-     DO_TEST_PARSE_AND_CHECK_FORMAT("1.2.3", "1.2.0.3", AF_INET, true);
-     DO_TEST_PARSE_AND_CHECK_FORMAT("1.2.3", "1.2.3.0", AF_INET, false);
-+    DO_TEST_PARSE_AND_CHECK_FORMAT("::ffff:a01:203", "::ffff:10.1.2.3", AF_INET6, true);
- 
-     DO_TEST_PARSE_AND_FORMAT("::1", AF_UNSPEC, true);
-     DO_TEST_PARSE_AND_FORMAT("::1", AF_INET, false);
-     DO_TEST_PARSE_AND_FORMAT("::1", AF_INET6, true);
-     DO_TEST_PARSE_AND_FORMAT("::1", AF_UNIX, false);
-     DO_TEST_PARSE_AND_FORMAT("::fffe:0:0", AF_UNSPEC, true);
-+    DO_TEST_PARSE_AND_FORMAT("::ffff:10.1.2.3", AF_UNSPEC, true);
- 
-     /* tests that specify a network that should contain the range */
-     DO_TEST_RANGE("192.168.122.1", "192.168.122.1", "192.168.122.1", 24, 1, true);
--- 
-2.33.0
-
diff --git a/src-workaround-warning-triggered-in-glib-2.69.patch b/src-workaround-warning-triggered-in-glib-2.69.patch
deleted file mode 100644
index af20607de4d3e63cd6d238134df6d4ace95fb622..0000000000000000000000000000000000000000
--- a/src-workaround-warning-triggered-in-glib-2.69.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From a5566155554ce8a43b1912188ae0879cfe2a26ad Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
-Date: Fri, 23 Jul 2021 13:41:02 +0100
-Subject: [PATCH] src: workaround warning triggered in glib 2.69
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Libvirt is using the G_GNUC_FALLTHROUGH macro provided by glib since
-version 2.60. Since we need to support older glib, we also have some
-compatibility code to define it if missing.
-
-We set the GLIB_VERSION_MAX_ALLOWED macro to ensure we get warnings
-when we use an API that dates from a glib version newer than our
-minimum benchmark. Historically this didn't get enforced for (most)
-macros, but GLib 2.69 has addressed that gap.
-
-This causes our usage of G_GNUC_FALLTHROUGH to trigger warnings.
-GLib is right to warn, because it does not know that we have added
-our own fallback for older versions.
-
-The only way to squelch this warning though, is to fully undefine
-the GLib provided G_GNUC_FALLTHROUGH and use our own in its place.
-We'll be able to remove all this compat burden when we finally
-update the min glib version to be >= 2.60
-
-Reviewed-by: Peter Krempa <pkrempa@redhat.com>
-Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
----
- src/internal.h | 11 ++++++++++-
- 1 file changed, 10 insertions(+), 1 deletion(-)
-
-diff --git a/src/internal.h b/src/internal.h
-index 0a03dfc46f..e1250a59fe 100644
---- a/src/internal.h
-+++ b/src/internal.h
-@@ -147,8 +147,17 @@
-  *
-  * silence the compiler warning when falling through a switch case
-  *
-- * TODO: Remove after upgrading to GLib >= 2.60
-+ * Note: GLib 2.69.0 introduced version checks on the
-+ * macro usage. Thus an app setting GLIB_VERSION_MAX_ALLOWED
-+ * to less than 2.60 will trigger a warning using G_GNUC_FALLTHROUGH
-+ * Normally the warning is a good thing, but we want to use our
-+ * fallback impl, so we have to temporarily cull the GLib macro.
-+ *
-+ * All this should be removed once updating to min GLib >= 2.60
-  */
-+#if GLIB_CHECK_VERSION(2, 69, 0)
-+# undef G_GNUC_FALLTHROUGH
-+#endif
- #ifndef G_GNUC_FALLTHROUGH
- # if __GNUC_PREREQ (7, 0)
- #  define G_GNUC_FALLTHROUGH __attribute__((fallthrough))
--- 
-2.27.0
-
diff --git a/storage-avoid-maybe-uninitialized-warning-by-GCC-10.patch b/storage-avoid-maybe-uninitialized-warning-by-GCC-10.patch
deleted file mode 100644
index d7ac1ff3e47f03a62ab9912c9a8a64ce5fbc278f..0000000000000000000000000000000000000000
--- a/storage-avoid-maybe-uninitialized-warning-by-GCC-10.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From 75afa2f5b77edd8c34b2062074abfa5c3029437d Mon Sep 17 00:00:00 2001
-From: Boris Fiuczynski <fiuczy@linux.ibm.com>
-Date: Thu, 13 Aug 2020 16:03:46 +0200
-Subject: [PATCH 046/108] storage: avoid maybe-uninitialized warning by GCC 10
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-GCC 10 complains about variables may be used uninitialized.
-Even though it might be false positives, we can easily avoid them.
-
-Avoiding
- ../src/storage/storage_backend_iscsi_direct.c:634:11: error: ‘nb_block’ may be used uninitialized in this function [-Werror=maybe-uninitialized]
-   634 |     while (lba < nb_block) {
-       |           ^
- ../src/storage/storage_backend_iscsi_direct.c:619:14: note: ‘nb_block’ was declared here
-   619 |     uint64_t nb_block;
-       |              ^~~~~~~~
- ../src/storage/storage_backend_iscsi_direct.c:637:16: error: ‘block_size’ may be used uninitialized in this function [-Werror=maybe-uninitialized]
-   637 |         task = iscsi_write16_sync(iscsi, lun, lba, data,
-       |                ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-   638 |                                   block_size * to_write,
-       |                                   ~~~~~~~~~~~~~~~~~~~~~~
-   639 |                                   block_size, 0, 0, 0, 0, 0);
-       |                                   ~~~~~~~~~~~~~~~~~~~~~~~~~~
- ../src/storage/storage_backend_iscsi_direct.c:618:14: note: ‘block_size’ was declared here
-   618 |     uint32_t block_size;
-       |              ^~~~~~~~~~
- ../src/storage/storage_backend_iscsi_direct.c: In function ‘virStorageBackendISCSIDirectRefreshPool’:
- ../src/storage/storage_backend_iscsi_direct.c:320:39: error: ‘nb_block’ may be used uninitialized in this function [-Werror=maybe-uninitialized]
-   320 |     vol->target.capacity = block_size * nb_block;
-       |                            ~~~~~~~~~~~^~~~~~~~~~
- ../src/storage/storage_backend_iscsi_direct.c:306:14: note: ‘nb_block’ was declared here
-   306 |     uint64_t nb_block;
-       |              ^~~~~~~~
- ../src/storage/storage_backend_iscsi_direct.c:320:39: error: ‘block_size’ may be used uninitialized in this function [-Werror=maybe-uninitialized]
-   320 |     vol->target.capacity = block_size * nb_block;
-       |                            ~~~~~~~~~~~^~~~~~~~~~
- ../src/storage/storage_backend_iscsi_direct.c:305:14: note: ‘block_size’ was declared here
-   305 |     uint32_t block_size;
-       |              ^~~~~~~~~~
-
-Signed-off-by: Boris Fiuczynski <fiuczy@linux.ibm.com>
-Reviewed-by: Marc Hartmayer <mhartmay@linux.ibm.com>
-Reviewed-by: Erik Skultety <eskultet@redhat.com>
-(cherry picked from commit ae8a83c35378d8d3eac2e41b3a10cac0e587ce54)
----
- src/storage/storage_backend_iscsi_direct.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/storage/storage_backend_iscsi_direct.c b/src/storage/storage_backend_iscsi_direct.c
-index c37c671db6..027fa83de7 100644
---- a/src/storage/storage_backend_iscsi_direct.c
-+++ b/src/storage/storage_backend_iscsi_direct.c
-@@ -302,8 +302,8 @@ virISCSIDirectRefreshVol(virStoragePoolObjPtr pool,
-                          char *portal)
- {
-     virStoragePoolDefPtr def = virStoragePoolObjGetDef(pool);
--    uint32_t block_size;
--    uint64_t nb_block;
-+    uint32_t block_size = 0;
-+    uint64_t nb_block = 0;
-     g_autoptr(virStorageVolDef) vol = NULL;
- 
-     if (virISCSIDirectTestUnitReady(iscsi, lun) < 0)
-@@ -615,8 +615,8 @@ virStorageBackendISCSIDirectVolWipeZero(virStorageVolDefPtr vol,
-                                         struct iscsi_context *iscsi)
- {
-     uint64_t lba = 0;
--    uint32_t block_size;
--    uint64_t nb_block;
-+    uint32_t block_size = 0;
-+    uint64_t nb_block = 0;
-     struct scsi_task *task = NULL;
-     int lun = 0;
-     int ret = -1;
--- 
-2.33.0
-
diff --git a/storageBackendProbeTarget-Don-t-fail-if-backing-stor.patch b/storageBackendProbeTarget-Don-t-fail-if-backing-stor.patch
deleted file mode 100644
index d00fa97b885e75986b422596938b26334a40e5ea..0000000000000000000000000000000000000000
--- a/storageBackendProbeTarget-Don-t-fail-if-backing-stor.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From bd45da8b308c16f30766ad756fe3c2f54e4f3e9f Mon Sep 17 00:00:00 2001
-From: Peter Krempa <pkrempa@redhat.com>
-Date: Thu, 25 Feb 2021 13:51:51 +0100
-Subject: [PATCH 016/108] storageBackendProbeTarget: Don't fail if backing
- store can't be parsed
-
-When the backing store of the image can't be parsed
-virStorageSourceNewFromBacking returns -1. storageBackendProbeTarget
-then also fails which makes the pool refresh fail or even the storage
-pool becomes inactive after (re)start of libvirtd.
-
-In situations when we can't access the backing store via network we
-just report the backing store string, thus we can do the same thing for
-unparsable backing store to prevent the pool from going offline.
-
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-(cherry picked from commit 104db1951d3abfd8cb363b8e8070f712044bc645)
----
- src/storage/storage_util.c | 6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/src/storage/storage_util.c b/src/storage/storage_util.c
-index 4c67d3a4b1..2e4c7b29b3 100644
---- a/src/storage/storage_util.c
-+++ b/src/storage/storage_util.c
-@@ -3363,13 +3363,11 @@ storageBackendProbeTarget(virStorageSourcePtr target,
-         return -1;
- 
-     if (meta->backingStoreRaw) {
--        if (virStorageSourceNewFromBacking(meta, &target->backingStore) < 0)
--            return -1;
--
-         /* XXX: Remote storage doesn't play nicely with volumes backed by
-          * remote storage. To avoid trouble, just fake the backing store is RAW
-          * and put the string from the metadata as the path of the target. */
--        if (!virStorageSourceIsLocalStorage(target->backingStore)) {
-+        if (virStorageSourceNewFromBacking(meta, &target->backingStore) < 0 ||
-+            !virStorageSourceIsLocalStorage(target->backingStore)) {
-             virObjectUnref(target->backingStore);
- 
-             if (!(target->backingStore = virStorageSourceNew()))
--- 
-2.33.0
-
diff --git a/storage_driver-Unlock-object-on-ACL-fail-in-storageP.patch b/storage_driver-Unlock-object-on-ACL-fail-in-storageP.patch
deleted file mode 100644
index 02bf3d5d35848573fc31de393333ae41f34ad3a0..0000000000000000000000000000000000000000
--- a/storage_driver-Unlock-object-on-ACL-fail-in-storageP.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 726ae2686cc74889671adf57d3e2b4560e62892a Mon Sep 17 00:00:00 2001
-From: Peter Krempa <pkrempa@redhat.com>
-Date: Wed, 21 Jul 2021 11:22:25 +0200
-Subject: [PATCH 1/2] storage_driver: Unlock object on ACL fail in
- storagePoolLookupByTargetPath
-
-'virStoragePoolObjListSearch' returns a locked and refed object, thus we
-must release it on ACL permission failure.
-
-Fixes: 7aa0e8c0cb8
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1984318
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
----
- src/storage/storage_driver.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/storage/storage_driver.c b/src/storage/storage_driver.c
-index 2db763caa5..d52d537152 100644
---- a/src/storage/storage_driver.c
-+++ b/src/storage/storage_driver.c
-@@ -1740,8 +1740,10 @@ storagePoolLookupByTargetPath(virConnectPtr conn,
-                                            storagePoolLookupByTargetPathCallback,
-                                            cleanpath))) {
-         def = virStoragePoolObjGetDef(obj);
--        if (virStoragePoolLookupByTargetPathEnsureACL(conn, def) < 0)
-+        if (virStoragePoolLookupByTargetPathEnsureACL(conn, def) < 0) {
-+            virStoragePoolObjEndAPI(&obj);
-             return NULL;
-+        }
- 
-         pool = virGetStoragePool(conn, def->name, def->uuid, NULL, NULL);
-         virStoragePoolObjEndAPI(&obj);
--- 
-2.27.0
-
diff --git a/storage_util-fix-qemu-img-sparse-allocation.patch b/storage_util-fix-qemu-img-sparse-allocation.patch
deleted file mode 100644
index 3c163ce9aade4c6f62af8ed93b4b4993fefdf4ed..0000000000000000000000000000000000000000
--- a/storage_util-fix-qemu-img-sparse-allocation.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From bd345bfdd2f07bc07d4b0e52ebc900c19ee882e0 Mon Sep 17 00:00:00 2001
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Tue, 25 Aug 2020 15:09:53 +0200
-Subject: [PATCH 050/108] storage_util: fix qemu-img sparse allocation
-
-Commit <c9ec7088c7a3f4cd26bb471f1f243931fff6f4f9> introduced a support
-to fully allocate qcow2 images when <allocation> matches <capacity> but
-it doesn't work as expected.
-
-The issue is that info.size_arg is in KB but the info.allocation
-introduced by the mentioned commit is in B. This results in using
-"preallocation=falloc," in cases where "preallocation=metadata," should
-be used.
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-(cherry picked from commit 81a3042a12c7c06adc8e95264b6143b2eeb4953f)
----
- src/storage/storage_util.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/storage/storage_util.c b/src/storage/storage_util.c
-index 2e4c7b29b3..4c8316c0d0 100644
---- a/src/storage/storage_util.c
-+++ b/src/storage/storage_util.c
-@@ -1065,7 +1065,7 @@ virStorageBackendCreateQemuImgCmdFromVol(virStoragePoolObjPtr pool,
-         .type = NULL,
-         .inputType = NULL,
-         .path = vol->target.path,
--        .allocation = vol->target.allocation,
-+        .allocation = VIR_DIV_UP(vol->target.allocation, 1024),
-         .encryption = !!vol->target.encryption,
-         .preallocate = !!(flags & VIR_STORAGE_VOL_CREATE_PREALLOC_METADATA),
-         .compat = vol->target.compat,
--- 
-2.33.0
-
diff --git a/storagepoolxml2argvtest-Reorder-gluster-arguments.patch b/storagepoolxml2argvtest-Reorder-gluster-arguments.patch
deleted file mode 100644
index 2a834656675fcf02f5cf353917d04e42afaa4322..0000000000000000000000000000000000000000
--- a/storagepoolxml2argvtest-Reorder-gluster-arguments.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 46d828475950bc3efbfe15a0e60571b7b40e1a62 Mon Sep 17 00:00:00 2001
-From: tangbinzy <tangbin_yewu@cmss.chinamobile.com>
-Date: Tue, 29 Nov 2022 09:58:35 +0000
-Subject: [PATCH 07/24] storagepoolxml2argvtest: Reorder gluster  arguments
- Commit f00cde7f1133 changed order of mount arguments in
- virStorageBackendFileSystemMountGlusterArgs() and introduced per-OS mount
- options and new test data. Old test data was left unmodified with prior order
- of arguments. That causes a test failure on all OSes but Linux and FreeBSD,
- i.e. on macOS:
-
-  15) Storage Pool XML-2-argv pool-netfs-gluster
-      ...
-  In
-  '/Users/roolebo/dev/libvirt/tests/storagepoolxml2argvdata/pool-netfs-gluster.argv':
-  Offset 39
-  Expect [-o direct-io-mode=1 /mnt/gluster]
-  Actual [/mnt/gluster -o direct-io-mode=1]
-
-Fixes: f00cde7f1133 ("storage: Add default mount options for fs/netfs storage pools")
-Signed-off-by: Roman Bolshakov <r.bolshakov@yadro.com>
-Reviewed-by: Andrea Bolognani <abologna@redhat.com>
-
-Signed-off-by: tangbin <tangbin_yewu@cmss.chinamobile.com>
-(cherry-pick from 040de3fe4643a2e859f22e31415e479e99e52347)
----
- tests/storagepoolxml2argvdata/pool-netfs-gluster.argv | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/storagepoolxml2argvdata/pool-netfs-gluster.argv b/tests/storagepoolxml2argvdata/pool-netfs-gluster.argv
-index 4303d514ef..97be9cbeb3 100644
---- a/tests/storagepoolxml2argvdata/pool-netfs-gluster.argv
-+++ b/tests/storagepoolxml2argvdata/pool-netfs-gluster.argv
-@@ -1 +1 @@
--mount -t glusterfs example.com:/volume -o direct-io-mode=1 /mnt/gluster
-+mount -t glusterfs example.com:/volume /mnt/gluster -o direct-io-mode=1
--- 
-2.27.0
-
diff --git a/sw_64-Add-sw64-architecture-support.patch b/sw_64-Add-sw64-architecture-support.patch
deleted file mode 100644
index 903142acb100c750d8d208a606e9839eaa65c3cd..0000000000000000000000000000000000000000
--- a/sw_64-Add-sw64-architecture-support.patch
+++ /dev/null
@@ -1,331 +0,0 @@
-From e3185252df62b1e5b6333ee059a2bd95a49acd60 Mon Sep 17 00:00:00 2001
-From: Lu Feifei <lufeifei@wxiat.com>
-Date: Wed, 25 May 2022 16:25:54 +0800
-Subject: [PATCH] sw_64: Add sw64 architecture support
-
-Signed-off-by: Lu Feifei <lufeifei@wxiat.com>
----
- src/cpu/Makefile.inc.am      |  2 +
- src/cpu/cpu.c                |  2 +
- src/cpu/cpu_sw64.c           | 71 ++++++++++++++++++++++++++++++++++++
- src/cpu/cpu_sw64.h           | 32 ++++++++++++++++
- src/qemu/qemu_capabilities.c | 10 +++++
- src/qemu/qemu_domain.c       |  5 +++
- src/util/virarch.c           |  6 +++
- src/util/virarch.h           |  4 ++
- src/util/virhostcpu.c        |  2 +
- src/util/virprocess.c        |  2 +
- src/util/virsysinfo.c        |  3 +-
- 11 files changed, 138 insertions(+), 1 deletion(-)
- create mode 100644 src/cpu/cpu_sw64.c
- create mode 100644 src/cpu/cpu_sw64.h
-
-diff --git a/src/cpu/Makefile.inc.am b/src/cpu/Makefile.inc.am
-index 0abeee87b6..1ee1290c2d 100644
---- a/src/cpu/Makefile.inc.am
-+++ b/src/cpu/Makefile.inc.am
-@@ -10,6 +10,8 @@ CPU_SOURCES = \
- 	cpu/cpu_s390.c \
- 	cpu/cpu_arm.h \
- 	cpu/cpu_arm.c \
-+	cpu/cpu_sw64.h \
-+	cpu/cpu_sw64.c \
- 	cpu/cpu_ppc64.h \
- 	cpu/cpu_ppc64.c \
- 	cpu/cpu_ppc64_data.h \
-diff --git a/src/cpu/cpu.c b/src/cpu/cpu.c
-index 631c755391..89c06aceeb 100644
---- a/src/cpu/cpu.c
-+++ b/src/cpu/cpu.c
-@@ -29,6 +29,7 @@
- #include "cpu_ppc64.h"
- #include "cpu_s390.h"
- #include "cpu_arm.h"
-+#include "cpu_sw64.h"
- #include "capabilities.h"
- #include "virstring.h"
- 
-@@ -42,6 +43,7 @@ static struct cpuArchDriver *drivers[] = {
-     &cpuDriverPPC64,
-     &cpuDriverS390,
-     &cpuDriverArm,
-+    &cpuDriverSW64,
- };
- 
- 
-diff --git a/src/cpu/cpu_sw64.c b/src/cpu/cpu_sw64.c
-new file mode 100644
-index 0000000000..d31e34fb01
---- /dev/null
-+++ b/src/cpu/cpu_sw64.c
-@@ -0,0 +1,71 @@
-+/*
-+ * cpu_sw64.c: CPU driver for sw64 CPUs
-+ *
-+ * Copyright (C) 2021 Lu Feifei
-+ *
-+ * 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/>.
-+ *
-+ * Authors:
-+ *      Lu Feifei <lufeifei@wxiat.com>
-+ */
-+
-+#include <config.h>
-+
-+#include "viralloc.h"
-+#include "cpu.h"
-+#include "cpu_sw64.h"
-+#include "virstring.h"
-+
-+#define VIR_FROM_THIS VIR_FROM_CPU
-+#define ARRAY_CARDINALITY(Array) (sizeof(Array) / sizeof(*(Array)))
-+
-+static const virArch archs[] = { VIR_ARCH_SW_64 };
-+
-+static int
-+virCPUsw64GetHost(virCPUDefPtr cpu ATTRIBUTE_UNUSED,
-+                  virDomainCapsCPUModelsPtr models ATTRIBUTE_UNUSED)
-+{
-+    return 0;
-+}
-+
-+static virCPUCompareResult
-+virCPUsw64Compare(virCPUDefPtr host ATTRIBUTE_UNUSED,
-+                  virCPUDefPtr cpu ATTRIBUTE_UNUSED,
-+                  bool failMessages ATTRIBUTE_UNUSED)
-+{
-+    return VIR_CPU_COMPARE_IDENTICAL;
-+}
-+
-+static int
-+virCPUsw64Update(virCPUDefPtr guest,
-+                 const virCPUDef *host ATTRIBUTE_UNUSED)
-+{
-+    guest->mode = VIR_CPU_MODE_CUSTOM;
-+    guest->match = VIR_CPU_MATCH_EXACT;
-+
-+    return 0;
-+}
-+
-+struct cpuArchDriver cpuDriverSW64 = {
-+    .name = "sw_64",
-+    .arch = archs,
-+    .narch = ARRAY_CARDINALITY(archs),
-+    .getHost = virCPUsw64GetHost,
-+    .compare = virCPUsw64Compare,
-+    .decode = NULL,
-+    .encode = NULL,
-+    .baseline = NULL,
-+    .update = virCPUsw64Update,
-+};
-diff --git a/src/cpu/cpu_sw64.h b/src/cpu/cpu_sw64.h
-new file mode 100644
-index 0000000000..4a03f0affa
---- /dev/null
-+++ b/src/cpu/cpu_sw64.h
-@@ -0,0 +1,32 @@
-+/*
-+ * cpu_sw64.h: CPU driver for sw64 CPUs
-+ *
-+ * Copyright (C) 2021 Lu Feifei
-+ *
-+ * 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/>.
-+ *
-+ * Authors:
-+ *      Lu Feifei <lufeifei@wxiat.com>
-+ */
-+
-+#ifndef __VIR_CPU_SW64_H__
-+# define __VIR_CPU_SW64_H__
-+
-+# include "cpu.h"
-+
-+extern struct cpuArchDriver cpuDriverSW64;
-+
-+#endif /* __VIR_CPU_SW64_H__ */
-+
-diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
-index 3b4e26822b..2931d0c190 100644
---- a/src/qemu/qemu_capabilities.c
-+++ b/src/qemu/qemu_capabilities.c
-@@ -708,6 +708,8 @@ virArch virQEMUCapsArchFromString(const char *arch)
-         return VIR_ARCH_ARMV7L;
-     if (STREQ(arch, "or32"))
-         return VIR_ARCH_OR32;
-+    if (STREQ(arch, "sw64"))
-+        return VIR_ARCH_SW_64;
- 
-     return virArchFromString(arch);
- }
-@@ -721,6 +723,8 @@ const char *virQEMUCapsArchToString(virArch arch)
-         return "arm";
-     else if (arch == VIR_ARCH_OR32)
-         return "or32";
-+    else if (arch == VIR_ARCH_SW_64)
-+        return "sw64";
- 
-     return virArchToString(arch);
- }
-@@ -1967,6 +1971,10 @@ bool virQEMUCapsHasPCIMultiBus(virQEMUCapsPtr qemuCaps,
-      * since forever */
-     if (ARCH_IS_X86(def->os.arch))
-         return true;
-+    /* sw_64 support PCI-multibus on all machine types
-+     * since forever */
-+    if (ARCH_IS_SW64(def->os.arch))
-+        return true;
- 
-     if (def->os.arch == VIR_ARCH_PPC ||
-         ARCH_IS_PPC64(def->os.arch)) {
-@@ -2674,6 +2682,8 @@ static const char *preferredMachines[] =
- 
-     "sim", /* VIR_ARCH_XTENSA */
-     "sim", /* VIR_ARCH_XTENSAEB */
-+
-+    "core3", /* VIR_ARCH_SW_64 */
- };
- G_STATIC_ASSERT(G_N_ELEMENTS(preferredMachines) == VIR_ARCH_LAST);
- 
-diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
-index cb2fbdc179..834af89a1e 100644
---- a/src/qemu/qemu_domain.c
-+++ b/src/qemu/qemu_domain.c
-@@ -4350,6 +4350,10 @@ qemuDomainDefAddDefaultDevices(virDomainDefPtr def,
-         addPCIRoot = true;
-         break;
- 
-+    case VIR_ARCH_SW_64:
-+	addPCIeRoot = true;
-+	break;
-+
-     case VIR_ARCH_ARMV7B:
-     case VIR_ARCH_CRIS:
-     case VIR_ARCH_ITANIUM:
-@@ -12959,6 +12963,7 @@ qemuDomainMachineHasBuiltinIDE(const char *machine,
-     return qemuDomainMachineIsI440FX(machine, arch) ||
-         STREQ(machine, "malta") ||
-         STREQ(machine, "sun4u") ||
-+        STREQ(machine, "core3") ||
-         STREQ(machine, "g3beige");
- }
- 
-diff --git a/src/util/virarch.c b/src/util/virarch.c
-index f088b6b676..653136cc73 100644
---- a/src/util/virarch.c
-+++ b/src/util/virarch.c
-@@ -83,6 +83,8 @@ static const struct virArchData {
- 
-     { "xtensa",       32, VIR_ARCH_LITTLE_ENDIAN },
-     { "xtensaeb",     32, VIR_ARCH_BIG_ENDIAN },
-+
-+    { "sw_64",        64, VIR_ARCH_LITTLE_ENDIAN},
- };
- 
- G_STATIC_ASSERT(G_N_ELEMENTS(virArchData) == VIR_ARCH_LAST);
-@@ -196,6 +198,8 @@ virArch virArchFromHost(void)
-         return VIR_ARCH_ARMV7L;
-     case PROCESSOR_ARCHITECTURE_ARM64:
-         return VIR_ARCH_AARCH64;
-+    case PROCESSOR_ARCHITECTURE_SW64:
-+        return VIR_ARCH_SW_64;
-     default:
-         VIR_WARN("Unknown host arch '%d', report to libvir-list@redhat.com",
-                  info.wProcessorArchitecture);
-@@ -220,6 +224,8 @@ virArch virArchFromHost(void)
-         arch = VIR_ARCH_I686;
-     } else if (STREQ(ut.machine, "amd64")) {
-         arch = VIR_ARCH_X86_64;
-+    } else if (STREQ(ut.machine, "sw_64")) {
-+        arch = VIR_ARCH_SW_64;
-     } else {
-         /* Otherwise assume the canonical name */
-         if ((arch = virArchFromString(ut.machine)) == VIR_ARCH_NONE) {
-diff --git a/src/util/virarch.h b/src/util/virarch.h
-index c3890606ec..5eb146eb1b 100644
---- a/src/util/virarch.h
-+++ b/src/util/virarch.h
-@@ -69,6 +69,8 @@ typedef enum {
-     VIR_ARCH_XTENSA,       /* XTensa      32 LE http://en.wikipedia.org/wiki/Xtensa#Processor_Cores */
-     VIR_ARCH_XTENSAEB,     /* XTensa      32 BE http://en.wikipedia.org/wiki/Xtensa#Processor_Cores */
- 
-+    VIR_ARCH_SW_64,        /* SW64        64 LE XHB*/
-+
-     VIR_ARCH_LAST,
- } virArch;
- 
-@@ -95,6 +97,8 @@ typedef enum {
- #define ARCH_IS_S390(arch) ((arch) == VIR_ARCH_S390 ||\
-                             (arch) == VIR_ARCH_S390X)
- 
-+#define ARCH_IS_SW64(arch)   ((arch) == VIR_ARCH_SW_64)
-+
- typedef enum {
-     VIR_ARCH_LITTLE_ENDIAN,
-     VIR_ARCH_BIG_ENDIAN,
-diff --git a/src/util/virhostcpu.c b/src/util/virhostcpu.c
-index 721d959d46..5ec98d6016 100644
---- a/src/util/virhostcpu.c
-+++ b/src/util/virhostcpu.c
-@@ -586,6 +586,8 @@ virHostCPUParseFrequency(FILE *cpuinfo,
-         prefix = "clock";
-     else if (ARCH_IS_S390(arch))
-         prefix = "cpu MHz dynamic";
-+    else if (ARCH_IS_SW64(arch))
-+        prefix = "cpu frequency [MHz]";
- 
-     if (!prefix) {
-         VIR_WARN("%s is not supported by the %s parser",
-diff --git a/src/util/virprocess.c b/src/util/virprocess.c
-index b126c3c9af..141ebb54e0 100644
---- a/src/util/virprocess.c
-+++ b/src/util/virprocess.c
-@@ -89,6 +89,8 @@ VIR_LOG_INIT("util.process");
- #   define __NR_setns 350
- #  elif defined(__s390__)
- #   define __NR_setns 339
-+#  elif defined(__sw_64__)
-+#   define __NR_setns 501
- #  endif
- # endif
- 
-diff --git a/src/util/virsysinfo.c b/src/util/virsysinfo.c
-index 41f4d1cff9..8a53702224 100644
---- a/src/util/virsysinfo.c
-+++ b/src/util/virsysinfo.c
-@@ -1197,7 +1197,8 @@ virSysinfoRead(void)
- #elif !defined(WIN32) && \
-     (defined(__x86_64__) || \
-      defined(__i386__) || \
--     defined(__amd64__))
-+     defined(__amd64__) || \
-+     defined(__sw_64__))
-     return virSysinfoReadDMI();
- #else /* WIN32 || not supported arch */
-     /*
--- 
-2.27.0
-
diff --git a/test-Fix-memory-leak-in-testParseXMLDocFromFile.patch b/test-Fix-memory-leak-in-testParseXMLDocFromFile.patch
deleted file mode 100644
index f6b68bc192402473408a168f32b909aa38e41fa2..0000000000000000000000000000000000000000
--- a/test-Fix-memory-leak-in-testParseXMLDocFromFile.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From b8ac909459af85d5c141de4cd6157b49caf8adf0 Mon Sep 17 00:00:00 2001
-From: John Ferlan <jferlan@redhat.com>
-Date: Tue, 16 Jun 2020 08:07:06 -0400
-Subject: [PATCH 002/108] test: Fix memory leak in testParseXMLDocFromFile
-
-Since ceb3255c, @absFile is leaked.
-
-Found by Coverity.
-
-Signed-off-by: John Ferlan <jferlan@redhat.com>
-Reviewed-by: Peter Krempa <pkrempa@redhat.com>
-(cherry picked from commit 072f6d6e43dc37a37cb1503f17cf3c1071ea02ca)
----
- src/test/test_driver.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/test/test_driver.c b/src/test/test_driver.c
-index 7759847c2d..33f1792177 100644
---- a/src/test/test_driver.c
-+++ b/src/test/test_driver.c
-@@ -777,7 +777,7 @@ testParseXMLDocFromFile(xmlNodePtr node, const char *file, const char *type)
- {
-     xmlNodePtr ret = NULL;
-     xmlDocPtr doc = NULL;
--    char *absFile = NULL;
-+    g_autofree char *absFile = NULL;
-     g_autofree char *relFile = NULL;
- 
-     if ((relFile = virXMLPropString(node, "file"))) {
--- 
-2.33.0
-
diff --git a/libvirt-tests-commandtest-skip-the-test4-if-the-testcase-is-.patch b/test-commandtest-skip-the-test4-if-the-testcase-is-r.patch
similarity index 57%
rename from libvirt-tests-commandtest-skip-the-test4-if-the-testcase-is-.patch
rename to test-commandtest-skip-the-test4-if-the-testcase-is-r.patch
index 002849f4702cdaebb8f055e9d1aab26e6f9e4056..7bf4f87409faa92b7d3917de7b919646d0010097 100644
--- a/libvirt-tests-commandtest-skip-the-test4-if-the-testcase-is-.patch
+++ b/test-commandtest-skip-the-test4-if-the-testcase-is-r.patch
@@ -1,7 +1,7 @@
-From 0b6e5773058e85b8e5e6ce83d3b275726e6883f2 Mon Sep 17 00:00:00 2001
+From de724c7b94cfd8049efed6349acf9e0fb643f289 Mon Sep 17 00:00:00 2001
 From: AlexChen <alex.chen@huawei.com>
-Date: Wed, 16 Sep 2020 15:53:57 +0800
-Subject: [PATCH] tests/commandtest: skip the test4 if the testcase is run in
+Date: Wed, 27 Mar 2024 05:20:21 +0800
+Subject: [PATCH] test/commandtest: skip the test4 if the testcase is run in
  the container env
 
 In a container environment without an init thread, the daemoned
@@ -10,38 +10,37 @@ the compilation to hung. So, skip it.
 
 Signed-off-by: AlexChen <alex.chen@huawei.com>
 ---
- tests/commandtest.c | 11 ++++++++---
- 1 file changed, 8 insertions(+), 3 deletions(-)
+ tests/commandtest.c | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
 
 diff --git a/tests/commandtest.c b/tests/commandtest.c
-index d5092b7dd0..ce492e31f7 100644
+index aa108ce583..1adfc9de7f 100644
 --- a/tests/commandtest.c
 +++ b/tests/commandtest.c
-@@ -259,6 +259,7 @@ static int test4(const void *unused G_GNUC_UNUSED)
-     char *pidfile = virPidFileBuildPath(abs_builddir, "commandhelper");
+@@ -211,6 +211,7 @@ static int test4(const void *unused G_GNUC_UNUSED)
+     g_autofree char *pidfile = virPidFileBuildPath(abs_builddir, "commandhelper");
      pid_t pid;
      int ret = -1;
 +    int count = 0;
  
      if (!pidfile)
          goto cleanup;
-@@ -275,9 +276,13 @@ static int test4(const void *unused G_GNUC_UNUSED)
+@@ -227,8 +228,13 @@ static int test4(const void *unused G_GNUC_UNUSED)
          printf("cannot read pidfile\n");
          goto cleanup;
      }
 -    while (kill(pid, 0) != -1)
 -        g_usleep(100*1000);
--
 +    while (kill(pid, 0) != -1) {
-+        if (count++ >= 600) {
++	if (count++ >= 600) {
 +            printf("check time exceeds 60s, it may be in container env, skip this testcase!!!\n");
-+            break;
-+        }
++	    break;
++	}
 +        g_usleep(100*1000); /* 100 */
 +    }
-     ret = checkoutput("test4", NULL);
  
-  cleanup:
+     ret = checkoutput("test4");
+ 
 -- 
 2.27.0
 
diff --git a/testCompareXMLToArgv-Split-out-preparation-and-comma.patch b/testCompareXMLToArgv-Split-out-preparation-and-comma.patch
deleted file mode 100644
index b81e2fadd8bda89c1da5fbcf8ebda33eee42d6bd..0000000000000000000000000000000000000000
--- a/testCompareXMLToArgv-Split-out-preparation-and-comma.patch
+++ /dev/null
@@ -1,204 +0,0 @@
-From fb0de8df975557e74af01a0eee0d25c08981c02a Mon Sep 17 00:00:00 2001
-From: Peter Krempa <pkrempa@redhat.com>
-Date: Fri, 15 May 2020 08:50:31 +0200
-Subject: [PATCH 15/18] testCompareXMLToArgv: Split out preparation and command
- formatting
-
-There are multiple steps of setting up the domain definition prior to
-formatting the command line for the tests. Extract it to a separate
-function so that it's self-contained and also will allow re-running the
-command line formatting which will be necessary for QMP schema
-validation tests.
-
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Eric Blake <eblake@redhat.com>
----
- tests/qemuxml2argvtest.c | 158 +++++++++++++++++++++------------------
- 1 file changed, 86 insertions(+), 72 deletions(-)
-
-diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
-index 2153e44c5a..762d65f521 100644
---- a/tests/qemuxml2argvtest.c
-+++ b/tests/qemuxml2argvtest.c
-@@ -395,6 +395,90 @@ testCheckExclusiveFlags(int flags)
- }
- 
- 
-+static virCommandPtr
-+testCompareXMLToArgvCreateArgs(virQEMUDriverPtr drv,
-+                               virDomainObjPtr vm,
-+                               const char *migrateURI,
-+                               struct testQemuInfo *info,
-+                               unsigned int flags)
-+{
-+    size_t i;
-+
-+    for (i = 0; i < vm->def->nhostdevs; i++) {
-+        virDomainHostdevDefPtr hostdev = vm->def->hostdevs[i];
-+
-+        if (hostdev->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS &&
-+            hostdev->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI &&
-+            hostdev->source.subsys.u.pci.backend == VIR_DOMAIN_HOSTDEV_PCI_BACKEND_DEFAULT) {
-+            hostdev->source.subsys.u.pci.backend = VIR_DOMAIN_HOSTDEV_PCI_BACKEND_VFIO;
-+        }
-+    }
-+
-+    for (i = 0; i < vm->def->nfss; i++) {
-+        virDomainFSDefPtr fs = vm->def->fss[i];
-+        char *s;
-+
-+        if (fs->fsdriver != VIR_DOMAIN_FS_DRIVER_TYPE_VIRTIOFS ||
-+            QEMU_DOMAIN_FS_PRIVATE(fs)->vhostuser_fs_sock)
-+            continue;
-+
-+        s = g_strdup_printf("/tmp/lib/domain--1-guest/fs%zu.vhost-fs.sock", i);
-+        QEMU_DOMAIN_FS_PRIVATE(fs)->vhostuser_fs_sock = s;
-+    }
-+
-+    if (vm->def->vsock) {
-+        virDomainVsockDefPtr vsock = vm->def->vsock;
-+        qemuDomainVsockPrivatePtr vsockPriv =
-+            (qemuDomainVsockPrivatePtr)vsock->privateData;
-+
-+        if (vsock->auto_cid == VIR_TRISTATE_BOOL_YES)
-+            vsock->guest_cid = 42;
-+
-+        vsockPriv->vhostfd = 6789;
-+    }
-+
-+    if (vm->def->tpm) {
-+        switch (vm->def->tpm->type) {
-+        case VIR_DOMAIN_TPM_TYPE_EMULATOR:
-+            VIR_FREE(vm->def->tpm->data.emulator.source.data.file.path);
-+            vm->def->tpm->data.emulator.source.data.file.path = g_strdup("/dev/test");
-+            vm->def->tpm->data.emulator.source.type = VIR_DOMAIN_CHR_TYPE_FILE;
-+            break;
-+        case VIR_DOMAIN_TPM_TYPE_PASSTHROUGH:
-+        case VIR_DOMAIN_TPM_TYPE_LAST:
-+            break;
-+       }
-+    }
-+
-+    for (i = 0; i < vm->def->nvideos; i++) {
-+        virDomainVideoDefPtr video = vm->def->videos[i];
-+
-+        if (video->backend == VIR_DOMAIN_VIDEO_BACKEND_TYPE_VHOSTUSER) {
-+            qemuDomainVideoPrivatePtr vpriv = QEMU_DOMAIN_VIDEO_PRIVATE(video);
-+
-+            vpriv->vhost_user_fd = 1729;
-+        }
-+    }
-+
-+    if (flags & FLAG_SLIRP_HELPER) {
-+        for (i = 0; i < vm->def->nnets; i++) {
-+            virDomainNetDefPtr net = vm->def->nets[i];
-+
-+            if (net->type == VIR_DOMAIN_NET_TYPE_USER &&
-+                virQEMUCapsGet(info->qemuCaps, QEMU_CAPS_DBUS_VMSTATE)) {
-+                qemuSlirpPtr slirp = qemuSlirpNew();
-+                slirp->fd[0] = 42;
-+                QEMU_DOMAIN_NETWORK_PRIVATE(net)->slirp = slirp;
-+            }
-+        }
-+    }
-+
-+    return qemuProcessCreatePretendCmd(drv, vm, migrateURI,
-+                                       (flags & FLAG_FIPS), false,
-+                                       VIR_QEMU_PROCESS_START_COLD);
-+}
-+
-+
- static int
- testCompareXMLToArgv(const void *data)
- {
-@@ -409,7 +493,6 @@ testCompareXMLToArgv(const void *data)
-     virConnectPtr conn;
-     char *log = NULL;
-     virCommandPtr cmd = NULL;
--    size_t i;
-     qemuDomainObjPrivatePtr priv = NULL;
- 
-     if (info->arch != VIR_ARCH_NONE && info->arch != VIR_ARCH_X86_64)
-@@ -486,77 +569,8 @@ testCompareXMLToArgv(const void *data)
-     VIR_FREE(log);
-     virResetLastError();
- 
--    for (i = 0; i < vm->def->nhostdevs; i++) {
--        virDomainHostdevDefPtr hostdev = vm->def->hostdevs[i];
--
--        if (hostdev->mode == VIR_DOMAIN_HOSTDEV_MODE_SUBSYS &&
--            hostdev->source.subsys.type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_PCI &&
--            hostdev->source.subsys.u.pci.backend == VIR_DOMAIN_HOSTDEV_PCI_BACKEND_DEFAULT) {
--            hostdev->source.subsys.u.pci.backend = VIR_DOMAIN_HOSTDEV_PCI_BACKEND_VFIO;
--        }
--    }
--
--    for (i = 0; i < vm->def->nfss; i++) {
--        virDomainFSDefPtr fs = vm->def->fss[i];
--        char *s;
--
--        if (fs->fsdriver != VIR_DOMAIN_FS_DRIVER_TYPE_VIRTIOFS)
--            continue;
--
--        s = g_strdup_printf("/tmp/lib/domain--1-guest/fs%zu.vhost-fs.sock", i);
--        QEMU_DOMAIN_FS_PRIVATE(fs)->vhostuser_fs_sock = s;
--    }
--
--    if (vm->def->vsock) {
--        virDomainVsockDefPtr vsock = vm->def->vsock;
--        qemuDomainVsockPrivatePtr vsockPriv =
--            (qemuDomainVsockPrivatePtr)vsock->privateData;
--
--        if (vsock->auto_cid == VIR_TRISTATE_BOOL_YES)
--            vsock->guest_cid = 42;
--
--        vsockPriv->vhostfd = 6789;
--    }
--
--    if (vm->def->tpm) {
--        switch (vm->def->tpm->type) {
--        case VIR_DOMAIN_TPM_TYPE_EMULATOR:
--            VIR_FREE(vm->def->tpm->data.emulator.source.data.file.path);
--            vm->def->tpm->data.emulator.source.data.file.path = g_strdup("/dev/test");
--            vm->def->tpm->data.emulator.source.type = VIR_DOMAIN_CHR_TYPE_FILE;
--            break;
--        case VIR_DOMAIN_TPM_TYPE_PASSTHROUGH:
--        case VIR_DOMAIN_TPM_TYPE_LAST:
--            break;
--       }
--    }
--
--    for (i = 0; i < vm->def->nvideos; i++) {
--        virDomainVideoDefPtr video = vm->def->videos[i];
--
--        if (video->backend == VIR_DOMAIN_VIDEO_BACKEND_TYPE_VHOSTUSER) {
--            qemuDomainVideoPrivatePtr vpriv = QEMU_DOMAIN_VIDEO_PRIVATE(video);
--
--            vpriv->vhost_user_fd = 1729;
--        }
--    }
--
--    if (flags & FLAG_SLIRP_HELPER) {
--        for (i = 0; i < vm->def->nnets; i++) {
--            virDomainNetDefPtr net = vm->def->nets[i];
--
--            if (net->type == VIR_DOMAIN_NET_TYPE_USER &&
--                virQEMUCapsGet(info->qemuCaps, QEMU_CAPS_DBUS_VMSTATE)) {
--                qemuSlirpPtr slirp = qemuSlirpNew();
--                slirp->fd[0] = 42;
--                QEMU_DOMAIN_NETWORK_PRIVATE(net)->slirp = slirp;
--            }
--        }
--    }
--
--    if (!(cmd = qemuProcessCreatePretendCmd(&driver, vm, migrateURI,
--                                            (flags & FLAG_FIPS), false,
--                                            VIR_QEMU_PROCESS_START_COLD))) {
-+    if (!(cmd = testCompareXMLToArgvCreateArgs(&driver, vm, migrateURI, info,
-+                                               flags))) {
-         if (flags & FLAG_EXPECT_FAILURE)
-             goto ok;
-         goto cleanup;
--- 
-2.23.0.windows.1
-
diff --git a/test_driver-Don-t-leak-group_name.patch b/test_driver-Don-t-leak-group_name.patch
deleted file mode 100644
index a8e56b8e557fa7f4de16708ad6a6e11989c7ed93..0000000000000000000000000000000000000000
--- a/test_driver-Don-t-leak-group_name.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 05a25f4c74e0e5c93703302a36b55a63b754d995 Mon Sep 17 00:00:00 2001
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Mon, 31 Jan 2022 13:52:25 +0100
-Subject: [PATCH 04/13] test_driver: Don't leak @group_name
-
-In testDomainSetBlockIoTune() the info.group_name is strdup()-ed
-and just after the whole @info structure is passed to
-virDomainDiskSetBlockIOTune() the @group_name member is set to
-NULL. This creates a memleak, because
-virDomainDiskSetBlockIOTune() creates its own copy of the string.
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Erik Skultety <eskultet@redhat.com>
----
- src/test/test_driver.c | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/src/test/test_driver.c b/src/test/test_driver.c
-index 33f1792177..e0d9c4fa0b 100644
---- a/src/test/test_driver.c
-+++ b/src/test/test_driver.c
-@@ -3845,7 +3845,6 @@ testDomainSetBlockIoTune(virDomainPtr dom,
- 
-     if (virDomainDiskSetBlockIOTune(conf_disk, &info) < 0)
-         goto cleanup;
--    info.group_name = NULL;
- 
-     ret = 0;
-  cleanup:
--- 
-2.33.0
-
diff --git a/tests-Add-hostcpudata-for-machine-with-CPU-clusters.patch b/tests-Add-hostcpudata-for-machine-with-CPU-clusters.patch
new file mode 100644
index 0000000000000000000000000000000000000000..b8f52afa1fab6b25251dcf452cc162a012ee8773
--- /dev/null
+++ b/tests-Add-hostcpudata-for-machine-with-CPU-clusters.patch
@@ -0,0 +1,914 @@
+From 0ed886925444ec4d3c8fa6f41e721efab36a9db2 Mon Sep 17 00:00:00 2001
+From: Andrea Bolognani <abologna@redhat.com>
+Date: Fri, 5 Jan 2024 15:07:06 +0100
+Subject: [PATCH] tests: Add hostcpudata for machine with CPU clusters
+
+The data is taken from an HPE Apollo 70 machine, which uses
+aarch64 CPUs. It is interesting for us because non-dummy
+information about CPU clusters is exposed through sysfs.
+
+In order to keep things reasonable, the data was manually
+modified so that only 8 of the original 224 CPUs are included.
+Care has been taken to ensure that the topology is otherwise
+unaltered.
+
+Signed-off-by: Andrea Bolognani <abologna@redhat.com>
+Reviewed-by: Peter Krempa <pkrempa@redhat.com>
+---
+ .../linux-basic-clusters/system/cpu           |  1 +
+ .../linux-basic-clusters/system/node          |  1 +
+ .../vircaps-aarch64-basic-clusters.xml        | 39 ++++++++++
+ tests/vircaps2xmltest.c                       |  1 +
+ .../linux-aarch64-with-clusters.cpuinfo       | 72 +++++++++++++++++++
+ .../linux-aarch64-with-clusters.expected      |  1 +
+ .../cpu/cpu0/topology/cluster_cpus_list       |  1 +
+ .../cpu/cpu0/topology/cluster_id              |  1 +
+ .../cpu/cpu0/topology/core_cpus_list          |  1 +
+ .../cpu/cpu0/topology/core_id                 |  1 +
+ .../cpu/cpu0/topology/core_siblings_list      |  1 +
+ .../cpu/cpu0/topology/package_cpus_list       |  1 +
+ .../cpu/cpu0/topology/physical_package_id     |  1 +
+ .../cpu/cpu0/topology/thread_siblings_list    |  1 +
+ .../cpu/cpu1/topology/cluster_cpus_list       |  1 +
+ .../cpu/cpu1/topology/cluster_id              |  1 +
+ .../cpu/cpu1/topology/core_cpus_list          |  1 +
+ .../cpu/cpu1/topology/core_id                 |  1 +
+ .../cpu/cpu1/topology/core_siblings_list      |  1 +
+ .../cpu/cpu1/topology/package_cpus_list       |  1 +
+ .../cpu/cpu1/topology/physical_package_id     |  1 +
+ .../cpu/cpu1/topology/thread_siblings_list    |  1 +
+ .../cpu/cpu2/topology/cluster_cpus_list       |  1 +
+ .../cpu/cpu2/topology/cluster_id              |  1 +
+ .../cpu/cpu2/topology/core_cpus_list          |  1 +
+ .../cpu/cpu2/topology/core_id                 |  1 +
+ .../cpu/cpu2/topology/core_siblings_list      |  1 +
+ .../cpu/cpu2/topology/package_cpus_list       |  1 +
+ .../cpu/cpu2/topology/physical_package_id     |  1 +
+ .../cpu/cpu2/topology/thread_siblings_list    |  1 +
+ .../cpu/cpu3/topology/cluster_cpus_list       |  1 +
+ .../cpu/cpu3/topology/cluster_id              |  1 +
+ .../cpu/cpu3/topology/core_cpus_list          |  1 +
+ .../cpu/cpu3/topology/core_id                 |  1 +
+ .../cpu/cpu3/topology/core_siblings_list      |  1 +
+ .../cpu/cpu3/topology/package_cpus_list       |  1 +
+ .../cpu/cpu3/topology/physical_package_id     |  1 +
+ .../cpu/cpu3/topology/thread_siblings_list    |  1 +
+ .../cpu/cpu4/topology/cluster_cpus_list       |  1 +
+ .../cpu/cpu4/topology/cluster_id              |  1 +
+ .../cpu/cpu4/topology/core_cpus_list          |  1 +
+ .../cpu/cpu4/topology/core_id                 |  1 +
+ .../cpu/cpu4/topology/core_siblings_list      |  1 +
+ .../cpu/cpu4/topology/package_cpus_list       |  1 +
+ .../cpu/cpu4/topology/physical_package_id     |  1 +
+ .../cpu/cpu4/topology/thread_siblings_list    |  1 +
+ .../cpu/cpu5/topology/cluster_cpus_list       |  1 +
+ .../cpu/cpu5/topology/cluster_id              |  1 +
+ .../cpu/cpu5/topology/core_cpus_list          |  1 +
+ .../cpu/cpu5/topology/core_id                 |  1 +
+ .../cpu/cpu5/topology/core_siblings_list      |  1 +
+ .../cpu/cpu5/topology/package_cpus_list       |  1 +
+ .../cpu/cpu5/topology/physical_package_id     |  1 +
+ .../cpu/cpu5/topology/thread_siblings_list    |  1 +
+ .../cpu/cpu6/topology/cluster_cpus_list       |  1 +
+ .../cpu/cpu6/topology/cluster_id              |  1 +
+ .../cpu/cpu6/topology/core_cpus_list          |  1 +
+ .../cpu/cpu6/topology/core_id                 |  1 +
+ .../cpu/cpu6/topology/core_siblings_list      |  1 +
+ .../cpu/cpu6/topology/package_cpus_list       |  1 +
+ .../cpu/cpu6/topology/physical_package_id     |  1 +
+ .../cpu/cpu6/topology/thread_siblings_list    |  1 +
+ .../cpu/cpu7/topology/cluster_cpus_list       |  1 +
+ .../cpu/cpu7/topology/cluster_id              |  1 +
+ .../cpu/cpu7/topology/core_cpus_list          |  1 +
+ .../cpu/cpu7/topology/core_id                 |  1 +
+ .../cpu/cpu7/topology/core_siblings_list      |  1 +
+ .../cpu/cpu7/topology/package_cpus_list       |  1 +
+ .../cpu/cpu7/topology/physical_package_id     |  1 +
+ .../cpu/cpu7/topology/thread_siblings_list    |  1 +
+ .../linux-with-clusters/cpu/online            |  1 +
+ .../linux-with-clusters/cpu/present           |  1 +
+ .../linux-with-clusters/node/node0/cpu0       |  1 +
+ .../linux-with-clusters/node/node0/cpu1       |  1 +
+ .../linux-with-clusters/node/node0/cpu2       |  1 +
+ .../linux-with-clusters/node/node0/cpu3       |  1 +
+ .../linux-with-clusters/node/node0/cpulist    |  1 +
+ .../linux-with-clusters/node/node1/cpu4       |  1 +
+ .../linux-with-clusters/node/node1/cpu5       |  1 +
+ .../linux-with-clusters/node/node1/cpu6       |  1 +
+ .../linux-with-clusters/node/node1/cpu7       |  1 +
+ .../linux-with-clusters/node/node1/cpulist    |  1 +
+ .../linux-with-clusters/node/online           |  1 +
+ .../linux-with-clusters/node/possible         |  1 +
+ tests/virhostcputest.c                        |  1 +
+ 85 files changed, 194 insertions(+)
+ create mode 120000 tests/vircaps2xmldata/linux-basic-clusters/system/cpu
+ create mode 120000 tests/vircaps2xmldata/linux-basic-clusters/system/node
+ create mode 100644 tests/vircaps2xmldata/vircaps-aarch64-basic-clusters.xml
+ create mode 100644 tests/virhostcpudata/linux-aarch64-with-clusters.cpuinfo
+ create mode 100644 tests/virhostcpudata/linux-aarch64-with-clusters.expected
+ create mode 100644 tests/virhostcpudata/linux-with-clusters/cpu/cpu0/topology/cluster_cpus_list
+ create mode 100644 tests/virhostcpudata/linux-with-clusters/cpu/cpu0/topology/cluster_id
+ create mode 100644 tests/virhostcpudata/linux-with-clusters/cpu/cpu0/topology/core_cpus_list
+ create mode 100644 tests/virhostcpudata/linux-with-clusters/cpu/cpu0/topology/core_id
+ create mode 100644 tests/virhostcpudata/linux-with-clusters/cpu/cpu0/topology/core_siblings_list
+ create mode 100644 tests/virhostcpudata/linux-with-clusters/cpu/cpu0/topology/package_cpus_list
+ create mode 100644 tests/virhostcpudata/linux-with-clusters/cpu/cpu0/topology/physical_package_id
+ create mode 100644 tests/virhostcpudata/linux-with-clusters/cpu/cpu0/topology/thread_siblings_list
+ create mode 100644 tests/virhostcpudata/linux-with-clusters/cpu/cpu1/topology/cluster_cpus_list
+ create mode 100644 tests/virhostcpudata/linux-with-clusters/cpu/cpu1/topology/cluster_id
+ create mode 100644 tests/virhostcpudata/linux-with-clusters/cpu/cpu1/topology/core_cpus_list
+ create mode 100644 tests/virhostcpudata/linux-with-clusters/cpu/cpu1/topology/core_id
+ create mode 100644 tests/virhostcpudata/linux-with-clusters/cpu/cpu1/topology/core_siblings_list
+ create mode 100644 tests/virhostcpudata/linux-with-clusters/cpu/cpu1/topology/package_cpus_list
+ create mode 100644 tests/virhostcpudata/linux-with-clusters/cpu/cpu1/topology/physical_package_id
+ create mode 100644 tests/virhostcpudata/linux-with-clusters/cpu/cpu1/topology/thread_siblings_list
+ create mode 100644 tests/virhostcpudata/linux-with-clusters/cpu/cpu2/topology/cluster_cpus_list
+ create mode 100644 tests/virhostcpudata/linux-with-clusters/cpu/cpu2/topology/cluster_id
+ create mode 100644 tests/virhostcpudata/linux-with-clusters/cpu/cpu2/topology/core_cpus_list
+ create mode 100644 tests/virhostcpudata/linux-with-clusters/cpu/cpu2/topology/core_id
+ create mode 100644 tests/virhostcpudata/linux-with-clusters/cpu/cpu2/topology/core_siblings_list
+ create mode 100644 tests/virhostcpudata/linux-with-clusters/cpu/cpu2/topology/package_cpus_list
+ create mode 100644 tests/virhostcpudata/linux-with-clusters/cpu/cpu2/topology/physical_package_id
+ create mode 100644 tests/virhostcpudata/linux-with-clusters/cpu/cpu2/topology/thread_siblings_list
+ create mode 100644 tests/virhostcpudata/linux-with-clusters/cpu/cpu3/topology/cluster_cpus_list
+ create mode 100644 tests/virhostcpudata/linux-with-clusters/cpu/cpu3/topology/cluster_id
+ create mode 100644 tests/virhostcpudata/linux-with-clusters/cpu/cpu3/topology/core_cpus_list
+ create mode 100644 tests/virhostcpudata/linux-with-clusters/cpu/cpu3/topology/core_id
+ create mode 100644 tests/virhostcpudata/linux-with-clusters/cpu/cpu3/topology/core_siblings_list
+ create mode 100644 tests/virhostcpudata/linux-with-clusters/cpu/cpu3/topology/package_cpus_list
+ create mode 100644 tests/virhostcpudata/linux-with-clusters/cpu/cpu3/topology/physical_package_id
+ create mode 100644 tests/virhostcpudata/linux-with-clusters/cpu/cpu3/topology/thread_siblings_list
+ create mode 100644 tests/virhostcpudata/linux-with-clusters/cpu/cpu4/topology/cluster_cpus_list
+ create mode 100644 tests/virhostcpudata/linux-with-clusters/cpu/cpu4/topology/cluster_id
+ create mode 100644 tests/virhostcpudata/linux-with-clusters/cpu/cpu4/topology/core_cpus_list
+ create mode 100644 tests/virhostcpudata/linux-with-clusters/cpu/cpu4/topology/core_id
+ create mode 100644 tests/virhostcpudata/linux-with-clusters/cpu/cpu4/topology/core_siblings_list
+ create mode 100644 tests/virhostcpudata/linux-with-clusters/cpu/cpu4/topology/package_cpus_list
+ create mode 100644 tests/virhostcpudata/linux-with-clusters/cpu/cpu4/topology/physical_package_id
+ create mode 100644 tests/virhostcpudata/linux-with-clusters/cpu/cpu4/topology/thread_siblings_list
+ create mode 100644 tests/virhostcpudata/linux-with-clusters/cpu/cpu5/topology/cluster_cpus_list
+ create mode 100644 tests/virhostcpudata/linux-with-clusters/cpu/cpu5/topology/cluster_id
+ create mode 100644 tests/virhostcpudata/linux-with-clusters/cpu/cpu5/topology/core_cpus_list
+ create mode 100644 tests/virhostcpudata/linux-with-clusters/cpu/cpu5/topology/core_id
+ create mode 100644 tests/virhostcpudata/linux-with-clusters/cpu/cpu5/topology/core_siblings_list
+ create mode 100644 tests/virhostcpudata/linux-with-clusters/cpu/cpu5/topology/package_cpus_list
+ create mode 100644 tests/virhostcpudata/linux-with-clusters/cpu/cpu5/topology/physical_package_id
+ create mode 100644 tests/virhostcpudata/linux-with-clusters/cpu/cpu5/topology/thread_siblings_list
+ create mode 100644 tests/virhostcpudata/linux-with-clusters/cpu/cpu6/topology/cluster_cpus_list
+ create mode 100644 tests/virhostcpudata/linux-with-clusters/cpu/cpu6/topology/cluster_id
+ create mode 100644 tests/virhostcpudata/linux-with-clusters/cpu/cpu6/topology/core_cpus_list
+ create mode 100644 tests/virhostcpudata/linux-with-clusters/cpu/cpu6/topology/core_id
+ create mode 100644 tests/virhostcpudata/linux-with-clusters/cpu/cpu6/topology/core_siblings_list
+ create mode 100644 tests/virhostcpudata/linux-with-clusters/cpu/cpu6/topology/package_cpus_list
+ create mode 100644 tests/virhostcpudata/linux-with-clusters/cpu/cpu6/topology/physical_package_id
+ create mode 100644 tests/virhostcpudata/linux-with-clusters/cpu/cpu6/topology/thread_siblings_list
+ create mode 100644 tests/virhostcpudata/linux-with-clusters/cpu/cpu7/topology/cluster_cpus_list
+ create mode 100644 tests/virhostcpudata/linux-with-clusters/cpu/cpu7/topology/cluster_id
+ create mode 100644 tests/virhostcpudata/linux-with-clusters/cpu/cpu7/topology/core_cpus_list
+ create mode 100644 tests/virhostcpudata/linux-with-clusters/cpu/cpu7/topology/core_id
+ create mode 100644 tests/virhostcpudata/linux-with-clusters/cpu/cpu7/topology/core_siblings_list
+ create mode 100644 tests/virhostcpudata/linux-with-clusters/cpu/cpu7/topology/package_cpus_list
+ create mode 100644 tests/virhostcpudata/linux-with-clusters/cpu/cpu7/topology/physical_package_id
+ create mode 100644 tests/virhostcpudata/linux-with-clusters/cpu/cpu7/topology/thread_siblings_list
+ create mode 100644 tests/virhostcpudata/linux-with-clusters/cpu/online
+ create mode 100644 tests/virhostcpudata/linux-with-clusters/cpu/present
+ create mode 120000 tests/virhostcpudata/linux-with-clusters/node/node0/cpu0
+ create mode 120000 tests/virhostcpudata/linux-with-clusters/node/node0/cpu1
+ create mode 120000 tests/virhostcpudata/linux-with-clusters/node/node0/cpu2
+ create mode 120000 tests/virhostcpudata/linux-with-clusters/node/node0/cpu3
+ create mode 100644 tests/virhostcpudata/linux-with-clusters/node/node0/cpulist
+ create mode 120000 tests/virhostcpudata/linux-with-clusters/node/node1/cpu4
+ create mode 120000 tests/virhostcpudata/linux-with-clusters/node/node1/cpu5
+ create mode 120000 tests/virhostcpudata/linux-with-clusters/node/node1/cpu6
+ create mode 120000 tests/virhostcpudata/linux-with-clusters/node/node1/cpu7
+ create mode 100644 tests/virhostcpudata/linux-with-clusters/node/node1/cpulist
+ create mode 100644 tests/virhostcpudata/linux-with-clusters/node/online
+ create mode 100644 tests/virhostcpudata/linux-with-clusters/node/possible
+
+diff --git a/tests/vircaps2xmldata/linux-basic-clusters/system/cpu b/tests/vircaps2xmldata/linux-basic-clusters/system/cpu
+new file mode 120000
+index 0000000000..f7354e3525
+--- /dev/null
++++ b/tests/vircaps2xmldata/linux-basic-clusters/system/cpu
+@@ -0,0 +1 @@
++../../../virhostcpudata/linux-with-clusters/cpu
+\ No newline at end of file
+diff --git a/tests/vircaps2xmldata/linux-basic-clusters/system/node b/tests/vircaps2xmldata/linux-basic-clusters/system/node
+new file mode 120000
+index 0000000000..57b972ce90
+--- /dev/null
++++ b/tests/vircaps2xmldata/linux-basic-clusters/system/node
+@@ -0,0 +1 @@
++../../../virhostcpudata/linux-with-clusters/node
+\ No newline at end of file
+diff --git a/tests/vircaps2xmldata/vircaps-aarch64-basic-clusters.xml b/tests/vircaps2xmldata/vircaps-aarch64-basic-clusters.xml
+new file mode 100644
+index 0000000000..fe61fc42cc
+--- /dev/null
++++ b/tests/vircaps2xmldata/vircaps-aarch64-basic-clusters.xml
+@@ -0,0 +1,39 @@
++<capabilities>
++
++  <host>
++    <cpu>
++      <arch>aarch64</arch>
++    </cpu>
++    <power_management/>
++    <iommu support='no'/>
++    <topology>
++      <cells num='2'>
++        <cell id='0'>
++          <memory unit='KiB'>1048576</memory>
++          <pages unit='KiB' size='4'>2048</pages>
++          <pages unit='KiB' size='2048'>4096</pages>
++          <pages unit='KiB' size='1048576'>6144</pages>
++          <cpus num='4'>
++            <cpu id='0' socket_id='36' die_id='0' core_id='0' siblings='0-1'/>
++            <cpu id='1' socket_id='36' die_id='0' core_id='0' siblings='0-1'/>
++            <cpu id='2' socket_id='36' die_id='0' core_id='1' siblings='2-3'/>
++            <cpu id='3' socket_id='36' die_id='0' core_id='1' siblings='2-3'/>
++          </cpus>
++        </cell>
++        <cell id='1'>
++          <memory unit='KiB'>2097152</memory>
++          <pages unit='KiB' size='4'>4096</pages>
++          <pages unit='KiB' size='2048'>6144</pages>
++          <pages unit='KiB' size='1048576'>8192</pages>
++          <cpus num='4'>
++            <cpu id='4' socket_id='3180' die_id='0' core_id='256' siblings='4-5'/>
++            <cpu id='5' socket_id='3180' die_id='0' core_id='256' siblings='4-5'/>
++            <cpu id='6' socket_id='3180' die_id='0' core_id='257' siblings='6-7'/>
++            <cpu id='7' socket_id='3180' die_id='0' core_id='257' siblings='6-7'/>
++          </cpus>
++        </cell>
++      </cells>
++    </topology>
++  </host>
++
++</capabilities>
+diff --git a/tests/vircaps2xmltest.c b/tests/vircaps2xmltest.c
+index 26a512e87f..2fdf694640 100644
+--- a/tests/vircaps2xmltest.c
++++ b/tests/vircaps2xmltest.c
+@@ -93,6 +93,7 @@ mymain(void)
+     DO_TEST_FULL("basic", VIR_ARCH_X86_64, false, false);
+     DO_TEST_FULL("basic", VIR_ARCH_AARCH64, true, false);
+     DO_TEST_FULL("basic-dies", VIR_ARCH_X86_64, false, false);
++    DO_TEST_FULL("basic-clusters", VIR_ARCH_AARCH64, false, false);
+ 
+     DO_TEST_FULL("caches", VIR_ARCH_X86_64, true, true);
+ 
+diff --git a/tests/virhostcpudata/linux-aarch64-with-clusters.cpuinfo b/tests/virhostcpudata/linux-aarch64-with-clusters.cpuinfo
+new file mode 100644
+index 0000000000..94030201d2
+--- /dev/null
++++ b/tests/virhostcpudata/linux-aarch64-with-clusters.cpuinfo
+@@ -0,0 +1,72 @@
++processor	: 0
++BogoMIPS	: 400.00
++Features	: fp asimd evtstrm aes pmull sha1 sha2 crc32 atomics cpuid asimdrdm
++CPU implementer	: 0x43
++CPU architecture: 8
++CPU variant	: 0x1
++CPU part	: 0x0af
++CPU revision	: 1
++
++processor	: 1
++BogoMIPS	: 400.00
++Features	: fp asimd evtstrm aes pmull sha1 sha2 crc32 atomics cpuid asimdrdm
++CPU implementer	: 0x43
++CPU architecture: 8
++CPU variant	: 0x1
++CPU part	: 0x0af
++CPU revision	: 1
++
++processor	: 2
++BogoMIPS	: 400.00
++Features	: fp asimd evtstrm aes pmull sha1 sha2 crc32 atomics cpuid asimdrdm
++CPU implementer	: 0x43
++CPU architecture: 8
++CPU variant	: 0x1
++CPU part	: 0x0af
++CPU revision	: 1
++
++processor	: 3
++BogoMIPS	: 400.00
++Features	: fp asimd evtstrm aes pmull sha1 sha2 crc32 atomics cpuid asimdrdm
++CPU implementer	: 0x43
++CPU architecture: 8
++CPU variant	: 0x1
++CPU part	: 0x0af
++CPU revision	: 1
++
++processor	: 4
++BogoMIPS	: 400.00
++Features	: fp asimd evtstrm aes pmull sha1 sha2 crc32 atomics cpuid asimdrdm
++CPU implementer	: 0x43
++CPU architecture: 8
++CPU variant	: 0x1
++CPU part	: 0x0af
++CPU revision	: 1
++
++processor	: 5
++BogoMIPS	: 400.00
++Features	: fp asimd evtstrm aes pmull sha1 sha2 crc32 atomics cpuid asimdrdm
++CPU implementer	: 0x43
++CPU architecture: 8
++CPU variant	: 0x1
++CPU part	: 0x0af
++CPU revision	: 1
++
++processor	: 6
++BogoMIPS	: 400.00
++Features	: fp asimd evtstrm aes pmull sha1 sha2 crc32 atomics cpuid asimdrdm
++CPU implementer	: 0x43
++CPU architecture: 8
++CPU variant	: 0x1
++CPU part	: 0x0af
++CPU revision	: 1
++
++processor	: 7
++BogoMIPS	: 400.00
++Features	: fp asimd evtstrm aes pmull sha1 sha2 crc32 atomics cpuid asimdrdm
++CPU implementer	: 0x43
++CPU architecture: 8
++CPU variant	: 0x1
++CPU part	: 0x0af
++CPU revision	: 1
++
+diff --git a/tests/virhostcpudata/linux-aarch64-with-clusters.expected b/tests/virhostcpudata/linux-aarch64-with-clusters.expected
+new file mode 100644
+index 0000000000..bf350bd40b
+--- /dev/null
++++ b/tests/virhostcpudata/linux-aarch64-with-clusters.expected
+@@ -0,0 +1 @@
++CPUs: 8/8, MHz: 0, Nodes: 2, Sockets: 1, Cores: 2, Threads: 2
+diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu0/topology/cluster_cpus_list b/tests/virhostcpudata/linux-with-clusters/cpu/cpu0/topology/cluster_cpus_list
+new file mode 100644
+index 0000000000..8b0fab869c
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu0/topology/cluster_cpus_list
+@@ -0,0 +1 @@
++0-1
+diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu0/topology/cluster_id b/tests/virhostcpudata/linux-with-clusters/cpu/cpu0/topology/cluster_id
+new file mode 100644
+index 0000000000..573541ac97
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu0/topology/cluster_id
+@@ -0,0 +1 @@
++0
+diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu0/topology/core_cpus_list b/tests/virhostcpudata/linux-with-clusters/cpu/cpu0/topology/core_cpus_list
+new file mode 100644
+index 0000000000..8b0fab869c
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu0/topology/core_cpus_list
+@@ -0,0 +1 @@
++0-1
+diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu0/topology/core_id b/tests/virhostcpudata/linux-with-clusters/cpu/cpu0/topology/core_id
+new file mode 100644
+index 0000000000..573541ac97
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu0/topology/core_id
+@@ -0,0 +1 @@
++0
+diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu0/topology/core_siblings_list b/tests/virhostcpudata/linux-with-clusters/cpu/cpu0/topology/core_siblings_list
+new file mode 100644
+index 0000000000..40c7bb2f1a
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu0/topology/core_siblings_list
+@@ -0,0 +1 @@
++0-3
+diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu0/topology/package_cpus_list b/tests/virhostcpudata/linux-with-clusters/cpu/cpu0/topology/package_cpus_list
+new file mode 100644
+index 0000000000..40c7bb2f1a
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu0/topology/package_cpus_list
+@@ -0,0 +1 @@
++0-3
+diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu0/topology/physical_package_id b/tests/virhostcpudata/linux-with-clusters/cpu/cpu0/topology/physical_package_id
+new file mode 100644
+index 0000000000..7facc89938
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu0/topology/physical_package_id
+@@ -0,0 +1 @@
++36
+diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu0/topology/thread_siblings_list b/tests/virhostcpudata/linux-with-clusters/cpu/cpu0/topology/thread_siblings_list
+new file mode 100644
+index 0000000000..8b0fab869c
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu0/topology/thread_siblings_list
+@@ -0,0 +1 @@
++0-1
+diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu1/topology/cluster_cpus_list b/tests/virhostcpudata/linux-with-clusters/cpu/cpu1/topology/cluster_cpus_list
+new file mode 100644
+index 0000000000..8b0fab869c
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu1/topology/cluster_cpus_list
+@@ -0,0 +1 @@
++0-1
+diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu1/topology/cluster_id b/tests/virhostcpudata/linux-with-clusters/cpu/cpu1/topology/cluster_id
+new file mode 100644
+index 0000000000..573541ac97
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu1/topology/cluster_id
+@@ -0,0 +1 @@
++0
+diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu1/topology/core_cpus_list b/tests/virhostcpudata/linux-with-clusters/cpu/cpu1/topology/core_cpus_list
+new file mode 100644
+index 0000000000..8b0fab869c
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu1/topology/core_cpus_list
+@@ -0,0 +1 @@
++0-1
+diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu1/topology/core_id b/tests/virhostcpudata/linux-with-clusters/cpu/cpu1/topology/core_id
+new file mode 100644
+index 0000000000..573541ac97
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu1/topology/core_id
+@@ -0,0 +1 @@
++0
+diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu1/topology/core_siblings_list b/tests/virhostcpudata/linux-with-clusters/cpu/cpu1/topology/core_siblings_list
+new file mode 100644
+index 0000000000..40c7bb2f1a
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu1/topology/core_siblings_list
+@@ -0,0 +1 @@
++0-3
+diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu1/topology/package_cpus_list b/tests/virhostcpudata/linux-with-clusters/cpu/cpu1/topology/package_cpus_list
+new file mode 100644
+index 0000000000..40c7bb2f1a
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu1/topology/package_cpus_list
+@@ -0,0 +1 @@
++0-3
+diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu1/topology/physical_package_id b/tests/virhostcpudata/linux-with-clusters/cpu/cpu1/topology/physical_package_id
+new file mode 100644
+index 0000000000..7facc89938
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu1/topology/physical_package_id
+@@ -0,0 +1 @@
++36
+diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu1/topology/thread_siblings_list b/tests/virhostcpudata/linux-with-clusters/cpu/cpu1/topology/thread_siblings_list
+new file mode 100644
+index 0000000000..8b0fab869c
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu1/topology/thread_siblings_list
+@@ -0,0 +1 @@
++0-1
+diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu2/topology/cluster_cpus_list b/tests/virhostcpudata/linux-with-clusters/cpu/cpu2/topology/cluster_cpus_list
+new file mode 100644
+index 0000000000..7a9857542a
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu2/topology/cluster_cpus_list
+@@ -0,0 +1 @@
++2-3
+diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu2/topology/cluster_id b/tests/virhostcpudata/linux-with-clusters/cpu/cpu2/topology/cluster_id
+new file mode 100644
+index 0000000000..d00491fd7e
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu2/topology/cluster_id
+@@ -0,0 +1 @@
++1
+diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu2/topology/core_cpus_list b/tests/virhostcpudata/linux-with-clusters/cpu/cpu2/topology/core_cpus_list
+new file mode 100644
+index 0000000000..7a9857542a
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu2/topology/core_cpus_list
+@@ -0,0 +1 @@
++2-3
+diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu2/topology/core_id b/tests/virhostcpudata/linux-with-clusters/cpu/cpu2/topology/core_id
+new file mode 100644
+index 0000000000..d00491fd7e
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu2/topology/core_id
+@@ -0,0 +1 @@
++1
+diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu2/topology/core_siblings_list b/tests/virhostcpudata/linux-with-clusters/cpu/cpu2/topology/core_siblings_list
+new file mode 100644
+index 0000000000..40c7bb2f1a
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu2/topology/core_siblings_list
+@@ -0,0 +1 @@
++0-3
+diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu2/topology/package_cpus_list b/tests/virhostcpudata/linux-with-clusters/cpu/cpu2/topology/package_cpus_list
+new file mode 100644
+index 0000000000..40c7bb2f1a
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu2/topology/package_cpus_list
+@@ -0,0 +1 @@
++0-3
+diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu2/topology/physical_package_id b/tests/virhostcpudata/linux-with-clusters/cpu/cpu2/topology/physical_package_id
+new file mode 100644
+index 0000000000..7facc89938
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu2/topology/physical_package_id
+@@ -0,0 +1 @@
++36
+diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu2/topology/thread_siblings_list b/tests/virhostcpudata/linux-with-clusters/cpu/cpu2/topology/thread_siblings_list
+new file mode 100644
+index 0000000000..7a9857542a
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu2/topology/thread_siblings_list
+@@ -0,0 +1 @@
++2-3
+diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu3/topology/cluster_cpus_list b/tests/virhostcpudata/linux-with-clusters/cpu/cpu3/topology/cluster_cpus_list
+new file mode 100644
+index 0000000000..7a9857542a
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu3/topology/cluster_cpus_list
+@@ -0,0 +1 @@
++2-3
+diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu3/topology/cluster_id b/tests/virhostcpudata/linux-with-clusters/cpu/cpu3/topology/cluster_id
+new file mode 100644
+index 0000000000..d00491fd7e
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu3/topology/cluster_id
+@@ -0,0 +1 @@
++1
+diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu3/topology/core_cpus_list b/tests/virhostcpudata/linux-with-clusters/cpu/cpu3/topology/core_cpus_list
+new file mode 100644
+index 0000000000..7a9857542a
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu3/topology/core_cpus_list
+@@ -0,0 +1 @@
++2-3
+diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu3/topology/core_id b/tests/virhostcpudata/linux-with-clusters/cpu/cpu3/topology/core_id
+new file mode 100644
+index 0000000000..d00491fd7e
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu3/topology/core_id
+@@ -0,0 +1 @@
++1
+diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu3/topology/core_siblings_list b/tests/virhostcpudata/linux-with-clusters/cpu/cpu3/topology/core_siblings_list
+new file mode 100644
+index 0000000000..40c7bb2f1a
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu3/topology/core_siblings_list
+@@ -0,0 +1 @@
++0-3
+diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu3/topology/package_cpus_list b/tests/virhostcpudata/linux-with-clusters/cpu/cpu3/topology/package_cpus_list
+new file mode 100644
+index 0000000000..40c7bb2f1a
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu3/topology/package_cpus_list
+@@ -0,0 +1 @@
++0-3
+diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu3/topology/physical_package_id b/tests/virhostcpudata/linux-with-clusters/cpu/cpu3/topology/physical_package_id
+new file mode 100644
+index 0000000000..7facc89938
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu3/topology/physical_package_id
+@@ -0,0 +1 @@
++36
+diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu3/topology/thread_siblings_list b/tests/virhostcpudata/linux-with-clusters/cpu/cpu3/topology/thread_siblings_list
+new file mode 100644
+index 0000000000..7a9857542a
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu3/topology/thread_siblings_list
+@@ -0,0 +1 @@
++2-3
+diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu4/topology/cluster_cpus_list b/tests/virhostcpudata/linux-with-clusters/cpu/cpu4/topology/cluster_cpus_list
+new file mode 100644
+index 0000000000..e66d883ade
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu4/topology/cluster_cpus_list
+@@ -0,0 +1 @@
++4-5
+diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu4/topology/cluster_id b/tests/virhostcpudata/linux-with-clusters/cpu/cpu4/topology/cluster_id
+new file mode 100644
+index 0000000000..9183bf03fc
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu4/topology/cluster_id
+@@ -0,0 +1 @@
++256
+diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu4/topology/core_cpus_list b/tests/virhostcpudata/linux-with-clusters/cpu/cpu4/topology/core_cpus_list
+new file mode 100644
+index 0000000000..e66d883ade
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu4/topology/core_cpus_list
+@@ -0,0 +1 @@
++4-5
+diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu4/topology/core_id b/tests/virhostcpudata/linux-with-clusters/cpu/cpu4/topology/core_id
+new file mode 100644
+index 0000000000..9183bf03fc
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu4/topology/core_id
+@@ -0,0 +1 @@
++256
+diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu4/topology/core_siblings_list b/tests/virhostcpudata/linux-with-clusters/cpu/cpu4/topology/core_siblings_list
+new file mode 100644
+index 0000000000..93fccd3cc6
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu4/topology/core_siblings_list
+@@ -0,0 +1 @@
++4-7
+diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu4/topology/package_cpus_list b/tests/virhostcpudata/linux-with-clusters/cpu/cpu4/topology/package_cpus_list
+new file mode 100644
+index 0000000000..93fccd3cc6
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu4/topology/package_cpus_list
+@@ -0,0 +1 @@
++4-7
+diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu4/topology/physical_package_id b/tests/virhostcpudata/linux-with-clusters/cpu/cpu4/topology/physical_package_id
+new file mode 100644
+index 0000000000..58cecca290
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu4/topology/physical_package_id
+@@ -0,0 +1 @@
++3180
+diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu4/topology/thread_siblings_list b/tests/virhostcpudata/linux-with-clusters/cpu/cpu4/topology/thread_siblings_list
+new file mode 100644
+index 0000000000..e66d883ade
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu4/topology/thread_siblings_list
+@@ -0,0 +1 @@
++4-5
+diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu5/topology/cluster_cpus_list b/tests/virhostcpudata/linux-with-clusters/cpu/cpu5/topology/cluster_cpus_list
+new file mode 100644
+index 0000000000..e66d883ade
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu5/topology/cluster_cpus_list
+@@ -0,0 +1 @@
++4-5
+diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu5/topology/cluster_id b/tests/virhostcpudata/linux-with-clusters/cpu/cpu5/topology/cluster_id
+new file mode 100644
+index 0000000000..9183bf03fc
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu5/topology/cluster_id
+@@ -0,0 +1 @@
++256
+diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu5/topology/core_cpus_list b/tests/virhostcpudata/linux-with-clusters/cpu/cpu5/topology/core_cpus_list
+new file mode 100644
+index 0000000000..e66d883ade
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu5/topology/core_cpus_list
+@@ -0,0 +1 @@
++4-5
+diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu5/topology/core_id b/tests/virhostcpudata/linux-with-clusters/cpu/cpu5/topology/core_id
+new file mode 100644
+index 0000000000..9183bf03fc
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu5/topology/core_id
+@@ -0,0 +1 @@
++256
+diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu5/topology/core_siblings_list b/tests/virhostcpudata/linux-with-clusters/cpu/cpu5/topology/core_siblings_list
+new file mode 100644
+index 0000000000..93fccd3cc6
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu5/topology/core_siblings_list
+@@ -0,0 +1 @@
++4-7
+diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu5/topology/package_cpus_list b/tests/virhostcpudata/linux-with-clusters/cpu/cpu5/topology/package_cpus_list
+new file mode 100644
+index 0000000000..93fccd3cc6
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu5/topology/package_cpus_list
+@@ -0,0 +1 @@
++4-7
+diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu5/topology/physical_package_id b/tests/virhostcpudata/linux-with-clusters/cpu/cpu5/topology/physical_package_id
+new file mode 100644
+index 0000000000..58cecca290
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu5/topology/physical_package_id
+@@ -0,0 +1 @@
++3180
+diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu5/topology/thread_siblings_list b/tests/virhostcpudata/linux-with-clusters/cpu/cpu5/topology/thread_siblings_list
+new file mode 100644
+index 0000000000..e66d883ade
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu5/topology/thread_siblings_list
+@@ -0,0 +1 @@
++4-5
+diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu6/topology/cluster_cpus_list b/tests/virhostcpudata/linux-with-clusters/cpu/cpu6/topology/cluster_cpus_list
+new file mode 100644
+index 0000000000..fdd9f37517
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu6/topology/cluster_cpus_list
+@@ -0,0 +1 @@
++6-7
+diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu6/topology/cluster_id b/tests/virhostcpudata/linux-with-clusters/cpu/cpu6/topology/cluster_id
+new file mode 100644
+index 0000000000..a700e79997
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu6/topology/cluster_id
+@@ -0,0 +1 @@
++257
+diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu6/topology/core_cpus_list b/tests/virhostcpudata/linux-with-clusters/cpu/cpu6/topology/core_cpus_list
+new file mode 100644
+index 0000000000..fdd9f37517
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu6/topology/core_cpus_list
+@@ -0,0 +1 @@
++6-7
+diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu6/topology/core_id b/tests/virhostcpudata/linux-with-clusters/cpu/cpu6/topology/core_id
+new file mode 100644
+index 0000000000..a700e79997
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu6/topology/core_id
+@@ -0,0 +1 @@
++257
+diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu6/topology/core_siblings_list b/tests/virhostcpudata/linux-with-clusters/cpu/cpu6/topology/core_siblings_list
+new file mode 100644
+index 0000000000..93fccd3cc6
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu6/topology/core_siblings_list
+@@ -0,0 +1 @@
++4-7
+diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu6/topology/package_cpus_list b/tests/virhostcpudata/linux-with-clusters/cpu/cpu6/topology/package_cpus_list
+new file mode 100644
+index 0000000000..93fccd3cc6
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu6/topology/package_cpus_list
+@@ -0,0 +1 @@
++4-7
+diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu6/topology/physical_package_id b/tests/virhostcpudata/linux-with-clusters/cpu/cpu6/topology/physical_package_id
+new file mode 100644
+index 0000000000..58cecca290
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu6/topology/physical_package_id
+@@ -0,0 +1 @@
++3180
+diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu6/topology/thread_siblings_list b/tests/virhostcpudata/linux-with-clusters/cpu/cpu6/topology/thread_siblings_list
+new file mode 100644
+index 0000000000..fdd9f37517
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu6/topology/thread_siblings_list
+@@ -0,0 +1 @@
++6-7
+diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu7/topology/cluster_cpus_list b/tests/virhostcpudata/linux-with-clusters/cpu/cpu7/topology/cluster_cpus_list
+new file mode 100644
+index 0000000000..fdd9f37517
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu7/topology/cluster_cpus_list
+@@ -0,0 +1 @@
++6-7
+diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu7/topology/cluster_id b/tests/virhostcpudata/linux-with-clusters/cpu/cpu7/topology/cluster_id
+new file mode 100644
+index 0000000000..a700e79997
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu7/topology/cluster_id
+@@ -0,0 +1 @@
++257
+diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu7/topology/core_cpus_list b/tests/virhostcpudata/linux-with-clusters/cpu/cpu7/topology/core_cpus_list
+new file mode 100644
+index 0000000000..fdd9f37517
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu7/topology/core_cpus_list
+@@ -0,0 +1 @@
++6-7
+diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu7/topology/core_id b/tests/virhostcpudata/linux-with-clusters/cpu/cpu7/topology/core_id
+new file mode 100644
+index 0000000000..a700e79997
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu7/topology/core_id
+@@ -0,0 +1 @@
++257
+diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu7/topology/core_siblings_list b/tests/virhostcpudata/linux-with-clusters/cpu/cpu7/topology/core_siblings_list
+new file mode 100644
+index 0000000000..93fccd3cc6
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu7/topology/core_siblings_list
+@@ -0,0 +1 @@
++4-7
+diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu7/topology/package_cpus_list b/tests/virhostcpudata/linux-with-clusters/cpu/cpu7/topology/package_cpus_list
+new file mode 100644
+index 0000000000..93fccd3cc6
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu7/topology/package_cpus_list
+@@ -0,0 +1 @@
++4-7
+diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu7/topology/physical_package_id b/tests/virhostcpudata/linux-with-clusters/cpu/cpu7/topology/physical_package_id
+new file mode 100644
+index 0000000000..58cecca290
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu7/topology/physical_package_id
+@@ -0,0 +1 @@
++3180
+diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/cpu7/topology/thread_siblings_list b/tests/virhostcpudata/linux-with-clusters/cpu/cpu7/topology/thread_siblings_list
+new file mode 100644
+index 0000000000..fdd9f37517
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-clusters/cpu/cpu7/topology/thread_siblings_list
+@@ -0,0 +1 @@
++6-7
+diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/online b/tests/virhostcpudata/linux-with-clusters/cpu/online
+new file mode 100644
+index 0000000000..5f4593c34a
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-clusters/cpu/online
+@@ -0,0 +1 @@
++0-223
+diff --git a/tests/virhostcpudata/linux-with-clusters/cpu/present b/tests/virhostcpudata/linux-with-clusters/cpu/present
+new file mode 100644
+index 0000000000..5f4593c34a
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-clusters/cpu/present
+@@ -0,0 +1 @@
++0-223
+diff --git a/tests/virhostcpudata/linux-with-clusters/node/node0/cpu0 b/tests/virhostcpudata/linux-with-clusters/node/node0/cpu0
+new file mode 120000
+index 0000000000..c841bea28b
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-clusters/node/node0/cpu0
+@@ -0,0 +1 @@
++../../cpu/cpu0
+\ No newline at end of file
+diff --git a/tests/virhostcpudata/linux-with-clusters/node/node0/cpu1 b/tests/virhostcpudata/linux-with-clusters/node/node0/cpu1
+new file mode 120000
+index 0000000000..5f4536279e
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-clusters/node/node0/cpu1
+@@ -0,0 +1 @@
++../../cpu/cpu1
+\ No newline at end of file
+diff --git a/tests/virhostcpudata/linux-with-clusters/node/node0/cpu2 b/tests/virhostcpudata/linux-with-clusters/node/node0/cpu2
+new file mode 120000
+index 0000000000..2dcca332ce
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-clusters/node/node0/cpu2
+@@ -0,0 +1 @@
++../../cpu/cpu2
+\ No newline at end of file
+diff --git a/tests/virhostcpudata/linux-with-clusters/node/node0/cpu3 b/tests/virhostcpudata/linux-with-clusters/node/node0/cpu3
+new file mode 120000
+index 0000000000..c7690e5aa6
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-clusters/node/node0/cpu3
+@@ -0,0 +1 @@
++../../cpu/cpu3
+\ No newline at end of file
+diff --git a/tests/virhostcpudata/linux-with-clusters/node/node0/cpulist b/tests/virhostcpudata/linux-with-clusters/node/node0/cpulist
+new file mode 100644
+index 0000000000..40c7bb2f1a
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-clusters/node/node0/cpulist
+@@ -0,0 +1 @@
++0-3
+diff --git a/tests/virhostcpudata/linux-with-clusters/node/node1/cpu4 b/tests/virhostcpudata/linux-with-clusters/node/node1/cpu4
+new file mode 120000
+index 0000000000..9e77a64eb4
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-clusters/node/node1/cpu4
+@@ -0,0 +1 @@
++../../cpu/cpu4
+\ No newline at end of file
+diff --git a/tests/virhostcpudata/linux-with-clusters/node/node1/cpu5 b/tests/virhostcpudata/linux-with-clusters/node/node1/cpu5
+new file mode 120000
+index 0000000000..cc07c3b97b
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-clusters/node/node1/cpu5
+@@ -0,0 +1 @@
++../../cpu/cpu5
+\ No newline at end of file
+diff --git a/tests/virhostcpudata/linux-with-clusters/node/node1/cpu6 b/tests/virhostcpudata/linux-with-clusters/node/node1/cpu6
+new file mode 120000
+index 0000000000..2e7576354f
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-clusters/node/node1/cpu6
+@@ -0,0 +1 @@
++../../cpu/cpu6
+\ No newline at end of file
+diff --git a/tests/virhostcpudata/linux-with-clusters/node/node1/cpu7 b/tests/virhostcpudata/linux-with-clusters/node/node1/cpu7
+new file mode 120000
+index 0000000000..09e3f79b43
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-clusters/node/node1/cpu7
+@@ -0,0 +1 @@
++../../cpu/cpu7
+\ No newline at end of file
+diff --git a/tests/virhostcpudata/linux-with-clusters/node/node1/cpulist b/tests/virhostcpudata/linux-with-clusters/node/node1/cpulist
+new file mode 100644
+index 0000000000..93fccd3cc6
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-clusters/node/node1/cpulist
+@@ -0,0 +1 @@
++4-7
+diff --git a/tests/virhostcpudata/linux-with-clusters/node/online b/tests/virhostcpudata/linux-with-clusters/node/online
+new file mode 100644
+index 0000000000..8b0fab869c
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-clusters/node/online
+@@ -0,0 +1 @@
++0-1
+diff --git a/tests/virhostcpudata/linux-with-clusters/node/possible b/tests/virhostcpudata/linux-with-clusters/node/possible
+new file mode 100644
+index 0000000000..8b0fab869c
+--- /dev/null
++++ b/tests/virhostcpudata/linux-with-clusters/node/possible
+@@ -0,0 +1 @@
++0-1
+diff --git a/tests/virhostcputest.c b/tests/virhostcputest.c
+index 0990013878..cf310cb4ce 100644
+--- a/tests/virhostcputest.c
++++ b/tests/virhostcputest.c
+@@ -273,6 +273,7 @@ mymain(void)
+         {"subcores3", VIR_ARCH_PPC64},
+         {"with-frequency", VIR_ARCH_S390X},
+         {"with-die", VIR_ARCH_X86_64},
++        {"with-clusters", VIR_ARCH_AARCH64},
+     };
+ 
+     if (virInitialize() < 0)
+-- 
+2.27.0
+
diff --git a/tests-Allow-expansion-of-mocked-stat-symbols.patch b/tests-Allow-expansion-of-mocked-stat-symbols.patch
deleted file mode 100644
index 67e08113ca86fc69f700361db84839ae80380df7..0000000000000000000000000000000000000000
--- a/tests-Allow-expansion-of-mocked-stat-symbols.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 9f6e5e5fe12e9cb4bb42918f597ba0268e57064b Mon Sep 17 00:00:00 2001
-From: xuyinghao <xuyinghao2@huawei.com>
-Date: Tue, 16 Aug 2022 19:08:45 +0800
-Subject: [PATCH 08/13] tests: Allow expansion of mocked stat symbols
-
-When libc uses a define to rewrite stat64 to stat our mocks do not work if they
-are chained because the symbol that we are looking up is being stringified and
-therefore preventing the stat64->stat expansion per C-preprocessor rules.  One
-stringification macro is just enough to make it work.
-
-Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- tests/virmock.h | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/tests/virmock.h b/tests/virmock.h
-index 95feeb0d92..188f0cf55b 100644
---- a/tests/virmock.h
-+++ b/tests/virmock.h
-@@ -57,6 +57,7 @@
- #define VIR_MOCK_GET_ARG20(z, a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t) z(a, b),  z(c, d), z(e, f), z(g, h), z(i, j), z(k, l), z(m, n), z(o, p), z(q, r), z(s, t)
- #define VIR_MOCK_GET_ARG21(z, a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u) z(a, b),  z(c, d), z(e, f), z(g, h), z(i, j), z(k, l), z(m, n), z(o, p), z(q, r), z(s, t)
- 
-+#define VIR_MOCK_STRINGIFY_SYMBOL(name) #name
- 
- #define VIR_MOCK_ARGNAMES_EXPAND(a, b, ...) VIR_MOCK_ARG_PASTE(a, b, __VA_ARGS__)
- #define VIR_MOCK_ARGNAMES(...) \
-@@ -283,7 +284,7 @@
-     do { \
-         if (real_##name == NULL && \
-             !(real_##name = dlsym(RTLD_NEXT, \
--                                  #name))) { \
-+                                  VIR_MOCK_STRINGIFY_SYMBOL(name)))) { \
-             fprintf(stderr, "Missing symbol '" #name "'\n"); \
-             abort(); \
-         } \
--- 
-2.33.0
-
diff --git a/tests-Don-t-leak-cpu-defs.patch b/tests-Don-t-leak-cpu-defs.patch
deleted file mode 100644
index d3c2a5ed7b99d6ad08cb335e808452e03eaf2522..0000000000000000000000000000000000000000
--- a/tests-Don-t-leak-cpu-defs.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 5ad5d48df150a4025eb7628596f3715ba4a91eb1 Mon Sep 17 00:00:00 2001
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Fri, 30 Jul 2021 10:34:50 +0200
-Subject: [PATCH 098/108] tests: Don't leak cpu defs
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-There are cpu definitions that are allocated in
-qemuTestDriverInit() but are missing corresponding
-virCPUDefFree() call in qemuTestDriverFree(). It's safe to call
-the free function because the definitions contain a refcounter
-and thus even if they were still in use the refcounter would be
-just decreased.
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 73890139bfa248e3a714feb5566144510c3e97dc)
----
- tests/testutilsqemu.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c
-index 6c43f07015..0e932877e8 100644
---- a/tests/testutilsqemu.c
-+++ b/tests/testutilsqemu.c
-@@ -317,6 +317,11 @@ void qemuTestDriverFree(virQEMUDriver *driver)
-     virObjectUnref(driver->caps);
-     virObjectUnref(driver->config);
-     virObjectUnref(driver->securityManager);
-+
-+    virCPUDefFree(cpuDefault);
-+    virCPUDefFree(cpuHaswell);
-+    virCPUDefFree(cpuPower8);
-+    virCPUDefFree(cpuPower9);
- }
- 
- int qemuTestCapsCacheInsert(virFileCachePtr cache,
--- 
-2.33.0
-
diff --git a/tests-Fix-false-positive-in-testConfRoundTrip.patch b/tests-Fix-false-positive-in-testConfRoundTrip.patch
deleted file mode 100644
index 61e402f6011d1184d1364e7d30e31eaab961fa4c..0000000000000000000000000000000000000000
--- a/tests-Fix-false-positive-in-testConfRoundTrip.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 5b813b4629554c6c7d85e14fe1b5927ebc99ffb3 Mon Sep 17 00:00:00 2001
-From: tangbinzy <tangbin_yewu@cmss.chinamobile.com>
-Date: Tue, 29 Nov 2022 08:50:42 +0000
-Subject: [PATCH 03/24] tests: Fix false positive in testConfRoundTrip
- testConfRoundTrip would return 0 (success) if virConfWriteMem succeeded and
- virTestCompareToFile failed.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Tim Wiederhake <twiederh@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Signed-off-by: Ján Tomko <jtomko@redhat.com>
-
-Signed-off-by: tangbin <tangbin_yewu@cmss.chinamobile.com>
-(cherry-pick from 4b53ce9fa7a387b7df6821aeade5a95bf0141ba5)
----
- tests/virconftest.c | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/tests/virconftest.c b/tests/virconftest.c
-index 83077342a9..d8f0cb137a 100644
---- a/tests/virconftest.c
-+++ b/tests/virconftest.c
-@@ -51,8 +51,7 @@ static int testConfRoundTrip(const void *opaque)
-         fprintf(stderr, "Failed to process %s\n", srcfile);
-         goto cleanup;
-     }
--    ret = virConfWriteMem(buffer, &len, conf);
--    if (ret < 0) {
-+    if (virConfWriteMem(buffer, &len, conf) < 0) {
-         fprintf(stderr, "Failed to serialize %s back\n", srcfile);
-         goto cleanup;
-     }
--- 
-2.27.0
-
diff --git a/tests-Fix-lstat-mock-initialization-on-macOS.patch b/tests-Fix-lstat-mock-initialization-on-macOS.patch
deleted file mode 100644
index c67376e280ed72ad3b3c0ef573644bffbfbf8369..0000000000000000000000000000000000000000
--- a/tests-Fix-lstat-mock-initialization-on-macOS.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 94ce004ea840aed0c8159502a6a7bd2b0dd3f4a7 Mon Sep 17 00:00:00 2001
-From: tangbinzy <tangbin_yewu@cmss.chinamobile.com>
-Date: Tue, 29 Nov 2022 09:42:43 +0000
-Subject: [PATCH 06/24] tests: Fix lstat() mock initialization on macOS There
- is a typo that prevents initialization of real_lstat.
-
-Fixes: d6b17edd5163 ("tests: Lookup extended stat/lstat in mocks")
-Signed-off-by: Roman Bolshakov <r.bolshakov@yadro.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-
-Signed-off-by: tangbin <tangbin_yewu@cmss.chinamobile.com>
-(cherry-pick from 2c0b3db3c7901f99eed8d95a652b176c9b04b45d)
----
- tests/virmockstathelpers.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/virmockstathelpers.c b/tests/virmockstathelpers.c
-index 5118ffc731..9cd6f5edb8 100644
---- a/tests/virmockstathelpers.c
-+++ b/tests/virmockstathelpers.c
-@@ -169,7 +169,7 @@ static void virMockStatInit(void)
- #endif
- #ifdef MOCK_LSTAT
- # ifdef __APPLE__
--    VIR_MOCK_REAL_INIT_ALIASED(stat, "lstat$INODE64");
-+    VIR_MOCK_REAL_INIT_ALIASED(lstat, "lstat$INODE64");
- # else
-     VIR_MOCK_REAL_INIT(lstat);
- # endif
--- 
-2.27.0
-
diff --git a/tests-Fix-vhostuser-args-file.patch b/tests-Fix-vhostuser-args-file.patch
deleted file mode 100644
index 734ef397a4f8bfb83a1e7d0244c22424d76f7d9f..0000000000000000000000000000000000000000
--- a/tests-Fix-vhostuser-args-file.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From e1626a91423572d025f5647174798f257e9f9ce1 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Hyman=20Huang=28=E9=BB=84=E5=8B=87=29?=
- <huangy81@chinatelecom.cn>
-Date: Tue, 6 Dec 2022 06:05:38 -0500
-Subject: [PATCH] tests: Fix vhostuser args file
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Hyman Huang(黄勇) <huangy81@chinatelecom.cn>
----
- tests/qemuxml2argvdata/disk-vhostuser.x86_64-latest.args | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/tests/qemuxml2argvdata/disk-vhostuser.x86_64-latest.args b/tests/qemuxml2argvdata/disk-vhostuser.x86_64-latest.args
-index 0a2b579e21..a143b7cdc6 100644
---- a/tests/qemuxml2argvdata/disk-vhostuser.x86_64-latest.args
-+++ b/tests/qemuxml2argvdata/disk-vhostuser.x86_64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu qemu64 \
- -m 214 \
- -overcommit mem-lock=off \
--- 
-2.27.0
-
diff --git a/tests-Replace-deprecated-ASN1-code.patch b/tests-Replace-deprecated-ASN1-code.patch
deleted file mode 100644
index 2cf05d5934ce7f5ea8087d1c8187fed26d8982f9..0000000000000000000000000000000000000000
--- a/tests-Replace-deprecated-ASN1-code.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From 88b38f685d57aac074656104def7111fe854e7c3 Mon Sep 17 00:00:00 2001
-From: Luke Yue <lukedyue@gmail.com>
-Date: Tue, 18 May 2021 09:19:26 +0800
-Subject: [PATCH] tests: Replace deprecated ASN1 code
-
-This fixes compiler warnings when building with libtasn1 4.17.0.
-
-Signed-off-by: Luke Yue <lukedyue@gmail.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
----
- tests/pkix_asn1_tab.c    |  2 +-
- tests/virnettlshelpers.c | 12 ++++++------
- 2 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/tests/pkix_asn1_tab.c b/tests/pkix_asn1_tab.c
-index 5d5ca3db5d..a28d5f20c3 100644
---- a/tests/pkix_asn1_tab.c
-+++ b/tests/pkix_asn1_tab.c
-@@ -5,7 +5,7 @@
- #include <config.h>
- #include <libtasn1.h>
- 
--const ASN1_ARRAY_TYPE pkix_asn1_tab[] = {
-+const asn1_static_node pkix_asn1_tab[] = {
-   { "PKIX1", 536875024, NULL },
-   { NULL, 1073741836, NULL },
-   { "id-pkix", 1879048204, NULL },
-diff --git a/tests/virnettlshelpers.c b/tests/virnettlshelpers.c
-index ce38571b0a..905e633e60 100644
---- a/tests/virnettlshelpers.c
-+++ b/tests/virnettlshelpers.c
-@@ -37,8 +37,8 @@ VIR_LOG_INIT("tests.nettlshelpers");
-  * These store some static data that is needed when
-  * encoding extensions in the x509 certs
-  */
--ASN1_TYPE pkix_asn1;
--extern const ASN1_ARRAY_TYPE pkix_asn1_tab[];
-+asn1_node pkix_asn1;
-+extern const asn1_static_node pkix_asn1_tab[];
- 
- /*
-  * To avoid consuming random entropy to generate keys,
-@@ -107,7 +107,7 @@ void testTLSCleanup(const char *keyfile)
- /*
-  * Turns an ASN1 object into a DER encoded byte array
-  */
--static void testTLSDerEncode(ASN1_TYPE src,
-+static void testTLSDerEncode(asn1_node src,
-                              const char *src_name,
-                              gnutls_datum_t * res)
- {
-@@ -267,7 +267,7 @@ testTLSGenerateCert(struct testTLSCertReq *req,
-      * the 'critical' field which we want control over
-      */
-     if (req->basicConstraintsEnable) {
--        ASN1_TYPE ext = ASN1_TYPE_EMPTY;
-+        asn1_node ext = NULL;
- 
-         asn1_create_element(pkix_asn1, "PKIX1.BasicConstraints", &ext);
-         asn1_write_value(ext, "cA", req->basicConstraintsIsCA ? "TRUE" : "FALSE", 1);
-@@ -292,7 +292,7 @@ testTLSGenerateCert(struct testTLSCertReq *req,
-      * to be 'critical'
-      */
-     if (req->keyUsageEnable) {
--        ASN1_TYPE ext = ASN1_TYPE_EMPTY;
-+        asn1_node ext = NULL;
-         char str[2];
- 
-         str[0] = req->keyUsageValue & 0xff;
-@@ -321,7 +321,7 @@ testTLSGenerateCert(struct testTLSCertReq *req,
-      * set this the hard way building up ASN1 data ourselves
-      */
-     if (req->keyPurposeEnable) {
--        ASN1_TYPE ext = ASN1_TYPE_EMPTY;
-+        asn1_node ext = NULL;
- 
-         asn1_create_element(pkix_asn1, "PKIX1.ExtKeyUsageSyntax", &ext);
-         if (req->keyPurposeOID1) {
--- 
-2.27.0
-
diff --git a/tests-Report-expected-monitor-command-for-simulated-.patch b/tests-Report-expected-monitor-command-for-simulated-.patch
deleted file mode 100644
index 3b4b9fd1be21c17d4e1c25c7eaaee72e7a4e4986..0000000000000000000000000000000000000000
--- a/tests-Report-expected-monitor-command-for-simulated-.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 31a4a7ecceeeaccfc016d28aa80f8a668c203ce0 Mon Sep 17 00:00:00 2001
-From: Bihong Yu <yubihong@huawei.com>
-Date: Tue, 30 Nov 2021 18:16:32 +0100
-Subject: [PATCH 09/13] tests: Report expected monitor command for simulated
- commands
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-There are two tests currently that simulate QMP talk:
-qemucapabilitiestest and qemuhotplugtest. In both cases they
-check whether currently executed command is the one for which
-reply was provided. If not an error message is reported. However,
-the error message contains only the actual command and not the
-expected one. This makes it harder to navigate through .replies
-files.
-
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Signed-off-by: Bihong Yu <yubihong@huawei.com>
----
- tests/qemumonitortestutils.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/tests/qemumonitortestutils.c b/tests/qemumonitortestutils.c
-index 159b1b909e..78d52028de 100644
---- a/tests/qemumonitortestutils.c
-+++ b/tests/qemumonitortestutils.c
-@@ -637,7 +637,8 @@ qemuMonitorTestProcessCommandVerbatim(qemuMonitorTestPtr test,
-         ret = qemuMonitorTestAddResponse(test, data->response);
-     } else {
-         if (data->cmderr) {
--            errmsg = g_strdup_printf("%s: %s", data->cmderr, cmdstr);
-+            errmsg = g_strdup_printf("%s: %s expected %s",
-+                                     data->cmderr, cmdstr, data->command_name);
- 
-             ret = qemuMonitorTestAddErrorResponse(test, errmsg);
-         } else {
--- 
-2.33.0
-
diff --git a/tests-Update-IPv4-in-IPv6-addresses.patch b/tests-Update-IPv4-in-IPv6-addresses.patch
deleted file mode 100644
index 6dddd356037fc362b9e59f3d0fcb652d149e678d..0000000000000000000000000000000000000000
--- a/tests-Update-IPv4-in-IPv6-addresses.patch
+++ /dev/null
@@ -1,607 +0,0 @@
-From 339c987367faf9bf758633d7a54b4bbcbf54d300 Mon Sep 17 00:00:00 2001
-From: xuyinghao <xuyinghao2@huawei.com>
-Date: Tue, 16 Aug 2022 19:33:07 +0800
-Subject: [PATCH 13/13] tests: Update IPv4-in-IPv6 addresses
-
-We have couple of tests where the obsolete IPv4-in-IPv6 notation is used (::10.1.2.3). Change them to the correct format (::ffff:10.1.2.3).
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- tests/nwfilterxml2firewalldata/ah-ipv6-linux.args      | 6 +++---
- tests/nwfilterxml2firewalldata/ah-ipv6.xml             | 2 +-
- tests/nwfilterxml2firewalldata/all-ipv6-linux.args     | 6 +++---
- tests/nwfilterxml2firewalldata/all-ipv6.xml            | 2 +-
- tests/nwfilterxml2firewalldata/comment-linux.args      | 4 ++--
- tests/nwfilterxml2firewalldata/comment.xml             | 4 ++--
- tests/nwfilterxml2firewalldata/esp-ipv6-linux.args     | 6 +++---
- tests/nwfilterxml2firewalldata/esp-ipv6.xml            | 2 +-
- tests/nwfilterxml2firewalldata/hex-data-linux.args     | 4 ++--
- tests/nwfilterxml2firewalldata/hex-data.xml            | 4 ++--
- tests/nwfilterxml2firewalldata/icmpv6-linux.args       | 2 +-
- tests/nwfilterxml2firewalldata/icmpv6.xml              | 2 +-
- tests/nwfilterxml2firewalldata/ipv6-linux.args         | 4 ++--
- tests/nwfilterxml2firewalldata/ipv6.xml                | 4 ++--
- tests/nwfilterxml2firewalldata/sctp-ipv6-linux.args    | 6 +++---
- tests/nwfilterxml2firewalldata/sctp-ipv6.xml           | 2 +-
- tests/nwfilterxml2firewalldata/tcp-ipv6-linux.args     | 6 +++---
- tests/nwfilterxml2firewalldata/tcp-ipv6.xml            | 2 +-
- tests/nwfilterxml2firewalldata/udp-ipv6-linux.args     | 6 +++---
- tests/nwfilterxml2firewalldata/udp-ipv6.xml            | 2 +-
- tests/nwfilterxml2firewalldata/udplite-ipv6-linux.args | 6 +++---
- tests/nwfilterxml2firewalldata/udplite-ipv6.xml        | 2 +-
- tests/nwfilterxml2xmlout/ah-ipv6-test.xml              | 2 +-
- tests/nwfilterxml2xmlout/all-ipv6-test.xml             | 2 +-
- tests/nwfilterxml2xmlout/comment-test.xml              | 2 +-
- tests/nwfilterxml2xmlout/esp-ipv6-test.xml             | 2 +-
- tests/nwfilterxml2xmlout/hex-data-test.xml             | 2 +-
- tests/nwfilterxml2xmlout/icmpv6-test.xml               | 2 +-
- tests/nwfilterxml2xmlout/ipv6-test.xml                 | 2 +-
- tests/nwfilterxml2xmlout/sctp-ipv6-test.xml            | 2 +-
- tests/nwfilterxml2xmlout/tcp-ipv6-test.xml             | 2 +-
- tests/nwfilterxml2xmlout/udp-ipv6-test.xml             | 2 +-
- tests/nwfilterxml2xmlout/udplite-ipv6-test.xml         | 2 +-
- 33 files changed, 53 insertions(+), 53 deletions(-)
-
-diff --git a/tests/nwfilterxml2firewalldata/ah-ipv6-linux.args b/tests/nwfilterxml2firewalldata/ah-ipv6-linux.args
-index 35c9de38b8..74e26f962f 100644
---- a/tests/nwfilterxml2firewalldata/ah-ipv6-linux.args
-+++ b/tests/nwfilterxml2firewalldata/ah-ipv6-linux.args
-@@ -64,7 +64,7 @@ ip6tables \
- ip6tables \
- -A FJ-vnet0 \
- -p ah \
----destination ::10.1.2.3/128 \
-+--destination ::ffff:10.1.2.3/128 \
- -m dscp \
- --dscp 33 \
- -m state \
-@@ -75,7 +75,7 @@ ip6tables \
- -p ah \
- -m mac \
- --mac-source 01:02:03:04:05:06 \
----source ::10.1.2.3/128 \
-+--source ::ffff:10.1.2.3/128 \
- -m dscp \
- --dscp 33 \
- -m state \
-@@ -84,7 +84,7 @@ ip6tables \
- ip6tables \
- -A HJ-vnet0 \
- -p ah \
----destination ::10.1.2.3/128 \
-+--destination ::ffff:10.1.2.3/128 \
- -m dscp \
- --dscp 33 \
- -m state \
-diff --git a/tests/nwfilterxml2firewalldata/ah-ipv6.xml b/tests/nwfilterxml2firewalldata/ah-ipv6.xml
-index 95ebbc9e09..b664c0dfa6 100644
---- a/tests/nwfilterxml2firewalldata/ah-ipv6.xml
-+++ b/tests/nwfilterxml2firewalldata/ah-ipv6.xml
-@@ -13,7 +13,7 @@
-   </rule>
-   <rule action='accept' direction='in'>
-      <ah-ipv6 srcmacaddr='1:2:3:4:5:6'
--              srcipaddr='::10.1.2.3' srcipmask='128'
-+              srcipaddr='::ffff:10.1.2.3' srcipmask='128'
-               dscp='33'/>
-   </rule>
- </filter>
-diff --git a/tests/nwfilterxml2firewalldata/all-ipv6-linux.args b/tests/nwfilterxml2firewalldata/all-ipv6-linux.args
-index 2f84c1bfea..47c459a0f9 100644
---- a/tests/nwfilterxml2firewalldata/all-ipv6-linux.args
-+++ b/tests/nwfilterxml2firewalldata/all-ipv6-linux.args
-@@ -64,7 +64,7 @@ ip6tables \
- ip6tables \
- -A FJ-vnet0 \
- -p all \
----destination ::10.1.2.3/128 \
-+--destination ::ffff:10.1.2.3/128 \
- -m dscp \
- --dscp 33 \
- -m state \
-@@ -75,7 +75,7 @@ ip6tables \
- -p all \
- -m mac \
- --mac-source 01:02:03:04:05:06 \
----source ::10.1.2.3/128 \
-+--source ::ffff:10.1.2.3/128 \
- -m dscp \
- --dscp 33 \
- -m state \
-@@ -84,7 +84,7 @@ ip6tables \
- ip6tables \
- -A HJ-vnet0 \
- -p all \
----destination ::10.1.2.3/128 \
-+--destination ::ffff:10.1.2.3/128 \
- -m dscp \
- --dscp 33 \
- -m state \
-diff --git a/tests/nwfilterxml2firewalldata/all-ipv6.xml b/tests/nwfilterxml2firewalldata/all-ipv6.xml
-index 5cf3519437..5132e9bdd6 100644
---- a/tests/nwfilterxml2firewalldata/all-ipv6.xml
-+++ b/tests/nwfilterxml2firewalldata/all-ipv6.xml
-@@ -13,7 +13,7 @@
-   </rule>
-   <rule action='accept' direction='in'>
-      <all-ipv6 srcmacaddr='1:2:3:4:5:6'
--               srcipaddr='::10.1.2.3' srcipmask='128'
-+               srcipaddr='::ffff:10.1.2.3' srcipmask='128'
-                dscp='33'/>
-   </rule>
- </filter>
-diff --git a/tests/nwfilterxml2firewalldata/comment-linux.args b/tests/nwfilterxml2firewalldata/comment-linux.args
-index 462b2e2177..815d4f1a79 100644
---- a/tests/nwfilterxml2firewalldata/comment-linux.args
-+++ b/tests/nwfilterxml2firewalldata/comment-linux.args
-@@ -22,8 +22,8 @@ ebtables \
- -s 01:02:03:04:05:06/ff:ff:ff:ff:ff:fe \
- -d aa:bb:cc:dd:ee:ff/ff:ff:ff:ff:ff:80 \
- -p ipv6 \
----ip6-source ::10.1.2.3/22 \
----ip6-destination ::10.1.2.3/113 \
-+--ip6-source ::ffff:10.1.2.3/22 \
-+--ip6-destination ::ffff:10.1.2.3/113 \
- --ip6-protocol 6 \
- --ip6-source-port 273:400 \
- --ip6-destination-port 13107:65535 \
-diff --git a/tests/nwfilterxml2firewalldata/comment.xml b/tests/nwfilterxml2firewalldata/comment.xml
-index a154a17c14..f1d2af1908 100644
---- a/tests/nwfilterxml2firewalldata/comment.xml
-+++ b/tests/nwfilterxml2firewalldata/comment.xml
-@@ -19,8 +19,8 @@
-   <rule action='accept' direction='out'>
-      <ipv6 srcmacaddr='1:2:3:4:5:6' srcmacmask='ff:ff:ff:ff:ff:fe'
-            dstmacaddr='aa:bb:cc:dd:ee:ff' dstmacmask='ff:ff:ff:ff:ff:80'
--           srcipaddr='::10.1.2.3' srcipmask='22'
--           dstipaddr='::10.1.2.3'
-+           srcipaddr='::ffff:10.1.2.3' srcipmask='22'
-+           dstipaddr='::ffff:10.1.2.3'
-            dstipmask='ffff:ffff:ffff:ffff:ffff:ffff:ffff:8000'
-            protocol='tcp'
-            srcportstart='0x111' srcportend='400'
-diff --git a/tests/nwfilterxml2firewalldata/esp-ipv6-linux.args b/tests/nwfilterxml2firewalldata/esp-ipv6-linux.args
-index 51cf74815b..98cd0984b6 100644
---- a/tests/nwfilterxml2firewalldata/esp-ipv6-linux.args
-+++ b/tests/nwfilterxml2firewalldata/esp-ipv6-linux.args
-@@ -64,7 +64,7 @@ ip6tables \
- ip6tables \
- -A FJ-vnet0 \
- -p esp \
----destination ::10.1.2.3/128 \
-+--destination ::ffff:10.1.2.3/128 \
- -m dscp \
- --dscp 33 \
- -m state \
-@@ -75,7 +75,7 @@ ip6tables \
- -p esp \
- -m mac \
- --mac-source 01:02:03:04:05:06 \
----source ::10.1.2.3/128 \
-+--source ::ffff:10.1.2.3/128 \
- -m dscp \
- --dscp 33 \
- -m state \
-@@ -84,7 +84,7 @@ ip6tables \
- ip6tables \
- -A HJ-vnet0 \
- -p esp \
----destination ::10.1.2.3/128 \
-+--destination ::ffff:10.1.2.3/128 \
- -m dscp \
- --dscp 33 \
- -m state \
-diff --git a/tests/nwfilterxml2firewalldata/esp-ipv6.xml b/tests/nwfilterxml2firewalldata/esp-ipv6.xml
-index 295d0f9b3b..d411366c1c 100644
---- a/tests/nwfilterxml2firewalldata/esp-ipv6.xml
-+++ b/tests/nwfilterxml2firewalldata/esp-ipv6.xml
-@@ -13,7 +13,7 @@
-   </rule>
-   <rule action='accept' direction='in'>
-      <esp-ipv6 srcmacaddr='1:2:3:4:5:6'
--               srcipaddr='::10.1.2.3' srcipmask='128'
-+               srcipaddr='::ffff:10.1.2.3' srcipmask='128'
-                dscp='33'/>
-   </rule>
- </filter>
-diff --git a/tests/nwfilterxml2firewalldata/hex-data-linux.args b/tests/nwfilterxml2firewalldata/hex-data-linux.args
-index f1a1f588f2..3d22f4ed69 100644
---- a/tests/nwfilterxml2firewalldata/hex-data-linux.args
-+++ b/tests/nwfilterxml2firewalldata/hex-data-linux.args
-@@ -22,8 +22,8 @@ ebtables \
- -s 01:02:03:04:05:06/ff:ff:ff:ff:ff:fe \
- -d aa:bb:cc:dd:ee:ff/ff:ff:ff:ff:ff:80 \
- -p ipv6 \
----ip6-source ::10.1.2.3/22 \
----ip6-destination ::10.1.2.3/113 \
-+--ip6-source ::ffff:10.1.2.3/22 \
-+--ip6-destination ::ffff:10.1.2.3/113 \
- --ip6-protocol 6 \
- --ip6-source-port 273:400 \
- --ip6-destination-port 13107:65535 \
-diff --git a/tests/nwfilterxml2firewalldata/hex-data.xml b/tests/nwfilterxml2firewalldata/hex-data.xml
-index 45df45129b..ee93bbccda 100644
---- a/tests/nwfilterxml2firewalldata/hex-data.xml
-+++ b/tests/nwfilterxml2firewalldata/hex-data.xml
-@@ -19,8 +19,8 @@
-   <rule action='accept' direction='out'>
-      <ipv6 srcmacaddr='1:2:3:4:5:6' srcmacmask='ff:ff:ff:ff:ff:fe'
-            dstmacaddr='aa:bb:cc:dd:ee:ff' dstmacmask='ff:ff:ff:ff:ff:80'
--           srcipaddr='::10.1.2.3' srcipmask='22'
--           dstipaddr='::10.1.2.3'
-+           srcipaddr='::ffff:10.1.2.3' srcipmask='22'
-+           dstipaddr='::ffff:10.1.2.3'
-            dstipmask='ffff:ffff:ffff:ffff:ffff:ffff:ffff:8000'
-            protocol='tcp'
-            srcportstart='0x111' srcportend='400'
-diff --git a/tests/nwfilterxml2firewalldata/icmpv6-linux.args b/tests/nwfilterxml2firewalldata/icmpv6-linux.args
-index 92190eb311..2462468ab4 100644
---- a/tests/nwfilterxml2firewalldata/icmpv6-linux.args
-+++ b/tests/nwfilterxml2firewalldata/icmpv6-linux.args
-@@ -41,7 +41,7 @@ ip6tables \
- -p icmpv6 \
- -m mac \
- --mac-source 01:02:03:04:05:06 \
----source ::10.1.2.3/128 \
-+--source ::ffff:10.1.2.3/128 \
- -m dscp \
- --dscp 33 \
- --icmpv6-type 255/255 \
-diff --git a/tests/nwfilterxml2firewalldata/icmpv6.xml b/tests/nwfilterxml2firewalldata/icmpv6.xml
-index 9d248266fe..52b3a7cada 100644
---- a/tests/nwfilterxml2firewalldata/icmpv6.xml
-+++ b/tests/nwfilterxml2firewalldata/icmpv6.xml
-@@ -13,7 +13,7 @@
-   </rule>
-   <rule action='accept' direction='in'>
-      <icmpv6 srcmacaddr='1:2:3:4:5:6'
--             srcipaddr='::10.1.2.3' srcipmask='128'
-+             srcipaddr='::ffff:10.1.2.3' srcipmask='128'
-              dscp='33' type='255' code='255'/>
-   </rule>
- </filter>
-diff --git a/tests/nwfilterxml2firewalldata/ipv6-linux.args b/tests/nwfilterxml2firewalldata/ipv6-linux.args
-index 6fba19f2eb..44b84f0916 100644
---- a/tests/nwfilterxml2firewalldata/ipv6-linux.args
-+++ b/tests/nwfilterxml2firewalldata/ipv6-linux.args
-@@ -4,8 +4,8 @@ ebtables \
- -s 01:02:03:04:05:06/ff:ff:ff:ff:ff:fe \
- -d aa:bb:cc:dd:ee:ff/ff:ff:ff:ff:ff:80 \
- -p ipv6 \
----ip6-source ::10.1.2.3/22 \
----ip6-destination ::10.1.2.3/113 \
-+--ip6-source ::ffff:10.1.2.3/22 \
-+--ip6-destination ::ffff:10.1.2.3/113 \
- --ip6-protocol 17 \
- --ip6-source-port 20:22 \
- --ip6-destination-port 100:101 \
-diff --git a/tests/nwfilterxml2firewalldata/ipv6.xml b/tests/nwfilterxml2firewalldata/ipv6.xml
-index 2400958030..0351bca01a 100644
---- a/tests/nwfilterxml2firewalldata/ipv6.xml
-+++ b/tests/nwfilterxml2firewalldata/ipv6.xml
-@@ -3,8 +3,8 @@
-   <rule action='accept' direction='out'>
-      <ipv6 srcmacaddr='1:2:3:4:5:6' srcmacmask='ff:ff:ff:ff:ff:fe'
-            dstmacaddr='aa:bb:cc:dd:ee:ff' dstmacmask='ff:ff:ff:ff:ff:80'
--           srcipaddr='::10.1.2.3' srcipmask='22'
--           dstipaddr='::10.1.2.3'
-+           srcipaddr='::ffff:10.1.2.3' srcipmask='22'
-+           dstipaddr='::ffff:10.1.2.3'
-            dstipmask='ffff:ffff:ffff:ffff:ffff:ffff:ffff:8000'
-            protocol='udp'
-            srcportstart='20' srcportend='22'
-diff --git a/tests/nwfilterxml2firewalldata/sctp-ipv6-linux.args b/tests/nwfilterxml2firewalldata/sctp-ipv6-linux.args
-index 959c4e8e0f..b39d3314b3 100644
---- a/tests/nwfilterxml2firewalldata/sctp-ipv6-linux.args
-+++ b/tests/nwfilterxml2firewalldata/sctp-ipv6-linux.args
-@@ -67,7 +67,7 @@ ip6tables \
- ip6tables \
- -A FJ-vnet0 \
- -p sctp \
----destination ::10.1.2.3/128 \
-+--destination ::ffff:10.1.2.3/128 \
- -m dscp \
- --dscp 63 \
- --dport 255:256 \
-@@ -80,7 +80,7 @@ ip6tables \
- -p sctp \
- -m mac \
- --mac-source 01:02:03:04:05:06 \
----source ::10.1.2.3/128 \
-+--source ::ffff:10.1.2.3/128 \
- -m dscp \
- --dscp 63 \
- --sport 255:256 \
-@@ -91,7 +91,7 @@ ip6tables \
- ip6tables \
- -A HJ-vnet0 \
- -p sctp \
----destination ::10.1.2.3/128 \
-+--destination ::ffff:10.1.2.3/128 \
- -m dscp \
- --dscp 63 \
- --dport 255:256 \
-diff --git a/tests/nwfilterxml2firewalldata/sctp-ipv6.xml b/tests/nwfilterxml2firewalldata/sctp-ipv6.xml
-index d1a57b8f93..1b870ce5d8 100644
---- a/tests/nwfilterxml2firewalldata/sctp-ipv6.xml
-+++ b/tests/nwfilterxml2firewalldata/sctp-ipv6.xml
-@@ -14,7 +14,7 @@
-   </rule>
-   <rule action='accept' direction='in'>
-      <sctp-ipv6 srcmacaddr='1:2:3:4:5:6'
--                srcipaddr='::10.1.2.3' srcipmask='128'
-+                srcipaddr='::ffff:10.1.2.3' srcipmask='128'
-                 dscp='63'
-                 srcportstart='255' srcportend='256'
-                 dstportstart='65535' dstportend='65535'/>
-diff --git a/tests/nwfilterxml2firewalldata/tcp-ipv6-linux.args b/tests/nwfilterxml2firewalldata/tcp-ipv6-linux.args
-index e6f8de3fca..6d59ac31b8 100644
---- a/tests/nwfilterxml2firewalldata/tcp-ipv6-linux.args
-+++ b/tests/nwfilterxml2firewalldata/tcp-ipv6-linux.args
-@@ -67,7 +67,7 @@ ip6tables \
- ip6tables \
- -A FJ-vnet0 \
- -p tcp \
----destination ::10.1.2.3/128 \
-+--destination ::ffff:10.1.2.3/128 \
- -m dscp \
- --dscp 63 \
- --dport 255:256 \
-@@ -80,7 +80,7 @@ ip6tables \
- -p tcp \
- -m mac \
- --mac-source 01:02:03:04:05:06 \
----source ::10.1.2.3/128 \
-+--source ::ffff:10.1.2.3/128 \
- -m dscp \
- --dscp 63 \
- --sport 255:256 \
-@@ -91,7 +91,7 @@ ip6tables \
- ip6tables \
- -A HJ-vnet0 \
- -p tcp \
----destination ::10.1.2.3/128 \
-+--destination ::ffff:10.1.2.3/128 \
- -m dscp \
- --dscp 63 \
- --dport 255:256 \
-diff --git a/tests/nwfilterxml2firewalldata/tcp-ipv6.xml b/tests/nwfilterxml2firewalldata/tcp-ipv6.xml
-index d4f24f44de..2f41b227b3 100644
---- a/tests/nwfilterxml2firewalldata/tcp-ipv6.xml
-+++ b/tests/nwfilterxml2firewalldata/tcp-ipv6.xml
-@@ -14,7 +14,7 @@
-   </rule>
-   <rule action='accept' direction='in'>
-      <tcp-ipv6 srcmacaddr='1:2:3:4:5:6'
--               srcipaddr='::10.1.2.3' srcipmask='128'
-+               srcipaddr='::ffff:10.1.2.3' srcipmask='128'
-                dscp='63'
-                srcportstart='255' srcportend='256'
-                dstportstart='65535' dstportend='65535'/>
-diff --git a/tests/nwfilterxml2firewalldata/udp-ipv6-linux.args b/tests/nwfilterxml2firewalldata/udp-ipv6-linux.args
-index 9183c08753..808c44e051 100644
---- a/tests/nwfilterxml2firewalldata/udp-ipv6-linux.args
-+++ b/tests/nwfilterxml2firewalldata/udp-ipv6-linux.args
-@@ -67,7 +67,7 @@ ip6tables \
- ip6tables \
- -A FJ-vnet0 \
- -p udp \
----destination ::10.1.2.3/128 \
-+--destination ::ffff:10.1.2.3/128 \
- -m dscp \
- --dscp 63 \
- --dport 255:256 \
-@@ -80,7 +80,7 @@ ip6tables \
- -p udp \
- -m mac \
- --mac-source 01:02:03:04:05:06 \
----source ::10.1.2.3/128 \
-+--source ::ffff:10.1.2.3/128 \
- -m dscp \
- --dscp 63 \
- --sport 255:256 \
-@@ -91,7 +91,7 @@ ip6tables \
- ip6tables \
- -A HJ-vnet0 \
- -p udp \
----destination ::10.1.2.3/128 \
-+--destination ::ffff:10.1.2.3/128 \
- -m dscp \
- --dscp 63 \
- --dport 255:256 \
-diff --git a/tests/nwfilterxml2firewalldata/udp-ipv6.xml b/tests/nwfilterxml2firewalldata/udp-ipv6.xml
-index fd4f135a4b..7c0be8404e 100644
---- a/tests/nwfilterxml2firewalldata/udp-ipv6.xml
-+++ b/tests/nwfilterxml2firewalldata/udp-ipv6.xml
-@@ -14,7 +14,7 @@
-   </rule>
-   <rule action='accept' direction='in'>
-      <udp-ipv6 srcmacaddr='1:2:3:4:5:6'
--               srcipaddr='::10.1.2.3' srcipmask='128'
-+               srcipaddr='::ffff:10.1.2.3' srcipmask='128'
-                dscp='63'
-                srcportstart='255' srcportend='256'
-                dstportstart='65535' dstportend='65535'/>
-diff --git a/tests/nwfilterxml2firewalldata/udplite-ipv6-linux.args b/tests/nwfilterxml2firewalldata/udplite-ipv6-linux.args
-index 9eb38d7e6d..f2267996f6 100644
---- a/tests/nwfilterxml2firewalldata/udplite-ipv6-linux.args
-+++ b/tests/nwfilterxml2firewalldata/udplite-ipv6-linux.args
-@@ -64,7 +64,7 @@ ip6tables \
- ip6tables \
- -A FJ-vnet0 \
- -p udplite \
----destination ::10.1.2.3/128 \
-+--destination ::ffff:10.1.2.3/128 \
- -m dscp \
- --dscp 33 \
- -m state \
-@@ -75,7 +75,7 @@ ip6tables \
- -p udplite \
- -m mac \
- --mac-source 01:02:03:04:05:06 \
----source ::10.1.2.3/128 \
-+--source ::ffff:10.1.2.3/128 \
- -m dscp \
- --dscp 33 \
- -m state \
-@@ -84,7 +84,7 @@ ip6tables \
- ip6tables \
- -A HJ-vnet0 \
- -p udplite \
----destination ::10.1.2.3/128 \
-+--destination ::ffff:10.1.2.3/128 \
- -m dscp \
- --dscp 33 \
- -m state \
-diff --git a/tests/nwfilterxml2firewalldata/udplite-ipv6.xml b/tests/nwfilterxml2firewalldata/udplite-ipv6.xml
-index 5b941a2465..1b006e1d42 100644
---- a/tests/nwfilterxml2firewalldata/udplite-ipv6.xml
-+++ b/tests/nwfilterxml2firewalldata/udplite-ipv6.xml
-@@ -13,7 +13,7 @@
-   </rule>
-   <rule action='accept' direction='in'>
-      <udplite-ipv6 srcmacaddr='1:2:3:4:5:6'
--               srcipaddr='::10.1.2.3' srcipmask='128'
-+               srcipaddr='::ffff:10.1.2.3' srcipmask='128'
-                dscp='33'/>
-   </rule>
- </filter>
-diff --git a/tests/nwfilterxml2xmlout/ah-ipv6-test.xml b/tests/nwfilterxml2xmlout/ah-ipv6-test.xml
-index 6d65b3de57..2c4b9c97af 100644
---- a/tests/nwfilterxml2xmlout/ah-ipv6-test.xml
-+++ b/tests/nwfilterxml2xmlout/ah-ipv6-test.xml
-@@ -7,6 +7,6 @@
-     <ah-ipv6 srcmacaddr='01:02:03:04:05:06' srcipaddr='a:b:c::' srcipmask='128' dscp='33'/>
-   </rule>
-   <rule action='accept' direction='in' priority='500'>
--    <ah-ipv6 srcmacaddr='01:02:03:04:05:06' srcipaddr='::10.1.2.3' dscp='33'/>
-+    <ah-ipv6 srcmacaddr='01:02:03:04:05:06' srcipaddr='::ffff:10.1.2.3' dscp='33'/>
-   </rule>
- </filter>
-diff --git a/tests/nwfilterxml2xmlout/all-ipv6-test.xml b/tests/nwfilterxml2xmlout/all-ipv6-test.xml
-index 263a679966..226e86bead 100644
---- a/tests/nwfilterxml2xmlout/all-ipv6-test.xml
-+++ b/tests/nwfilterxml2xmlout/all-ipv6-test.xml
-@@ -7,6 +7,6 @@
-     <all-ipv6 srcmacaddr='01:02:03:04:05:06' srcipaddr='a:b:c::' srcipmask='128' dscp='33'/>
-   </rule>
-   <rule action='accept' direction='in' priority='500'>
--    <all-ipv6 srcmacaddr='01:02:03:04:05:06' srcipaddr='::10.1.2.3' dscp='33'/>
-+    <all-ipv6 srcmacaddr='01:02:03:04:05:06' srcipaddr='::ffff:10.1.2.3' dscp='33'/>
-   </rule>
- </filter>
-diff --git a/tests/nwfilterxml2xmlout/comment-test.xml b/tests/nwfilterxml2xmlout/comment-test.xml
-index 1d95af1c27..70779bcb23 100644
---- a/tests/nwfilterxml2xmlout/comment-test.xml
-+++ b/tests/nwfilterxml2xmlout/comment-test.xml
-@@ -7,7 +7,7 @@
-     <ip srcmacaddr='01:02:03:04:05:06' srcmacmask='ff:ff:ff:ff:ff:ff' dstmacaddr='aa:bb:cc:dd:ee:ff' dstmacmask='ff:ff:ff:ff:ff:ff' srcipaddr='10.1.2.3' srcipmask='32' dstipaddr='10.1.2.3' dstipmask='32' protocol='udp' srcportstart='0x123' srcportend='0x234' dstportstart='0x3456' dstportend='0x4567' dscp='0x32' comment='ip rule'/>
-   </rule>
-   <rule action='accept' direction='out' priority='500'>
--    <ipv6 srcmacaddr='01:02:03:04:05:06' srcmacmask='ff:ff:ff:ff:ff:fe' dstmacaddr='aa:bb:cc:dd:ee:ff' dstmacmask='ff:ff:ff:ff:ff:80' srcipaddr='::10.1.2.3' srcipmask='22' dstipaddr='::10.1.2.3' dstipmask='113' protocol='tcp' srcportstart='0x111' srcportend='400' dstportstart='0x3333' dstportend='65535' comment='ipv6 rule'/>
-+    <ipv6 srcmacaddr='01:02:03:04:05:06' srcmacmask='ff:ff:ff:ff:ff:fe' dstmacaddr='aa:bb:cc:dd:ee:ff' dstmacmask='ff:ff:ff:ff:ff:80' srcipaddr='::ffff:10.1.2.3' srcipmask='22' dstipaddr='::10.1.2.3' dstipmask='113' protocol='tcp' srcportstart='0x111' srcportend='400' dstportstart='0x3333' dstportend='65535' comment='ipv6 rule'/>
-   </rule>
-   <rule action='accept' direction='out' priority='500'>
-     <arp srcmacaddr='01:02:03:04:05:06' srcmacmask='ff:ff:ff:ff:ff:ff' dstmacaddr='aa:bb:cc:dd:ee:ff' dstmacmask='ff:ff:ff:ff:ff:ff' hwtype='0x12' protocoltype='0x56' opcode='Request' arpsrcmacaddr='01:02:03:04:05:06' arpdstmacaddr='0a:0b:0c:0d:0e:0f' comment='arp rule'/>
-diff --git a/tests/nwfilterxml2xmlout/esp-ipv6-test.xml b/tests/nwfilterxml2xmlout/esp-ipv6-test.xml
-index 3852aaca47..c8744b86d8 100644
---- a/tests/nwfilterxml2xmlout/esp-ipv6-test.xml
-+++ b/tests/nwfilterxml2xmlout/esp-ipv6-test.xml
-@@ -7,6 +7,6 @@
-     <esp-ipv6 srcmacaddr='01:02:03:04:05:06' srcipaddr='a:b:c::' srcipmask='128' dscp='33'/>
-   </rule>
-   <rule action='accept' direction='in' priority='500'>
--    <esp-ipv6 srcmacaddr='01:02:03:04:05:06' srcipaddr='::10.1.2.3' dscp='33'/>
-+    <esp-ipv6 srcmacaddr='01:02:03:04:05:06' srcipaddr='::ffff:10.1.2.3' dscp='33'/>
-   </rule>
- </filter>
-diff --git a/tests/nwfilterxml2xmlout/hex-data-test.xml b/tests/nwfilterxml2xmlout/hex-data-test.xml
-index 35a125b600..98eeac7152 100644
---- a/tests/nwfilterxml2xmlout/hex-data-test.xml
-+++ b/tests/nwfilterxml2xmlout/hex-data-test.xml
-@@ -7,7 +7,7 @@
-     <ip srcmacaddr='01:02:03:04:05:06' srcmacmask='ff:ff:ff:ff:ff:ff' dstmacaddr='aa:bb:cc:dd:ee:ff' dstmacmask='ff:ff:ff:ff:ff:ff' srcipaddr='10.1.2.3' srcipmask='32' dstipaddr='10.1.2.3' dstipmask='32' protocol='udp' srcportstart='0x123' srcportend='0x234' dstportstart='0x3456' dstportend='0x4567' dscp='0x32'/>
-   </rule>
-   <rule action='accept' direction='out' priority='500'>
--    <ipv6 srcmacaddr='01:02:03:04:05:06' srcmacmask='ff:ff:ff:ff:ff:fe' dstmacaddr='aa:bb:cc:dd:ee:ff' dstmacmask='ff:ff:ff:ff:ff:80' srcipaddr='::10.1.2.3' srcipmask='22' dstipaddr='::10.1.2.3' dstipmask='113' protocol='tcp' srcportstart='0x111' srcportend='400' dstportstart='0x3333' dstportend='65535'/>
-+    <ipv6 srcmacaddr='01:02:03:04:05:06' srcmacmask='ff:ff:ff:ff:ff:fe' dstmacaddr='aa:bb:cc:dd:ee:ff' dstmacmask='ff:ff:ff:ff:ff:80' srcipaddr='::ffff:10.1.2.3' srcipmask='22' dstipaddr='::10.1.2.3' dstipmask='113' protocol='tcp' srcportstart='0x111' srcportend='400' dstportstart='0x3333' dstportend='65535'/>
-   </rule>
-   <rule action='accept' direction='out' priority='500'>
-     <arp srcmacaddr='01:02:03:04:05:06' srcmacmask='ff:ff:ff:ff:ff:ff' dstmacaddr='aa:bb:cc:dd:ee:ff' dstmacmask='ff:ff:ff:ff:ff:ff' hwtype='0x12' protocoltype='0x56' opcode='Request' arpsrcmacaddr='01:02:03:04:05:06' arpdstmacaddr='0a:0b:0c:0d:0e:0f'/>
-diff --git a/tests/nwfilterxml2xmlout/icmpv6-test.xml b/tests/nwfilterxml2xmlout/icmpv6-test.xml
-index 3334038a84..314aad2137 100644
---- a/tests/nwfilterxml2xmlout/icmpv6-test.xml
-+++ b/tests/nwfilterxml2xmlout/icmpv6-test.xml
-@@ -7,6 +7,6 @@
-     <icmpv6 srcmacaddr='01:02:03:04:05:06' srcipaddr='a:b:c::' srcipmask='128' dscp='33' type='255' code='255'/>
-   </rule>
-   <rule action='accept' direction='in' priority='500'>
--    <icmpv6 srcmacaddr='01:02:03:04:05:06' srcipaddr='::10.1.2.3' dscp='33'/>
-+    <icmpv6 srcmacaddr='01:02:03:04:05:06' srcipaddr='::ffff:10.1.2.3' dscp='33'/>
-   </rule>
- </filter>
-diff --git a/tests/nwfilterxml2xmlout/ipv6-test.xml b/tests/nwfilterxml2xmlout/ipv6-test.xml
-index ce9dd06233..3c5799590a 100644
---- a/tests/nwfilterxml2xmlout/ipv6-test.xml
-+++ b/tests/nwfilterxml2xmlout/ipv6-test.xml
-@@ -1,7 +1,7 @@
- <filter name='testcase' chain='root'>
-   <uuid>5c6d49af-b071-6127-b4ec-6f8ed4b55335</uuid>
-   <rule action='accept' direction='out' priority='500'>
--    <ipv6 srcmacaddr='01:02:03:04:05:06' srcmacmask='ff:ff:ff:ff:ff:fe' dstmacaddr='aa:bb:cc:dd:ee:ff' dstmacmask='ff:ff:ff:ff:ff:80' srcipaddr='::10.1.2.3' srcipmask='22' dstipaddr='::10.1.2.3' dstipmask='113' protocol='udp' srcportstart='20' srcportend='22' dstportstart='100' dstportend='101'/>
-+    <ipv6 srcmacaddr='01:02:03:04:05:06' srcmacmask='ff:ff:ff:ff:ff:fe' dstmacaddr='aa:bb:cc:dd:ee:ff' dstmacmask='ff:ff:ff:ff:ff:80' srcipaddr='::ffff:10.1.2.3' srcipmask='22' dstipaddr='::10.1.2.3' dstipmask='113' protocol='udp' srcportstart='20' srcportend='22' dstportstart='100' dstportend='101'/>
-   </rule>
-   <rule action='accept' direction='inout' priority='500'>
-     <ipv6 srcipaddr='1::2' srcipmask='128' dstipaddr='a:b:c::' dstipmask='65' protocol='tcp' srcportstart='20' srcportend='22' dstportstart='100' dstportend='101'/>
-diff --git a/tests/nwfilterxml2xmlout/sctp-ipv6-test.xml b/tests/nwfilterxml2xmlout/sctp-ipv6-test.xml
-index 3ef8589a00..87c8487257 100644
---- a/tests/nwfilterxml2xmlout/sctp-ipv6-test.xml
-+++ b/tests/nwfilterxml2xmlout/sctp-ipv6-test.xml
-@@ -7,6 +7,6 @@
-     <sctp-ipv6 srcmacaddr='01:02:03:04:05:06' srcipaddr='a:b:c::' srcipmask='128' dscp='33' srcportstart='20' srcportend='21' dstportstart='100' dstportend='1111'/>
-   </rule>
-   <rule action='accept' direction='in' priority='500'>
--    <sctp-ipv6 srcmacaddr='01:02:03:04:05:06' srcipaddr='::10.1.2.3' dscp='63' srcportstart='255' srcportend='256' dstportstart='65535'/>
-+    <sctp-ipv6 srcmacaddr='01:02:03:04:05:06' srcipaddr='::ffff:10.1.2.3' dscp='63' srcportstart='255' srcportend='256' dstportstart='65535'/>
-   </rule>
- </filter>
-diff --git a/tests/nwfilterxml2xmlout/tcp-ipv6-test.xml b/tests/nwfilterxml2xmlout/tcp-ipv6-test.xml
-index fcbe7a4a0f..0755c1b75f 100644
---- a/tests/nwfilterxml2xmlout/tcp-ipv6-test.xml
-+++ b/tests/nwfilterxml2xmlout/tcp-ipv6-test.xml
-@@ -7,6 +7,6 @@
-     <tcp-ipv6 srcmacaddr='01:02:03:04:05:06' srcipaddr='a:b:c::' srcipmask='128' dscp='33' srcportstart='20' srcportend='21' dstportstart='100' dstportend='1111'/>
-   </rule>
-   <rule action='accept' direction='in' priority='500'>
--    <tcp-ipv6 srcmacaddr='01:02:03:04:05:06' srcipaddr='::10.1.2.3' dscp='63' srcportstart='255' srcportend='256' dstportstart='65535'/>
-+    <tcp-ipv6 srcmacaddr='01:02:03:04:05:06' srcipaddr='::ffff:10.1.2.3' dscp='63' srcportstart='255' srcportend='256' dstportstart='65535'/>
-   </rule>
- </filter>
-diff --git a/tests/nwfilterxml2xmlout/udp-ipv6-test.xml b/tests/nwfilterxml2xmlout/udp-ipv6-test.xml
-index abcf698169..28b1a93f4d 100644
---- a/tests/nwfilterxml2xmlout/udp-ipv6-test.xml
-+++ b/tests/nwfilterxml2xmlout/udp-ipv6-test.xml
-@@ -7,6 +7,6 @@
-     <udp-ipv6 srcmacaddr='01:02:03:04:05:06' srcipmask='128' dscp='33' srcportstart='20' srcportend='21' dstportstart='100' dstportend='1111'/>
-   </rule>
-   <rule action='accept' direction='in' priority='500'>
--    <udp-ipv6 srcmacaddr='01:02:03:04:05:06' srcipaddr='::10.1.2.3' dscp='63' srcportstart='255' srcportend='256' dstportstart='65535'/>
-+    <udp-ipv6 srcmacaddr='01:02:03:04:05:06' srcipaddr='::ffff:10.1.2.3' dscp='63' srcportstart='255' srcportend='256' dstportstart='65535'/>
-   </rule>
- </filter>
-diff --git a/tests/nwfilterxml2xmlout/udplite-ipv6-test.xml b/tests/nwfilterxml2xmlout/udplite-ipv6-test.xml
-index 9f41181535..308fb98e6f 100644
---- a/tests/nwfilterxml2xmlout/udplite-ipv6-test.xml
-+++ b/tests/nwfilterxml2xmlout/udplite-ipv6-test.xml
-@@ -7,6 +7,6 @@
-     <udplite-ipv6 srcmacaddr='01:02:03:04:05:06' srcipaddr='a:b:c::' srcipmask='128' dscp='33'/>
-   </rule>
-   <rule action='accept' direction='in' priority='500'>
--    <udplite-ipv6 srcmacaddr='01:02:03:04:05:06' srcipaddr='::10.1.2.3' dscp='33'/>
-+    <udplite-ipv6 srcmacaddr='01:02:03:04:05:06' srcipaddr='::ffff:10.1.2.3' dscp='33'/>
-   </rule>
- </filter>
--- 
-2.33.0
-
diff --git a/tests-Verify-handling-of-CPU-clusters-in-QMP-data.patch b/tests-Verify-handling-of-CPU-clusters-in-QMP-data.patch
new file mode 100644
index 0000000000000000000000000000000000000000..75779acf081c8a9f16bed09f2e3a039c57d3c38d
--- /dev/null
+++ b/tests-Verify-handling-of-CPU-clusters-in-QMP-data.patch
@@ -0,0 +1,453 @@
+From 2a4546f32943b429ba74d3290143909afcc10a62 Mon Sep 17 00:00:00 2001
+From: Andrea Bolognani <abologna@redhat.com>
+Date: Mon, 8 Jan 2024 18:44:25 +0100
+Subject: [PATCH] tests: Verify handling of CPU clusters in QMP data
+
+Since aarch64 doesn't support CPU hotplug at the moment, we have
+to get a bit creative.
+
+While the 'query-cpus-fast' output is taken directly from a VM
+configured as
+
+  <vcpu current='7'>16</vcpu>
+  <cpu mode='host-passthrough'>
+    <topology sockets='2' dies='1' clusters='2' cores='2' threads='2'/>
+  </cpu>
+
+the 'query-hotpluggable-cpus' output is constructed by hand
+starting from the former and using the 'x86-dies' test data as
+a model.
+
+Signed-off-by: Andrea Bolognani <abologna@redhat.com>
+Reviewed-by: Peter Krempa <pkrempa@redhat.com>
+---
+ ...torjson-cpuinfo-aarch64-clusters-cpus.json |  88 +++++++++
+ ...json-cpuinfo-aarch64-clusters-hotplug.json | 171 ++++++++++++++++++
+ ...umonitorjson-cpuinfo-aarch64-clusters.data | 108 +++++++++++
+ tests/qemumonitorjsontest.c                   |   9 +-
+ 4 files changed, 375 insertions(+), 1 deletion(-)
+ create mode 100644 tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-aarch64-clusters-cpus.json
+ create mode 100644 tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-aarch64-clusters-hotplug.json
+ create mode 100644 tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-aarch64-clusters.data
+
+diff --git a/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-aarch64-clusters-cpus.json b/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-aarch64-clusters-cpus.json
+new file mode 100644
+index 0000000000..817f65d109
+--- /dev/null
++++ b/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-aarch64-clusters-cpus.json
+@@ -0,0 +1,88 @@
++{
++  "return": [
++    {
++      "thread-id": 284700,
++      "props": {
++        "core-id": 0,
++        "thread-id": 0,
++        "socket-id": 0,
++        "cluster-id": 0
++      },
++      "qom-path": "/machine/unattached/device[0]",
++      "cpu-index": 0,
++      "target": "aarch64"
++    },
++    {
++      "thread-id": 284701,
++      "props": {
++        "core-id": 0,
++        "thread-id": 1,
++        "socket-id": 0,
++        "cluster-id": 0
++      },
++      "qom-path": "/machine/unattached/device[1]",
++      "cpu-index": 1,
++      "target": "aarch64"
++    },
++    {
++      "thread-id": 284702,
++      "props": {
++        "core-id": 1,
++        "thread-id": 0,
++        "socket-id": 0,
++        "cluster-id": 0
++      },
++      "qom-path": "/machine/unattached/device[2]",
++      "cpu-index": 2,
++      "target": "aarch64"
++    },
++    {
++      "thread-id": 284703,
++      "props": {
++        "core-id": 1,
++        "thread-id": 1,
++        "socket-id": 0,
++        "cluster-id": 0
++      },
++      "qom-path": "/machine/unattached/device[3]",
++      "cpu-index": 3,
++      "target": "aarch64"
++    },
++    {
++      "thread-id": 284704,
++      "props": {
++        "core-id": 0,
++        "thread-id": 0,
++        "socket-id": 0,
++        "cluster-id": 1
++      },
++      "qom-path": "/machine/unattached/device[4]",
++      "cpu-index": 4,
++      "target": "aarch64"
++    },
++    {
++      "thread-id": 284705,
++      "props": {
++        "core-id": 0,
++        "thread-id": 1,
++        "socket-id": 0,
++        "cluster-id": 1
++      },
++      "qom-path": "/machine/unattached/device[5]",
++      "cpu-index": 5,
++      "target": "aarch64"
++    },
++    {
++      "thread-id": 284706,
++      "props": {
++        "core-id": 1,
++        "thread-id": 0,
++        "socket-id": 0,
++        "cluster-id": 1
++      },
++      "qom-path": "/machine/unattached/device[6]",
++      "cpu-index": 6,
++      "target": "aarch64"
++    }
++  ]
++}
+diff --git a/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-aarch64-clusters-hotplug.json b/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-aarch64-clusters-hotplug.json
+new file mode 100644
+index 0000000000..7ae30bf111
+--- /dev/null
++++ b/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-aarch64-clusters-hotplug.json
+@@ -0,0 +1,171 @@
++{
++  "return": [
++    {
++      "props": {
++        "core-id": 1,
++        "thread-id": 1,
++        "socket-id": 1,
++        "cluster-id": 1
++      },
++      "vcpus-count": 1,
++      "type": "host-arm-cpu"
++    },
++    {
++      "props": {
++        "core-id": 1,
++        "thread-id": 0,
++        "socket-id": 1,
++        "cluster-id": 1
++      },
++      "vcpus-count": 1,
++      "type": "host-arm-cpu"
++    },
++    {
++      "props": {
++        "core-id": 0,
++        "thread-id": 1,
++        "socket-id": 1,
++        "cluster-id": 1
++      },
++      "vcpus-count": 1,
++      "type": "host-arm-cpu"
++    },
++    {
++      "props": {
++        "core-id": 0,
++        "thread-id": 0,
++        "socket-id": 1,
++        "cluster-id": 1
++      },
++      "vcpus-count": 1,
++      "type": "host-arm-cpu"
++    },
++    {
++      "props": {
++        "core-id": 1,
++        "thread-id": 1,
++        "socket-id": 1,
++        "cluster-id": 0
++      },
++      "vcpus-count": 1,
++      "type": "host-arm-cpu"
++    },
++    {
++      "props": {
++        "core-id": 1,
++        "thread-id": 0,
++        "socket-id": 1,
++        "cluster-id": 0
++      },
++      "vcpus-count": 1,
++      "type": "host-arm-cpu"
++    },
++    {
++      "props": {
++        "core-id": 0,
++        "thread-id": 1,
++        "socket-id": 1,
++        "cluster-id": 0
++      },
++      "vcpus-count": 1,
++      "type": "host-arm-cpu"
++    },
++    {
++      "props": {
++        "core-id": 0,
++        "thread-id": 0,
++        "socket-id": 1,
++        "cluster-id": 0
++      },
++      "vcpus-count": 1,
++      "type": "host-arm-cpu"
++    },
++    {
++      "props": {
++        "core-id": 1,
++        "thread-id": 1,
++        "socket-id": 0,
++        "cluster-id": 1
++      },
++      "vcpus-count": 1,
++      "type": "host-arm-cpu"
++    },
++    {
++      "props": {
++        "core-id": 1,
++        "thread-id": 0,
++        "socket-id": 0,
++        "cluster-id": 1
++      },
++      "vcpus-count": 1,
++      "qom-path": "/machine/unattached/device[6]",
++      "type": "host-arm-cpu"
++    },
++    {
++      "props": {
++        "core-id": 0,
++        "thread-id": 1,
++        "socket-id": 0,
++        "cluster-id": 1
++      },
++      "vcpus-count": 1,
++      "qom-path": "/machine/unattached/device[5]",
++      "type": "host-arm-cpu"
++    },
++    {
++      "props": {
++        "core-id": 0,
++        "thread-id": 0,
++        "socket-id": 0,
++        "cluster-id": 1
++      },
++      "vcpus-count": 1,
++      "qom-path": "/machine/unattached/device[4]",
++      "type": "host-arm-cpu"
++    },
++    {
++      "props": {
++        "core-id": 1,
++        "thread-id": 1,
++        "socket-id": 0,
++        "cluster-id": 0
++      },
++      "vcpus-count": 1,
++      "qom-path": "/machine/unattached/device[3]",
++      "type": "host-arm-cpu"
++    },
++    {
++      "props": {
++        "core-id": 1,
++        "thread-id": 0,
++        "socket-id": 0,
++        "cluster-id": 0
++      },
++      "vcpus-count": 1,
++      "qom-path": "/machine/unattached/device[2]",
++      "type": "host-arm-cpu"
++    },
++    {
++      "props": {
++        "core-id": 0,
++        "thread-id": 1,
++        "socket-id": 0,
++        "cluster-id": 0
++      },
++      "vcpus-count": 1,
++      "qom-path": "/machine/unattached/device[1]",
++      "type": "host-arm-cpu"
++    },
++    {
++      "props": {
++        "core-id": 0,
++        "thread-id": 0,
++        "socket-id": 0,
++        "cluster-id": 0
++      },
++      "vcpus-count": 1,
++      "qom-path": "/machine/unattached/device[0]",
++      "type": "host-arm-cpu"
++    }
++  ]
++}
+diff --git a/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-aarch64-clusters.data b/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-aarch64-clusters.data
+new file mode 100644
+index 0000000000..87e927e7a8
+--- /dev/null
++++ b/tests/qemumonitorjsondata/qemumonitorjson-cpuinfo-aarch64-clusters.data
+@@ -0,0 +1,108 @@
++[vcpu libvirt-id='0']
++    online=yes
++    hotpluggable=no
++    thread-id='284700'
++    enable-id='1'
++    query-cpus-id='0'
++    type='host-arm-cpu'
++    qom_path='/machine/unattached/device[0]'
++    topology: socket='0' cluster_id='0' core='0' thread='0' vcpus='1'
++[vcpu libvirt-id='1']
++    online=yes
++    hotpluggable=no
++    thread-id='284701'
++    enable-id='2'
++    query-cpus-id='1'
++    type='host-arm-cpu'
++    qom_path='/machine/unattached/device[1]'
++    topology: socket='0' cluster_id='0' core='0' thread='1' vcpus='1'
++[vcpu libvirt-id='2']
++    online=yes
++    hotpluggable=no
++    thread-id='284702'
++    enable-id='3'
++    query-cpus-id='2'
++    type='host-arm-cpu'
++    qom_path='/machine/unattached/device[2]'
++    topology: socket='0' cluster_id='0' core='1' thread='0' vcpus='1'
++[vcpu libvirt-id='3']
++    online=yes
++    hotpluggable=no
++    thread-id='284703'
++    enable-id='4'
++    query-cpus-id='3'
++    type='host-arm-cpu'
++    qom_path='/machine/unattached/device[3]'
++    topology: socket='0' cluster_id='0' core='1' thread='1' vcpus='1'
++[vcpu libvirt-id='4']
++    online=yes
++    hotpluggable=no
++    thread-id='284704'
++    enable-id='5'
++    query-cpus-id='4'
++    type='host-arm-cpu'
++    qom_path='/machine/unattached/device[4]'
++    topology: socket='0' cluster_id='1' core='0' thread='0' vcpus='1'
++[vcpu libvirt-id='5']
++    online=yes
++    hotpluggable=no
++    thread-id='284705'
++    enable-id='6'
++    query-cpus-id='5'
++    type='host-arm-cpu'
++    qom_path='/machine/unattached/device[5]'
++    topology: socket='0' cluster_id='1' core='0' thread='1' vcpus='1'
++[vcpu libvirt-id='6']
++    online=yes
++    hotpluggable=no
++    thread-id='284706'
++    enable-id='7'
++    query-cpus-id='6'
++    type='host-arm-cpu'
++    qom_path='/machine/unattached/device[6]'
++    topology: socket='0' cluster_id='1' core='1' thread='0' vcpus='1'
++[vcpu libvirt-id='7']
++    online=no
++    hotpluggable=yes
++    type='host-arm-cpu'
++    topology: socket='0' cluster_id='1' core='1' thread='1' vcpus='1'
++[vcpu libvirt-id='8']
++    online=no
++    hotpluggable=yes
++    type='host-arm-cpu'
++    topology: socket='1' cluster_id='0' core='0' thread='0' vcpus='1'
++[vcpu libvirt-id='9']
++    online=no
++    hotpluggable=yes
++    type='host-arm-cpu'
++    topology: socket='1' cluster_id='0' core='0' thread='1' vcpus='1'
++[vcpu libvirt-id='10']
++    online=no
++    hotpluggable=yes
++    type='host-arm-cpu'
++    topology: socket='1' cluster_id='0' core='1' thread='0' vcpus='1'
++[vcpu libvirt-id='11']
++    online=no
++    hotpluggable=yes
++    type='host-arm-cpu'
++    topology: socket='1' cluster_id='0' core='1' thread='1' vcpus='1'
++[vcpu libvirt-id='12']
++    online=no
++    hotpluggable=yes
++    type='host-arm-cpu'
++    topology: socket='1' cluster_id='1' core='0' thread='0' vcpus='1'
++[vcpu libvirt-id='13']
++    online=no
++    hotpluggable=yes
++    type='host-arm-cpu'
++    topology: socket='1' cluster_id='1' core='0' thread='1' vcpus='1'
++[vcpu libvirt-id='14']
++    online=no
++    hotpluggable=yes
++    type='host-arm-cpu'
++    topology: socket='1' cluster_id='1' core='1' thread='0' vcpus='1'
++[vcpu libvirt-id='15']
++    online=no
++    hotpluggable=yes
++    type='host-arm-cpu'
++    topology: socket='1' cluster_id='1' core='1' thread='1' vcpus='1'
+diff --git a/tests/qemumonitorjsontest.c b/tests/qemumonitorjsontest.c
+index d9ebb429e7..45cee23798 100644
+--- a/tests/qemumonitorjsontest.c
++++ b/tests/qemumonitorjsontest.c
+@@ -2262,13 +2262,16 @@ testQemuMonitorCPUInfoFormat(qemuMonitorCPUInfo *vcpus,
+         if (vcpu->qom_path)
+             virBufferAsprintf(&buf, "qom_path='%s'\n", vcpu->qom_path);
+ 
+-        if (vcpu->socket_id != -1 || vcpu->core_id != -1 ||
++        if (vcpu->socket_id != -1 || vcpu->die_id != -1 ||
++            vcpu->cluster_id != -1 || vcpu->core_id != -1 ||
+             vcpu->thread_id != -1 || vcpu->vcpus != 0) {
+             virBufferAddLit(&buf, "topology:");
+             if (vcpu->socket_id != -1)
+                 virBufferAsprintf(&buf, " socket='%d'", vcpu->socket_id);
+             if (vcpu->die_id != -1)
+                 virBufferAsprintf(&buf, " die='%d'", vcpu->die_id);
++            if (vcpu->cluster_id != -1)
++                virBufferAsprintf(&buf, " cluster_id='%d'", vcpu->cluster_id);
+             if (vcpu->core_id != -1)
+                 virBufferAsprintf(&buf, " core='%d'", vcpu->core_id);
+             if (vcpu->thread_id != -1)
+@@ -2919,6 +2922,10 @@ mymain(void)
+     DO_TEST_CPU_INFO("ppc64-hotplug-4", 24);
+     DO_TEST_CPU_INFO("ppc64-no-threads", 16);
+ 
++    /* aarch64 doesn't support CPU hotplug yet, so the data used in
++     * this test is partially synthetic */
++    DO_TEST_CPU_INFO("aarch64-clusters", 16);
++
+     DO_TEST_CPU_INFO("s390", 2);
+ 
+ 
+-- 
+2.27.0
+
diff --git a/tests-add-explicit-test-case-for-pflash-loader-lacki.patch b/tests-add-explicit-test-case-for-pflash-loader-lacki.patch
deleted file mode 100644
index 5916b5a9eddeaf8e0af9ea5bc467565fc1f6d529..0000000000000000000000000000000000000000
--- a/tests-add-explicit-test-case-for-pflash-loader-lacki.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From d72b85480695e15f1ffdd7cd91ddecc4608467c6 Mon Sep 17 00:00:00 2001
-From: liumengqiu <liumengqiu1@huawei.com>
-Date: Thu, 25 Aug 2022 20:22:02 +0800
-Subject: [PATCH 05/13] tests: add explicit test case for pflash loader lacking
- path
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The following is expected to raise an error:
-
-  <os>
-    <loader readonly='yes' type='pflash'/>
-  </os>
-
-because no path to the pflash loader is given and there is
-no default built-in.
-
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
-Signed-off-by: liumengqiu <liumengqiu1@huawei.com>
----
- tests/qemuxml2argvdata/bios-nvram-no-path.err |  1 +
- tests/qemuxml2argvdata/bios-nvram-no-path.xml | 19 +++++++++++++++++++
- tests/qemuxml2argvtest.c                      |  1 +
- 3 files changed, 21 insertions(+)
- create mode 100644 tests/qemuxml2argvdata/bios-nvram-no-path.err
- create mode 100644 tests/qemuxml2argvdata/bios-nvram-no-path.xml
-
-diff --git a/tests/qemuxml2argvdata/bios-nvram-no-path.err b/tests/qemuxml2argvdata/bios-nvram-no-path.err
-new file mode 100644
-index 0000000000..795386008c
---- /dev/null
-+++ b/tests/qemuxml2argvdata/bios-nvram-no-path.err
-@@ -0,0 +1 @@
-+no loader path specified and firmware auto selection disabled
-diff --git a/tests/qemuxml2argvdata/bios-nvram-no-path.xml b/tests/qemuxml2argvdata/bios-nvram-no-path.xml
-new file mode 100644
-index 0000000000..bf97f0bdd6
---- /dev/null
-+++ b/tests/qemuxml2argvdata/bios-nvram-no-path.xml
-@@ -0,0 +1,19 @@
-+<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='x86_64' machine='pc'>hvm</type>
-+    <loader readonly='yes' type='pflash'/>
-+    <boot dev='hd'/>
-+    <bootmenu enable='yes'/>
-+  </os>
-+  <features>
-+    <acpi/>
-+  </features>
-+  <devices>
-+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
-+  </devices>
-+</domain>
-diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
-index d37969d065..e3ecd37c2b 100644
---- a/tests/qemuxml2argvtest.c
-+++ b/tests/qemuxml2argvtest.c
-@@ -990,6 +990,7 @@ mymain(void)
-             QEMU_CAPS_DEVICE_ISA_SERIAL,
-             QEMU_CAPS_SGA);
-     DO_TEST("bios-nvram", NONE);
-+    DO_TEST_PARSE_ERROR("bios-nvram-no-path", NONE);
-     DO_TEST("bios-nvram-secure",
-             QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
-             QEMU_CAPS_DEVICE_PCI_BRIDGE,
--- 
-2.33.0
-
diff --git a/tests-add-test-case-for-NVRAM-with-template.patch b/tests-add-test-case-for-NVRAM-with-template.patch
deleted file mode 100644
index a6428cad93570a17509774d92226dce3626984df..0000000000000000000000000000000000000000
--- a/tests-add-test-case-for-NVRAM-with-template.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-From 29348ffca334863dccc462d8337d9bedea3d511f Mon Sep 17 00:00:00 2001
-From: liumengqiu <liumengqiu1@huawei.com>
-Date: Wed, 24 Aug 2022 16:33:34 +0800
-Subject: [PATCH] tests: add test case for NVRAM with template
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This demonstrates that
-
-  <os>
-    <loader readonly='yes' type='pflash'>/usr/share/OVMF/OVMF_CODE.fd</loader>
-    <nvram template="/usr/share/OVMF/OVMF_VARS.fd"/>
-  </os>
-
-gets expanded to give a per-VM NVRAM path.
-
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
-Signed-off-by: liumengqiu <liumengqiu1@huawei.com>
----
- .../bios-nvram-template.x86_64-latest.args    | 36 +++++++++++++++++++
- .../qemuxml2argvdata/bios-nvram-template.xml  | 21 +++++++++++
- tests/qemuxml2argvtest.c                      |  3 +-
- 3 files changed, 59 insertions(+), 1 deletion(-)
- create mode 100644 tests/qemuxml2argvdata/bios-nvram-template.x86_64-latest.args
- create mode 100644 tests/qemuxml2argvdata/bios-nvram-template.xml
-
-diff --git a/tests/qemuxml2argvdata/bios-nvram-template.x86_64-latest.args b/tests/qemuxml2argvdata/bios-nvram-template.x86_64-latest.args
-new file mode 100644
-index 0000000000..bd612d1001
---- /dev/null
-+++ b/tests/qemuxml2argvdata/bios-nvram-template.x86_64-latest.args
-@@ -0,0 +1,36 @@
-+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-x86_64 \
-+-name guest=test-bios,debug-threads=on \
-+-S \
-+-object 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"}' \
-+-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 \
-+-accel tcg \
-+-cpu qemu64 \
-+-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,nowait \
-+-mon chardev=charmonitor,id=monitor,mode=control \
-+-rtc base=utc \
-+-no-shutdown \
-+-boot menu=on,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/bios-nvram-template.xml b/tests/qemuxml2argvdata/bios-nvram-template.xml
-new file mode 100644
-index 0000000000..1bbe4314b5
---- /dev/null
-+++ b/tests/qemuxml2argvdata/bios-nvram-template.xml
-@@ -0,0 +1,21 @@
-+<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='x86_64' machine='pc'>hvm</type>
-+    <loader readonly='yes' type='pflash'>/usr/share/OVMF/OVMF_CODE.fd</loader>
-+    <nvram template="/usr/share/OVMF/OVMF_VARS.fd"/>
-+    <boot dev='hd'/>
-+    <bootmenu enable='yes'/>
-+  </os>
-+  <features>
-+    <acpi/>
-+  </features>
-+  <clock offset='utc'/>
-+  <devices>
-+    <emulator>/usr/bin/qemu-system-x86_64</emulator>
-+  </devices>
-+</domain>
-diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
-index d37969d065..dacaf0bca3 100644
---- a/tests/qemuxml2argvtest.c
-+++ b/tests/qemuxml2argvtest.c
-@@ -997,7 +997,8 @@ mymain(void)
-             QEMU_CAPS_ICH9_AHCI,
-             QEMU_CAPS_MACHINE_SMM_OPT,
-             QEMU_CAPS_VIRTIO_SCSI);
--
-+    DO_TEST_CAPS_LATEST("bios-nvram-template");
-+    
-     /* Make sure all combinations of ACPI and UEFI behave as expected */
-     DO_TEST("q35-acpi-uefi", NONE);
-     DO_TEST_PARSE_ERROR("q35-noacpi-uefi", NONE);
--- 
-2.33.0
-
diff --git a/tests-avoid-close-of-bad-file-handle-in-commandtest.patch b/tests-avoid-close-of-bad-file-handle-in-commandtest.patch
deleted file mode 100644
index 18cf5ae7305a6f9f5c0ca435092a0d763269c11f..0000000000000000000000000000000000000000
--- a/tests-avoid-close-of-bad-file-handle-in-commandtest.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 1e5ac569100a5afa90ddee94e8a1cf9c7a9e0415 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
-Date: Mon, 21 Sep 2020 18:37:03 +0100
-Subject: [PATCH 029/108] tests: avoid close of bad file handle in commandtest
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Closed file handles need to be initialized to -1, not 0. This caused a
-inappropriate double close of stdin, which is not desirable, although
-it had no ill effects.
-
-Reviewed-by: Eric Blake <eblake@redhat.com>
-Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
-(cherry picked from commit faf76dd70e96e43478b3fe02106afa62eeb65dc8)
----
- tests/commandtest.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tests/commandtest.c b/tests/commandtest.c
-index ce492e31f7..cc2c99bb68 100644
---- a/tests/commandtest.c
-+++ b/tests/commandtest.c
-@@ -1205,8 +1205,8 @@ static int test27(const void *unused G_GNUC_UNUSED)
-         printf("Could not set send buffers\n");
-         goto cleanup;
-     }
--    pipe1[1] = 0;
--    pipe2[1] = 0;
-+    pipe1[1] = -1;
-+    pipe2[1] = -1;
-     buffer1 = NULL;
-     buffer2 = NULL;
- 
--- 
-2.33.0
-
diff --git a/tests-disabale-storage-tests.patch b/tests-disabale-storage-tests.patch
deleted file mode 100644
index 09afb47e4674d603f84f59eaa5bdb6f79b66fc21..0000000000000000000000000000000000000000
--- a/tests-disabale-storage-tests.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From c4001b2b3f3a078db03ffdc0812e72881972b300 Mon Sep 17 00:00:00 2001
-From: imxcc <xingchaochao@huawei.com>
-Date: Fri, 14 Jan 2022 11:46:27 +0800
-Subject: [PATCH] tests: disabale storage tests
-
-The storagetest in obs cannot be, and related tests are temporarily
-disabled
-
-Signed-off-by: imxcc <xingchaochao@huawei.com>
----
- tests/Makefile.am | 7 -------
- 1 file changed, 7 deletions(-)
-
-diff --git a/tests/Makefile.am b/tests/Makefile.am
-index ada5b8f..abb261e 100644
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -363,16 +363,10 @@ endif WITH_NWFILTER
- 
- if WITH_STORAGE
- test_programs += storagevolxml2argvtest
--test_programs += storagepoolxml2argvtest
- test_programs += virstorageutiltest
--test_programs += storagepoolxml2xmltest
- test_programs += storagepoolcapstest
- endif WITH_STORAGE
- 
--if WITH_STORAGE_FS
--test_programs += virstoragetest
--endif WITH_STORAGE_FS
--
- if WITH_LINUX
- test_programs += virscsitest
- endif WITH_LINUX
-@@ -430,7 +424,6 @@ test_scripts += $(libvirtd_test_scripts)
- 
- test_programs += \
- 	eventtest \
--	virdrivermoduletest \
- 	virdriverconnvalidatetest
- else ! WITH_LIBVIRTD
- EXTRA_DIST += $(libvirtd_test_scripts)
--- 
-2.27.0
-
diff --git a/tests-fix-stat-mocking-with-Fedora-rawhide.patch b/tests-fix-stat-mocking-with-Fedora-rawhide.patch
deleted file mode 100644
index ec33b293828146dbb5030ee1b6a90b8671902b9d..0000000000000000000000000000000000000000
--- a/tests-fix-stat-mocking-with-Fedora-rawhide.patch
+++ /dev/null
@@ -1,135 +0,0 @@
-From 7da32d9655a074995de29fc6c1ac7bcd5aa6bfe6 Mon Sep 17 00:00:00 2001
-From: imxcc <xingchaochao@huawei.com>
-Date: Fri, 9 Jul 2021 15:26:08 +0800
-Subject: [PATCH] tests: fix stat mocking with Fedora rawhide
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-GLibC has a really complicated way of dealing with the 'stat' function
-historically, which means our mocks in turn have to look at four
-different possible functions to replace, stat, stat64, __xstat,
-__xstat64.
-
-In Fedora 33 and earlier:
-
- - libvirt.so links to __xstat64
- - libc.so library exports stat, stat64, __xstat, __xstat64
- - sys/stat.h header exposes stat and __xstat
-
-In Fedora 34 rawhide:
-
- - libvirt.so links to stat64
- - libc.so library exports stat, stat64, __xstat, __xstat64
- - sys/stat.h header exposes stat
-
-Historically we only looked at the exported symbols from libc.so to
-decide which to mock.
-
-In F34 though we must not consider __xstat / __xstat64 though because
-they only existance for binary compatibility. Newly built binaries
-won't reference them.
-
-Thus we must introduce a header file check into our logic for deciding
-which symbol to mock. We must ignore the __xstat / __xstat64 symbols
-if they don't appear in the sys/stat.h header, even if they appear
-in libc.so
-
-Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-Signed-off-by: Peng Liang <liangpeng10@huawei.com>
-Signed-off-by: imxcc <xingchaochao@huawei.com>
----
- configure.ac               |  1 +
- tests/virmockstathelpers.c | 58 ++++++++++++++++++++++----------------
- 2 files changed, 35 insertions(+), 24 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index e565437062..cb62e5aac8 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -396,6 +396,7 @@ AC_CHECK_HEADERS([\
- dnl Check whether endian provides handy macros.
- AC_CHECK_DECLS([htole64], [], [], [[#include <endian.h>]])
- AC_CHECK_FUNCS([stat stat64 __xstat __xstat64 lstat lstat64 __lxstat __lxstat64])
-+AC_CHECK_DECLS([stat, stat64, __xstat, __xstat64, lstat, lstat64, __lxstat, __lxstat64], [], [], [[#include <sys/stat.h>]])
- 
- AC_CHECK_TYPE([struct ifreq],
-   [AC_DEFINE([HAVE_STRUCT_IFREQ],[1],
-diff --git a/tests/virmockstathelpers.c b/tests/virmockstathelpers.c
-index ba26e7bd45..5118ffc731 100644
---- a/tests/virmockstathelpers.c
-+++ b/tests/virmockstathelpers.c
-@@ -69,35 +69,45 @@
-  *  - If __xstat & __xstat64 exist, then stat & stat64 will not exist
-  *    as symbols in the library, so the latter should not be mocked.
-  *
-+ *  - If __xstat exists in the library, but not the header than it
-+ *    it is just there for binary back compat and should not be
-+ *    mocked
-+ *
-  * The same all applies to lstat()
-  */
- 
- 
-+#if !HAVE_DECL___XSTAT
-+# if defined(HAVE_STAT) && !defined(_FILE_OFFSET_BITS) || defined(__APPLE__)
-+#  define MOCK_STAT
-+# endif
-+# if defined(HAVE_STAT64)
-+#  define MOCK_STAT64
-+# endif
-+#else /* HAVE_DECL___XSTAT */
-+# if defined(HAVE___XSTAT) && !defined(_FILE_OFFSET_BITS)
-+#  define MOCK___XSTAT
-+# endif
-+# if defined(HAVE___XSTAT64)
-+#  define MOCK___XSTAT64
-+# endif
-+#endif /* HAVE_DECL___XSTAT */
- 
--#if defined(HAVE_STAT) && !defined(HAVE___XSTAT) && !defined(_FILE_OFFSET_BITS)
--# define MOCK_STAT
--#endif
--#if defined(HAVE_STAT64) && !defined(HAVE___XSTAT64)
--# define MOCK_STAT64
--#endif
--#if defined(HAVE___XSTAT) && !defined(_FILE_OFFSET_BITS)
--# define MOCK___XSTAT
--#endif
--#if defined(HAVE___XSTAT64)
--# define MOCK___XSTAT64
--#endif
--#if defined(HAVE_LSTAT) && !defined(HAVE___LXSTAT) && !defined(_FILE_OFFSET_BITS)
--# define MOCK_LSTAT
--#endif
--#if defined(HAVE_LSTAT64) && !defined(HAVE___LXSTAT64)
--# define MOCK_LSTAT64
--#endif
--#if defined(HAVE___LXSTAT) && !defined(_FILE_OFFSET_BITS)
--# define MOCK___LXSTAT
--#endif
--#if defined(HAVE___LXSTAT64)
--# define MOCK___LXSTAT64
--#endif
-+#if !HAVE_DECL___LXSTAT
-+# if defined(HAVE_LSTAT) && !defined(_FILE_OFFSET_BITS) || defined(__APPLE__)
-+#  define MOCK_LSTAT
-+# endif
-+# if defined(HAVE_LSTAT64)
-+#  define MOCK_LSTAT64
-+# endif
-+#else /* HAVE_DECL___LXSTAT */
-+# if defined(HAVE___LXSTAT) && !defined(_FILE_OFFSET_BITS)
-+#  define MOCK___LXSTAT
-+# endif
-+# if defined(HAVE___LXSTAT64)
-+#  define MOCK___LXSTAT64
-+# endif
-+#endif /* HAVE_DECL___LXSTAT */
- 
- #ifdef MOCK_STAT
- static int (*real_stat)(const char *path, struct stat *sb);
--- 
-2.27.0
-
diff --git a/tests-qemuxml2argv-Validate-generation-of-JSON-props.patch b/tests-qemuxml2argv-Validate-generation-of-JSON-props.patch
deleted file mode 100644
index f58186efcd818e3432f3d673a9cd8c3fe0beec62..0000000000000000000000000000000000000000
--- a/tests-qemuxml2argv-Validate-generation-of-JSON-props.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 798600dd1fd6d0d96661f9c2b5cbd6e8ae96a229 Mon Sep 17 00:00:00 2001
-From: Peter Krempa <pkrempa@redhat.com>
-Date: Thu, 26 Nov 2020 18:35:55 +0100
-Subject: [PATCH 15/16] tests: qemuxml2argv: Validate generation of JSON props
- for object-add
-
-Similarly to the validation for blockdev-add and netdev_add, use the
-qemuxml2argv test repository to drive validation of props for
-object-add.
-
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-Signed-off-by: Yan Wang <wangyan122@huawei.com>
----
- tests/qemuxml2argvtest.c | 18 ++++++++++++++++++
- 1 file changed, 18 insertions(+)
-
-diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
-index 47fce1c3bf..e07d6cf398 100644
---- a/tests/qemuxml2argvtest.c
-+++ b/tests/qemuxml2argvtest.c
-@@ -546,6 +546,24 @@ testCompareXMLToArgvValidateSchema(virQEMUDriverPtr drv,
-                 return -1;
-             }
- 
-+            i++;
-+        } else if (STREQ(args[i], "-object")) {
-+
-+            if (*args[i + 1] != '{') {
-+                i++;
-+                continue;
-+            }
-+
-+            if (!(jsonargs = virJSONValueFromString(args[i + 1])))
-+                return -1;
-+
-+            if (testQEMUSchemaValidateCommand("object-add", jsonargs,
-+                                              schema, &debug) < 0) {
-+                VIR_TEST_VERBOSE("failed to validate -object '%s' against QAPI schema: %s",
-+                                 args[i + 1], virBufferCurrentContent(&debug));
-+                return -1;
-+            }
-+
-             i++;
-         }
-     }
--- 
-2.27.0
-
diff --git a/tests-qemuxml2argvdata-qtests-switch-to-accel.patch b/tests-qemuxml2argvdata-qtests-switch-to-accel.patch
deleted file mode 100644
index eddeb18fc47b896568a4c3f27ced19e78ed0e641..0000000000000000000000000000000000000000
--- a/tests-qemuxml2argvdata-qtests-switch-to-accel.patch
+++ /dev/null
@@ -1,314 +0,0 @@
-From bc412bc2ab8afacaab05e1e393b7a92c773a9f64 Mon Sep 17 00:00:00 2001
-From: chenhuiying <chenhuiying4@huawei.com>
-Date: Tue, 6 Dec 2022 18:47:30 +0800
-Subject: [PATCH] tests: qemuxml2argvdata qtests switch to -accel
-
-fix "qemu: Switch to -accel"
-
-Signed-off-by: yezengruan <yezengruan@huawei.com>
----
- tests/qemuxml2argvdata/aarch64-gic-default-both.args           | 3 ++-
- tests/qemuxml2argvdata/aarch64-gic-default-v2.args             | 3 ++-
- tests/qemuxml2argvdata/aarch64-gic-default-v3.args             | 3 ++-
- tests/qemuxml2argvdata/aarch64-gic-default.args                | 3 ++-
- tests/qemuxml2argvdata/aarch64-gic-none-both.args              | 3 ++-
- tests/qemuxml2argvdata/aarch64-gic-none-v2.args                | 3 ++-
- tests/qemuxml2argvdata/aarch64-gic-none-v3.args                | 3 ++-
- tests/qemuxml2argvdata/aarch64-gic-none.args                   | 3 ++-
- tests/qemuxml2argvdata/cpu-check-full.args                     | 3 ++-
- tests/qemuxml2argvdata/cpu-check-partial.args                  | 3 ++-
- .../disk-backing-chains-index.x86_64-2.12.0.args               | 3 ++-
- .../disk-backing-chains-index.x86_64-latest.args               | 3 ++-
- tests/qemuxml2argvdata/mach-virt-console-native.args           | 3 ++-
- tests/qemuxml2argvdata/mach-virt-serial+console-native.args    | 3 ++-
- tests/qemuxml2argvdata/mach-virt-serial-compat.args            | 3 ++-
- tests/qemuxml2argvdata/pci-rom-disabled-invalid.args           | 3 ++-
- tests/qemuxml2argvdata/pseries-console-native.args             | 3 ++-
- tests/qemuxml2argvdata/pseries-serial+console-native.args      | 3 ++-
- tests/qemuxml2argvdata/pseries-serial-compat.args              | 3 ++-
- tests/qemuxml2argvdata/user-aliases2.args                      | 3 ++-
- 20 files changed, 40 insertions(+), 20 deletions(-)
-
-diff --git a/tests/qemuxml2argvdata/aarch64-gic-default-both.args b/tests/qemuxml2argvdata/aarch64-gic-default-both.args
-index 2049250..9d28764 100644
---- a/tests/qemuxml2argvdata/aarch64-gic-default-both.args
-+++ b/tests/qemuxml2argvdata/aarch64-gic-default-both.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-aarch64 \
- -name aarch64test \
- -S \
---machine virt,accel=kvm,usb=off,dump-guest-core=off,gic-version=3 \
-+-machine virt,usb=off,dump-guest-core=off,gic-version=3 \
-+-accel kvm \
- -cpu host \
- -m 1024 \
- -realtime mlock=off \
-diff --git a/tests/qemuxml2argvdata/aarch64-gic-default-v2.args b/tests/qemuxml2argvdata/aarch64-gic-default-v2.args
-index 6cf5839..9d6f2de 100644
---- a/tests/qemuxml2argvdata/aarch64-gic-default-v2.args
-+++ b/tests/qemuxml2argvdata/aarch64-gic-default-v2.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-aarch64 \
- -name aarch64test \
- -S \
---machine virt,accel=kvm,usb=off,dump-guest-core=off,gic-version=2 \
-+-machine virt,usb=off,dump-guest-core=off,gic-version=2 \
-+-accel kvm \
- -cpu host \
- -m 1024 \
- -realtime mlock=off \
-diff --git a/tests/qemuxml2argvdata/aarch64-gic-default-v3.args b/tests/qemuxml2argvdata/aarch64-gic-default-v3.args
-index 2049250..9d28764 100644
---- a/tests/qemuxml2argvdata/aarch64-gic-default-v3.args
-+++ b/tests/qemuxml2argvdata/aarch64-gic-default-v3.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-aarch64 \
- -name aarch64test \
- -S \
---machine virt,accel=kvm,usb=off,dump-guest-core=off,gic-version=3 \
-+-machine virt,usb=off,dump-guest-core=off,gic-version=3 \
-+-accel kvm \
- -cpu host \
- -m 1024 \
- -realtime mlock=off \
-diff --git a/tests/qemuxml2argvdata/aarch64-gic-default.args b/tests/qemuxml2argvdata/aarch64-gic-default.args
-index 6cf5839..9d6f2de 100644
---- a/tests/qemuxml2argvdata/aarch64-gic-default.args
-+++ b/tests/qemuxml2argvdata/aarch64-gic-default.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-aarch64 \
- -name aarch64test \
- -S \
---machine virt,accel=kvm,usb=off,dump-guest-core=off,gic-version=2 \
-+-machine virt,usb=off,dump-guest-core=off,gic-version=2 \
-+-accel kvm \
- -cpu host \
- -m 1024 \
- -realtime mlock=off \
-diff --git a/tests/qemuxml2argvdata/aarch64-gic-none-both.args b/tests/qemuxml2argvdata/aarch64-gic-none-both.args
-index 2049250..9d28764 100644
---- a/tests/qemuxml2argvdata/aarch64-gic-none-both.args
-+++ b/tests/qemuxml2argvdata/aarch64-gic-none-both.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-aarch64 \
- -name aarch64test \
- -S \
---machine virt,accel=kvm,usb=off,dump-guest-core=off,gic-version=3 \
-+-machine virt,usb=off,dump-guest-core=off,gic-version=3 \
-+-accel kvm \
- -cpu host \
- -m 1024 \
- -realtime mlock=off \
-diff --git a/tests/qemuxml2argvdata/aarch64-gic-none-v2.args b/tests/qemuxml2argvdata/aarch64-gic-none-v2.args
-index 6cf5839..9d6f2de 100644
---- a/tests/qemuxml2argvdata/aarch64-gic-none-v2.args
-+++ b/tests/qemuxml2argvdata/aarch64-gic-none-v2.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-aarch64 \
- -name aarch64test \
- -S \
---machine virt,accel=kvm,usb=off,dump-guest-core=off,gic-version=2 \
-+-machine virt,usb=off,dump-guest-core=off,gic-version=2 \
-+-accel kvm \
- -cpu host \
- -m 1024 \
- -realtime mlock=off \
-diff --git a/tests/qemuxml2argvdata/aarch64-gic-none-v3.args b/tests/qemuxml2argvdata/aarch64-gic-none-v3.args
-index 2049250..9d28764 100644
---- a/tests/qemuxml2argvdata/aarch64-gic-none-v3.args
-+++ b/tests/qemuxml2argvdata/aarch64-gic-none-v3.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-aarch64 \
- -name aarch64test \
- -S \
---machine virt,accel=kvm,usb=off,dump-guest-core=off,gic-version=3 \
-+-machine virt,usb=off,dump-guest-core=off,gic-version=3 \
-+-accel kvm \
- -cpu host \
- -m 1024 \
- -realtime mlock=off \
-diff --git a/tests/qemuxml2argvdata/aarch64-gic-none.args b/tests/qemuxml2argvdata/aarch64-gic-none.args
-index 6cf5839..9d6f2de 100644
---- a/tests/qemuxml2argvdata/aarch64-gic-none.args
-+++ b/tests/qemuxml2argvdata/aarch64-gic-none.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-aarch64 \
- -name aarch64test \
- -S \
---machine virt,accel=kvm,usb=off,dump-guest-core=off,gic-version=2 \
-+-machine virt,usb=off,dump-guest-core=off,gic-version=2 \
-+-accel kvm \
- -cpu host \
- -m 1024 \
- -realtime mlock=off \
-diff --git a/tests/qemuxml2argvdata/cpu-check-full.args b/tests/qemuxml2argvdata/cpu-check-full.args
-index 1e4af63..71891fd 100644
---- a/tests/qemuxml2argvdata/cpu-check-full.args
-+++ b/tests/qemuxml2argvdata/cpu-check-full.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=kvm,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel kvm \
- -cpu core2duo \
- -m 214 \
- -realtime mlock=off \
-diff --git a/tests/qemuxml2argvdata/cpu-check-partial.args b/tests/qemuxml2argvdata/cpu-check-partial.args
-index 1e4af63..71891fd 100644
---- a/tests/qemuxml2argvdata/cpu-check-partial.args
-+++ b/tests/qemuxml2argvdata/cpu-check-partial.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name QEMUGuest1 \
- -S \
---machine pc,accel=kvm,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel kvm \
- -cpu core2duo \
- -m 214 \
- -realtime mlock=off \
-diff --git a/tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-2.12.0.args b/tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-2.12.0.args
-index 4769133..bd87945 100644
---- a/tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-2.12.0.args
-+++ b/tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-2.12.0.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc-i440fx-2.12,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc-i440fx-2.12,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-latest.args b/tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-latest.args
-index 6c19da9..9148864 100644
---- a/tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-latest.args
-+++ b/tests/qemuxml2argvdata/disk-backing-chains-index.x86_64-latest.args
-@@ -12,7 +12,8 @@ QEMU_AUDIO_DRV=none \
- -S \
- -object secret,id=masterKey0,format=raw,\
- file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -cpu qemu64 \
- -m 214 \
- -overcommit mem-lock=off \
-diff --git a/tests/qemuxml2argvdata/mach-virt-console-native.args b/tests/qemuxml2argvdata/mach-virt-console-native.args
-index 8d25e49..cd27ffe 100644
---- a/tests/qemuxml2argvdata/mach-virt-console-native.args
-+++ b/tests/qemuxml2argvdata/mach-virt-console-native.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-aarch64 \
- -name guest \
- -S \
---machine virt,accel=tcg,usb=off,dump-guest-core=off \
-+-machine virt,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 512 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/mach-virt-serial+console-native.args b/tests/qemuxml2argvdata/mach-virt-serial+console-native.args
-index 8d25e49..cd27ffe 100644
---- a/tests/qemuxml2argvdata/mach-virt-serial+console-native.args
-+++ b/tests/qemuxml2argvdata/mach-virt-serial+console-native.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-aarch64 \
- -name guest \
- -S \
---machine virt,accel=tcg,usb=off,dump-guest-core=off \
-+-machine virt,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 512 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/mach-virt-serial-compat.args b/tests/qemuxml2argvdata/mach-virt-serial-compat.args
-index 8d25e49..cd27ffe 100644
---- a/tests/qemuxml2argvdata/mach-virt-serial-compat.args
-+++ b/tests/qemuxml2argvdata/mach-virt-serial-compat.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-aarch64 \
- -name guest \
- -S \
---machine virt,accel=tcg,usb=off,dump-guest-core=off \
-+-machine virt,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 512 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/pci-rom-disabled-invalid.args b/tests/qemuxml2argvdata/pci-rom-disabled-invalid.args
-index 1dd1695..b812421 100644
---- a/tests/qemuxml2argvdata/pci-rom-disabled-invalid.args
-+++ b/tests/qemuxml2argvdata/pci-rom-disabled-invalid.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name guest \
- -S \
---machine pc,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/pseries-console-native.args b/tests/qemuxml2argvdata/pseries-console-native.args
-index 9a5f8c8..c8295f7 100644
---- a/tests/qemuxml2argvdata/pseries-console-native.args
-+++ b/tests/qemuxml2argvdata/pseries-console-native.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-ppc64 \
- -name guest \
- -S \
---machine pseries,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pseries,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 512 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/pseries-serial+console-native.args b/tests/qemuxml2argvdata/pseries-serial+console-native.args
-index 9a5f8c8..c8295f7 100644
---- a/tests/qemuxml2argvdata/pseries-serial+console-native.args
-+++ b/tests/qemuxml2argvdata/pseries-serial+console-native.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-ppc64 \
- -name guest \
- -S \
---machine pseries,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pseries,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 512 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/pseries-serial-compat.args b/tests/qemuxml2argvdata/pseries-serial-compat.args
-index 9a5f8c8..c8295f7 100644
---- a/tests/qemuxml2argvdata/pseries-serial-compat.args
-+++ b/tests/qemuxml2argvdata/pseries-serial-compat.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-ppc64 \
- -name guest \
- -S \
---machine pseries,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pseries,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 512 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
-diff --git a/tests/qemuxml2argvdata/user-aliases2.args b/tests/qemuxml2argvdata/user-aliases2.args
-index cfc396c..aecaa24 100644
---- a/tests/qemuxml2argvdata/user-aliases2.args
-+++ b/tests/qemuxml2argvdata/user-aliases2.args
-@@ -10,7 +10,8 @@ QEMU_AUDIO_DRV=none \
- /usr/bin/qemu-system-x86_64 \
- -name QEMUGuest1 \
- -S \
---machine pc-q35-2.4,accel=tcg,usb=off,dump-guest-core=off \
-+-machine pc-q35-2.4,usb=off,dump-guest-core=off \
-+-accel tcg \
- -m 214 \
- -realtime mlock=off \
- -smp 1,sockets=1,cores=1,threads=1 \
--- 
-2.27.0
-
diff --git a/tests-upstream-Fixing-compiler-warning-in-cputest.patch b/tests-upstream-Fixing-compiler-warning-in-cputest.patch
deleted file mode 100644
index d151ef2abec0f1c656ff27355f593440b2fa94d5..0000000000000000000000000000000000000000
--- a/tests-upstream-Fixing-compiler-warning-in-cputest.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 53ff014d6e62a0bbef7e9fda360ddfe197115324 Mon Sep 17 00:00:00 2001
-From: laokz <zhangkai@iscas.ac.cn>
-Date: Thu, 14 Sep 2023 11:46:39 +0800
-Subject: [PATCH] tests: upstream Fixing compiler warning in cputest
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Reference: https://github.com/libvirt/libvirt/commit/67c77744d74fe99a6b0e4ddef6869b305e29d6aa
----
-tests: Fixing compiler warning in cputest
-
-Found when building on Fedora 36 on s390x.
-
- C compiler for the host machine: gcc (gcc 12.0.1 "gcc (GCC) 12.0.1 20220308 (Red Hat 12.0.1-0)")
- C linker for the host machine: gcc ld.bfd 2.37-24
-
- In function ‘cpuTestUpdateLiveCompare’,
-     inlined from ‘cpuTestUpdateLive’ at ../dist-unpack/libvirt-8.2.5/tests/cputest.c:784:12:
- ../dist-unpack/libvirt-8.2.5/tests/cputest.c:696:21: warning: potential null pointer dereference [-Wnull-dereference]
-   696 |              featAct->policy == VIR_CPU_FEATURE_REQUIRE) ||
-       |              ~~~~~~~^~~~~~~~
-
-Signed-off-by: Boris Fiuczynski <fiuczy@linux.ibm.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
----
- tests/cputest.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/cputest.c b/tests/cputest.c
-index 3657fa4095..8c22fb3ee9 100644
---- a/tests/cputest.c
-+++ b/tests/cputest.c
-@@ -760,7 +760,7 @@ cpuTestUpdateLiveCompare(virArch arch,
-         if ((cmp == 0 &&
-              featAct->policy == VIR_CPU_FEATURE_REQUIRE &&
-              featExp->policy == VIR_CPU_FEATURE_DISABLE) ||
--            (cmp < 0 &&
-+            (cmp < 0 && featAct &&
-              featAct->policy == VIR_CPU_FEATURE_REQUIRE) ||
-             (cmp > 0 &&
-              featExp->policy == VIR_CPU_FEATURE_DISABLE)) {
--- 
-2.27.0
-
diff --git a/testutils-Don-t-leak-testBitmap-and-failedTests.patch b/testutils-Don-t-leak-testBitmap-and-failedTests.patch
deleted file mode 100644
index e92e06ef7700930cb750283946d0d4876bd7532a..0000000000000000000000000000000000000000
--- a/testutils-Don-t-leak-testBitmap-and-failedTests.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From ad50df08d50dbaaad974d4f6b19328fb881857af Mon Sep 17 00:00:00 2001
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Thu, 29 Jul 2021 15:53:16 +0200
-Subject: [PATCH 097/108] testutils: Don't leak @testBitmap and @failedTests
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-In virTestMain() the @failedTests bitmap is allocated and
-optionally @testBitmap too. But neither of them is freed.
-
-Fixes: 0cd5a726e365e67690a81e3ce33ecd0cb0b5178d
-Fixes: cebb468ef5e82b8d4253e27ef70c67812cf93c5a
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 77f7067059a59a1b15e898f64944a7a06ae9f675)
----
- tests/testutils.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/tests/testutils.c b/tests/testutils.c
-index aa4195920d..2aeaee3306 100644
---- a/tests/testutils.c
-+++ b/tests/testutils.c
-@@ -849,6 +849,9 @@ int virTestMain(int argc,
-         fprintf(stderr, "Some tests failed. Run them using:\n");
-         fprintf(stderr, "VIR_TEST_DEBUG=1 VIR_TEST_RANGE=%s %s\n", failed, argv[0]);
-     }
-+
-+    virBitmapFree(testBitmap);
-+    virBitmapFree(failedTests);
-     virLogReset();
-     return ret;
- }
--- 
-2.33.0
-
diff --git a/testutils-Terminate-usage-string-with-a-new-line.patch b/testutils-Terminate-usage-string-with-a-new-line.patch
deleted file mode 100644
index 4c5fdd21f6ba96a8ed9bb0047cbf7d5988950819..0000000000000000000000000000000000000000
--- a/testutils-Terminate-usage-string-with-a-new-line.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 51e4c7c4c88b424b13cddbc5d1e3804d34d88df0 Mon Sep 17 00:00:00 2001
-From: Bihong Yu <yubihong@huawei.com>
-Date: Mon, 17 Jan 2022 16:46:46 +0100
-Subject: [PATCH 10/13] testutils: Terminate usage string with a new line
-
-If a test binary is executed with an argument then usage
-information is printed out (that no arguments are accepted and
-what environment variables affect execution). The string is
-printed onto stderr but it is not terminated with a newline
-character producing not so nice output.
-
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Signed-off-by: Bihong Yu <yubihong@huawei.com>
----
- tests/testutils.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tests/testutils.c b/tests/testutils.c
-index 2aeaee3306..a2cb6666c2 100644
---- a/tests/testutils.c
-+++ b/tests/testutils.c
-@@ -804,7 +804,7 @@ int virTestMain(int argc,
-         fprintf(stderr, "Usage: %s\n", argv[0]);
-         fputs("effective environment variables:\n"
-               "VIR_TEST_VERBOSE set to show names of individual tests\n"
--              "VIR_TEST_DEBUG set to show information for debugging failures",
-+              "VIR_TEST_DEBUG set to show information for debugging failures\n",
-               stderr);
-         return EXIT_FAILURE;
-     }
--- 
-2.33.0
-
diff --git a/testutils-call-va_end-before-return.patch b/testutils-call-va_end-before-return.patch
deleted file mode 100644
index f3b17dcafb9300b8fc09f4d94c2d941a4acef5fd..0000000000000000000000000000000000000000
--- a/testutils-call-va_end-before-return.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 35b8b20e2923777b9b413a3cb906d8c4bbc064e1 Mon Sep 17 00:00:00 2001
-From: Pavel Hrdina <phrdina@redhat.com>
-Date: Mon, 16 Nov 2020 16:12:09 +0100
-Subject: [PATCH 075/108] testutils: call va_end before return
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Reviewed-by: Peter Krempa <pkrempa@redhat.com>
-(cherry picked from commit e8e90a35df007ee6032d2dc0b6aa3d21747cc326)
----
- tests/testutils.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/tests/testutils.c b/tests/testutils.c
-index 5fd81b70a2..aa4195920d 100644
---- a/tests/testutils.c
-+++ b/tests/testutils.c
-@@ -771,6 +771,7 @@ int virTestMain(int argc,
-     while ((lib = va_arg(ap, const char *))) {
-         if (!virFileIsExecutable(lib)) {
-             perror(lib);
-+            va_end(ap);
-             return EXIT_FAILURE;
-         }
- 
--- 
-2.33.0
-
diff --git a/testutilsqemuschema-Introduce-testQEMUSchemaValidate.patch b/testutilsqemuschema-Introduce-testQEMUSchemaValidate.patch
deleted file mode 100644
index 11f423b515edf32f2482dedc9772fbea1a7891fe..0000000000000000000000000000000000000000
--- a/testutilsqemuschema-Introduce-testQEMUSchemaValidate.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-From 740581f96fa4007d6549e82131a9ef48a6478149 Mon Sep 17 00:00:00 2001
-From: Peter Krempa <pkrempa@redhat.com>
-Date: Wed, 4 Mar 2020 10:22:19 +0100
-Subject: [PATCH 14/18] testutilsqemuschema: Introduce
- testQEMUSchemaValidateCommand
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The new helper splits out all steps necessary to validate a QMP command
-against the schema.
-
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- tests/testutilsqemuschema.c | 44 +++++++++++++++++++++++++++++++++++++
- tests/testutilsqemuschema.h |  6 +++++
- 2 files changed, 50 insertions(+)
-
-diff --git a/tests/testutilsqemuschema.c b/tests/testutilsqemuschema.c
-index 7b82ff27b2..fe8501f3a0 100644
---- a/tests/testutilsqemuschema.c
-+++ b/tests/testutilsqemuschema.c
-@@ -517,6 +517,50 @@ testQEMUSchemaValidate(virJSONValuePtr obj,
- }
- 
- 
-+/**
-+ * testQEMUSchemaValidateCommand:
-+ * @command: command to validate
-+ * @arguments: arguments of @command to validate
-+ * @schema: hash table containing schema entries
-+ * @debug: a virBuffer which will be filled with debug information if provided
-+ *
-+ * Validates whether @command and its @arguments conform to the QAPI schema
-+ * passed in via @schema. Returns 0, if the command and args match @schema,
-+ * -1 if it does not and -2 if there is a problem with the schema or with
-+ *  internals.
-+ *
-+ * @debug is filled with information regarding the validation process
-+ */
-+int
-+testQEMUSchemaValidateCommand(const char *command,
-+                              virJSONValuePtr arguments,
-+                              virHashTablePtr schema,
-+                              virBufferPtr debug)
-+{
-+    g_autofree char *schemapatharguments = g_strdup_printf("%s/arg-type", command);
-+    g_autoptr(virJSONValue) emptyargs = NULL;
-+    virJSONValuePtr schemarootcommand;
-+    virJSONValuePtr schemarootarguments;
-+
-+    if (virQEMUQAPISchemaPathGet(command, schema, &schemarootcommand) < 0 ||
-+        !schemarootcommand) {
-+        virBufferAsprintf(debug, "ERROR: command '%s' not found in the schema", command);
-+        return -1;
-+    }
-+
-+    if (!arguments)
-+        arguments = emptyargs = virJSONValueNewObject();
-+
-+    if (virQEMUQAPISchemaPathGet(schemapatharguments, schema, &schemarootarguments) < 0 ||
-+        !schemarootarguments) {
-+        virBufferAsprintf(debug, "ERROR: failed to look up 'arg-type' of  '%s'", command);
-+        return -1;
-+    }
-+
-+    return testQEMUSchemaValidateRecurse(arguments, schemarootarguments, schema, debug);
-+}
-+
-+
- /**
-  * testQEMUSchemaGetLatest:
-  *
-diff --git a/tests/testutilsqemuschema.h b/tests/testutilsqemuschema.h
-index 84ee9a9670..e3a375b038 100644
---- a/tests/testutilsqemuschema.h
-+++ b/tests/testutilsqemuschema.h
-@@ -28,6 +28,12 @@ testQEMUSchemaValidate(virJSONValuePtr obj,
-                        virHashTablePtr schema,
-                        virBufferPtr debug);
- 
-+int
-+testQEMUSchemaValidateCommand(const char *command,
-+                              virJSONValuePtr arguments,
-+                              virHashTablePtr schema,
-+                              virBufferPtr debug);
-+
- virJSONValuePtr
- testQEMUSchemaGetLatest(const char* arch);
- 
--- 
-2.23.0.windows.1
-
diff --git a/tools-avoid-potential-null-pointer-dereference-by-GC.patch b/tools-avoid-potential-null-pointer-dereference-by-GC.patch
deleted file mode 100644
index 4cd86b0780dbcfbe5bfe0f9e1a933c2cca61a3f6..0000000000000000000000000000000000000000
--- a/tools-avoid-potential-null-pointer-dereference-by-GC.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From d02aeaf7c2b2e6038dd5967fddd9339480b7a25e Mon Sep 17 00:00:00 2001
-From: Boris Fiuczynski <fiuczy@linux.ibm.com>
-Date: Thu, 13 Aug 2020 16:03:45 +0200
-Subject: [PATCH 045/108] tools: avoid potential null pointer dereference by
- GCC 10
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-GCC 10 complains about "arg" possibly being a NULL dereference.
-Even though it might be a false positive, we can easily avoid it.
-
-Avoiding
- ../tools/vsh.c: In function ‘vshCommandOptStringReq’:
- ../tools/vsh.c:1034:19: error: potential null pointer dereference [-Werror=null-dereference]
-  1034 |     else if (!*arg->data && !(arg->def->flags & VSH_OFLAG_EMPTY_OK))
-       |                ~~~^~~~~~
-
-Signed-off-by: Boris Fiuczynski <fiuczy@linux.ibm.com>
-Reviewed-by: Marc Hartmayer <mhartmay@linux.ibm.com>
-Reviewed-by: Erik Skultety <eskultet@redhat.com>
-(cherry picked from commit e2bd2af6e4f9323cf732563b430ef02e075fc804)
----
- tools/vsh.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tools/vsh.c b/tools/vsh.c
-index 58bb1e6a3c..65f4a48d62 100644
---- a/tools/vsh.c
-+++ b/tools/vsh.c
-@@ -1034,7 +1034,7 @@ vshCommandOptStringReq(vshControl *ctl,
-     /* this should not be propagated here, just to be sure */
-     if (ret == -1)
-         error = N_("Mandatory option not present");
--    else if (!*arg->data && !(arg->def->flags & VSH_OFLAG_EMPTY_OK))
-+    else if (arg && !*arg->data && !(arg->def->flags & VSH_OFLAG_EMPTY_OK))
-         error = N_("Option argument is empty");
- 
-     if (error) {
--- 
-2.33.0
-
diff --git a/update-the-Chinese-translation-of-nwfilter.patch b/update-the-Chinese-translation-of-nwfilter.patch
deleted file mode 100644
index 25cad647c90326102112511cc30af9b4c09f126c..0000000000000000000000000000000000000000
--- a/update-the-Chinese-translation-of-nwfilter.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 0af67000d77afbc4c843709d8119010957855660 Mon Sep 17 00:00:00 2001
-From: yezengruan <yezengruan@huawei.com>
-Date: Sat, 10 Dec 2022 15:00:48 +0800
-Subject: [PATCH] update the Chinese translation of nwfilter
-
-commit e9fd6de8f from upstream.
-
-Signed-off-by: yezengruan <yezengruan@huawei.com>
----
- po/zh_CN.mini.po | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/po/zh_CN.mini.po b/po/zh_CN.mini.po
-index 3d588abcbe..cd899a429c 100644
---- a/po/zh_CN.mini.po
-+++ b/po/zh_CN.mini.po
-@@ -18301,7 +18301,7 @@ msgid "nvram device is only supported for PPC64"
- msgstr "只为 PPC64 支持 nvram 设备"
- 
- msgid "nwfilter is in use"
--msgstr "nwfilter 未使用"
-+msgstr "nwfilter 使用中"
- 
- msgid "occupied"
- msgstr "已占用"
--- 
-2.27.0
-
diff --git a/util-Avoid-double-free-in-virProcessSetAffinity.patch b/util-Avoid-double-free-in-virProcessSetAffinity.patch
deleted file mode 100644
index 7d55ccd5ceb35232cf1883eb87a71bc7241dafd1..0000000000000000000000000000000000000000
--- a/util-Avoid-double-free-in-virProcessSetAffinity.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 3c487e9d9b50e220f9eb32a020cbd9fd742d4405 Mon Sep 17 00:00:00 2001
-From: Martin Kletzander <mkletzan@redhat.com>
-Date: Tue, 27 Oct 2020 13:48:38 +0100
-Subject: [PATCH 072/108] util: Avoid double free in virProcessSetAffinity
-
-The cpu mask was free()'d immediately on any error and at the end of the
-function, where it was expected that it would either error out and return or
-goto another allocation if the code was to fail.  However since commit
-9514e24984ee the error path did not return in one new case which caused
-double-free in such situation.  In order to make the code more straightforward
-just free the mask after it's been used even before checking the return code of
-the call.
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1819801
-
-Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
-Reviewed-by: Peter Krempa <pkrempa@redhat.com>
-(cherry picked from commit 1f807631f402210d036ec4803e7adfefa222f786)
----
- src/util/virprocess.c | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/src/util/virprocess.c b/src/util/virprocess.c
-index 141ebb54e0..c3f88d206b 100644
---- a/src/util/virprocess.c
-+++ b/src/util/virprocess.c
-@@ -450,6 +450,7 @@ int virProcessSetAffinity(pid_t pid, virBitmapPtr map)
-     int numcpus = 1024;
-     size_t masklen;
-     cpu_set_t *mask;
-+    int rv = -1;
- 
-     /* Not only may the statically allocated cpu_set_t be too small,
-      * but there is no way to ask the kernel what size is large enough.
-@@ -473,8 +474,10 @@ int virProcessSetAffinity(pid_t pid, virBitmapPtr map)
-             CPU_SET_S(i, masklen, mask);
-     }
- 
--    if (sched_setaffinity(pid, masklen, mask) < 0) {
--        CPU_FREE(mask);
-+    rv = sched_setaffinity(pid, masklen, mask);
-+    CPU_FREE(mask);
-+
-+    if (rv < 0) {
-         if (errno == EINVAL &&
-             numcpus < (1024 << 8)) { /* 262144 cpus ought to be enough for anyone */
-             numcpus = numcpus << 2;
-@@ -484,7 +487,6 @@ int virProcessSetAffinity(pid_t pid, virBitmapPtr map)
-                              _("cannot set CPU affinity on process %d"), pid);
-         return -1;
-     }
--    CPU_FREE(mask);
- 
-     return 0;
- }
--- 
-2.33.0
-
diff --git a/util-Drop-pointless-NUL_TERMINATE-macro.patch b/util-Drop-pointless-NUL_TERMINATE-macro.patch
deleted file mode 100644
index 766ecf3ec980e848431c0a0c7edb10c52af095b9..0000000000000000000000000000000000000000
--- a/util-Drop-pointless-NUL_TERMINATE-macro.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 28781bb30db71760da3c88a5c34903ee1387d20b Mon Sep 17 00:00:00 2001
-From: Xu Zheng <xuzheng_yewu@cmss.chinamobile.com>
-Date: Thu, 24 Nov 2022 18:12:49 +0800
-Subject: [PATCH 21/23] util: Drop pointless NUL_TERMINATE macro
-
-It's only used once and open coding it is at least as clear as using the
-macro.
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Peter Krempa <pkrempa@redhat.com>
-Signed-off-by: Xu Zheng <xuzheng_yewu@cmss.chinamobile.com>
----
- src/internal.h | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/src/internal.h b/src/internal.h
-index a1068eb63b..302fddba34 100644
---- a/src/internal.h
-+++ b/src/internal.h
-@@ -87,7 +87,6 @@
- #define STREQ_NULLABLE(a, b) (g_strcmp0(a, b) == 0)
- #define STRNEQ_NULLABLE(a, b) (g_strcmp0(a, b) != 0)
- 
--#define NUL_TERMINATE(buf) do { (buf)[sizeof(buf)-1] = '\0'; } while (0)
- 
- #ifdef WIN32
- # ifndef O_CLOEXEC
--- 
-2.27.0
-
diff --git a/util-Fix-error-reporting-in-virnetlink.patch b/util-Fix-error-reporting-in-virnetlink.patch
deleted file mode 100644
index 4e222c3a86b3c5be0090f4f23969de1c49110225..0000000000000000000000000000000000000000
--- a/util-Fix-error-reporting-in-virnetlink.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 4218f98f09f2155823f01846502c9373d660aa5a Mon Sep 17 00:00:00 2001
-From: Andrea Bolognani <abologna@redhat.com>
-Date: Tue, 9 Mar 2021 11:18:53 +0100
-Subject: [PATCH 020/108] util: Fix error reporting in virnetlink
-
-The preprocessor macro we use to check whether we're on Linux
-has not been spelled properly, and so we will always report the
-error message intended for other platforms.
-
-Fixes: 879bcee08ce0f91f556fddfe452c3fbed5318468
-Signed-off-by: Andrea Bolognani <abologna@redhat.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-(cherry picked from commit 9b2f6c103028ae2dfab21f152f69352a1bfd72b9)
----
- src/util/virnetlink.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/util/virnetlink.c b/src/util/virnetlink.c
-index 3117dcbe65..a49c29a169 100644
---- a/src/util/virnetlink.c
-+++ b/src/util/virnetlink.c
-@@ -1215,7 +1215,7 @@ virNetlinkEventRemoveClient(int watch, const virMacAddr *macaddr,
- 
- #else
- 
--# if defined(__linux)
-+# if defined(__linux__)
- static const char *unsupported = N_("libnl was not available at build time");
- # else
- static const char *unsupported = N_("not supported on non-linux platforms");
--- 
-2.33.0
-
diff --git a/util-Fix-memory-leak-in-virAuthConfigLookup.patch b/util-Fix-memory-leak-in-virAuthConfigLookup.patch
deleted file mode 100644
index 7b9af8eedf982ec71191da6769097e831e5a9f37..0000000000000000000000000000000000000000
--- a/util-Fix-memory-leak-in-virAuthConfigLookup.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 654c77db8239678b3154590f16e7c7c1da557c89 Mon Sep 17 00:00:00 2001
-From: John Ferlan <jferlan@redhat.com>
-Date: Tue, 16 Jun 2020 08:07:03 -0400
-Subject: [PATCH 004/108] util: Fix memory leak in virAuthConfigLookup
-
-Since 5084091a, @authcred is filled by a g_key_file_get_string which is
-now an allocated string as opposed to some hash table lookup value, so
-we need to treat it as so.
-
-Found by Coverity
-
-Signed-off-by: John Ferlan <jferlan@redhat.com>
-Reviewed-by: Peter Krempa <pkrempa@redhat.com>
-(cherry picked from commit d25758141723d45aecd368ee3e5183ccb5c7eea2)
----
- src/util/virauthconfig.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/util/virauthconfig.c b/src/util/virauthconfig.c
-index 1c007757c7..0da9c2461f 100644
---- a/src/util/virauthconfig.c
-+++ b/src/util/virauthconfig.c
-@@ -103,7 +103,7 @@ int virAuthConfigLookup(virAuthConfigPtr auth,
- {
-     g_autofree char *authgroup = NULL;
-     g_autofree char *credgroup = NULL;
--    const char *authcred;
-+    g_autofree char *authcred = NULL;
- 
-     *value = NULL;
- 
--- 
-2.33.0
-
diff --git a/util-Fix-memory-leak-in-virAuthGetCredential.patch b/util-Fix-memory-leak-in-virAuthGetCredential.patch
deleted file mode 100644
index 17a25e521fae128d0768d5a8f9b9217d6ca2b4f7..0000000000000000000000000000000000000000
--- a/util-Fix-memory-leak-in-virAuthGetCredential.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-From 1d0a80317f2bb3bc5e44c54cc7d49e44ac80b66f Mon Sep 17 00:00:00 2001
-From: John Ferlan <jferlan@redhat.com>
-Date: Tue, 16 Jun 2020 08:07:02 -0400
-Subject: [PATCH 005/108] util: Fix memory leak in virAuthGetCredential
-
-Since 5084091a, @tmp is filled by a g_key_file_get_string which is
-now an allocated string as opposed to some hash table lookup value,
-so we need to treat it as so.
-
-Found by Coverity
-
-Signed-off-by: John Ferlan <jferlan@redhat.com>
-Reviewed-by: Peter Krempa <pkrempa@redhat.com>
-(cherry picked from commit d585847d2e9c98ccb765027999824568c355ddc6)
----
- src/remote/remote_driver.c | 2 +-
- src/util/virauth.c         | 5 +----
- src/util/virauthconfig.c   | 2 +-
- src/util/virauthconfig.h   | 2 +-
- tests/virauthconfigtest.c  | 2 +-
- 5 files changed, 5 insertions(+), 8 deletions(-)
-
-diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
-index 1202d44017..7591263f6d 100644
---- a/src/remote/remote_driver.c
-+++ b/src/remote/remote_driver.c
-@@ -4097,7 +4097,7 @@ static int remoteAuthFillFromConfig(virConnectPtr conn,
-     }
- 
-     for (ninteract = 0; state->interact[ninteract].id != 0; ninteract++) {
--        const char *value = NULL;
-+        char *value = NULL;
- 
-         switch (state->interact[ninteract].id) {
-         case SASL_CB_USER:
-diff --git a/src/util/virauth.c b/src/util/virauth.c
-index f75e674586..105fca16eb 100644
---- a/src/util/virauth.c
-+++ b/src/util/virauth.c
-@@ -107,7 +107,6 @@ virAuthGetCredential(const char *servicename,
-                      char **value)
- {
-     g_autoptr(virAuthConfig) config = NULL;
--    const char *tmp;
- 
-     *value = NULL;
- 
-@@ -121,11 +120,9 @@ virAuthGetCredential(const char *servicename,
-                             servicename,
-                             hostname,
-                             credname,
--                            &tmp) < 0)
-+                            value) < 0)
-         return -1;
- 
--    *value = g_strdup(tmp);
--
-     return 0;
- }
- 
-diff --git a/src/util/virauthconfig.c b/src/util/virauthconfig.c
-index 0da9c2461f..2e50609531 100644
---- a/src/util/virauthconfig.c
-+++ b/src/util/virauthconfig.c
-@@ -99,7 +99,7 @@ int virAuthConfigLookup(virAuthConfigPtr auth,
-                         const char *service,
-                         const char *hostname,
-                         const char *credname,
--                        const char **value)
-+                        char **value)
- {
-     g_autofree char *authgroup = NULL;
-     g_autofree char *credgroup = NULL;
-diff --git a/src/util/virauthconfig.h b/src/util/virauthconfig.h
-index de28b1ff28..b6f5b5c110 100644
---- a/src/util/virauthconfig.h
-+++ b/src/util/virauthconfig.h
-@@ -37,6 +37,6 @@ int virAuthConfigLookup(virAuthConfigPtr auth,
-                         const char *service,
-                         const char *hostname,
-                         const char *credname,
--                        const char **value);
-+                        char **value);
- 
- G_DEFINE_AUTOPTR_CLEANUP_FUNC(virAuthConfig, virAuthConfigFree);
-diff --git a/tests/virauthconfigtest.c b/tests/virauthconfigtest.c
-index 20855f004e..a88b453543 100644
---- a/tests/virauthconfigtest.c
-+++ b/tests/virauthconfigtest.c
-@@ -42,7 +42,7 @@ struct ConfigLookupData {
- static int testAuthLookup(const void *args)
- {
-     const struct ConfigLookupData *data = args;
--    const char *actual = NULL;
-+    g_autofree char *actual = NULL;
-     int rv;
- 
-     rv = virAuthConfigLookup(data->config,
--- 
-2.33.0
-
diff --git a/util-Move-virIsDevMapperDevice-to-virdevmapper.c.patch b/util-Move-virIsDevMapperDevice-to-virdevmapper.c.patch
deleted file mode 100644
index 8f905a292abf2e1b1d1430e30bbe1d7b56f504f9..0000000000000000000000000000000000000000
--- a/util-Move-virIsDevMapperDevice-to-virdevmapper.c.patch
+++ /dev/null
@@ -1,176 +0,0 @@
-From 96025f7cddd4e04ce9409d14d109d1d71a497590 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michal=20Pr=C3=ADvozn=C3=ADk?= <mprivozn@redhat.com>
-Date: Thu, 14 Jan 2021 09:26:01 +0800
-Subject: [PATCH] util: Move virIsDevMapperDevice() to virdevmapper.c
-
-CVE-2020-14339
-
-When introducing virdevmapper.c (in v4.3.0-rc1~427) I didn't
-realize there is a function that calls in devmapper. The function
-is called virIsDevMapperDevice() and lives in virutil.c. Now that
-we have a special file for handling devmapper move it there.
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
-
-cherry-pick from commit dfa0e118f745fe3f4fe95975c6100f0fc6d788be
-Signed-off-by: Jiajie Li <lijiajie11@huawei.com>
----
- src/libvirt_private.syms           |  2 +-
- src/storage/parthelper.c           |  2 +-
- src/storage/storage_backend_disk.c |  1 +
- src/util/virdevmapper.c            | 24 ++++++++++++++++++++++++
- src/util/virdevmapper.h            |  3 +++
- src/util/virutil.c                 | 24 ------------------------
- src/util/virutil.h                 |  2 --
- 7 files changed, 30 insertions(+), 28 deletions(-)
-
-diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
-index e276f55bb1..bac96e140e 100644
---- a/src/libvirt_private.syms
-+++ b/src/libvirt_private.syms
-@@ -1931,6 +1931,7 @@ virDBusSetSharedBus;
- 
- # util/virdevmapper.h
- virDevMapperGetTargets;
-+virIsDevMapperDevice;
- 
- 
- # util/virdnsmasq.h
-@@ -3415,7 +3416,6 @@ virGetUserShell;
- virHostGetDRMRenderNode;
- virHostHasIOMMU;
- virIndexToDiskName;
--virIsDevMapperDevice;
- virMemoryLimitIsSet;
- virMemoryLimitTruncate;
- virMemoryMaxValue;
-diff --git a/src/storage/parthelper.c b/src/storage/parthelper.c
-index 761a7f93fc..812e90d3cb 100644
---- a/src/storage/parthelper.c
-+++ b/src/storage/parthelper.c
-@@ -36,10 +36,10 @@
- #include <sys/stat.h>
- #include <unistd.h>
- 
--#include "virutil.h"
- #include "virfile.h"
- #include "virstring.h"
- #include "virgettext.h"
-+#include "virdevmapper.h"
- 
- /* we don't need to include the full internal.h just for this */
- #define STREQ(a, b) (strcmp(a, b) == 0)
-diff --git a/src/storage/storage_backend_disk.c b/src/storage/storage_backend_disk.c
-index 35b07abbfe..eae23ec24a 100644
---- a/src/storage/storage_backend_disk.c
-+++ b/src/storage/storage_backend_disk.c
-@@ -32,6 +32,7 @@
- #include "virutil.h"
- #include "configmake.h"
- #include "virstring.h"
-+#include "virdevmapper.h"
- 
- #define VIR_FROM_THIS VIR_FROM_STORAGE
- 
-diff --git a/src/util/virdevmapper.c b/src/util/virdevmapper.c
-index 79dbc3d02a..600e1f6322 100644
---- a/src/util/virdevmapper.c
-+++ b/src/util/virdevmapper.c
-@@ -212,3 +212,27 @@ virDevMapperGetTargets(const char *path G_GNUC_UNUSED,
-     return -1;
- }
- #endif /* ! WITH_DEVMAPPER */
-+
-+
-+#if WITH_DEVMAPPER
-+bool
-+virIsDevMapperDevice(const char *dev_name)
-+{
-+    struct stat buf;
-+
-+    if (!stat(dev_name, &buf) &&
-+        S_ISBLK(buf.st_mode) &&
-+        dm_is_dm_major(major(buf.st_rdev)))
-+            return true;
-+
-+    return false;
-+}
-+
-+#else /* ! WITH_DEVMAPPER */
-+
-+bool
-+virIsDevMapperDevice(const char *dev_name G_GNUC_UNUSED)
-+{
-+    return false;
-+}
-+#endif /* ! WITH_DEVMAPPER */
-diff --git a/src/util/virdevmapper.h b/src/util/virdevmapper.h
-index 87bbc63cfd..834900692e 100644
---- a/src/util/virdevmapper.h
-+++ b/src/util/virdevmapper.h
-@@ -25,3 +25,6 @@
- int
- virDevMapperGetTargets(const char *path,
-                        char ***devPaths) G_GNUC_NO_INLINE;
-+
-+bool
-+virIsDevMapperDevice(const char *dev_name) ATTRIBUTE_NONNULL(1);
-diff --git a/src/util/virutil.c b/src/util/virutil.c
-index 5b52e4e6d4..bea9749cae 100644
---- a/src/util/virutil.c
-+++ b/src/util/virutil.c
-@@ -37,10 +37,6 @@
- 
- #include <sys/types.h>
- 
--#if WITH_DEVMAPPER
--# include <libdevmapper.h>
--#endif
--
- #ifdef HAVE_GETPWUID_R
- # include <pwd.h>
- # include <grp.h>
-@@ -1340,26 +1336,6 @@ void virWaitForDevices(void)
-     ignore_value(virCommandRun(cmd, &exitstatus));
- }
- 
--#if WITH_DEVMAPPER
--bool
--virIsDevMapperDevice(const char *dev_name)
--{
--    struct stat buf;
--
--    if (!stat(dev_name, &buf) &&
--        S_ISBLK(buf.st_mode) &&
--        dm_is_dm_major(major(buf.st_rdev)))
--            return true;
--
--    return false;
--}
--#else
--bool virIsDevMapperDevice(const char *dev_name G_GNUC_UNUSED)
--{
--    return false;
--}
--#endif
--
- bool
- virValidateWWN(const char *wwn)
- {
-diff --git a/src/util/virutil.h b/src/util/virutil.h
-index ee23f0c1f4..e4328564e4 100644
---- a/src/util/virutil.h
-+++ b/src/util/virutil.h
-@@ -114,8 +114,6 @@ bool virDoesUserExist(const char *name);
- bool virDoesGroupExist(const char *name);
- 
- 
--bool virIsDevMapperDevice(const char *dev_name) ATTRIBUTE_NONNULL(1);
--
- bool virValidateWWN(const char *wwn);
- 
- int virGetDeviceID(const char *path,
--- 
-2.27.0
-
diff --git a/util-Skip-over-any-extra-verbiage-preceding-version-.patch b/util-Skip-over-any-extra-verbiage-preceding-version-.patch
deleted file mode 100644
index 35c82265718ab74135ea986aa70c891a994871ce..0000000000000000000000000000000000000000
--- a/util-Skip-over-any-extra-verbiage-preceding-version-.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From bd463a77381e3233d3529fa445c0f57b7851006c Mon Sep 17 00:00:00 2001
-From: Laine Stump <laine@redhat.com>
-Date: Thu, 7 Jan 2021 20:03:05 -0500
-Subject: [PATCH 081/108] util: Skip over any extra verbiage preceding version
- in dnsmasq version string
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-dnsmasq usually prints out a version string like this:
-
- Dnsmasq version 2.82 [...]
-
-but a user reported that the build of dnsmasq included with pihole has
-a version string like this:
-
- Dnsmasq version pi-hole-2.81 [...]
-
-We parse the dnsmasq version number to figure out if the dnsmasq
-binary supports certain features. Since we expect the version number
-(and it must be only numbers!) to start on the first non-space after
-the string "Dnsmasq version", we fail to parse this format of the
-version string.
-
-Rather than spending a bunch of time trying to get pihole to change
-that, we can just make our parsing more permissive - after searching
-for "Dnsmasq version", we'll skip ahead to the first decimal digit,
-rather than just the first non-space.
-
-(NB: The features we're checking for purely by looking at version
-number have been in all releases of dnsmasq since at least 2012, so we
-could actually just remove the reading of the version number
-completely. However it's possible (although *highly* unlikely)
-that some new feature would be added to dnsmasq in the future and we
-would need to add that code back.)
-
-Resolves: https://gitlab.com/libvirt/libvirt/-/issues/29
-Signed-off-by: Laine Stump <laine@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit a4be2e35db39df87fe70a638cf64c32be74f1a55)
----
- src/util/virdnsmasq.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/util/virdnsmasq.c b/src/util/virdnsmasq.c
-index adc6f96bb6..5a329ae278 100644
---- a/src/util/virdnsmasq.c
-+++ b/src/util/virdnsmasq.c
-@@ -648,7 +648,9 @@ dnsmasqCapsSetFromBuffer(dnsmasqCapsPtr caps, const char *buf)
-     p = STRSKIP(buf, DNSMASQ_VERSION_STR);
-     if (!p)
-        goto fail;
--    virSkipSpaces(&p);
-+
-+    virSkipToDigit(&p);
-+
-     if (virParseVersionString(p, &caps->version, true) < 0)
-         goto fail;
- 
--- 
-2.33.0
-
diff --git a/util-avoid-race-in-releasing-the-GSource-in-event-th.patch b/util-avoid-race-in-releasing-the-GSource-in-event-th.patch
deleted file mode 100644
index 17b44e4012ab09394e8450c84ee40ec02dd78efd..0000000000000000000000000000000000000000
--- a/util-avoid-race-in-releasing-the-GSource-in-event-th.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-From 55e288946ccda11131fd36a3f62c4c91ad93dde1 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
-Date: Wed, 29 Jul 2020 17:51:53 +0100
-Subject: [PATCH 001/108] util: avoid race in releasing the GSource in event
- thread
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-There is a race between  vir_event_thread_finalize and
-virEventThreadWorker in releasing the last reference on
-the GMainContext. If virEventThreadDataFree() runs after
-vir_event_thread_finalize releases its reference, then
-it will release the last reference on the GMainContext.
-As a result g_autoptr cleanup on the GSource will access
-free'd memory.
-
-The race can be seen in non-deterministic crashes of the
-virt-run-qemu program during its shutdown, but could
-also likely affect the main libvirtd QEMU driver:
-
-  Thread 2 (Thread 0x7f508ffff700 (LWP 222813)):
-  #0  0x00007f509c8e26b0 in malloc_consolidate (av=av@entry=0x7f5088000020) at malloc.c:4488
-  #1  0x00007f509c8e4b08 in _int_malloc (av=av@entry=0x7f5088000020, bytes=bytes@entry=2048) at malloc.c:3711
-  #2  0x00007f509c8e6412 in __GI___libc_malloc (bytes=2048) at malloc.c:3073
-  #3  0x00007f509d6e925e in g_realloc (mem=0x0, n_bytes=2048) at gmem.c:164
-  #4  0x00007f509d705a57 in g_string_maybe_expand (string=string@entry=0x7f5088001f20, len=len@entry=1024) at gstring.c:102
-  #5  0x00007f509d705ab6 in g_string_sized_new (dfl_size=dfl_size@entry=1024) at gstring.c:127
-  #6  0x00007f509d708c5e in g_test_log_dump (len=<synthetic pointer>, msg=<synthetic pointer>) at gtestutils.c:3330
-  #7  0x00007f509d708c5e in g_test_log
-      (lbit=G_TEST_LOG_ERROR, string1=0x7f508800fcb0 "GLib:ERROR:ghash.c:377:g_hash_table_lookup_node: assertion failed: (hash_table->ref_count > 0)", string2=<optimized out>, n_args=0, largs=0x0) at gtestutils.c:975
-  #8  0x00007f509d70af2a in g_assertion_message
-      (domain=<optimized out>, file=0x7f509d7324a2 "ghash.c", line=<optimized out>, func=0x7f509d732750 <__func__.11348> "g_hash_table_lookup_node", message=<optimized out>)
-      at gtestutils.c:2504
-  #9  0x00007f509d70af8e in g_assertion_message_expr
-      (domain=domain@entry=0x7f509d72d76e "GLib", file=file@entry=0x7f509d7324a2 "ghash.c", line=line@entry=377, func=func@entry=0x7f509d732750 <__func__.11348> "g_hash_table_lookup_node", expr=expr@entry=0x7f509d732488 "hash_table->ref_count > 0") at gtestutils.c:2555
-  #10 0x00007f509d6d197e in g_hash_table_lookup_node (hash_table=0x55b70ace1760, key=<optimized out>, hash_return=<synthetic pointer>) at ghash.c:377
-  #11 0x00007f509d6d197e in g_hash_table_lookup_node (hash_return=<synthetic pointer>, key=<optimized out>, hash_table=0x55b70ace1760) at ghash.c:361
-  #12 0x00007f509d6d197e in g_hash_table_remove_internal (hash_table=0x55b70ace1760, key=<optimized out>, notify=1) at ghash.c:1371
-  #13 0x00007f509d6e0664 in g_source_unref_internal (source=0x7f5088000b60, context=0x55b70ad87e00, have_lock=0) at gmain.c:2103
-  #14 0x00007f509d6e1f64 in g_source_unref (source=<optimized out>) at gmain.c:2176
-  #15 0x00007f50a08ff84c in glib_autoptr_cleanup_GSource (_ptr=<synthetic pointer>) at /usr/include/glib-2.0/glib/glib-autocleanups.h:58
-  #16 0x00007f50a08ff84c in virEventThreadWorker (opaque=0x55b70ad87f80) at ../../src/util/vireventthread.c:114
-  #17 0x00007f509d70bd4a in g_thread_proxy (data=0x55b70acf3850) at gthread.c:784
-  #18 0x00007f509d04714a in start_thread (arg=<optimized out>) at pthread_create.c:479
-  #19 0x00007f509c95cf23 in clone () at ../sysdeps/unix/sysv/linux/x86_64/clone.S:95
-
-  Thread 1 (Thread 0x7f50a1380c00 (LWP 222802)):
-  #0  0x00007f509c8977ff in __GI_raise (sig=sig@entry=6) at ../sysdeps/unix/sysv/linux/raise.c:50
-  #1  0x00007f509c881c35 in __GI_abort () at abort.c:79
-  #2  0x00007f509d72a823 in g_mutex_clear (mutex=0x55b70ad87e00) at gthread-posix.c:1307
-  #3  0x00007f509d72a823 in g_mutex_clear (mutex=mutex@entry=0x55b70ad87e00) at gthread-posix.c:1302
-  #4  0x00007f509d6e1a84 in g_main_context_unref (context=0x55b70ad87e00) at gmain.c:582
-  #5  0x00007f509d6e1a84 in g_main_context_unref (context=0x55b70ad87e00) at gmain.c:541
-  #6  0x00007f50a08ffabb in vir_event_thread_finalize (object=0x55b70ad83180 [virEventThread]) at ../../src/util/vireventthread.c:50
-  #7  0x00007f509d9c48a9 in g_object_unref (_object=<optimized out>) at gobject.c:3340
-  #8  0x00007f509d9c48a9 in g_object_unref (_object=0x55b70ad83180) at gobject.c:3232
-
-  #9  0x00007f509583d311 in qemuProcessQMPFree (proc=proc@entry=0x55b70ad87b90) at ../../src/qemu/qemu_process.c:8355
-  #10 0x00007f5095790f58 in virQEMUCapsInitQMPSingle
-      (qemuCaps=qemuCaps@entry=0x55b70ad88010, libDir=libDir@entry=0x55b70ad049e0 "/tmp/virt-qemu-run-VZC9N0/lib/qemu", runUid=runUid@entry=107, runGid=runGid@entry=107, onlyTCG=onlyTCG@entry=false) at ../../src/qemu/qemu_capabilities.c:5409
-  #11 0x00007f509579108f in virQEMUCapsInitQMP (runGid=107, runUid=107, libDir=0x55b70ad049e0 "/tmp/virt-qemu-run-VZC9N0/lib/qemu", qemuCaps=0x55b70ad88010)
-      at ../../src/qemu/qemu_capabilities.c:5420
-  #12 0x00007f509579108f in virQEMUCapsNewForBinaryInternal
-      (hostArch=VIR_ARCH_X86_64, binary=binary@entry=0x55b70ad7dc40 "/usr/libexec/qemu-kvm", libDir=0x55b70ad049e0 "/tmp/virt-qemu-run-VZC9N0/lib/qemu", runUid=107, runGid=107, hostCPUSignature=0x55b70ad01320 "GenuineIntel, Intel(R) Xeon(R) Silver 4210 CPU @ 2.20GHz, family: 6, model: 85, stepping: 7", microcodeVersion=83898113, kernelVersion=0x55b70ad00d60 "4.18.0-211.el8.x86_64 #1 SMP Thu Jun 4 08:08:16 UTC 2020") at ../../src/qemu/qemu_capabilities.c:5472
-  #13 0x00007f5095791373 in virQEMUCapsNewData (binary=0x55b70ad7dc40 "/usr/libexec/qemu-kvm", privData=0x55b70ad5b8f0) at ../../src/qemu/qemu_capabilities.c:5505
-  #14 0x00007f50a09a32b1 in virFileCacheNewData (name=0x55b70ad7dc40 "/usr/libexec/qemu-kvm", cache=<optimized out>) at ../../src/util/virfilecache.c:208
-  #15 0x00007f50a09a32b1 in virFileCacheValidate (cache=cache@entry=0x55b70ad5c030, name=name@entry=0x55b70ad7dc40 "/usr/libexec/qemu-kvm", data=data@entry=0x7ffca39ffd90)
-      at ../../src/util/virfilecache.c:277
-  #16 0x00007f50a09a37ea in virFileCacheLookup (cache=cache@entry=0x55b70ad5c030, name=name@entry=0x55b70ad7dc40 "/usr/libexec/qemu-kvm") at ../../src/util/virfilecache.c:310
-  #17 0x00007f5095791627 in virQEMUCapsCacheLookup (cache=0x55b70ad5c030, binary=0x55b70ad7dc40 "/usr/libexec/qemu-kvm") at ../../src/qemu/qemu_capabilities.c:5647
-  #18 0x00007f50957c34c3 in qemuDomainPostParseDataAlloc (def=<optimized out>, parseFlags=<optimized out>, opaque=<optimized out>, parseOpaque=0x7ffca39ffe18)
-      at ../../src/qemu/qemu_domain.c:5470
-  #19 0x00007f50a0a34051 in virDomainDefPostParse
-      (def=def@entry=0x55b70ad7d200, parseFlags=parseFlags@entry=258, xmlopt=xmlopt@entry=0x55b70ad5d010, parseOpaque=parseOpaque@entry=0x0)
-      at ../../src/conf/domain_conf.c:5970
-  #20 0x00007f50a0a464bb in virDomainDefParseNode
-      (xml=xml@entry=0x55b70aced140, root=root@entry=0x55b70ad5f020, xmlopt=xmlopt@entry=0x55b70ad5d010, parseOpaque=parseOpaque@entry=0x0, flags=flags@entry=258)
-      at ../../src/conf/domain_conf.c:22520
-  #21 0x00007f50a0a4669b in virDomainDefParse
-      (xmlStr=xmlStr@entry=0x55b70ad5f9e0 "<domain type='kvm'>\n  <name>83</name>\n  <uuid>9350639d-1c8a-4f51-a4a6-4eaf8eabe83e</uuid>\n  <metadata>\n    <libosinfo:libosinfo xmlns:libosinfo=\"http://libosinfo.org/xmlns/libvirt/domain/1.0\">\n      <"..., filename=filename@entry=0x0, xmlopt=0x55b70ad5d010, parseOpaque=parseOpaque@entry=0x0, flags=flags@entry=258) at ../../src/conf/domain_conf.c:22474
-  #22 0x00007f50a0a467ae in virDomainDefParseString
-      (xmlStr=xmlStr@entry=0x55b70ad5f9e0 "<domain type='kvm'>\n  <name>83</name>\n  <uuid>9350639d-1c8a-4f51-a4a6-4eaf8eabe83e</uuid>\n  <metadata>\n    <libosinfo:libosinfo xmlns:libosinfo=\"http://libosinfo.org/xmlns/libvirt/domain/1.0\">\n      <"..., xmlopt=<optimized out>, parseOpaque=parseOpaque@entry=0x0, flags=flags@entry=258)
-      at ../../src/conf/domain_conf.c:22488
-  #23 0x00007f50958ce112 in qemuDomainCreateXML
-      (conn=0x55b70acf9090, xml=0x55b70ad5f9e0 "<domain type='kvm'>\n  <name>83</name>\n  <uuid>9350639d-1c8a-4f51-a4a6-4eaf8eabe83e</uuid>\n  <metadata>\n    <libosinfo:libosinfo xmlns:libosinfo=\"http://libosinfo.org/xmlns/libvirt/domain/1.0\">\n      <"..., flags=0) at ../../src/qemu/qemu_driver.c:1744
-  #24 0x00007f50a0c268ac in virDomainCreateXML
-      (conn=0x55b70acf9090, xmlDesc=0x55b70ad5f9e0 "<domain type='kvm'>\n  <name>83</name>\n  <uuid>9350639d-1c8a-4f51-a4a6-4eaf8eabe83e</uuid>\n  <metadata>\n    <libosinfo:libosinfo xmlns:libosinfo=\"http://libosinfo.org/xmlns/libvirt/domain/1.0\">\n      <"..., flags=0) at ../../src/libvirt-domain.c:176
-  #25 0x000055b709547e7b in main (argc=<optimized out>, argv=<optimized out>) at ../../src/qemu/qemu_shim.c:289
-
-The solution is to explicitly unref the GSource at a safe time instead
-of letting g_autoptr unref it when leaving scope.
-
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
-(cherry picked from commit 2998ba2012ea7997f2b233b2b81879fea3ee1b6a)
----
- src/util/vireventthread.c | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/src/util/vireventthread.c b/src/util/vireventthread.c
-index cf865925eb..485672278a 100644
---- a/src/util/vireventthread.c
-+++ b/src/util/vireventthread.c
-@@ -111,7 +111,11 @@ static void *
- virEventThreadWorker(void *opaque)
- {
-     virEventThreadData *data = opaque;
--    g_autoptr(GSource) running = g_idle_source_new();
-+    /*
-+     * Do NOT use g_autoptr on this. We need to unref it
-+     * before the GMainContext is unrefed
-+     */
-+    GSource *running = g_idle_source_new();
- 
-     g_source_set_callback(running, virEventThreadNotify, data, NULL);
- 
-@@ -119,6 +123,7 @@ virEventThreadWorker(void *opaque)
- 
-     g_main_loop_run(data->loop);
- 
-+    g_source_unref(running);
-     virEventThreadDataFree(data);
- 
-     return NULL;
--- 
-2.33.0
-
diff --git a/util-event-check-return-value-of-virInitialize.patch b/util-event-check-return-value-of-virInitialize.patch
deleted file mode 100644
index bccea8b6fca0b112ee3d1182c8d30c7550408285..0000000000000000000000000000000000000000
--- a/util-event-check-return-value-of-virInitialize.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From c8f1809df2bc40720415a6043f86aabaecd1490e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
-Date: Tue, 22 Sep 2020 23:17:18 +0200
-Subject: [PATCH 030/108] util: event: check return value of virInitialize
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This function can possibly fail.
-
-Signed-off-by: Ján Tomko <jtomko@redhat.com>
-Fixes: 2e07a1e14635ad25c57b66c13488feff4c8d2b0c
-Reviewed-by: Peter Krempa <pkrempa@redhat.com>
-(cherry picked from commit a95fc756271d2371c5ae947840458c572d83fd13)
----
- src/util/virevent.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/util/virevent.c b/src/util/virevent.c
-index 3477d63554..f6eb806faf 100644
---- a/src/util/virevent.c
-+++ b/src/util/virevent.c
-@@ -305,7 +305,8 @@ int virEventRegisterDefaultImpl(void)
- {
-     VIR_DEBUG("registering default event implementation");
- 
--    virInitialize();
-+    if (virInitialize() < 0)
-+        return -1;
- 
-     virResetLastError();
- 
--- 
-2.33.0
-
diff --git a/util-fix-cache-invalidation-of-swtpm-capabilities.patch b/util-fix-cache-invalidation-of-swtpm-capabilities.patch
deleted file mode 100644
index 731331a111693a846ada91dfabce02aa26808237..0000000000000000000000000000000000000000
--- a/util-fix-cache-invalidation-of-swtpm-capabilities.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 7aee8a63e2ad8aac9fc0c0902e1c6e406a6b149f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= <berrange@redhat.com>
-Date: Wed, 24 Nov 2021 10:56:02 +0000
-Subject: [PATCH 105/108] util: fix cache invalidation of swtpm capabilities
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The check for whether the swtpm binary was modified is checking pointers
-to the mtime field in two distinct structs, so will always compare
-different. This resulted in re-probing swtpm capabilities every time,
-as many as 20 times for a single VM launch.
-
-Fixes:
-
-  commit 01cf7a1bb9f1da27ad8bcbaa82c4f7a948c6a793
-  Author: Stefan Berger <stefanb@us.ibm.com>
-  Date:   Thu Jul 25 14:22:04 2019 -0400
-
-    tpm: Check whether previously found executables were updated
-
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Martin Kletzander <mkletzan@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
-(cherry picked from commit e18fff6c85485e45ea17385862b80af9dc37383e)
----
- src/util/virtpm.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/util/virtpm.c b/src/util/virtpm.c
-index 1a61a92f69..79e1c3cd6a 100644
---- a/src/util/virtpm.c
-+++ b/src/util/virtpm.c
-@@ -298,7 +298,7 @@ virTPMEmulatorInit(void)
-                 findit = true;
- 
-             if (!findit &&
--                &statbuf.st_mtime != &prgs[i].stat->st_mtime)
-+                statbuf.st_mtime != prgs[i].stat->st_mtime)
-                 findit = true;
-         }
- 
--- 
-2.33.0
-
diff --git a/util-fix-syslog-facility-value.patch b/util-fix-syslog-facility-value.patch
deleted file mode 100644
index 1283d3c21005a212a6c1bf6e38d715443a3d4687..0000000000000000000000000000000000000000
--- a/util-fix-syslog-facility-value.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From aaff56af24b3931e08b28a994a4953c1a0d1851b Mon Sep 17 00:00:00 2001
-From: wangmeiyang <wangmeiyang_yewu@cmss.chinamobile.com>
-Date: Wed, 23 Nov 2022 17:16:24 +0800
-Subject: [PATCH 05/23] util: fix syslog facility value
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-We set SYSLOG_PRIORITY when sending to journald to avoid our
-messages getting tagged with the default facility which is
-used for the kernel.
-
-Unfortunately:
-
-  commit fd00f0e6c75b00c3d97be8670afcd9094b823855
-  Author: Guido Günther <agx@sigxcpu.org>
-  Date:   Mon Sep 21 20:06:55 2015 +0200
-
-    Use daemon log facility for journald
-
-used the LOG_nnn constants from the syslog header without realizing
-that these values have a bit-shift applied. While Linux defines a
-LOG_FAC() macros to undo the bit-shift this doesn't appear to be
-standardized. So the safe thing is to just use the raw value since
-these values are fixed by RFC 5424.
-
-cherry-pick from 017fa1e097769455c0cd8929760cf9ff52a556ec
-
-Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
-Signed-off-by: Meiyang Wang <wangmeiyang@cmss.chinamobile.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/virlog.c | 9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/src/util/virlog.c b/src/util/virlog.c
-index e4944d1258..07d4eb4123 100644
---- a/src/util/virlog.c
-+++ b/src/util/virlog.c
-@@ -932,7 +932,14 @@ virLogOutputToJournald(virLogSourcePtr source,
-     journalAddString(&state, "MESSAGE", rawstr);
-     journalAddInt(&state, "PRIORITY",
-                   virLogPrioritySyslog(priority));
--    journalAddInt(&state, "SYSLOG_FACILITY", LOG_DAEMON);
-+    /* See RFC 5424 section 6.2.1
-+     *
-+     * Don't use LOG_nnn constants as those have a bit-shift
-+     * applied for use with syslog()  API, while journald
-+     * needs the raw value
-+     */
-+    journalAddInt(&state, "SYSLOG_FACILITY", 3);
-+
-     journalAddString(&state, "LIBVIRT_SOURCE", source->name);
-     if (filename)
-         journalAddString(&state, "CODE_FILE", filename);
--- 
-2.27.0
-
diff --git a/util-fix-very-old-bug-typo-in-virNetDevParseVfInfo.patch b/util-fix-very-old-bug-typo-in-virNetDevParseVfInfo.patch
deleted file mode 100644
index 8ef70af3773af2fd926a795d4498e7da1895625d..0000000000000000000000000000000000000000
--- a/util-fix-very-old-bug-typo-in-virNetDevParseVfInfo.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 416267baaa37a7ada0b9fc0f78c7d9be3df3c52e Mon Sep 17 00:00:00 2001
-From: Laine Stump <laine@redhat.com>
-Date: Tue, 20 Oct 2020 22:31:27 -0400
-Subject: [PATCH 073/108] util: fix very old bug/typo in virNetDevParseVfInfo()
-
-When this function was recently changed to add in parsing of
-IFLA_VF_STATS, I noticed that the checks for existence of IFLA_VF_MAC
-and IFLA_VF_VLAN were looking in the *wrong array*. The array that
-contains the results of parsing each IFLA_VFINFO in
-tb[IFLA_VFINFO_LIST] is tb_vf, but we were checking for these in tb
-(which is the array containing the results of the toplevel parsing of
-the netlink message, *not* the results of parsing one of the nested
-IFLA_VFINFO's.
-
-This incorrect code has been here since the function was originally
-written in 2012. It has only worked all these years due to coincidence
-- the items at those indexes in tb are IFLA_ADDRESS and IFLA_BROADCAST
-(of the *PF*, not of any of its VFs), and those happen to always be
-present in the toplevel netlink message; since we are only looking in
-the incorrect place to check for mere existence of the attribute (but
-are doing the actual retrieval of the attribute from the correct
-place), this bug has no real consequences other than confusing anyone
-trying to understand the code.
-
-Signed-off-by: Laine Stump <laine@redhat.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-(cherry picked from commit 6bd4505dea60b66203d82b3636bc9c51a557629f)
----
- src/util/virnetdev.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c
-index ff86aa1fc9..950844b110 100644
---- a/src/util/virnetdev.c
-+++ b/src/util/virnetdev.c
-@@ -1713,7 +1713,7 @@ virNetDevParseVfConfig(struct nlattr **tb, int32_t vf, virMacAddrPtr mac,
-             return rc;
-         }
- 
--        if (mac && tb[IFLA_VF_MAC]) {
-+        if (mac && tb_vf[IFLA_VF_MAC]) {
-             vf_mac = RTA_DATA(tb_vf[IFLA_VF_MAC]);
-             if (vf_mac && vf_mac->vf == vf)  {
-                 virMacAddrSetRaw(mac, vf_mac->mac);
-@@ -1721,7 +1721,7 @@ virNetDevParseVfConfig(struct nlattr **tb, int32_t vf, virMacAddrPtr mac,
-             }
-         }
- 
--        if (vlanid && tb[IFLA_VF_VLAN]) {
-+        if (vlanid && tb_vf[IFLA_VF_VLAN]) {
-             vf_vlan = RTA_DATA(tb_vf[IFLA_VF_VLAN]);
-             if (vf_vlan && vf_vlan->vf == vf)  {
-                 *vlanid = vf_vlan->vlan;
--- 
-2.33.0
-
diff --git a/util-json-Introduce-virJSONValueObjectAppendStringPr.patch b/util-json-Introduce-virJSONValueObjectAppendStringPr.patch
deleted file mode 100644
index 7f63b0e99d993bec1109ff8a95ac4b5d2beb1549..0000000000000000000000000000000000000000
--- a/util-json-Introduce-virJSONValueObjectAppendStringPr.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From 0924902c3814677f9f328f521a95d4a79635d81a Mon Sep 17 00:00:00 2001
-From: Peter Krempa <pkrempa@redhat.com>
-Date: Thu, 14 May 2020 08:09:56 +0200
-Subject: [PATCH 04/18] util: json: Introduce
- virJSONValueObjectAppendStringPrintf
-
-Add a variant similar to virJSONValueObjectAppendString which also
-formats more complex value strings with printf syntax.
-
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Eric Blake <eblake@redhat.com>
----
- src/libvirt_private.syms |  1 +
- src/util/virjson.c       | 17 +++++++++++++++++
- src/util/virjson.h       |  2 ++
- 3 files changed, 20 insertions(+)
-
-diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
-index 84f3bd57ca..726e7a21f9 100644
---- a/src/libvirt_private.syms
-+++ b/src/libvirt_private.syms
-@@ -2349,6 +2349,7 @@ virJSONValueObjectAppendNumberLong;
- virJSONValueObjectAppendNumberUint;
- virJSONValueObjectAppendNumberUlong;
- virJSONValueObjectAppendString;
-+virJSONValueObjectAppendStringPrintf;
- virJSONValueObjectCreate;
- virJSONValueObjectCreateVArgs;
- virJSONValueObjectDeflatten;
-diff --git a/src/util/virjson.c b/src/util/virjson.c
-index dc662bf8e9..6921eccb60 100644
---- a/src/util/virjson.c
-+++ b/src/util/virjson.c
-@@ -649,6 +649,23 @@ virJSONValueObjectAppendString(virJSONValuePtr object,
- }
- 
- 
-+int
-+virJSONValueObjectAppendStringPrintf(virJSONValuePtr object,
-+                                     const char *key,
-+                                     const char *fmt,
-+                                     ...)
-+{
-+    va_list ap;
-+    g_autofree char *str = NULL;
-+
-+    va_start(ap, fmt);
-+    str = g_strdup_vprintf(fmt, ap);
-+    va_end(ap);
-+
-+    return virJSONValueObjectInsertString(object, key, str, false);
-+}
-+
-+
- int
- virJSONValueObjectPrependString(virJSONValuePtr object,
-                                 const char *key,
-diff --git a/src/util/virjson.h b/src/util/virjson.h
-index 0894e91b59..588c977650 100644
---- a/src/util/virjson.h
-+++ b/src/util/virjson.h
-@@ -127,6 +127,8 @@ int virJSONValueObjectGetBoolean(virJSONValuePtr object, const char *key, bool *
- int virJSONValueObjectIsNull(virJSONValuePtr object, const char *key);
- 
- int virJSONValueObjectAppendString(virJSONValuePtr object, const char *key, const char *value);
-+int virJSONValueObjectAppendStringPrintf(virJSONValuePtr object, const char *key, const char *fmt, ...)
-+    G_GNUC_PRINTF(3, 4);
- int virJSONValueObjectPrependString(virJSONValuePtr object, const char *key, const char *value);
- int virJSONValueObjectAppendNumberInt(virJSONValuePtr object, const char *key, int number);
- int virJSONValueObjectAppendNumberUint(virJSONValuePtr object, const char *key, unsigned int number);
--- 
-2.23.0.windows.1
-
diff --git a/util-json-Replace-virJSONValueObjectSteal-by-virJSON.patch b/util-json-Replace-virJSONValueObjectSteal-by-virJSON.patch
deleted file mode 100644
index b776156533476392ad74b07aabe20d4638aec1a7..0000000000000000000000000000000000000000
--- a/util-json-Replace-virJSONValueObjectSteal-by-virJSON.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From bca866e875d4f1a4f02f792201cf5e46cdafe4f5 Mon Sep 17 00:00:00 2001
-From: Peter Krempa <pkrempa@redhat.com>
-Date: Mon, 30 Nov 2020 14:59:38 +0100
-Subject: [PATCH 06/16] util: json: Replace virJSONValueObjectSteal by
- virJSONValueObjectRemoveKey
-
-virJSONValueObjectRemoveKey can be used as direct replacement. Fix the
-one caller and remove the duplicate function.
-
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
----
- src/util/virjson.c | 29 ++++-------------------------
- 1 file changed, 4 insertions(+), 25 deletions(-)
-
-diff --git a/src/util/virjson.c b/src/util/virjson.c
-index 6921eccb60..6626e78255 100644
---- a/src/util/virjson.c
-+++ b/src/util/virjson.c
-@@ -888,30 +888,6 @@ virJSONValueObjectGet(virJSONValuePtr object,
- }
- 
- 
--static virJSONValuePtr
--virJSONValueObjectSteal(virJSONValuePtr object,
--                        const char *key)
--{
--    size_t i;
--    virJSONValuePtr obj = NULL;
--
--    if (object->type != VIR_JSON_TYPE_OBJECT)
--        return NULL;
--
--    for (i = 0; i < object->data.object.npairs; i++) {
--        if (STREQ(object->data.object.pairs[i].key, key)) {
--            obj = g_steal_pointer(&object->data.object.pairs[i].value);
--            VIR_FREE(object->data.object.pairs[i].key);
--            VIR_DELETE_ELEMENT(object->data.object.pairs, i,
--                               object->data.object.npairs);
--            break;
--        }
--    }
--
--    return obj;
--}
--
--
- /* Return the value associated with KEY within OBJECT, but return NULL
-  * if the key is missing or if value is not the correct TYPE.  */
- virJSONValuePtr
-@@ -934,7 +910,10 @@ virJSONValueObjectStealByType(virJSONValuePtr object,
-                               const char *key,
-                               virJSONType type)
- {
--    virJSONValuePtr value = virJSONValueObjectSteal(object, key);
-+    virJSONValuePtr value;
-+
-+    if (virJSONValueObjectRemoveKey(object, key, &value) <= 0)
-+        return NULL;
- 
-     if (value && value->type == type)
-         return value;
--- 
-2.27.0
-
diff --git a/util-new-function-virSkipToDigit.patch b/util-new-function-virSkipToDigit.patch
deleted file mode 100644
index 9da7aa6c018ffceef70cc6c938a1d124ad18c368..0000000000000000000000000000000000000000
--- a/util-new-function-virSkipToDigit.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From 6282c4e163751149ade6d5407229644fd41d5fbb Mon Sep 17 00:00:00 2001
-From: Laine Stump <laine@redhat.com>
-Date: Thu, 7 Jan 2021 19:55:43 -0500
-Subject: [PATCH 080/108] util: new function virSkipToDigit()
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This function skips over the beginning of a string until it reaches a
-decimal digit (0-9) or the NULL at the end of the string. The original
-pointer is modified in place (similar to virSkipSpaces()).
-
-Signed-off-by: Laine Stump <laine@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 0e89a7b4e0defb2b3711c1e854a51d296d7b6f7f)
----
- src/libvirt_private.syms |  1 +
- src/util/virstring.c     | 18 ++++++++++++++++++
- src/util/virstring.h     |  1 +
- 3 files changed, 20 insertions(+)
-
-diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
-index 997039868e..4d54c5e42f 100644
---- a/src/libvirt_private.syms
-+++ b/src/libvirt_private.syms
-@@ -3172,6 +3172,7 @@ virStorageFileBackendRegister;
- virSkipSpaces;
- virSkipSpacesAndBackslash;
- virSkipSpacesBackwards;
-+virSkipToDigit;
- virStrcpy;
- virStringBufferIsPrintable;
- virStringFilterChars;
-diff --git a/src/util/virstring.c b/src/util/virstring.c
-index e9e792f3bf..56c5e37def 100644
---- a/src/util/virstring.c
-+++ b/src/util/virstring.c
-@@ -817,6 +817,24 @@ virSkipSpacesAndBackslash(const char **str)
-     *str = cur;
- }
- 
-+
-+/**
-+ * virSkipToDigit:
-+ * @str: pointer to the char pointer used
-+ *
-+ * Skip over any character that is not 0-9
-+ */
-+void
-+virSkipToDigit(const char **str)
-+{
-+    const char *cur = *str;
-+
-+    while (*cur && !g_ascii_isdigit(*cur))
-+        cur++;
-+    *str = cur;
-+}
-+
-+
- /**
-  * virTrimSpaces:
-  * @str: string to modify to remove all trailing spaces
-diff --git a/src/util/virstring.h b/src/util/virstring.h
-index 360c68395c..878da86c33 100644
---- a/src/util/virstring.h
-+++ b/src/util/virstring.h
-@@ -117,6 +117,7 @@ int virDoubleToStr(char **strp, double number)
- 
- void virSkipSpaces(const char **str) ATTRIBUTE_NONNULL(1);
- void virSkipSpacesAndBackslash(const char **str) ATTRIBUTE_NONNULL(1);
-+void virSkipToDigit(const char **str) ATTRIBUTE_NONNULL(1);
- void virTrimSpaces(char *str, char **endp) ATTRIBUTE_NONNULL(1);
- void virSkipSpacesBackwards(const char *str, char **endp)
-     ATTRIBUTE_NONNULL(1) ATTRIBUTE_NONNULL(2);
--- 
-2.33.0
-
diff --git a/util-set-facility-when-opening-syslog-channel.patch b/util-set-facility-when-opening-syslog-channel.patch
deleted file mode 100644
index 21e5a8b6e4c62ef674550ba47cdac7d1c1b449db..0000000000000000000000000000000000000000
--- a/util-set-facility-when-opening-syslog-channel.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 20d0e6064cf81240dac3cccc89c2bd299cca210d Mon Sep 17 00:00:00 2001
-From: wangmeiyang <wangmeiyang_yewu@cmss.chinamobile.com>
-Date: Wed, 23 Nov 2022 17:25:58 +0800
-Subject: [PATCH 06/23] util: set facility when opening syslog channel
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-We're currently passing '0' which leaves the syslog facility
-unset. Since we're passing an explicit facility for syslog
-when using journald, it makes sense to be explicit when
-using  syslog directly too.
-
-cherry-pick from ab96031943d494010166875f399656a6c13aadf5
-
-Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
-Signed-off-by: Meiyang Wang <wangmeiyang@cmss.chinamobile.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/virlog.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/util/virlog.c b/src/util/virlog.c
-index e4944d1258..1b510389da 100644
---- a/src/util/virlog.c
-+++ b/src/util/virlog.c
-@@ -1411,7 +1411,7 @@ virLogDefineOutputs(virLogOutputPtr *outputs, size_t noutputs)
-         tmp = g_strdup(outputs[id]->name);
-         VIR_FREE(current_ident);
-         current_ident = tmp;
--        openlog(current_ident, 0, 0);
-+        openlog(current_ident, 0, LOG_DAEMON);
-     }
- #endif /* HAVE_SYSLOG_H */
- 
--- 
-2.27.0
-
diff --git a/util-virExec-may-blocked-by-reading-pipe-if-grandchi.patch b/util-virExec-may-blocked-by-reading-pipe-if-grandchi.patch
deleted file mode 100644
index 2bd7ef4e6894163466a05b6f2178555c3ea32980..0000000000000000000000000000000000000000
--- a/util-virExec-may-blocked-by-reading-pipe-if-grandchi.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 5122e578df1760c5e576682e3f84a1d18dbfca5d Mon Sep 17 00:00:00 2001
-From: Xu Chao <xu.chao6@zte.com.cn>
-Date: Wed, 24 Nov 2021 10:33:11 +0800
-Subject: [PATCH 104/108] util: virExec may blocked by reading pipe if
- grandchild prematurely exit
-
-When VIR_EXEC_DAEMON is set, if virPidFileAcquirePath/virSetInherit failed,
-then pipesync[0] can not be closed when granchild process exit, because
-pipesync[1] still opened in child process. and then saferead in child
-process may blocked forever, and left grandchild process in defunct state.
-
-Signed-off-by: Xu Chao <xu.chao6@zte.com.cn>
-Signed-off-by: Yi Wang <wang.yi59@zte.com.cn>
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-(cherry picked from commit 6fac961b085af51340246bf51205a9f2f1615962)
----
- src/util/vircommand.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/util/vircommand.c b/src/util/vircommand.c
-index 8ab83cb8f5..bb824bf60f 100644
---- a/src/util/vircommand.c
-+++ b/src/util/vircommand.c
-@@ -775,6 +775,10 @@ virExec(virCommandPtr cmd)
-         }
- 
-         if (pid > 0) {
-+            /* At this point it's us and the child that holds the write end of
-+             * the pipe open. Close the write end of the pipe, so that the pipe
-+             * is fully closed if child dies prematurely. */
-+            VIR_FORCE_CLOSE(pipesync[1]);
-             /* The parent expect us to have written the pid file before
-              * exiting. Wait here for the child to write it and signal us. */
-             if (cmd->pidfile &&
--- 
-2.33.0
-
diff --git a/util-virIdentitySetCurrent-only-unref-the-old-identi.patch b/util-virIdentitySetCurrent-only-unref-the-old-identi.patch
deleted file mode 100644
index 0c3191ed75fff9eb519644427c6fb27f6beed98a..0000000000000000000000000000000000000000
--- a/util-virIdentitySetCurrent-only-unref-the-old-identi.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 8a06893a603f32791899314fd16afdd424e77e6a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
-Date: Fri, 3 Sep 2021 16:04:44 +0200
-Subject: [PATCH 100/108] util: virIdentitySetCurrent: only unref the old
- identity on success
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-In the unlikely case that we were unable to set the new
-identity, we would unref the old one even though it still
-could be in the thread-local storage.
-
-Fixes: c6825d88137cb8e4debdf4310e45ee23cb5698c0
-Signed-off-by: Ján Tomko <jtomko@redhat.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-(cherry picked from commit a082c462290bfa8fd4cbbc41c1d6040864228c78)
----
- src/util/viridentity.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/util/viridentity.c b/src/util/viridentity.c
-index 2cb9042a84..e133d29e7d 100644
---- a/src/util/viridentity.c
-+++ b/src/util/viridentity.c
-@@ -122,7 +122,7 @@ virIdentityPtr virIdentityGetCurrent(void)
-  */
- int virIdentitySetCurrent(virIdentityPtr ident)
- {
--    g_autoptr(virIdentity) old = NULL;
-+    virIdentity *old = NULL;
- 
-     if (virIdentityInitialize() < 0)
-         return -1;
-@@ -138,6 +138,8 @@ int virIdentitySetCurrent(virIdentityPtr ident)
-         return -1;
-     }
- 
-+    if (old)
-+        g_object_unref(old);
-     return 0;
- }
- 
--- 
-2.33.0
-
diff --git a/util-virqemu-Introduce-virQEMUBuildNetdevCommandline.patch b/util-virqemu-Introduce-virQEMUBuildNetdevCommandline.patch
deleted file mode 100644
index 299725dedc3d47e5c71b0fead1eeeb8c52342bcd..0000000000000000000000000000000000000000
--- a/util-virqemu-Introduce-virQEMUBuildNetdevCommandline.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From b9ff1a5a81df23f0a138a7f6d7d3ab0654f669e2 Mon Sep 17 00:00:00 2001
-From: Peter Krempa <pkrempa@redhat.com>
-Date: Thu, 14 May 2020 10:10:16 +0200
-Subject: [PATCH 03/18] util: virqemu: Introduce
- virQEMUBuildNetdevCommandlineFromJSON
-
-In preparation for converting the generator of -netdev to generate JSON
-which will be used to do the command line rather than the other way
-around we need to introduce a convertor which properly configures
-virQEMUBuildCommandLineJSON for the quirks of -netdev.
-
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Eric Blake <eblake@redhat.com>
----
- src/libvirt_private.syms |  1 +
- src/util/virqemu.c       | 22 ++++++++++++++++++++++
- src/util/virqemu.h       |  3 +++
- 3 files changed, 26 insertions(+)
-
-diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
-index bac96e140e..84f3bd57ca 100644
---- a/src/libvirt_private.syms
-+++ b/src/libvirt_private.syms
-@@ -2902,6 +2902,7 @@ virQEMUBuildCommandLineJSON;
- virQEMUBuildCommandLineJSONArrayBitmap;
- virQEMUBuildCommandLineJSONArrayNumbered;
- virQEMUBuildDriveCommandlineFromJSON;
-+virQEMUBuildNetdevCommandlineFromJSON;
- virQEMUBuildObjectCommandlineFromJSON;
- virQEMUBuildQemuImgKeySecretOpts;
- 
-diff --git a/src/util/virqemu.c b/src/util/virqemu.c
-index 549f88fcd5..0f8cab29df 100644
---- a/src/util/virqemu.c
-+++ b/src/util/virqemu.c
-@@ -252,6 +252,28 @@ virQEMUBuildCommandLineJSON(virJSONValuePtr value,
- }
- 
- 
-+/**
-+ * virQEMUBuildNetdevCommandlineFromJSON:
-+ * @props: JSON properties describing a netdev
-+ *
-+ * Converts @props into arguments for -netdev including all the quirks and
-+ * differences between the monitor and command line syntax.
-+ */
-+char *
-+virQEMUBuildNetdevCommandlineFromJSON(virJSONValuePtr props)
-+{
-+    const char *type = virJSONValueObjectGetString(props, "type");
-+    g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
-+
-+    virBufferAsprintf(&buf, "%s,", type);
-+
-+    if (virQEMUBuildCommandLineJSON(props, &buf, "type", true, NULL) < 0)
-+        return NULL;
-+
-+    return virBufferContentAndReset(&buf);
-+}
-+
-+
- static int
- virQEMUBuildObjectCommandlineFromJSONInternal(virBufferPtr buf,
-                                               const char *type,
-diff --git a/src/util/virqemu.h b/src/util/virqemu.h
-index 67a5711613..22f47851df 100644
---- a/src/util/virqemu.h
-+++ b/src/util/virqemu.h
-@@ -49,6 +49,9 @@ int virQEMUBuildCommandLineJSON(virJSONValuePtr value,
-                                 bool onOff,
-                                 virQEMUBuildCommandLineJSONArrayFormatFunc array);
- 
-+char *
-+virQEMUBuildNetdevCommandlineFromJSON(virJSONValuePtr props);
-+
- int virQEMUBuildObjectCommandlineFromJSON(virBufferPtr buf,
-                                           virJSONValuePtr objprops);
- 
--- 
-2.23.0.windows.1
-
diff --git a/vahDeinit-Fix-memory-leak.patch b/vahDeinit-Fix-memory-leak.patch
deleted file mode 100644
index 73c74efaaf4c48e2112a6f3c32c0907d1acd6d0b..0000000000000000000000000000000000000000
--- a/vahDeinit-Fix-memory-leak.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From adc93f772bd3552be91ca53cf62bb81e9c6737e2 Mon Sep 17 00:00:00 2001
-From: Tim Wiederhake <twiederh@redhat.com>
-Date: Thu, 22 Apr 2021 15:07:33 +0200
-Subject: [PATCH 051/108] vahDeinit: Fix memory leak
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Calling VIR_FREE on a virDomainDef* does not free its various contained
-pointers.
-
-Signed-off-by: Tim Wiederhake <twiederh@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Signed-off-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 9ac2ca799a48388ac1d3c561b99bfbe039d17cca)
----
- src/security/virt-aa-helper.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/security/virt-aa-helper.c b/src/security/virt-aa-helper.c
-index 8526b7b985..9c9b844146 100644
---- a/src/security/virt-aa-helper.c
-+++ b/src/security/virt-aa-helper.c
-@@ -78,7 +78,7 @@ vahDeinit(vahControl * ctl)
-     if (ctl == NULL)
-         return -1;
- 
--    VIR_FREE(ctl->def);
-+    virDomainDefFree(ctl->def);
-     virObjectUnref(ctl->caps);
-     virObjectUnref(ctl->xmlopt);
-     VIR_FREE(ctl->files);
--- 
-2.33.0
-
diff --git a/vbox_network-fix-possible-memory-leak-in-vboxNetwork.patch b/vbox_network-fix-possible-memory-leak-in-vboxNetwork.patch
deleted file mode 100644
index cff67fafbc3fff31b339504182a667eb1ff52326..0000000000000000000000000000000000000000
--- a/vbox_network-fix-possible-memory-leak-in-vboxNetwork.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From ecac0391e48796b570d540212629205889cab421 Mon Sep 17 00:00:00 2001
-From: wangmeiyang <wangmeiyang_yewu@cmss.chinamobile.com>
-Date: Thu, 1 Dec 2022 09:21:05 +0800
-Subject: [PATCH 22/24] vbox_network: fix possible memory leak in
- vboxNetworkDefineCreateXML()
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-virNetworkDef was not freed if the function failed in the first
-two ifs, causing a possible memory leak.
-
-cherry-pick from ef83940524c1138dde616004be6cad5095b94001
-
-Signed-off-by: Kristina Hanicova <khanicov@redhat.com>
-Signed-off-by: Ján Tomko <jtomko@redhat.com>
-Signed-off-by: Meiyang Wang <wangmeiyang_yewu@cmss.chinamobile.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/vbox/vbox_network.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/vbox/vbox_network.c b/src/vbox/vbox_network.c
-index 19b4d23ed8..dbee9a6f55 100644
---- a/src/vbox/vbox_network.c
-+++ b/src/vbox/vbox_network.c
-@@ -375,7 +375,7 @@ vboxNetworkDefineCreateXML(virConnectPtr conn, const char *xml, bool start)
-     PRUnichar *networkNameUtf16 = NULL;
-     char *networkNameUtf8 = NULL;
-     IHostNetworkInterface *networkInterface = NULL;
--    virNetworkDefPtr def = virNetworkDefParseString(xml, NULL);
-+    virNetworkDef *def = NULL;
-     virNetworkIPDefPtr ipdef = NULL;
-     unsigned char uuid[VIR_UUID_BUFLEN];
-     vboxIID vboxnetiid;
-@@ -393,7 +393,7 @@ vboxNetworkDefineCreateXML(virConnectPtr conn, const char *xml, bool start)
- 
-     VBOX_IID_INITIALIZE(&vboxnetiid);
- 
--    if ((!def) ||
-+    if (!(def = virNetworkDefParseString(xml, NULL)) ||
-         (def->forward.type != VIR_NETWORK_FORWARD_NONE) ||
-         (def->nips == 0 || !def->ips))
-         goto cleanup;
--- 
-2.27.0
-
diff --git a/vdpa-support-vdpa-device-hot-plug-unplug.patch b/vdpa-support-vdpa-device-hot-plug-unplug.patch
index 5890c6fe91e505aa1680b10748d7683143dd63ef..a845b3d48771f6d7d1015f25221741b9ea3a1ec6 100644
--- a/vdpa-support-vdpa-device-hot-plug-unplug.patch
+++ b/vdpa-support-vdpa-device-hot-plug-unplug.patch
@@ -1,90 +1,84 @@
-From 9033b938d402c3eb2cbc13b3dc2a87b191b03aed Mon Sep 17 00:00:00 2001
+From 399548b72ba5630981db3ac434c9d2c7a46fa5e7 Mon Sep 17 00:00:00 2001
 From: AlexChen <alex.chen@huawei.com>
-Date: Sat, 25 Nov 2023 09:51:46 +0800
+Date: Fri, 29 Mar 2024 16:16:09 +0800
 Subject: [PATCH] vdpa: support vdpa device hot plug/unplug
 
 support vdpa device hot plug/unplug
 
-Signed-off-by: jiangdongxu <jiangdongxu1@huawei.com>
 Signed-off-by: AlexChen <alex.chen@huawei.com>
 ---
- src/qemu/qemu_hotplug.c | 95 +++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 95 insertions(+)
+ src/qemu/qemu_hotplug.c | 84 +++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 84 insertions(+)
 
 diff --git a/src/qemu/qemu_hotplug.c b/src/qemu/qemu_hotplug.c
-index e13879cde3..3c5540291b 100644
+index 29c0856f62..87353d2149 100644
 --- a/src/qemu/qemu_hotplug.c
 +++ b/src/qemu/qemu_hotplug.c
-@@ -2907,6 +2907,89 @@ qemuDomainAttachMediatedDevice(virQEMUDriverPtr driver,
+@@ -2761,6 +2761,82 @@ qemuDomainAttachMediatedDevice(virQEMUDriver *driver,
+     return ret;
  }
  
- 
 +static int
-+qemuDomainAttachVDPADevice(virQEMUDriverPtr driver,
-+                           virDomainObjPtr vm,
-+                           virDomainHostdevDefPtr hostdev)
++qemuDomainAttachVDPADevice(virQEMUDriver *driver,
++                           virDomainObj *vm,
++                           virDomainHostdevDef *hostdev)
 +{
 +    int ret = -1;
-+    g_autofree char *devstr = NULL;
++    g_autoptr(virJSONValue) devprops = NULL;
 +    bool teardowncgroup = false;
 +    bool teardownlabel = false;
 +    bool teardowndevice = false;
 +    bool teardownmemlock = false;
 +    bool releaseaddr = false;
-+    qemuDomainObjPrivatePtr priv = vm->privateData;
++    qemuDomainObjPrivate *priv = vm->privateData;
 +    virDomainDeviceDef dev = { VIR_DOMAIN_DEVICE_HOSTDEV,
 +                               { .hostdev = hostdev } };
 +
-+    if (qemuDomainNamespaceSetupHostdev(vm, hostdev) < 0)
-+        goto error;
-+    teardowndevice = true;
++    if (qemuDomainNamespaceSetupHostdev(vm, hostdev, &teardowndevice) < 0)
++        goto cleanup;
 +
 +    if (qemuSetupHostdevCgroup(vm, hostdev) < 0)
-+        goto error;
++        goto cleanup;
 +    teardowncgroup = true;
 +
 +    if (qemuSecuritySetHostdevLabel(driver, vm, hostdev) < 0)
-+        goto error;
++        goto cleanup;
 +    teardownlabel = true;
 +
-+    if (qemuDomainEnsurePCIAddress(vm, &dev, driver) < 0)
-+        goto error;
++    if (qemuDomainEnsurePCIAddress(vm, &dev) < 0)
++        goto cleanup;
 +    releaseaddr = true;
 +
-+    if (qemuAssignDeviceHostdevAlias(vm->def, &hostdev->info->alias, -1) < 0)
-+        goto error;
++    qemuAssignDeviceHostdevAlias(vm->def, &hostdev->info->alias, -1);
 +
 +    if (!virDomainObjIsActive(vm)) {
 +        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
 +                       _("guest unexpectedly quit during hotplug"));
-+        goto error;
++        goto cleanup;
 +    }
 +
-+    if (!(devstr = qemuBuildHostdevVDPAStr(vm->def, hostdev, priv->qemuCaps)))
-+        goto error;
++    if (!(devprops = qemuBuildHostdevVDPADevProps(hostdev)))
++        goto cleanup;
 +
-+    if (VIR_REALLOC_N(vm->def->hostdevs, vm->def->nhostdevs + 1) < 0)
-+        goto error;
++    VIR_REALLOC_N(vm->def->hostdevs, vm->def->nhostdevs + 1);
 +
 +    if (qemuDomainAdjustMaxMemLockHostdev(vm, hostdev) < 0)
-+        goto error;
++        goto cleanup;
 +    teardownmemlock = true;
 +
-+    qemuDomainObjEnterMonitor(driver, vm);
-+    ret = qemuMonitorAddDevice(priv->mon, devstr);
-+    if (qemuDomainObjExitMonitor(driver, vm) < 0) {
-+        goto error;
-+    }
++    qemuDomainObjEnterMonitor(vm);
++    ret = qemuMonitorAddDeviceProps(priv->mon, &devprops);
++    qemuDomainObjExitMonitor(vm);
 +
 +    virDomainAuditHostdev(vm, hostdev, "attach", ret == 0);
 +    if (ret < 0)
-+        goto error;
++        goto cleanup;
 +
 +    vm->def->hostdevs[vm->def->nhostdevs++] = hostdev;
 +
 +    return 0;
 +
-+ error:
++ cleanup:
 +    if (teardowncgroup && qemuTeardownHostdevCgroup(vm, hostdev) < 0)
 +        VIR_WARN("Unable to remove host device cgroup ACL on hotplug fail");
 +    if (teardownlabel &&
@@ -93,58 +87,45 @@ index e13879cde3..3c5540291b 100644
 +    if (teardowndevice &&
 +        qemuDomainNamespaceTeardownHostdev(vm, hostdev) < 0)
 +        VIR_WARN("Unable to remove host device from /dev");
-+    if (teardownmemlock && qemuDomainAdjustMaxMemLock(vm, false) < 0)
++    if (teardownmemlock && qemuDomainAdjustMaxMemLock(vm) < 0)
 +        VIR_WARN("Unable to reset maximum locked memory on hotplug fail");
 +    if (releaseaddr)
 +        qemuDomainReleaseDeviceAddress(vm, hostdev->info);
 +
 +    return -1;
 +}
-+
-+
- int
- qemuDomainAttachHostDevice(virQEMUDriverPtr driver,
-                            virDomainObjPtr vm,
-@@ -2947,6 +3030,11 @@ qemuDomainAttachHostDevice(virQEMUDriverPtr driver,
-             return -1;
+ 
+ static int
+ qemuDomainAttachHostDevice(virQEMUDriver *driver,
+@@ -2806,6 +2882,9 @@ qemuDomainAttachHostDevice(virQEMUDriver *driver,
          break;
  
-+    case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_VDPA:
+     case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_VDPA:
 +        if (qemuDomainAttachVDPADevice(driver, vm, hostdev) < 0)
 +            return -1;
 +        break;
-+
+     case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_LAST:
      default:
          virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-                        _("hotplug is not supported for hostdev subsys type '%s'"),
-@@ -4564,6 +4652,7 @@ qemuDomainRemoveHostDevice(virQEMUDriverPtr driver,
-     case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_MDEV:
-         qemuDomainRemoveMediatedDevice(driver, vm, hostdev);
-         break;
-+    case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_VDPA:
-     case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_LAST:
-         break;
-     }
-@@ -5397,6 +5486,7 @@ qemuDomainDetachPrepHostdev(virDomainObjPtr vm,
-     virDomainHostdevSubsysPCIPtr pcisrc = &subsys->u.pci;
-     virDomainHostdevSubsysSCSIPtr scsisrc = &subsys->u.scsi;
-     virDomainHostdevSubsysMediatedDevPtr mdevsrc = &subsys->u.mdev;
-+    virDomainHostdevSubsysVDPAPtr vdpasrc = &subsys->u.vdpa;
-     virDomainHostdevDefPtr hostdev = NULL;
+@@ -5689,6 +5768,7 @@ qemuDomainDetachPrepHostdev(virDomainObj *vm,
+     virDomainHostdevSubsysPCI *pcisrc = &subsys->u.pci;
+     virDomainHostdevSubsysSCSI *scsisrc = &subsys->u.scsi;
+     virDomainHostdevSubsysMediatedDev *mdevsrc = &subsys->u.mdev;
++    virDomainHostdevSubsysVDPA *vdpasrc = &subsys->u.vdpa;
+     virDomainHostdevDef *hostdev = NULL;
      int idx;
  
-@@ -5454,6 +5544,11 @@ qemuDomainDetachPrepHostdev(virDomainObjPtr vm,
-             break;
+@@ -5746,6 +5826,10 @@ qemuDomainDetachPrepHostdev(virDomainObj *vm,
          case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI_HOST:
              break;
-+        case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_VDPA:
+         case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_VDPA:
 +            virReportError(VIR_ERR_DEVICE_MISSING,
 +                           _("vdpa device '%s' not found"),
 +                           vdpasrc->devpath);
 +            break;
+         case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_LAST:
          default:
              virReportError(VIR_ERR_INTERNAL_ERROR,
-                            _("unexpected hostdev type %d"), subsys->type);
 -- 
 2.27.0
 
diff --git a/vdpa-support-vdpa-device-migrate.patch b/vdpa-support-vdpa-device-migrate.patch
index 1bb57d9f7f50b0d120526e845d5fff7e85c60003..9befadfe901199bd0cf2c7a1f1fc3eb3530ea611 100644
--- a/vdpa-support-vdpa-device-migrate.patch
+++ b/vdpa-support-vdpa-device-migrate.patch
@@ -1,4 +1,4 @@
-From 9c99d1cfbcd12f4def9a836b62c6f0c044aecb86 Mon Sep 17 00:00:00 2001
+From a74ff9ceea076a92a4dd3b9b26a31f14c513da0a Mon Sep 17 00:00:00 2001
 From: AlexChen <alex.chen@huawei.com>
 Date: Sat, 25 Nov 2023 09:55:08 +0800
 Subject: [PATCH] vdpa: support vdpa device migrate
@@ -8,16 +8,16 @@ support vdpa device migrate
 Signed-off-by: jiangdongxu <jiangdongxu1@huawei.com>
 Signed-off-by: AlexChen <alex.chen@huawei.com>
 ---
- src/qemu/qemu_migration.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
+ src/qemu/qemu_migration.c | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
 
 diff --git a/src/qemu/qemu_migration.c b/src/qemu/qemu_migration.c
-index c2a694eff1..04b9333fae 100644
+index 0a89d102df..9c7eea0d6d 100644
 --- a/src/qemu/qemu_migration.c
 +++ b/src/qemu/qemu_migration.c
-@@ -1114,7 +1114,8 @@ qemuMigrationSrcIsAllowedHostdev(const virDomainDef *def)
+@@ -1304,14 +1304,13 @@ qemuMigrationSrcIsAllowedHostdev(const virDomainDef *def)
          case VIR_DOMAIN_HOSTDEV_MODE_SUBSYS:
-             switch ((virDomainHostdevSubsysType)hostdev->source.subsys.type) {
+             switch (hostdev->source.subsys.type) {
              case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB:
 -                /* USB devices can be "migrated" */
 +            case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_VDPA:
@@ -25,6 +25,13 @@ index c2a694eff1..04b9333fae 100644
                  continue;
  
              case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI:
+             case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI_HOST:
+             case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_MDEV:
+-                /* The vDPA devices don't support migration for now */
+-            case VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_VDPA:
+                 virReportError(VIR_ERR_OPERATION_UNSUPPORTED,
+                                _("cannot migrate a domain with <hostdev mode='subsystem' type='%1$s'>"),
+                                virDomainHostdevSubsysTypeToString(hostdev->source.subsys.type));
 -- 
 2.27.0
 
diff --git a/virBufferAdd-Ensure-that-the-buffer-is-initialized-a.patch b/virBufferAdd-Ensure-that-the-buffer-is-initialized-a.patch
deleted file mode 100644
index e0d5237b25d21f8f49ec2e58ab5b703a94d6aaba..0000000000000000000000000000000000000000
--- a/virBufferAdd-Ensure-that-the-buffer-is-initialized-a.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 56b44fe637c040187338b51a401d8cc2f1d60612 Mon Sep 17 00:00:00 2001
-From: Peter Krempa <pkrempa@redhat.com>
-Date: Thu, 4 Mar 2021 18:09:42 +0100
-Subject: [PATCH 018/108] virBufferAdd: Ensure that the buffer is initialized
- also when len == 0
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-There's an optimization in virBufferAdd which returns early when the
-length of the added string is 0 (given that auto-indent is disabled).
-
-The optimization causes inconsistent behaviour between these two cases:
-
- virBufferAdd(buf, "", 0);  // this doesn't initialize the buffer
-
-and
-
- virBufferAdd(buf, "", -1); //this initializes the buffer
-
-Since using an empty string is used to prime the buffer to an empty
-string it can be confusing. Remove the optimization.
-
-This fixes such a wrong initialization done in x86FeatureNames.
-
-Note that our code in many places expects that if no virBuffer APIs are
-used on a buffer object, then NULL should be retured, so we can't always
-prime the buffer to an empty string.
-
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 1553e7256701c725cf87bafa5d738da16f278c3d)
----
- src/util/virbuffer.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/util/virbuffer.c b/src/util/virbuffer.c
-index b78c3debe9..1fd055f77d 100644
---- a/src/util/virbuffer.c
-+++ b/src/util/virbuffer.c
-@@ -156,7 +156,7 @@ virBufferApplyIndent(virBufferPtr buf)
- void
- virBufferAdd(virBufferPtr buf, const char *str, int len)
- {
--    if (!str || !buf || (len == 0 && buf->indent == 0))
-+    if (!str || !buf)
-         return;
- 
-     virBufferInitialize(buf);
--- 
-2.33.0
-
diff --git a/virCPUDefFindFeature-Make-first-argument-const-ptr.patch b/virCPUDefFindFeature-Make-first-argument-const-ptr.patch
deleted file mode 100644
index e7a53ce4e949d78883b57cf740cc034af692064e..0000000000000000000000000000000000000000
--- a/virCPUDefFindFeature-Make-first-argument-const-ptr.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 993e67d6fcd79d3fb9c96a805b8c3882206c3b2c Mon Sep 17 00:00:00 2001
-From: Tim Wiederhake <twiederh@redhat.com>
-Date: Tue, 23 Mar 2021 11:01:53 +0100
-Subject: [PATCH 092/108] virCPUDefFindFeature: Make first argument const ptr
-
-Signed-off-by: Tim Wiederhake <twiederh@redhat.com>
-Reviewed-by: Jiri Denemark <jdenemar@redhat.com
-(cherry picked from commit 1e1db6783636ac22faab91e1462d3b859b3ce605)
----
- src/conf/cpu_conf.c | 2 +-
- src/conf/cpu_conf.h | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c
-index 07404c6fb0..989306b1c0 100644
---- a/src/conf/cpu_conf.c
-+++ b/src/conf/cpu_conf.c
-@@ -935,7 +935,7 @@ virCPUDefAddFeature(virCPUDefPtr def,
- 
- 
- virCPUFeatureDefPtr
--virCPUDefFindFeature(virCPUDefPtr def,
-+virCPUDefFindFeature(const virCPUDef *def,
-                      const char *name)
- {
-     size_t i;
-diff --git a/src/conf/cpu_conf.h b/src/conf/cpu_conf.h
-index a95d56d017..1b297ed246 100644
---- a/src/conf/cpu_conf.h
-+++ b/src/conf/cpu_conf.h
-@@ -227,7 +227,7 @@ virCPUDefUpdateFeature(virCPUDefPtr cpu,
-                        int policy);
- 
- virCPUFeatureDefPtr
--virCPUDefFindFeature(virCPUDefPtr def,
-+virCPUDefFindFeature(const virCPUDef *def,
-                      const char *name);
- 
- int
--- 
-2.33.0
-
diff --git a/virCapabilitiesHostNUMAInitReal-Free-cpus-properly.patch b/virCapabilitiesHostNUMAInitReal-Free-cpus-properly.patch
deleted file mode 100644
index f819f97c45216d80d322649744f5bca4a5a10ccb..0000000000000000000000000000000000000000
--- a/virCapabilitiesHostNUMAInitReal-Free-cpus-properly.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 406e6587036e916c9fa5507e5bcb624ae394442d Mon Sep 17 00:00:00 2001
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Tue, 4 May 2021 08:21:59 +0200
-Subject: [PATCH 054/108] virCapabilitiesHostNUMAInitReal: Free @cpus properly
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The @cpus variable is an array of structs in which each item
-contains a virBitmap member. As such it is not enough to just
-VIR_FREE() the array - each bitmap has to be freed too.
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 26a24a702c47403effadb355b7e37f7cf5a488db)
----
- src/conf/capabilities.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c
-index 99b69aebb5..d6ec1f12f4 100644
---- a/src/conf/capabilities.c
-+++ b/src/conf/capabilities.c
-@@ -1690,6 +1690,7 @@ virCapabilitiesHostNUMAInitReal(virCapsHostNUMAPtr caps)
- 
-  cleanup:
-     virBitmapFree(cpumap);
-+    virCapabilitiesClearHostNUMACellCPUTopology(cpus, ncpus);
-     VIR_FREE(cpus);
-     VIR_FREE(siblings);
-     VIR_FREE(pageinfo);
--- 
-2.33.0
-
diff --git a/virCgroupKillRecursive-Return-1-on-failure-condition.patch b/virCgroupKillRecursive-Return-1-on-failure-condition.patch
deleted file mode 100644
index 00c765c8e4a3879c8eaf1c74f7e9a6e3d0382899..0000000000000000000000000000000000000000
--- a/virCgroupKillRecursive-Return-1-on-failure-condition.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 420abccb9e834938a5f03726559f044fb0aa426b Mon Sep 17 00:00:00 2001
-From: tangbinzy <tangbin_yewu@cmss.chinamobile.com>
-Date: Tue, 29 Nov 2022 09:36:57 +0000
-Subject: [PATCH 05/24] virCgroupKillRecursive: Return -1 on failure  condition
- virCgroupKillRecursive sneakily initializes 'ret' to 0 rather than the usual
- -1. 401030499bf moved an error condition but didn't actually modify 'ret'
- return the proper error code.
-
-Fixes: 401030499bf
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
-
-Signed-off-by: tangbin <tangbin_yewu@cmss.chinamobile.com>
-(cherry-pick from 0778cff2aedd1da142562c396d482335df18e620)
----
- src/util/vircgroup.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/util/vircgroup.c b/src/util/vircgroup.c
-index 70d85200cb..f52a8cc843 100644
---- a/src/util/vircgroup.c
-+++ b/src/util/vircgroup.c
-@@ -2613,6 +2613,7 @@ virCgroupKillRecursive(virCgroupPtr group, int signum)
-     if (!backends || !backendAvailable) {
-         virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-                        _("no cgroup backend available"));
-+        ret = -1;
-         goto cleanup;
-     }
- 
--- 
-2.27.0
-
diff --git a/virCommand-Introduce-virCommandGetArgList.patch b/virCommand-Introduce-virCommandGetArgList.patch
deleted file mode 100644
index 997ededa162c96c0d2a0db26102b97e915dac9c1..0000000000000000000000000000000000000000
--- a/virCommand-Introduce-virCommandGetArgList.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From 548ea1fcfcfbfc40fab04301e780d28ebe4320a4 Mon Sep 17 00:00:00 2001
-From: Peter Krempa <pkrempa@redhat.com>
-Date: Wed, 13 May 2020 17:55:21 +0200
-Subject: [PATCH 13/18] virCommand: Introduce virCommandGetArgList
-
-The helper returns a list of arguments of a virCommand. This will be
-useful in tests where we'll inspect certain already formatted arguments.
-
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Eric Blake <eblake@redhat.com>
----
- src/libvirt_private.syms |  1 +
- src/util/vircommand.c    | 23 +++++++++++++++++++++++
- src/util/vircommand.h    |  1 +
- 3 files changed, 25 insertions(+)
-
-diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
-index 726e7a21f9..861a4892be 100644
---- a/src/libvirt_private.syms
-+++ b/src/libvirt_private.syms
-@@ -1829,6 +1829,7 @@ virCommandDaemonize;
- virCommandDoAsyncIO;
- virCommandExec;
- virCommandFree;
-+virCommandGetArgList;
- virCommandGetGID;
- virCommandGetUID;
- virCommandHandshakeNotify;
-diff --git a/src/util/vircommand.c b/src/util/vircommand.c
-index b84fb40948..86e4c5cd39 100644
---- a/src/util/vircommand.c
-+++ b/src/util/vircommand.c
-@@ -2167,6 +2167,29 @@ virCommandToString(virCommandPtr cmd, bool linebreaks)
- }
- 
- 
-+int
-+virCommandGetArgList(virCommandPtr cmd,
-+                     char ***args,
-+                     size_t *nargs)
-+{
-+    size_t i;
-+
-+    if (cmd->has_error) {
-+        virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
-+                       _("invalid use of command API"));
-+        return -1;
-+    }
-+
-+    *args = g_new0(char *, cmd->nargs);
-+    *nargs = cmd->nargs - 1;
-+
-+    for (i = 1; i < cmd->nargs; i++)
-+        (*args)[i - 1] = g_strdup(cmd->args[i]);
-+
-+    return 0;
-+}
-+
-+
- #ifndef WIN32
- /*
-  * Manage input and output to the child process.
-diff --git a/src/util/vircommand.h b/src/util/vircommand.h
-index 4e6cb0ac0d..854bfe6576 100644
---- a/src/util/vircommand.h
-+++ b/src/util/vircommand.h
-@@ -171,6 +171,7 @@ void virCommandWriteArgLog(virCommandPtr cmd,
-                            int logfd);
- 
- char *virCommandToString(virCommandPtr cmd, bool linebreaks) G_GNUC_WARN_UNUSED_RESULT;
-+int virCommandGetArgList(virCommandPtr cmd, char ***args, size_t *nargs);
- 
- int virCommandExec(virCommandPtr cmd, gid_t *groups, int ngroups) G_GNUC_WARN_UNUSED_RESULT;
- 
--- 
-2.23.0.windows.1
-
diff --git a/virConnectDomainEventRegisterAny-correct-docs.patch b/virConnectDomainEventRegisterAny-correct-docs.patch
deleted file mode 100644
index e324fa94bc27f02b380d003b68de123dc20fcb67..0000000000000000000000000000000000000000
--- a/virConnectDomainEventRegisterAny-correct-docs.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 3a68d932c30efd54bbf2833f932adcfdc8a99876 Mon Sep 17 00:00:00 2001
-From: huangkai <huangkai101@huawei.com>
-Date: Tue, 2 Aug 2022 16:16:57 +0800
-Subject: [PATCH 14/22] virConnectDomainEventRegisterAny: correct docs
-
-The callback ID can be zero, not necessarily positive; correct the
-comment to reflect this.
-
-Signed-off-by: John Levon <levon@movementarian.org>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
----
- src/libvirt-domain.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/libvirt-domain.c b/src/libvirt-domain.c
-index 0ff99c94b6..6ce4a6715c 100644
---- a/src/libvirt-domain.c
-+++ b/src/libvirt-domain.c
-@@ -9281,7 +9281,7 @@ virDomainMigrateStartPostCopy(virDomainPtr domain,
-  * The reference can be released once the object is no longer required
-  * by calling virDomainFree().
-  *
-- * The return value from this method is a positive integer identifier
-+ * The return value from this method is a non-negative integer identifier
-  * for the callback. To unregister a callback, this callback ID should
-  * be passed to the virConnectDomainEventDeregisterAny() method.
-  *
--- 
-2.33.0
-
diff --git a/virDevMapperGetTargets-Don-t-ignore-EBADF.patch b/virDevMapperGetTargets-Don-t-ignore-EBADF.patch
deleted file mode 100644
index 03c250a163b81bef7d7577028fca6c44acd018e9..0000000000000000000000000000000000000000
--- a/virDevMapperGetTargets-Don-t-ignore-EBADF.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From e450ebb4c6eab1b7376a5ba873d10936ad563b75 Mon Sep 17 00:00:00 2001
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Thu, 23 Jul 2020 17:08:46 +0200
-Subject: [PATCH] virDevMapperGetTargets: Don't ignore EBADF
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
----
- src/qemu/qemu_cgroup.c | 2 +-
- src/qemu/qemu_domain.c | 4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/qemu/qemu_cgroup.c b/src/qemu/qemu_cgroup.c
-index 914bf640ca..e88da02341 100644
---- a/src/qemu/qemu_cgroup.c
-+++ b/src/qemu/qemu_cgroup.c
-@@ -87,7 +87,7 @@ qemuSetupImagePathCgroup(virDomainObjPtr vm,
-     }
- 
-     if (virDevMapperGetTargets(path, &targetPaths) < 0 &&
--        errno != ENOSYS && errno != EBADF) {
-+        errno != ENOSYS) {
-         virReportSystemError(errno,
-                              _("Unable to get devmapper targets for %s"),
-                              path);
-diff --git a/src/qemu/qemu_domain.c b/src/qemu/qemu_domain.c
-index 5b22eb2eaa..2058290870 100644
---- a/src/qemu/qemu_domain.c
-+++ b/src/qemu/qemu_domain.c
-@@ -10264,7 +10264,7 @@ qemuDomainSetupDisk(virQEMUDriverConfigPtr cfg G_GNUC_UNUSED,
-                 return -1;
- 
-             if (virDevMapperGetTargets(next->path, &targetPaths) < 0 &&
--                errno != ENOSYS && errno != EBADF) {
-+                errno != ENOSYS) {
-                 virReportSystemError(errno,
-                                      _("Unable to get devmapper targets for %s"),
-                                      next->path);
-@@ -11328,7 +11328,7 @@ qemuDomainNamespaceSetupDisk(virDomainObjPtr vm,
-             tmpPath = g_strdup(next->path);
- 
-             if (virDevMapperGetTargets(next->path, &targetPaths) < 0 &&
--                errno != ENOSYS && errno != EBADF) {
-+                errno != ENOSYS) {
-                 virReportSystemError(errno,
-                                      _("Unable to get devmapper targets for %s"),
-                                      next->path);
--- 
-2.27.0
-
diff --git a/virDomainCheckpointCreateXML-Don-t-use-HTML-in-funct.patch b/virDomainCheckpointCreateXML-Don-t-use-HTML-in-funct.patch
deleted file mode 100644
index 58616e3fbb7d1f4fa4a88940446ea346786ef3a7..0000000000000000000000000000000000000000
--- a/virDomainCheckpointCreateXML-Don-t-use-HTML-in-funct.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From b8b8276707d6bf8cba80f4f6359731f23db73ba6 Mon Sep 17 00:00:00 2001
-From: jipengfei <jipengfei_yewu@cmss.chinamobile.com>
-Date: Thu, 24 Nov 2022 18:03:56 +0800
-Subject: [PATCH 22/23] virDomainCheckpointCreateXML: Don't use HTML in
- function docs and fix link
-
-cherry-pick from 35fc11139ec9f077a30e1c8b97effc28f8822e9b
-
-Fix the link target after the conversion of the XML description to RST
-which renamed anchors and drop the <a> tag from the C code comment.
-Apart from not working properly in the .c file it didn't work in the
-generated docs either as the brackets were escaped.
-
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-Signed-off-by: jipengfei <jipengfei_yewu@cmss.chinamobile.com>
-Reviewed-by: Jonathon Jongsma <jjongsma@redhat.com>
----
- src/libvirt-domain-checkpoint.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/libvirt-domain-checkpoint.c b/src/libvirt-domain-checkpoint.c
-index 432c2d5a52..64bf5b323b 100644
---- a/src/libvirt-domain-checkpoint.c
-+++ b/src/libvirt-domain-checkpoint.c
-@@ -108,7 +108,7 @@ virDomainCheckpointGetConnect(virDomainCheckpointPtr checkpoint)
-  * kicking off a backup job with virDomainBackupBegin(); however, it
-  * is also possible to start a checkpoint without a backup.
-  *
-- * See <a href="formatcheckpoint.html#CheckpointAttributes">Checkpoint XML</a>
-+ * See https://www.libvirt.org/formatcheckpoint.html#checkpoint-xml
-  * for more details on @xmlDesc. In particular, some hypervisors may require
-  * particular disk formats, such as qcow2, in order to support this
-  * command; where @xmlDesc can be used to limit the checkpoint to a working
--- 
-2.27.0
-
diff --git a/virDomainInputDefValidate-Validate-model.patch b/virDomainInputDefValidate-Validate-model.patch
deleted file mode 100644
index 52a62d74da95c1ba0d983366b04285fe86f010d0..0000000000000000000000000000000000000000
--- a/virDomainInputDefValidate-Validate-model.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 5d17ae66252024451c1e9f30f348f5e223b26c72 Mon Sep 17 00:00:00 2001
-From: chenyuhui <chenyuhui5@huawei.com>
-Date: Tue, 2 Aug 2022 10:51:59 +0800
-Subject: [PATCH 19/22] virDomainInputDefValidate: Validate model
-
-If input device has one of virtio* models set then it has to go
-onto virtio bus. Introduce such check into the validator.
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2081981
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Martin Kletzander <mkletzan@redhat.com>
----
- src/conf/domain_conf.c | 21 +++++++++++++++++++++
- 1 file changed, 21 insertions(+)
-
-diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
-index 2d1726af8f..b8cf1adb98 100644
---- a/src/conf/domain_conf.c
-+++ b/src/conf/domain_conf.c
-@@ -6834,6 +6834,27 @@ virDomainInputDefValidate(const virDomainInputDef *input)
-             return -1;
-     }
- 
-+    switch ((virDomainInputModel)input->model) {
-+        case VIR_DOMAIN_INPUT_MODEL_VIRTIO:
-+        case VIR_DOMAIN_INPUT_MODEL_VIRTIO_TRANSITIONAL:
-+        case VIR_DOMAIN_INPUT_MODEL_VIRTIO_NON_TRANSITIONAL:
-+            if (input->bus != VIR_DOMAIN_INPUT_BUS_VIRTIO) {
-+                virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-+                               _("only bus 'virtio' is supported for input model '%s'"),
-+                               virDomainInputModelTypeToString(input->model));
-+                return -1;
-+            }
-+            break;
-+
-+        case VIR_DOMAIN_INPUT_MODEL_DEFAULT:
-+            break;
-+
-+        case VIR_DOMAIN_INPUT_MODEL_LAST:
-+        default:
-+            virReportEnumRangeError(virDomainInputModel, input->model);
-+            return -1;
-+    }
-+
-     return 0;
- }
- 
--- 
-2.33.0
-
diff --git a/virFileReadLimFD-Cast-maxlen-to-size_t-before-adding.patch b/virFileReadLimFD-Cast-maxlen-to-size_t-before-adding.patch
deleted file mode 100644
index b3749ce14db9060c43d753e694d804cd234da2bb..0000000000000000000000000000000000000000
--- a/virFileReadLimFD-Cast-maxlen-to-size_t-before-adding.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 6c70b9987df7b3c2e82b88513ad6f5ebbe87065a Mon Sep 17 00:00:00 2001
-From: Tim Wiederhake <twiederh@redhat.com>
-Date: Thu, 22 Jul 2021 10:30:21 +0200
-Subject: [PATCH 095/108] virFileReadLimFD: Cast maxlen to size_t before adding
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-If the function is called with maxlen equal to `INT_MAX`, adding
-one will trigger a signed integer overflow.
-
-Signed-off-by: Tim Wiederhake <twiederh@redhat.com>
-Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
-(cherry picked from commit 2ed93ed979170c3310ace5cdf75a99873ba9d317)
----
- src/util/virfile.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/util/virfile.c b/src/util/virfile.c
-index 20260a2e58..74eae7658e 100644
---- a/src/util/virfile.c
-+++ b/src/util/virfile.c
-@@ -1423,7 +1423,7 @@ virFileReadLimFD(int fd, int maxlen, char **buf)
-         errno = EINVAL;
-         return -1;
-     }
--    s = saferead_lim(fd, maxlen+1, &len);
-+    s = saferead_lim(fd, (size_t) maxlen + 1, &len);
-     if (s == NULL)
-         return -1;
-     if (len > maxlen || (int)len != len) {
--- 
-2.33.0
-
diff --git a/virInterfaceDefDevFormat-Add-missing-error-handling.patch b/virInterfaceDefDevFormat-Add-missing-error-handling.patch
deleted file mode 100644
index 55c1e17c94f85b7fdde2fc9ef0be1332818470f4..0000000000000000000000000000000000000000
--- a/virInterfaceDefDevFormat-Add-missing-error-handling.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 1a6d497e64f668d16e7e431bd93efc5436d48a07 Mon Sep 17 00:00:00 2001
-From: Bihong Yu <yubihong@huawei.com>
-Date: Wed, 12 Jan 2022 12:17:39 +0100
-Subject: [PATCH 01/22] virInterfaceDefDevFormat: Add missing error handling
-
-Add missing error handling for virInterfaceDefDevFormat.
-
-Signed-off-by: Tim Wiederhake <twiederh@redhat.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-Signed-off-by: Bihong Yu <yubihong@huawei.com>
----
- src/conf/interface_conf.c | 9 ++++++---
- 1 file changed, 6 insertions(+), 3 deletions(-)
-
-diff --git a/src/conf/interface_conf.c b/src/conf/interface_conf.c
-index d1732621b5..c0744c3899 100644
---- a/src/conf/interface_conf.c
-+++ b/src/conf/interface_conf.c
-@@ -1110,13 +1110,16 @@ virInterfaceDefDevFormat(virBufferPtr buf,
-                 virBufferAsprintf(buf, "<mac address='%s'/>\n", def->mac);
-             break;
-         case VIR_INTERFACE_TYPE_BRIDGE:
--            virInterfaceBridgeDefFormat(buf, def);
-+            if (virInterfaceBridgeDefFormat(buf, def) < 0)
-+                return -1;
-             break;
-         case VIR_INTERFACE_TYPE_BOND:
--            virInterfaceBondDefFormat(buf, def);
-+            if (virInterfaceBondDefFormat(buf, def) < 0)
-+                return -1;
-             break;
-         case VIR_INTERFACE_TYPE_VLAN:
--            virInterfaceVlanDefFormat(buf, def);
-+            if (virInterfaceVlanDefFormat(buf, def) < 0)
-+                return -1;
-             break;
-     }
- 
--- 
-2.33.0
-
diff --git a/virNWFilterObjListFree-Prevent-null-pointer-derefern.patch b/virNWFilterObjListFree-Prevent-null-pointer-derefern.patch
deleted file mode 100644
index b26a1716b2c32b46a31cd61e92ef780f78caf343..0000000000000000000000000000000000000000
--- a/virNWFilterObjListFree-Prevent-null-pointer-derefern.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 2153e7eb25d0ffd2b4af0776df8e089e7c503687 Mon Sep 17 00:00:00 2001
-From: huangkai <huangkai101@huawei.com>
-Date: Tue, 2 Aug 2022 16:26:13 +0800
-Subject: [PATCH 16/22] virNWFilterObjListFree: Prevent null pointer derefernce
-
-Allow virNWFilterObjListFree to be called with a NULL argument.
-This enables a later patch to use virNWFilterObjListFree as a
-cleanup function safely, as it is a no-op if virNWFilterObj was
-not yet initialized.
-
-Signed-off-by: Tim Wiederhake <twiederh@redhat.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
----
- src/conf/virnwfilterobj.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/src/conf/virnwfilterobj.c b/src/conf/virnwfilterobj.c
-index c9e224061d..cc59c0ea9d 100644
---- a/src/conf/virnwfilterobj.c
-+++ b/src/conf/virnwfilterobj.c
-@@ -108,6 +108,11 @@ void
- virNWFilterObjListFree(virNWFilterObjListPtr nwfilters)
- {
-     size_t i;
-+
-+    if (!nwfilters) {
-+        return;
-+    }
-+
-     for (i = 0; i < nwfilters->count; i++)
-         virNWFilterObjFree(nwfilters->objs[i]);
-     VIR_FREE(nwfilters->objs);
--- 
-2.33.0
-
diff --git a/virNetDevOpenvswitchUpdateVlan-Use-space-for-indenta.patch b/virNetDevOpenvswitchUpdateVlan-Use-space-for-indenta.patch
deleted file mode 100644
index f9eea1d2869a0ae56d77c1a0fa6225bdaf548e93..0000000000000000000000000000000000000000
--- a/virNetDevOpenvswitchUpdateVlan-Use-space-for-indenta.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 4bb06dc8104d886e7fa5bfdb7e32825e6cb50966 Mon Sep 17 00:00:00 2001
-From: liumengqiu <liumengqiu1@huawei.com>
-Date: Thu, 11 Aug 2022 21:19:22 +0800
-Subject: [PATCH 11/22] virNetDevOpenvswitchUpdateVlan: Use space for
- indentation
-
-Breaks syntax-check:
-
-TAB_in_indentation
-/home/pipo/libvirt/src/util/virnetdevopenvswitch.c:610: if (virtVlan && virtVlan->nTags > 0)
-/home/pipo/libvirt/src/util/virnetdevopenvswitch.c:611: virCommandAddArgList(cmd, "--", "--if-exists", "set", "Port", ifname, NULL);
-make: Leaving directory '/home/pipo/build/libvirt/gcc/build-aux'
-
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
----
- src/util/virnetdevopenvswitch.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/util/virnetdevopenvswitch.c b/src/util/virnetdevopenvswitch.c
-index 5de8c7f5cf..52feff7468 100644
---- a/src/util/virnetdevopenvswitch.c
-+++ b/src/util/virnetdevopenvswitch.c
-@@ -549,8 +549,8 @@ int virNetDevOpenvswitchUpdateVlan(const char *ifname,
-                          "--", "--if-exists", "clear", "Port", ifname, "trunk",
-                          "--", "--if-exists", "clear", "Port", ifname, "vlan_mode", NULL);
- 
--            if (virtVlan && virtVlan->nTags > 0)
--                       virCommandAddArgList(cmd, "--", "--if-exists", "set", "Port", ifname, NULL);
-+        if (virtVlan && virtVlan->nTags > 0)
-+                virCommandAddArgList(cmd, "--", "--if-exists", "set", "Port", ifname, NULL);
- 
-     if (virNetDevOpenvswitchConstructVlans(cmd, virtVlan) < 0)
-         return -1;
--- 
-2.33.0
-
diff --git a/virNetDevOpenvswitchUpdateVlan-fix-vlan-tag-update-e.patch b/virNetDevOpenvswitchUpdateVlan-fix-vlan-tag-update-e.patch
deleted file mode 100644
index a688ce4364ef755d4d5fab436b2860a4f75bf966..0000000000000000000000000000000000000000
--- a/virNetDevOpenvswitchUpdateVlan-fix-vlan-tag-update-e.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 3b5a24866bf5fae387de70be8cb65e29b31a3a6d Mon Sep 17 00:00:00 2001
-From: liumengqiu <liumengqiu1@huawei.com>
-Date: Thu, 11 Aug 2022 20:04:09 +0800
-Subject: [PATCH 10/22] virNetDevOpenvswitchUpdateVlan: fix vlan tag update
- error
-
-We try to update vlan tag by running virsh update-device command,
-libvirtd will report ovs-vsctl arguments error. Vlan tag update
-funtion does't consider the xml with no vlan configured circumstances.
-
-The steps to reproduce the problem:
-1 define and start domain with its vlan configured as:
-    <interface type='bridge'>
-      <mac address='52:54:00:9e:bb:ac'/>
-      <source bridge='ovs-br0'/>
-      <vlan>
-        <tag id='10'/>
-      </vlan>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='vnet4.0'/>
-      <model type='virtio'/>
-      <driver name='vhost'/>
-    </interface>
-2 define and run virsh update-device command with no vlan configured as:
-    <interface type='bridge'>
-      <mac address='52:54:00:9e:bb:ac'/>
-      <source bridge='ovs-br0'/>
-      <virtualport type='openvswitch'>
-      </virtualport>
-      <target dev='vnet4.0'/>
-      <model type='virtio'/>
-      <driver name='vhost'/>
-    </interface>
-   #virsh update-device dom-id novlan.xml
-3 virsh command returned error, and we got an error in libvirtd.log:
-  error : virCommandWait:2584 : internal error: exit status 1: ovs-vsctl: 'set' command requires at least 3 arguments
-  . Child process (ovs-vsctl --timeout=5 -- --if-exists clear Port vnet4.0 tag -- --if-exists clear Port vnet4.0 trunk
-  -- --if-exists clear Port vnet4.0 vlan_mode -- --if-exists set Port vnet4.0) unexpected
-  error : virNetDevOpenvswitchUpdateVlan:540 : internal error: Unable to set vlan configuration on port vnet4.0
-
-Signed-off-by: Tu Qiang <tu.qiang35@zte.com.cn>
-Signed-off-by: Yi Wang <wang.yi59@zte.com.cn>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
----
- src/util/virnetdevopenvswitch.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/src/util/virnetdevopenvswitch.c b/src/util/virnetdevopenvswitch.c
-index f961777411..5de8c7f5cf 100644
---- a/src/util/virnetdevopenvswitch.c
-+++ b/src/util/virnetdevopenvswitch.c
-@@ -547,8 +547,10 @@ int virNetDevOpenvswitchUpdateVlan(const char *ifname,
-     virCommandAddArgList(cmd,
-                          "--", "--if-exists", "clear", "Port", ifname, "tag",
-                          "--", "--if-exists", "clear", "Port", ifname, "trunk",
--                         "--", "--if-exists", "clear", "Port", ifname, "vlan_mode",
--                         "--", "--if-exists", "set", "Port", ifname, NULL);
-+                         "--", "--if-exists", "clear", "Port", ifname, "vlan_mode", NULL);
-+
-+            if (virtVlan && virtVlan->nTags > 0)
-+                       virCommandAddArgList(cmd, "--", "--if-exists", "set", "Port", ifname, NULL);
- 
-     if (virNetDevOpenvswitchConstructVlans(cmd, virtVlan) < 0)
-         return -1;
--- 
-2.33.0
-
diff --git a/virNetDevSaveNetConfig-Pass-mode-to-virFileWriteStr.patch b/virNetDevSaveNetConfig-Pass-mode-to-virFileWriteStr.patch
deleted file mode 100644
index b761eeba4975cd4fd9b0809ba12be63c520be30e..0000000000000000000000000000000000000000
--- a/virNetDevSaveNetConfig-Pass-mode-to-virFileWriteStr.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 2aefb506e491e0ddf1abb6a7cbb2c4137e01e47e Mon Sep 17 00:00:00 2001
-From: chenyuhui <chenyuhui5@huawei.com>
-Date: Mon, 1 Aug 2022 19:32:29 +0800
-Subject: [PATCH 21/22] virNetDevSaveNetConfig: Pass mode to virFileWriteStr()
-
-For some types of SRIOV interfaces we create a temporary file
-where the state of the interface is saved before we start
-modifying it. The file is used then to restore the original
-configuration when the interface is no longer associated with any
-guest. For writing the file virFileWriteStr() is used. However,
-it's given wrong argument: the last argument is supposed to be
-mode to create the file with but virNetDevSaveNetConfig() passes
-open(2) flags (O_CREAT|O_TRUNC|O_WRONLY). We need the file to be
-writable and readable by root only (0600). Therefore, pass that
-mode instead of gibberish.
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Peter Krempa <pkrempa@redhat.com>
----
- src/util/virnetdev.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/util/virnetdev.c b/src/util/virnetdev.c
-index 950844b110..518eaea820 100644
---- a/src/util/virnetdev.c
-+++ b/src/util/virnetdev.c
-@@ -1916,7 +1916,7 @@ virNetDevSaveNetConfig(const char *linkdev, int vf,
-     if (!(fileStr = virJSONValueToString(configJSON, true)))
-         goto cleanup;
- 
--    if (virFileWriteStr(filePath, fileStr, O_CREAT|O_TRUNC|O_WRONLY) < 0) {
-+    if (virFileWriteStr(filePath, fileStr, 0600) < 0) { /* 0600: writable and readable by root */
-         virReportSystemError(errno, _("Unable to preserve mac/vlan tag "
-                                       "for device = %s, vf = %d"), linkdev, vf);
-         goto cleanup;
--- 
-2.33.0
-
diff --git a/virNodeDevPCICapSRIOVVirtualParseXML-fix-memleak-of-.patch b/virNodeDevPCICapSRIOVVirtualParseXML-fix-memleak-of-.patch
deleted file mode 100644
index fcf8bb0e3c6d6367af3f2dd96c271e6a2d14bcbb..0000000000000000000000000000000000000000
--- a/virNodeDevPCICapSRIOVVirtualParseXML-fix-memleak-of-.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From d707abe3210f4bdc723aefdf8e99710efc78edea Mon Sep 17 00:00:00 2001
-From: Hao Wang <wanghao232@huawei.com>
-Date: Thu, 30 Jul 2020 20:03:08 +0800
-Subject: [PATCH 040/108] virNodeDevPCICapSRIOVVirtualParseXML: fix memleak of
- addr
-
-virPCIDeviceAddressPtr 'addr' is forgotten to be freed in the branch
-'VIR_APPEND_ELEMENT() < 0'. Use g_autoptr instead.
-
-Signed-off-by: Hao Wang <wanghao232@huawei.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-(cherry picked from commit f7f5b86be25d27915cc67a8b84fa9a2589df4ab8)
----
- src/conf/node_device_conf.c | 6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/src/conf/node_device_conf.c b/src/conf/node_device_conf.c
-index 4cf5b6e3d7..d64f6d3986 100644
---- a/src/conf/node_device_conf.c
-+++ b/src/conf/node_device_conf.c
-@@ -1503,15 +1503,13 @@ virNodeDevPCICapSRIOVVirtualParseXML(xmlXPathContextPtr ctxt,
-         goto cleanup;
- 
-     for (i = 0; i < naddresses; i++) {
--        virPCIDeviceAddressPtr addr = NULL;
-+        g_autoptr(virPCIDeviceAddress) addr = NULL;
- 
-         if (VIR_ALLOC(addr) < 0)
-             goto cleanup;
- 
--        if (virPCIDeviceAddressParseXML(addresses[i], addr) < 0) {
--            VIR_FREE(addr);
-+        if (virPCIDeviceAddressParseXML(addresses[i], addr) < 0)
-             goto cleanup;
--        }
- 
-         if (VIR_APPEND_ELEMENT(pci_dev->virtual_functions,
-                                pci_dev->num_virtual_functions,
--- 
-2.33.0
-
diff --git a/virPipeImpl-Don-t-overwrite-error.patch b/virPipeImpl-Don-t-overwrite-error.patch
deleted file mode 100644
index de7c87c1f1f0e40d317e94b3434b1d72de85a160..0000000000000000000000000000000000000000
--- a/virPipeImpl-Don-t-overwrite-error.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 03f4080c80170f388f9d902e4f8db3c5d0a6eb10 Mon Sep 17 00:00:00 2001
-From: Peter Krempa <pkrempa@redhat.com>
-Date: Mon, 1 Mar 2021 10:25:18 +0100
-Subject: [PATCH 017/108] virPipeImpl: Don't overwrite error
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-If WITH_PIPE2 is not defined we attempt to set the pipe to nonblocking
-operation after they are created. We errorneously rewrote the existing
-error message on failure to do so or even reported an error if quiet
-mode was requested.
-
-Fixes: ab36f729470c313b9d5b7debdbeac441f7780dec
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit ae87dc3d09cc26aa9b6587e4db73d42529dce69b)
----
- src/util/virutil.c | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/src/util/virutil.c b/src/util/virutil.c
-index bea9749cae..ada3dae7c6 100644
---- a/src/util/virutil.c
-+++ b/src/util/virutil.c
-@@ -1759,8 +1759,6 @@ virPipeImpl(int fds[2], bool nonblock, bool errreport)
-             if (errreport)
-                 virReportSystemError(errno, "%s",
-                                      _("Unable to set pipes to non-blocking"));
--            virReportSystemError(errno, "%s",
--                                 _("Unable to create pipes"));
-             VIR_FORCE_CLOSE(fds[0]);
-             VIR_FORCE_CLOSE(fds[1]);
-             return -1;
--- 
-2.33.0
-
diff --git a/virQEMUBuildCommandLineJSON-Add-possibility-for-usin.patch b/virQEMUBuildCommandLineJSON-Add-possibility-for-usin.patch
deleted file mode 100644
index 06aa3aaa7ecd1f718ac9c28c20d44e2fa7247eb5..0000000000000000000000000000000000000000
--- a/virQEMUBuildCommandLineJSON-Add-possibility-for-usin.patch
+++ /dev/null
@@ -1,218 +0,0 @@
-From b80d9efd8af5de335e3c1de24b74d2e647832458 Mon Sep 17 00:00:00 2001
-From: Peter Krempa <pkrempa@redhat.com>
-Date: Thu, 14 May 2020 22:45:24 +0200
-Subject: [PATCH 02/18] virQEMUBuildCommandLineJSON: Add possibility for using
- 'on/off' instead of 'yes/no'
-
-In some cases we use 'on/off' for command line arguments. Add a switch
-which will select the preferred spelling for a specific usage.
-
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Eric Blake <eblake@redhat.com>
----
- src/util/virqemu.c          | 44 ++++++++++++++++++++++++-------------
- src/util/virqemu.h          | 10 ++++++---
- tests/qemucommandutiltest.c |  2 +-
- 3 files changed, 37 insertions(+), 19 deletions(-)
-
-diff --git a/src/util/virqemu.c b/src/util/virqemu.c
-index 0e6fa412bc..549f88fcd5 100644
---- a/src/util/virqemu.c
-+++ b/src/util/virqemu.c
-@@ -37,6 +37,7 @@ struct virQEMUCommandLineJSONIteratorData {
-     const char *prefix;
-     virBufferPtr buf;
-     const char *skipKey;
-+    bool onOff;
-     virQEMUBuildCommandLineJSONArrayFormatFunc arrayFunc;
- };
- 
-@@ -46,6 +47,7 @@ virQEMUBuildCommandLineJSONRecurse(const char *key,
-                                    virJSONValuePtr value,
-                                    virBufferPtr buf,
-                                    const char *skipKey,
-+                                   bool onOff,
-                                    virQEMUBuildCommandLineJSONArrayFormatFunc arrayFunc,
-                                    bool nested);
- 
-@@ -55,7 +57,8 @@ int
- virQEMUBuildCommandLineJSONArrayBitmap(const char *key,
-                                        virJSONValuePtr array,
-                                        virBufferPtr buf,
--                                       const char *skipKey G_GNUC_UNUSED)
-+                                       const char *skipKey G_GNUC_UNUSED,
-+                                       bool onOff G_GNUC_UNUSED)
- {
-     ssize_t pos = -1;
-     ssize_t end;
-@@ -84,7 +87,8 @@ int
- virQEMUBuildCommandLineJSONArrayNumbered(const char *key,
-                                          virJSONValuePtr array,
-                                          virBufferPtr buf,
--                                         const char *skipKey)
-+                                         const char *skipKey,
-+                                         bool onOff)
- {
-     virJSONValuePtr member;
-     size_t i;
-@@ -95,7 +99,7 @@ virQEMUBuildCommandLineJSONArrayNumbered(const char *key,
- 
-         prefix = g_strdup_printf("%s.%zu", key, i);
- 
--        if (virQEMUBuildCommandLineJSONRecurse(prefix, member, buf, skipKey,
-+        if (virQEMUBuildCommandLineJSONRecurse(prefix, member, buf, skipKey, onOff,
-                                                virQEMUBuildCommandLineJSONArrayNumbered,
-                                                true) < 0)
-             return 0;
-@@ -122,11 +126,11 @@ virQEMUBuildCommandLineJSONIterate(const char *key,
-         tmpkey = g_strdup_printf("%s.%s", data->prefix, key);
- 
-         return virQEMUBuildCommandLineJSONRecurse(tmpkey, value, data->buf,
--                                                  data->skipKey,
-+                                                  data->skipKey, data->onOff,
-                                                   data->arrayFunc, false);
-     } else {
-         return virQEMUBuildCommandLineJSONRecurse(key, value, data->buf,
--                                                  data->skipKey,
-+                                                  data->skipKey, data->onOff,
-                                                   data->arrayFunc, false);
-     }
- }
-@@ -137,10 +141,11 @@ virQEMUBuildCommandLineJSONRecurse(const char *key,
-                                    virJSONValuePtr value,
-                                    virBufferPtr buf,
-                                    const char *skipKey,
-+                                   bool onOff,
-                                    virQEMUBuildCommandLineJSONArrayFormatFunc arrayFunc,
-                                    bool nested)
- {
--    struct virQEMUCommandLineJSONIteratorData data = { key, buf, skipKey, arrayFunc };
-+    struct virQEMUCommandLineJSONIteratorData data = { key, buf, skipKey, onOff, arrayFunc };
-     virJSONType type = virJSONValueGetType(value);
-     virJSONValuePtr elem;
-     bool tmp;
-@@ -165,10 +170,17 @@ virQEMUBuildCommandLineJSONRecurse(const char *key,
- 
-     case VIR_JSON_TYPE_BOOLEAN:
-         virJSONValueGetBoolean(value, &tmp);
--        if (tmp)
--            virBufferAsprintf(buf, "%s=yes,", key);
--        else
--            virBufferAsprintf(buf, "%s=no,", key);
-+        if (onOff) {
-+            if (tmp)
-+                virBufferAsprintf(buf, "%s=on,", key);
-+            else
-+                virBufferAsprintf(buf, "%s=off,", key);
-+        } else {
-+            if (tmp)
-+                virBufferAsprintf(buf, "%s=yes,", key);
-+            else
-+                virBufferAsprintf(buf, "%s=no,", key);
-+        }
- 
-         break;
- 
-@@ -180,7 +192,7 @@ virQEMUBuildCommandLineJSONRecurse(const char *key,
-             return -1;
-         }
- 
--        if (!arrayFunc || arrayFunc(key, value, buf, skipKey) < 0) {
-+        if (!arrayFunc || arrayFunc(key, value, buf, skipKey, onOff) < 0) {
-             /* fallback, treat the array as a non-bitmap, adding the key
-              * for each member */
-             for (i = 0; i < virJSONValueArraySize(value); i++) {
-@@ -188,7 +200,7 @@ virQEMUBuildCommandLineJSONRecurse(const char *key,
- 
-                 /* recurse to avoid duplicating code */
-                 if (virQEMUBuildCommandLineJSONRecurse(key, elem, buf, skipKey,
--                                                       arrayFunc, true) < 0)
-+                                                       onOff, arrayFunc, true) < 0)
-                     return -1;
-             }
-         }
-@@ -216,6 +228,7 @@ virQEMUBuildCommandLineJSONRecurse(const char *key,
-  * @value: json object containing the value
-  * @buf: otuput buffer
-  * @skipKey: name of key that will be handled separately by caller
-+ * @onOff: Use 'on' and 'off' for boolean values rather than 'yes' and 'no'
-  * @arrayFunc: array formatter function to allow for different syntax
-  *
-  * Formats JSON value object into command line parameters suitable for use with
-@@ -227,9 +240,10 @@ int
- virQEMUBuildCommandLineJSON(virJSONValuePtr value,
-                             virBufferPtr buf,
-                             const char *skipKey,
-+                            bool onOff,
-                             virQEMUBuildCommandLineJSONArrayFormatFunc array)
- {
--    if (virQEMUBuildCommandLineJSONRecurse(NULL, value, buf, skipKey, array, false) < 0)
-+    if (virQEMUBuildCommandLineJSONRecurse(NULL, value, buf, skipKey, onOff, array, false) < 0)
-         return -1;
- 
-     virBufferTrim(buf, ",");
-@@ -255,7 +269,7 @@ virQEMUBuildObjectCommandlineFromJSONInternal(virBufferPtr buf,
- 
-     if (props) {
-         virBufferAddLit(buf, ",");
--        if (virQEMUBuildCommandLineJSON(props, buf, NULL,
-+        if (virQEMUBuildCommandLineJSON(props, buf, NULL, false,
-                                 virQEMUBuildCommandLineJSONArrayBitmap) < 0)
-             return -1;
-     }
-@@ -282,7 +296,7 @@ virQEMUBuildDriveCommandlineFromJSON(virJSONValuePtr srcdef)
-     virBuffer buf = VIR_BUFFER_INITIALIZER;
-     char *ret = NULL;
- 
--    if (virQEMUBuildCommandLineJSON(srcdef, &buf, NULL,
-+    if (virQEMUBuildCommandLineJSON(srcdef, &buf, NULL, false,
-                                     virQEMUBuildCommandLineJSONArrayNumbered) < 0)
-         goto cleanup;
- 
-diff --git a/src/util/virqemu.h b/src/util/virqemu.h
-index 9d3db7c2a2..67a5711613 100644
---- a/src/util/virqemu.h
-+++ b/src/util/virqemu.h
-@@ -30,19 +30,23 @@
- typedef int (*virQEMUBuildCommandLineJSONArrayFormatFunc)(const char *key,
-                                                           virJSONValuePtr array,
-                                                           virBufferPtr buf,
--                                                          const char *skipKey);
-+                                                          const char *skipKey,
-+                                                          bool onOff);
- int virQEMUBuildCommandLineJSONArrayBitmap(const char *key,
-                                            virJSONValuePtr array,
-                                            virBufferPtr buf,
--                                           const char *skipKey);
-+                                           const char *skipKey,
-+                                           bool onOff);
- int virQEMUBuildCommandLineJSONArrayNumbered(const char *key,
-                                              virJSONValuePtr array,
-                                              virBufferPtr buf,
--                                             const char *skipKey);
-+                                             const char *skipKey,
-+                                             bool onOff);
- 
- int virQEMUBuildCommandLineJSON(virJSONValuePtr value,
-                                 virBufferPtr buf,
-                                 const char *skipKey,
-+                                bool onOff,
-                                 virQEMUBuildCommandLineJSONArrayFormatFunc array);
- 
- int virQEMUBuildObjectCommandlineFromJSON(virBufferPtr buf,
-diff --git a/tests/qemucommandutiltest.c b/tests/qemucommandutiltest.c
-index 923776e642..049fd2f0b0 100644
---- a/tests/qemucommandutiltest.c
-+++ b/tests/qemucommandutiltest.c
-@@ -47,7 +47,7 @@ testQemuCommandBuildFromJSON(const void *opaque)
-         return -1;
-     }
- 
--    if (virQEMUBuildCommandLineJSON(val, &buf, NULL, data->arrayfunc) < 0) {
-+    if (virQEMUBuildCommandLineJSON(val, &buf, NULL, false, data->arrayfunc) < 0) {
-         fprintf(stderr,
-                 "\nvirQEMUBuildCommandlineJSON failed process JSON:\n%s\n",
-                 data->props);
--- 
-2.23.0.windows.1
-
diff --git a/virQEMUBuildCommandLineJSON-Allow-skipping-certain-k.patch b/virQEMUBuildCommandLineJSON-Allow-skipping-certain-k.patch
deleted file mode 100644
index e67e949cb9aaa2de93870bae12dbfd409da055c4..0000000000000000000000000000000000000000
--- a/virQEMUBuildCommandLineJSON-Allow-skipping-certain-k.patch
+++ /dev/null
@@ -1,202 +0,0 @@
-From b1e8b606813b1097cdb3a0d9e9f04c629d7bcf29 Mon Sep 17 00:00:00 2001
-From: Peter Krempa <pkrempa@redhat.com>
-Date: Thu, 14 May 2020 09:41:48 +0200
-Subject: [PATCH 01/18] virQEMUBuildCommandLineJSON: Allow skipping certain
- keys
-
-Allow reusing this for formatting of netdev_add arguments into -netdev.
-We need to be able to skip the 'type' property as it's used without the
-prefix by our generator.
-
-Add infrastructure which allows skipping property with a specific name.
-
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Eric Blake <eblake@redhat.com>
----
- src/util/virqemu.c          | 30 +++++++++++++++++++++---------
- src/util/virqemu.h          | 10 +++++++---
- tests/qemucommandutiltest.c |  2 +-
- 3 files changed, 29 insertions(+), 13 deletions(-)
-
-diff --git a/src/util/virqemu.c b/src/util/virqemu.c
-index 78a9e0480b..0e6fa412bc 100644
---- a/src/util/virqemu.c
-+++ b/src/util/virqemu.c
-@@ -36,6 +36,7 @@ VIR_LOG_INIT("util.qemu");
- struct virQEMUCommandLineJSONIteratorData {
-     const char *prefix;
-     virBufferPtr buf;
-+    const char *skipKey;
-     virQEMUBuildCommandLineJSONArrayFormatFunc arrayFunc;
- };
- 
-@@ -44,6 +45,7 @@ static int
- virQEMUBuildCommandLineJSONRecurse(const char *key,
-                                    virJSONValuePtr value,
-                                    virBufferPtr buf,
-+                                   const char *skipKey,
-                                    virQEMUBuildCommandLineJSONArrayFormatFunc arrayFunc,
-                                    bool nested);
- 
-@@ -52,7 +54,8 @@ virQEMUBuildCommandLineJSONRecurse(const char *key,
- int
- virQEMUBuildCommandLineJSONArrayBitmap(const char *key,
-                                        virJSONValuePtr array,
--                                       virBufferPtr buf)
-+                                       virBufferPtr buf,
-+                                       const char *skipKey G_GNUC_UNUSED)
- {
-     ssize_t pos = -1;
-     ssize_t end;
-@@ -80,7 +83,8 @@ virQEMUBuildCommandLineJSONArrayBitmap(const char *key,
- int
- virQEMUBuildCommandLineJSONArrayNumbered(const char *key,
-                                          virJSONValuePtr array,
--                                         virBufferPtr buf)
-+                                         virBufferPtr buf,
-+                                         const char *skipKey)
- {
-     virJSONValuePtr member;
-     size_t i;
-@@ -91,7 +95,7 @@ virQEMUBuildCommandLineJSONArrayNumbered(const char *key,
- 
-         prefix = g_strdup_printf("%s.%zu", key, i);
- 
--        if (virQEMUBuildCommandLineJSONRecurse(prefix, member, buf,
-+        if (virQEMUBuildCommandLineJSONRecurse(prefix, member, buf, skipKey,
-                                                virQEMUBuildCommandLineJSONArrayNumbered,
-                                                true) < 0)
-             return 0;
-@@ -109,15 +113,20 @@ virQEMUBuildCommandLineJSONIterate(const char *key,
- {
-     struct virQEMUCommandLineJSONIteratorData *data = opaque;
- 
-+    if (STREQ_NULLABLE(key, data->skipKey))
-+        return 0;
-+
-     if (data->prefix) {
-         g_autofree char *tmpkey = NULL;
- 
-         tmpkey = g_strdup_printf("%s.%s", data->prefix, key);
- 
-         return virQEMUBuildCommandLineJSONRecurse(tmpkey, value, data->buf,
-+                                                  data->skipKey,
-                                                   data->arrayFunc, false);
-     } else {
-         return virQEMUBuildCommandLineJSONRecurse(key, value, data->buf,
-+                                                  data->skipKey,
-                                                   data->arrayFunc, false);
-     }
- }
-@@ -127,10 +136,11 @@ static int
- virQEMUBuildCommandLineJSONRecurse(const char *key,
-                                    virJSONValuePtr value,
-                                    virBufferPtr buf,
-+                                   const char *skipKey,
-                                    virQEMUBuildCommandLineJSONArrayFormatFunc arrayFunc,
-                                    bool nested)
- {
--    struct virQEMUCommandLineJSONIteratorData data = { key, buf, arrayFunc };
-+    struct virQEMUCommandLineJSONIteratorData data = { key, buf, skipKey, arrayFunc };
-     virJSONType type = virJSONValueGetType(value);
-     virJSONValuePtr elem;
-     bool tmp;
-@@ -170,14 +180,14 @@ virQEMUBuildCommandLineJSONRecurse(const char *key,
-             return -1;
-         }
- 
--        if (!arrayFunc || arrayFunc(key, value, buf) < 0) {
-+        if (!arrayFunc || arrayFunc(key, value, buf, skipKey) < 0) {
-             /* fallback, treat the array as a non-bitmap, adding the key
-              * for each member */
-             for (i = 0; i < virJSONValueArraySize(value); i++) {
-                 elem = virJSONValueArrayGet((virJSONValuePtr)value, i);
- 
-                 /* recurse to avoid duplicating code */
--                if (virQEMUBuildCommandLineJSONRecurse(key, elem, buf,
-+                if (virQEMUBuildCommandLineJSONRecurse(key, elem, buf, skipKey,
-                                                        arrayFunc, true) < 0)
-                     return -1;
-             }
-@@ -205,6 +215,7 @@ virQEMUBuildCommandLineJSONRecurse(const char *key,
-  * virQEMUBuildCommandLineJSON:
-  * @value: json object containing the value
-  * @buf: otuput buffer
-+ * @skipKey: name of key that will be handled separately by caller
-  * @arrayFunc: array formatter function to allow for different syntax
-  *
-  * Formats JSON value object into command line parameters suitable for use with
-@@ -215,9 +226,10 @@ virQEMUBuildCommandLineJSONRecurse(const char *key,
- int
- virQEMUBuildCommandLineJSON(virJSONValuePtr value,
-                             virBufferPtr buf,
-+                            const char *skipKey,
-                             virQEMUBuildCommandLineJSONArrayFormatFunc array)
- {
--    if (virQEMUBuildCommandLineJSONRecurse(NULL, value, buf, array, false) < 0)
-+    if (virQEMUBuildCommandLineJSONRecurse(NULL, value, buf, skipKey, array, false) < 0)
-         return -1;
- 
-     virBufferTrim(buf, ",");
-@@ -243,7 +255,7 @@ virQEMUBuildObjectCommandlineFromJSONInternal(virBufferPtr buf,
- 
-     if (props) {
-         virBufferAddLit(buf, ",");
--        if (virQEMUBuildCommandLineJSON(props, buf,
-+        if (virQEMUBuildCommandLineJSON(props, buf, NULL,
-                                 virQEMUBuildCommandLineJSONArrayBitmap) < 0)
-             return -1;
-     }
-@@ -270,7 +282,7 @@ virQEMUBuildDriveCommandlineFromJSON(virJSONValuePtr srcdef)
-     virBuffer buf = VIR_BUFFER_INITIALIZER;
-     char *ret = NULL;
- 
--    if (virQEMUBuildCommandLineJSON(srcdef, &buf,
-+    if (virQEMUBuildCommandLineJSON(srcdef, &buf, NULL,
-                                     virQEMUBuildCommandLineJSONArrayNumbered) < 0)
-         goto cleanup;
- 
-diff --git a/src/util/virqemu.h b/src/util/virqemu.h
-index 227325e80e..9d3db7c2a2 100644
---- a/src/util/virqemu.h
-+++ b/src/util/virqemu.h
-@@ -29,16 +29,20 @@
- 
- typedef int (*virQEMUBuildCommandLineJSONArrayFormatFunc)(const char *key,
-                                                           virJSONValuePtr array,
--                                                          virBufferPtr buf);
-+                                                          virBufferPtr buf,
-+                                                          const char *skipKey);
- int virQEMUBuildCommandLineJSONArrayBitmap(const char *key,
-                                            virJSONValuePtr array,
--                                           virBufferPtr buf);
-+                                           virBufferPtr buf,
-+                                           const char *skipKey);
- int virQEMUBuildCommandLineJSONArrayNumbered(const char *key,
-                                              virJSONValuePtr array,
--                                             virBufferPtr buf);
-+                                             virBufferPtr buf,
-+                                             const char *skipKey);
- 
- int virQEMUBuildCommandLineJSON(virJSONValuePtr value,
-                                 virBufferPtr buf,
-+                                const char *skipKey,
-                                 virQEMUBuildCommandLineJSONArrayFormatFunc array);
- 
- int virQEMUBuildObjectCommandlineFromJSON(virBufferPtr buf,
-diff --git a/tests/qemucommandutiltest.c b/tests/qemucommandutiltest.c
-index c5b3e7b735..923776e642 100644
---- a/tests/qemucommandutiltest.c
-+++ b/tests/qemucommandutiltest.c
-@@ -47,7 +47,7 @@ testQemuCommandBuildFromJSON(const void *opaque)
-         return -1;
-     }
- 
--    if (virQEMUBuildCommandLineJSON(val, &buf, data->arrayfunc) < 0) {
-+    if (virQEMUBuildCommandLineJSON(val, &buf, NULL, data->arrayfunc) < 0) {
-         fprintf(stderr,
-                 "\nvirQEMUBuildCommandlineJSON failed process JSON:\n%s\n",
-                 data->props);
--- 
-2.23.0.windows.1
-
diff --git a/virQEMUBuildNetdevCommandlineFromJSON-Prepare-for-qu.patch b/virQEMUBuildNetdevCommandlineFromJSON-Prepare-for-qu.patch
deleted file mode 100644
index 1b2a1bd656660fbe58bec7bd5508557eaad94642..0000000000000000000000000000000000000000
--- a/virQEMUBuildNetdevCommandlineFromJSON-Prepare-for-qu.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From 9df86be1d8d974dc6bcf174c63814cd4492ddd5e Mon Sep 17 00:00:00 2001
-From: Peter Krempa <pkrempa@redhat.com>
-Date: Fri, 15 May 2020 10:59:40 +0200
-Subject: [PATCH 16/18] virQEMUBuildNetdevCommandlineFromJSON: Prepare for
- quirky 'guestfwd'
-
-QEMU models guestfwd as:
-
- 'guestfwd': [
-                 { "str": "tcp:10.0.2.1:4600-chardev:charchannel0" },
-                 { "str": "...."},
-             ]
-
-but the command line as:
-
-guestfwd=tcp:10.0.2.1:4600-chardev:charchannel0,guestfwd=...
-
-I guess the original idea was to make it extensible while not worrying
-about adding another object for it. Either way it requires us to add yet
-another JSON->cmdline convertor for arrays.
-
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Eric Blake <eblake@redhat.com>
----
- src/util/virqemu.c | 40 +++++++++++++++++++++++++++++++++++++++-
- 1 file changed, 39 insertions(+), 1 deletion(-)
-
-diff --git a/src/util/virqemu.c b/src/util/virqemu.c
-index 0f8cab29df..9823ebc14d 100644
---- a/src/util/virqemu.c
-+++ b/src/util/virqemu.c
-@@ -109,6 +109,43 @@ virQEMUBuildCommandLineJSONArrayNumbered(const char *key,
- }
- 
- 
-+/**
-+ * This array convertor is for quirky cases where the QMP schema mandates an
-+ * array of objects with only one attribute 'str' which needs to be formatted as
-+ * repeated key-value pairs without the 'str' being printed:
-+ *
-+ * 'guestfwd': [
-+ *                  { "str": "tcp:10.0.2.1:4600-chardev:charchannel0" },
-+ *                  { "str": "...."},
-+ *             ]
-+ *
-+ *  guestfwd=tcp:10.0.2.1:4600-chardev:charchannel0,guestfwd=...
-+ */
-+static int
-+virQEMUBuildCommandLineJSONArrayObjectsStr(const char *key,
-+                                           virJSONValuePtr array,
-+                                           virBufferPtr buf,
-+                                           const char *skipKey G_GNUC_UNUSED,
-+                                           bool onOff G_GNUC_UNUSED)
-+{
-+    g_auto(virBuffer) tmp = VIR_BUFFER_INITIALIZER;
-+    size_t i;
-+
-+    for (i = 0; i < virJSONValueArraySize(array); i++) {
-+        virJSONValuePtr member = virJSONValueArrayGet(array, i);
-+        const char *str = virJSONValueObjectGetString(member, "str");
-+
-+        if (!str)
-+            return -1;
-+
-+        virBufferAsprintf(&tmp, "%s=%s,", key, str);
-+    }
-+
-+    virBufferAddBuffer(buf, &tmp);
-+    return 0;
-+}
-+
-+
- /* internal iterator to handle nested object formatting */
- static int
- virQEMUBuildCommandLineJSONIterate(const char *key,
-@@ -267,7 +304,8 @@ virQEMUBuildNetdevCommandlineFromJSON(virJSONValuePtr props)
- 
-     virBufferAsprintf(&buf, "%s,", type);
- 
--    if (virQEMUBuildCommandLineJSON(props, &buf, "type", true, NULL) < 0)
-+    if (virQEMUBuildCommandLineJSON(props, &buf, "type", true,
-+                                    virQEMUBuildCommandLineJSONArrayObjectsStr) < 0)
-         return NULL;
- 
-     return virBufferContentAndReset(&buf);
--- 
-2.23.0.windows.1
-
diff --git a/virSecurityManagerMetadataLock-Clarify-directory-loc.patch b/virSecurityManagerMetadataLock-Clarify-directory-loc.patch
deleted file mode 100644
index 2c4f3e11436cf6f2a90bd3b76e8b12564abd9d75..0000000000000000000000000000000000000000
--- a/virSecurityManagerMetadataLock-Clarify-directory-loc.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 027f0b2895a4f5fbf879d02f43ab1bb0489bd938 Mon Sep 17 00:00:00 2001
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Fri, 10 Jul 2020 10:42:01 +0200
-Subject: [PATCH 008/108] virSecurityManagerMetadataLock: Clarify directory
- locking comment
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-In the light of recent commit of 9d83281382 fix the comment that
-says directories can't be locked. Well, in general they can, but
-not in our case.
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 0a145de970af31e605d837c3502855fe93aaec9a)
----
- src/security/security_manager.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/src/security/security_manager.c b/src/security/security_manager.c
-index 5159abd92d..9d5dfec12b 100644
---- a/src/security/security_manager.c
-+++ b/src/security/security_manager.c
-@@ -1331,7 +1331,8 @@ virSecurityManagerMetadataLock(virSecurityManagerPtr mgr G_GNUC_UNUSED,
-             continue;
- 
-         if (S_ISDIR(sb.st_mode)) {
--            /* Directories can't be locked */
-+            /* We need to open the path for writing because we need exclusive
-+             * (write) lock. But directories can't be opened for writing. */
-             continue;
-         }
- 
--- 
-2.33.0
-
diff --git a/virSecurityManagerMetadataLock-Ignore-RO-filesystem.patch b/virSecurityManagerMetadataLock-Ignore-RO-filesystem.patch
deleted file mode 100644
index 2986ac3685c42fbf00482a4e3a5db6a9c697761f..0000000000000000000000000000000000000000
--- a/virSecurityManagerMetadataLock-Ignore-RO-filesystem.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 4f9226a33786ead60eb470f88783d8764a66e35a Mon Sep 17 00:00:00 2001
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Fri, 10 Jul 2020 10:48:01 +0200
-Subject: [PATCH 007/108] virSecurityManagerMetadataLock: Ignore RO filesystem
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-When locking files for metadata change, we open() them for R/W
-access. The write access is needed because we want to acquire
-exclusive (write) lock (to mutually exclude with other daemons
-trying to modify XATTRs on the same file). Anyway, the open()
-might fail if the file lives on a RO filesystem. Well, if that's
-the case, ignore the error and continue with the next file on the
-list. We won't change any seclabel on the file anyway - there is
-nothing to remember then.
-
-Reported-by: Olaf Hering <olaf@aepfle.de>
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit c531f42755119190888ac73a58f93d79de5afa56)
----
- src/security/security_manager.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/src/security/security_manager.c b/src/security/security_manager.c
-index 1445291410..5159abd92d 100644
---- a/src/security/security_manager.c
-+++ b/src/security/security_manager.c
-@@ -1336,6 +1336,11 @@ virSecurityManagerMetadataLock(virSecurityManagerPtr mgr G_GNUC_UNUSED,
-         }
- 
-         if ((fd = open(p, O_RDWR)) < 0) {
-+            if (errno == EROFS) {
-+                /* There is nothing we can do for RO filesystem. */
-+                continue;
-+            }
-+
- #ifndef WIN32
-             if (S_ISSOCK(sb.st_mode)) {
-                 /* Sockets can be opened only if there exists the
--- 
-2.33.0
-
diff --git a/virbuftest-Increase-coverage.patch b/virbuftest-Increase-coverage.patch
deleted file mode 100644
index e99e6e768fca7343b0997ddee8fc01f9f4d0abf1..0000000000000000000000000000000000000000
--- a/virbuftest-Increase-coverage.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 23f96f11539b13cee88563d8c670036b4868787b Mon Sep 17 00:00:00 2001
-From: liumengqiu <liumengqiu1@huawei.com>
-Date: Wed, 24 Aug 2022 16:22:15 +0800
-Subject: [PATCH 11/13] virbuftest: Increase coverage
-
-Test the behavior of virBufferEscapeShell for different types of
-quotes as well as the empty string.
-
-Signed-off-by: Andrea Bolognani abologna@redhat.com
-Reviewed-by: Michal Privoznik mprivozn@redhat.com
-Signed-off-by: liumengqiu <liumengqiu1@huawei.com>
----
- tests/virbuftest.c | 9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/tests/virbuftest.c b/tests/virbuftest.c
-index f9d19ff1a1..26e344feab 100644
---- a/tests/virbuftest.c
-+++ b/tests/virbuftest.c
-@@ -20,7 +20,8 @@ static int testBufAutoIndent(const void *data G_GNUC_UNUSED)
-     virBuffer bufinit = VIR_BUFFER_INITIALIZER;
-     virBufferPtr buf = &bufinit;
-     const char expected[] =
--        "  1\n  2\n  3\n  4\n  5\n  6\n  7\n  &amp;\n  8\n  9\n  10\n  ' 11'\n";
-+        "  1\n  2\n  3\n  4\n  5\n  6\n  7\n  &amp;\n  8\n  9\n  10\n"
-+        "  ' 11'\n  ''\\''12'\n  '\"13'\n  ''\n";
-     g_autofree char *result = NULL;
-     int ret = 0;
- 
-@@ -85,6 +86,12 @@ static int testBufAutoIndent(const void *data G_GNUC_UNUSED)
-     virBufferAddChar(buf, '\n');
-     virBufferEscapeShell(buf, " 11");
-     virBufferAddChar(buf, '\n');
-+    virBufferEscapeShell(buf, "'12");
-+    virBufferAddChar(buf, '\n');
-+    virBufferEscapeShell(buf, "\"13");
-+    virBufferAddChar(buf, '\n');
-+    virBufferEscapeShell(buf, "");
-+    virBufferAddChar(buf, '\n');
- 
-     result = virBufferContentAndReset(buf);
-     if (!result || STRNEQ(result, expected)) {
--- 
-2.33.0
-
diff --git a/vircgroupmock-Be-wiser-about-detecting-fakerootdir-c.patch b/vircgroupmock-Be-wiser-about-detecting-fakerootdir-c.patch
deleted file mode 100644
index 7027f86fa52c295ac761bc3749d23a12aafb9e0e..0000000000000000000000000000000000000000
--- a/vircgroupmock-Be-wiser-about-detecting-fakerootdir-c.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 6ce9382804a5598150d4d357adfef2fd2d09c48b Mon Sep 17 00:00:00 2001
-From: xuyinghao <xuyinghao2@huawei.com>
-Date: Tue, 16 Aug 2022 19:38:53 +0800
-Subject: [PATCH 12/13] vircgroupmock: Be wiser about detecting fakerootdir
- change
-
-The way that vircgroupmock works is that the vircgrouptest creates a temporary directory and sets LIBVIRT_FAKE_ROOT_DIR env variable which is then checked by the mock at the beginning of basically every function it overrides (access(), stat in all its flavours, mkdir(), etc.). The mock then creates a CGroup dir structure. But the test is allowed to change the directory, to accommodate environment for the particular test case. This is done by changing the environment variable which is then detected by the mock and the whole process repeats.
-
-However, the way the mock detect changes is buggy. After it got the environment variable it compares it to the last known value (global variable @fakerootdir) and if they don't match the last known value is set to point to the new value. Problem is that the result of getenv() is assigned to the @fakerootdir directly.Therefore, @fakerootdir points somewhere into the buffer of environment variables. In turn, when the test sets new value (via g_setenv()) it may be placed at the very same position in the env var buffer and thus the mock fails to detect the change.
-
-The solution is to keep our private copy of the value (by g_strdup()) which makes the variable not rely on getenv()/setenv() placing values at random positions.
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- tests/vircgroupmock.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/tests/vircgroupmock.c b/tests/vircgroupmock.c
-index 66b8c01852..4acadb8686 100644
---- a/tests/vircgroupmock.c
-+++ b/tests/vircgroupmock.c
-@@ -352,7 +352,8 @@ static void init_sysfs(void)
-     if (fakerootdir && STREQ(fakerootdir, newfakerootdir))
-         return;
- 
--    fakerootdir = newfakerootdir;
-+    VIR_FREE(fakerootdir);
-+    fakerootdir = g_strdup(newfakerootdir);
- 
-     mock = getenv("VIR_CGROUP_MOCK_MODE");
-     if (mock) {
--- 
-2.33.0
-
diff --git a/vircgroupv1-fix-null-string-specifier-argument-in-vi.patch b/vircgroupv1-fix-null-string-specifier-argument-in-vi.patch
deleted file mode 100644
index 2960f6c034e82055beff97452c8386457123ffea..0000000000000000000000000000000000000000
--- a/vircgroupv1-fix-null-string-specifier-argument-in-vi.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 164fb659e30346c7140bdda2bf9b47e59bdcebe9 Mon Sep 17 00:00:00 2001
-From: wangmeiyang <wangmeiyang_yewu@cmss.chinamobile.com>
-Date: Wed, 23 Nov 2022 10:28:49 +0800
-Subject: [PATCH 01/23] vircgroupv1: fix null string specifier argument in
- virCgroupV1ValidatePlacement
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Detected by gcc 11 -Wformat-overflow:
-../../src/util/vircgroupv1.c: In function ‘virCgroupV1ValidatePlacement’:
-../../src/util/virerror.h:176:5: warning: ‘%s’ directive argument is null [-Wformat-overflow=]
-  176 |     virReportErrorHelper(VIR_FROM_THIS, code, __FILE__, \
-      |     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-  177 |                          __FUNCTION__, __LINE__, __VA_ARGS__)
-      |                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-../../src/util/vircgroupv1.c:411:13: note: in expansion of macro ‘virReportError’
-  411 |             virReportError(VIR_ERR_INTERNAL_ERROR,
-      |             ^~~~~~~~~~~~~~
-../../src/util/vircgroupv1.c:412:80: note: format string is defined here
-  412 |                            _("Could not find placement for v1 controller %s at %s"),
-      |                                                                                ^~
-
-cherry-pick from 8833b42f3b092c1b401109ddf174ea1dbb1eb8c6
-
-Signed-off-by: Scott Davis <scott.davis@starlab.io>
-Signed-off-by: Meiyang Wang <wangmeiyang@cmss.chinamobile.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/util/vircgroupv1.c | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/src/util/vircgroupv1.c b/src/util/vircgroupv1.c
-index 5504441fa6..f5a96bd736 100644
---- a/src/util/vircgroupv1.c
-+++ b/src/util/vircgroupv1.c
-@@ -376,9 +376,8 @@ virCgroupV1ValidatePlacement(virCgroupPtr group,
- 
-         if (!group->legacy[i].placement) {
-             virReportError(VIR_ERR_INTERNAL_ERROR,
--                           _("Could not find placement for v1 controller %s at %s"),
--                           virCgroupV1ControllerTypeToString(i),
--                           group->legacy[i].placement);
-+                           _("Could not find placement for v1 controller %s"),
-+                           virCgroupV1ControllerTypeToString(i));
-             return -1;
-         }
- 
--- 
-2.27.0
-
diff --git a/vircgroupv2devices-fix-counting-entries-in-BPF-map.patch b/vircgroupv2devices-fix-counting-entries-in-BPF-map.patch
deleted file mode 100644
index 39bdddc22a9e3942991a7e23a3fd2af0d8dcb00f..0000000000000000000000000000000000000000
--- a/vircgroupv2devices-fix-counting-entries-in-BPF-map.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From f268a97669b2871735fb0a2bb9cda275bf8c204f Mon Sep 17 00:00:00 2001
-From: tangbinzy <tangbin_yewu@cmss.chinamobile.com>
-Date: Thu, 24 Nov 2022 02:45:01 +0000
-Subject: [PATCH 13/23] vircgroupv2devices: fix counting entries in BPF  map
- BPF syscall BPF_MAP_GET_NEXT_KEY returns -1 if something fails but it will
- also return -1 if trying to get next key using the last key in the map with
- errno set to ENOENT.
-
-If there are VMs running and libvirtd is restarted and user tries to
-call some cgroup devices operation on a VM we need to get the count of
-entries in BPF map and it fails which will result in error when trying
-to attach/detech devices.
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1833321
-
-Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
-Reviewed-by: Erik Skultety <eskultet@redhat.com>
-
-Signed-off-by: tangbin <tangbin_yewu@cmss.chinamobile.com>
-(cherry-pick from 7e574d1a079bd13aeeedb7024cc45f85b1843fcc)
----
- src/util/vircgroupv2devices.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/util/vircgroupv2devices.c b/src/util/vircgroupv2devices.c
-index d62ee12a05..234e0f2278 100644
---- a/src/util/vircgroupv2devices.c
-+++ b/src/util/vircgroupv2devices.c
-@@ -342,7 +342,7 @@ virCgroupV2DevicesCountMapEntries(int mapfd)
-         prevKey = key;
-     }
- 
--    if (rc < 0)
-+    if (rc < 0 && errno != ENOENT)
-         return -1;
- 
-     return ret;
--- 
-2.27.0
-
diff --git a/vircommand.c-write-child-pidfile-before-process-tuni.patch b/vircommand.c-write-child-pidfile-before-process-tuni.patch
deleted file mode 100644
index 1fdf5c5d3e5e6d92b705bed083c4959c801776fd..0000000000000000000000000000000000000000
--- a/vircommand.c-write-child-pidfile-before-process-tuni.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From ea6794e88ca66d730a6c0ba76a996ff59491176e Mon Sep 17 00:00:00 2001
-From: Daniel Henrique Barboza <danielhb413@gmail.com>
-Date: Thu, 1 Oct 2020 10:34:24 -0300
-Subject: [PATCH 034/108] vircommand.c: write child pidfile before process
- tuning in virExec()
-
-When VIR_EXEC_DAEMON is true and cmd->pidfile exists, the parent
-will expect the pidfile to be written before exiting, sitting
-tight in a saferead() call waiting.
-
-The child then does process tuning (via virProcessSet* functions)
-before writing the pidfile. Problem is that these tunings can
-fail, and trigger a 'fork_error' jump, before cmd->pidfile is
-written. The result is that the process was aborted in the
-child, but the parent is still hang in the saferead() call.
-
-This behavior can be reproduced by trying to create and execute
-a QEMU guest in user mode (e.g. using qemu:///session as non-root).
-virProcessSetMaxMemLock() will fail if the spawned libvirtd user
-process does not have CAP_SYS_RESOURCE capability. setrlimit() will
-fail, and a 'fork_error' jump is triggered before cmd->pidfile
-is written. The parent will hung in saferead() indefinitely. From
-the user perspective, 'virsh start <guest>' will hang up
-indefinitely. CTRL+C can be used to retrieve the terminal, but
-any subsequent 'virsh' call will also hang because the previous
-libvirtd user process is still there.
-
-We can fix this by moving all virProcessSet*() tuning functions
-to be executed after cmd->pidfile is taken care of. In the case
-mentioned above, this would be the result of 'virsh start'
-after this patch:
-
-error: Failed to start domain vm1
-error: internal error: Process exited prior to exec: libvirt:  error :
-cannot limit locked memory to 79691776: Operation not permitted
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1882093
-
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-Signed-off-by: Daniel Henrique Barboza <danielhb413@gmail.com>
-(cherry picked from commit 0bb796bda31103ebf54eefc11c471586c87b95fd)
----
- src/util/vircommand.c | 19 ++++++++++---------
- 1 file changed, 10 insertions(+), 9 deletions(-)
-
-diff --git a/src/util/vircommand.c b/src/util/vircommand.c
-index 86e4c5cd39..8ab83cb8f5 100644
---- a/src/util/vircommand.c
-+++ b/src/util/vircommand.c
-@@ -787,15 +787,6 @@ virExec(virCommandPtr cmd)
-         }
-     }
- 
--    if (virProcessSetMaxMemLock(0, cmd->maxMemLock) < 0)
--        goto fork_error;
--    if (virProcessSetMaxProcesses(0, cmd->maxProcesses) < 0)
--        goto fork_error;
--    if (virProcessSetMaxFiles(0, cmd->maxFiles) < 0)
--        goto fork_error;
--    if (cmd->setMaxCore &&
--        virProcessSetMaxCoreSize(0, cmd->maxCore) < 0)
--        goto fork_error;
-     if (cmd->pidfile) {
-         int pidfilefd = -1;
-         char c;
-@@ -820,6 +811,16 @@ virExec(virCommandPtr cmd)
-         /* pidfilefd is intentionally leaked. */
-     }
- 
-+    if (virProcessSetMaxMemLock(0, cmd->maxMemLock) < 0)
-+        goto fork_error;
-+    if (virProcessSetMaxProcesses(0, cmd->maxProcesses) < 0)
-+        goto fork_error;
-+    if (virProcessSetMaxFiles(0, cmd->maxFiles) < 0)
-+        goto fork_error;
-+    if (cmd->setMaxCore &&
-+        virProcessSetMaxCoreSize(0, cmd->maxCore) < 0)
-+        goto fork_error;
-+
-     if (cmd->hook) {
-         VIR_DEBUG("Run hook %p %p", cmd->hook, cmd->opaque);
-         ret = cmd->hook(cmd->opaque);
--- 
-2.33.0
-
diff --git a/virdevmapper-Don-t-use-libdevmapper-to-obtain-depend.patch b/virdevmapper-Don-t-use-libdevmapper-to-obtain-depend.patch
deleted file mode 100644
index d8bcb6f1c7d2557fb928579f7071fd0c71eca550..0000000000000000000000000000000000000000
--- a/virdevmapper-Don-t-use-libdevmapper-to-obtain-depend.patch
+++ /dev/null
@@ -1,494 +0,0 @@
-From f0393f20647edb836a15de2b10262b006da700bc Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Michal=20Pr=C3=ADvozn=C3=ADk?= <mprivozn@redhat.com>
-Date: Thu, 14 Jan 2021 09:38:20 +0800
-Subject: [PATCH] virdevmapper: Don't use libdevmapper to obtain dependencies
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-CVE-2020-14339
-
-When building domain's private /dev in a namespace, libdevmapper
-is consulted for getting full dependency tree of domain's disks.
-The reason is that for a multipath devices all dependent devices
-must be created in the namespace and allowed in CGroups.
-
-However, this approach is very fragile as building of namespace
-happens in the forked off child process, after mass close of FDs
-and just before dropping privileges and execing QEMU. And it so
-happens that when calling libdevmapper APIs, one of them opens
-/dev/mapper/control and saves the FD into a global variable. The
-FD is kept open until the lib is unlinked or dm_lib_release() is
-called explicitly. We are doing neither.
-
-However, the virDevMapperGetTargets() function is called also
-from libvirtd (when setting up CGroups) and thus has to be thread
-safe. Unfortunately, libdevmapper APIs are not thread safe (nor
-async signal safe) and thus we can't use them. Reimplement what
-libdevmapper would do using plain C (ioctl()-s, /proc/devices
-parsing, /dev/mapper dirwalking, and so on).
-
-Fixes: a30078cb832646177defd256e77c632905f1e6d0
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1858260
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
-
-cherry-pick from commit 22494556542c676d1b9e7f1c1f2ea13ac17e1e3e
-Signed-off-by: Jiajie Li <lijiajie11@huawei.com>
----
- po/POTFILES.in          |   1 +
- src/util/virdevmapper.c | 336 ++++++++++++++++++++++++++--------------
- 2 files changed, 225 insertions(+), 112 deletions(-)
-
-diff --git a/po/POTFILES.in b/po/POTFILES.in
-index 551411a854..6f9620d73a 100644
---- a/po/POTFILES.in
-+++ b/po/POTFILES.in
-@@ -238,6 +238,7 @@
- @SRCDIR@/src/util/vircrypto.c
- @SRCDIR@/src/util/virdaemon.c
- @SRCDIR@/src/util/virdbus.c
-+@SRCDIR@/src/util/virdevmapper.c
- @SRCDIR@/src/util/virdnsmasq.c
- @SRCDIR@/src/util/virerror.c
- @SRCDIR@/src/util/virerror.h
-diff --git a/src/util/virdevmapper.c b/src/util/virdevmapper.c
-index 600e1f6322..a471504176 100644
---- a/src/util/virdevmapper.c
-+++ b/src/util/virdevmapper.c
-@@ -20,38 +20,67 @@
- 
- #include <config.h>
- 
-+#include "virdevmapper.h"
-+#include "internal.h"
-+
- #ifdef __linux__
- # include <sys/sysmacros.h>
--#endif
-+# include <linux/dm-ioctl.h>
-+# include <sys/ioctl.h>
-+# include <sys/types.h>
-+# include <sys/stat.h>
-+# include <fcntl.h>
- 
--#ifdef WITH_DEVMAPPER
--# include <libdevmapper.h>
--#endif
-+# include "virthread.h"
-+# include "viralloc.h"
-+# include "virstring.h"
-+# include "virfile.h"
-+
-+# define VIR_FROM_THIS VIR_FROM_STORAGE
-+
-+# define PROC_DEVICES "/proc/devices"
-+# define DM_NAME "device-mapper"
-+# define DEV_DM_DIR "/dev/" DM_DIR
-+# define CONTROL_PATH DEV_DM_DIR "/" DM_CONTROL_NODE
-+# define BUF_SIZE (16 * 1024)
-+
-+G_STATIC_ASSERT(BUF_SIZE > sizeof(struct dm_ioctl));
-+
-+static unsigned int virDMMajor;
- 
--#include "virdevmapper.h"
--#include "internal.h"
--#include "virthread.h"
--#include "viralloc.h"
--#include "virstring.h"
--
--#ifdef WITH_DEVMAPPER
--static void
--virDevMapperDummyLogger(int level G_GNUC_UNUSED,
--                        const char *file G_GNUC_UNUSED,
--                        int line G_GNUC_UNUSED,
--                        int dm_errno G_GNUC_UNUSED,
--                        const char *fmt G_GNUC_UNUSED,
--                        ...)
--{
--    return;
--}
- 
- static int
- virDevMapperOnceInit(void)
- {
--    /* Ideally, we would not need this. But libdevmapper prints
--     * error messages to stderr by default. Sad but true. */
--    dm_log_with_errno_init(virDevMapperDummyLogger);
-+    g_autofree char *buf = NULL;
-+    VIR_AUTOSTRINGLIST lines = NULL;
-+    size_t i;
-+
-+    if (virFileReadAll(PROC_DEVICES, BUF_SIZE, &buf) < 0)
-+        return -1;
-+
-+    lines = virStringSplit(buf, "\n", 0);
-+    if (!lines)
-+        return -1;
-+
-+    for (i = 0; lines[i]; i++) {
-+        g_autofree char *dev = NULL;
-+        unsigned int maj;
-+
-+        if (sscanf(lines[i], "%u %ms\n", &maj, &dev) == 2 &&
-+            STREQ(dev, DM_NAME)) {
-+            virDMMajor = maj;
-+            break;
-+        }
-+    }
-+
-+    if (!lines[i]) {
-+        virReportError(VIR_ERR_INTERNAL_ERROR,
-+                       _("Unable to find major for %s"),
-+                       DM_NAME);
-+        return -1;
-+    }
-+
-     return 0;
- }
- 
-@@ -59,111 +88,190 @@ virDevMapperOnceInit(void)
- VIR_ONCE_GLOBAL_INIT(virDevMapper);
- 
- 
-+static void *
-+virDMIoctl(int controlFD, int cmd, struct dm_ioctl *dm, char **buf)
-+{
-+    size_t bufsize = BUF_SIZE;
-+
-+ reread:
-+    *buf = g_new0(char, bufsize);
-+
-+    dm->version[0] = DM_VERSION_MAJOR;
-+    dm->version[1] = 0;
-+    dm->version[2] = 0;
-+    dm->data_size = bufsize;
-+    dm->data_start = sizeof(struct dm_ioctl);
-+
-+    memcpy(*buf, dm, sizeof(struct dm_ioctl));
-+
-+    if (ioctl(controlFD, cmd, *buf) < 0) {
-+        VIR_FREE(*buf);
-+        return NULL;
-+    }
-+
-+    memcpy(dm, *buf, sizeof(struct dm_ioctl));
-+
-+    if (dm->flags & DM_BUFFER_FULL_FLAG) {
-+        bufsize += BUF_SIZE;
-+        VIR_FREE(*buf);
-+        goto reread;
-+    }
-+
-+    return *buf + dm->data_start;
-+}
-+
-+
- static int
--virDevMapperGetTargetsImpl(const char *path,
--                           char ***devPaths_ret,
--                           unsigned int ttl)
-+virDMOpen(void)
- {
--    struct stat sb;
--    struct dm_task *dmt = NULL;
--    struct dm_deps *deps;
--    struct dm_info info;
--    char **devPaths = NULL;
--    char **recursiveDevPaths = NULL;
--    size_t i;
--    int ret = -1;
-+    VIR_AUTOCLOSE controlFD = -1;
-+    struct dm_ioctl dm;
-+    g_autofree char *tmp = NULL;
-+    int ret;
- 
--    *devPaths_ret = NULL;
-+    memset(&dm, 0, sizeof(dm));
- 
--    if (virDevMapperInitialize() < 0)
--        return ret;
-+    if ((controlFD = open(CONTROL_PATH, O_RDWR)) < 0)
-+        return -1;
- 
--    if (ttl == 0) {
--        errno = ELOOP;
--        return ret;
-+    if (!virDMIoctl(controlFD, DM_VERSION, &dm, &tmp)) {
-+        virReportSystemError(errno, "%s",
-+                             _("Unable to get device-mapper version"));
-+        return -1;
-     }
- 
--    if (stat(path, &sb) < 0) {
--        if (errno == ENOENT)
--            return 0;
-+    if (dm.version[0] != DM_VERSION_MAJOR) {
-+        virReportError(VIR_ERR_OPERATION_UNSUPPORTED,
-+                       _("Unsupported device-mapper version. Expected %d got %d"),
-+                       DM_VERSION_MAJOR, dm.version[0]);
-         return -1;
-     }
- 
--    if (!dm_is_dm_major(major(sb.st_dev)))
--        return 0;
-+    ret = controlFD;
-+    controlFD = -1;
-+    return ret;
-+}
- 
--    if (!(dmt = dm_task_create(DM_DEVICE_DEPS))) {
--        if (errno == ENOENT || errno == ENODEV) {
--            /* It's okay. Kernel is probably built without
--             * devmapper support. */
--            ret = 0;
--        }
--        return ret;
-+
-+static char *
-+virDMSanitizepath(const char *path)
-+{
-+    g_autofree char *dmDirPath = NULL;
-+    struct dirent *ent = NULL;
-+    struct stat sb[2];
-+    DIR *dh = NULL;
-+    const char *p;
-+    char *ret = NULL;
-+    int rc;
-+
-+    /* If a path is NOT provided then assume it's DM name */
-+    p = strrchr(path, '/');
-+
-+    if (!p)
-+        return g_strdup(path);
-+    else
-+        p++;
-+
-+    /* It's a path. Check if the last component is DM name */
-+    if (stat(path, &sb[0]) < 0) {
-+        virReportError(errno,
-+                       _("Unable to stat %p"),
-+                       path);
-+        return NULL;
-     }
- 
--    if (!dm_task_set_name(dmt, path)) {
--        if (errno == ENOENT) {
--            /* It's okay, @path is not managed by devmapper =>
--             * not a devmapper device. */
--            ret = 0;
--        }
--        goto cleanup;
-+    dmDirPath = g_strdup_printf(DEV_DM_DIR "/%s", p);
-+
-+    if (stat(dmDirPath, &sb[1]) == 0 &&
-+        sb[0].st_rdev == sb[1].st_rdev) {
-+        return g_strdup(p);
-     }
- 
--    dm_task_no_open_count(dmt);
-+    /* The last component of @path wasn't DM name. Let's check if
-+     * there's a device under /dev/mapper/ with the same rdev. */
-+    if (virDirOpen(&dh, DEV_DM_DIR) < 0)
-+        return NULL;
-+
-+    while ((rc = virDirRead(dh, &ent, DEV_DM_DIR)) > 0) {
-+        g_autofree char *tmp = g_strdup_printf(DEV_DM_DIR "/%s", ent->d_name);
- 
--    if (!dm_task_run(dmt)) {
--        if (errno == ENXIO) {
--            /* If @path = "/dev/mapper/control" ENXIO is returned. */
--            ret = 0;
-+        if (stat(tmp, &sb[1]) == 0 &&
-+            sb[0].st_rdev == sb[0].st_rdev) {
-+            ret = g_steal_pointer(&tmp);
-+            break;
-         }
--        goto cleanup;
-     }
- 
--    if (!dm_task_get_info(dmt, &info))
--        goto cleanup;
-+    virDirClose(&dh);
-+    return ret;
-+}
-+
-+
-+static int
-+virDevMapperGetTargetsImpl(int controlFD,
-+                           const char *path,
-+                           char ***devPaths_ret,
-+                           unsigned int ttl)
-+{
-+    g_autofree char *sanitizedPath = NULL;
-+    g_autofree char *buf = NULL;
-+    struct dm_ioctl dm;
-+    struct dm_target_deps *deps = NULL;
-+    VIR_AUTOSTRINGLIST devPaths = NULL;
-+    size_t i;
-+
-+    memset(&dm, 0, sizeof(dm));
-+    *devPaths_ret = NULL;
- 
--    if (!info.exists) {
--        ret = 0;
--        goto cleanup;
-+    if (ttl == 0) {
-+        errno = ELOOP;
-+        return -1;
-     }
- 
--    if (!(deps = dm_task_get_deps(dmt)))
--        goto cleanup;
-+    if (!virIsDevMapperDevice(path))
-+        return 0;
-+
-+    if (!(sanitizedPath = virDMSanitizepath(path)))
-+        return 0;
-+
-+    if (virStrncpy(dm.name, sanitizedPath, -1, DM_TABLE_DEPS) < 0) {
-+        virReportError(VIR_ERR_OPERATION_UNSUPPORTED, "%s",
-+                       _("Resolved device mapper name too long"));
-+        return -1;
-+    }
-+
-+    deps = virDMIoctl(controlFD, DM_TABLE_DEPS, &dm, &buf);
-+    if (!deps) {
-+        if (errno == ENXIO)
-+            return 0;
-+
-+        virReportSystemError(errno,
-+                             _("Unable to query dependencies for %s"),
-+                             path);
-+        return -1;
-+    }
- 
-     if (VIR_ALLOC_N_QUIET(devPaths, deps->count + 1) < 0)
--        goto cleanup;
-+        return -1;
- 
-     for (i = 0; i < deps->count; i++) {
-         devPaths[i] = g_strdup_printf("/dev/block/%u:%u",
--                                      major(deps->device[i]),
--                                      minor(deps->device[i]));
-+                                      major(deps->dev[i]),
-+                                      minor(deps->dev[i]));
-     }
- 
--    recursiveDevPaths = NULL;
-     for (i = 0; i < deps->count; i++) {
--        char **tmpPaths;
-+        VIR_AUTOSTRINGLIST tmpPaths = NULL;
- 
--        if (virDevMapperGetTargetsImpl(devPaths[i], &tmpPaths, ttl - 1) < 0)
--            goto cleanup;
-+        if (virDevMapperGetTargetsImpl(controlFD, devPaths[i], &tmpPaths, ttl - 1) < 0)
-+            return -1;
- 
--        if (tmpPaths &&
--            virStringListMerge(&recursiveDevPaths, &tmpPaths) < 0) {
--            virStringListFree(tmpPaths);
--            goto cleanup;
--        }
-+        if (virStringListMerge(&devPaths, &tmpPaths) < 0)
-+            return -1;
-     }
- 
--    if (virStringListMerge(&devPaths, &recursiveDevPaths) < 0)
--        goto cleanup;
--
-     *devPaths_ret = g_steal_pointer(&devPaths);
--    ret = 0;
-- cleanup:
--    virStringListFree(recursiveDevPaths);
--    virStringListFree(devPaths);
--    dm_task_destroy(dmt);
--    return ret;
-+    return 0;
- }
- 
- 
-@@ -182,9 +290,6 @@ virDevMapperGetTargetsImpl(const char *path,
-  * If @path consists of yet another devmapper targets these are
-  * consulted recursively.
-  *
-- * If we don't have permissions to talk to kernel, -1 is returned
-- * and errno is set to EBADF.
-- *
-  * Returns 0 on success,
-  *        -1 otherwise (with errno set, no libvirt error is
-  *        reported)
-@@ -193,46 +298,53 @@ int
- virDevMapperGetTargets(const char *path,
-                        char ***devPaths)
- {
-+    VIR_AUTOCLOSE controlFD = -1;
-     const unsigned int ttl = 32;
- 
-     /* Arbitrary limit on recursion level. A devmapper target can
-      * consist of devices or yet another targets. If that's the
-      * case, we have to stop recursion somewhere. */
- 
--    return virDevMapperGetTargetsImpl(path, devPaths, ttl);
--}
-+    if (virDevMapperInitialize() < 0)
-+        return -1;
- 
--#else /* ! WITH_DEVMAPPER */
-+    if ((controlFD = virDMOpen()) < 0)
-+        return -1;
- 
--int
--virDevMapperGetTargets(const char *path G_GNUC_UNUSED,
--                       char ***devPaths G_GNUC_UNUSED)
--{
--    errno = ENOSYS;
--    return -1;
-+    return virDevMapperGetTargetsImpl(controlFD, path, devPaths, ttl);
- }
--#endif /* ! WITH_DEVMAPPER */
- 
- 
--#if WITH_DEVMAPPER
- bool
- virIsDevMapperDevice(const char *dev_name)
- {
-     struct stat buf;
- 
-+    if (virDevMapperInitialize() < 0)
-+        return false;
-+
-     if (!stat(dev_name, &buf) &&
-         S_ISBLK(buf.st_mode) &&
--        dm_is_dm_major(major(buf.st_rdev)))
--            return true;
-+        major(buf.st_rdev) == virDMMajor)
-+        return true;
- 
-     return false;
- }
- 
--#else /* ! WITH_DEVMAPPER */
-+#else /* !defined(__linux__)  */
-+
-+int
-+virDevMapperGetTargets(const char *path G_GNUC_UNUSED,
-+                       char ***devPaths G_GNUC_UNUSED)
-+{
-+    errno = ENOSYS;
-+    return -1;
-+}
-+
- 
- bool
- virIsDevMapperDevice(const char *dev_name G_GNUC_UNUSED)
- {
-     return false;
- }
--#endif /* ! WITH_DEVMAPPER */
-+#endif /* ! defined(__linux__) */
--- 
-2.27.0
-
diff --git a/virdevmapper-Handle-kernel-without-device-mapper-sup.patch b/virdevmapper-Handle-kernel-without-device-mapper-sup.patch
deleted file mode 100644
index 6d4f9e554a471298a0c2247bb14b07caeaa4ca69..0000000000000000000000000000000000000000
--- a/virdevmapper-Handle-kernel-without-device-mapper-sup.patch
+++ /dev/null
@@ -1,79 +0,0 @@
-From 98581cc016224a13c4245346a1c501af511b3437 Mon Sep 17 00:00:00 2001
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Tue, 18 Aug 2020 11:04:24 +0200
-Subject: [PATCH] virdevmapper: Handle kernel without device-mapper support
-
-In one of my latest patch (v6.6.0~30) I was trying to remove
-libdevmapper use in favor of our own implementation. However, the
-code did not take into account that device mapper can be not
-compiled into the kernel (e.g. be a separate module that's not
-loaded) in which case /proc/devices won't have the device-mapper
-major number and thus virDevMapperGetTargets() and/or
-virIsDevMapperDevice() fails.
-
-However, such failure is safe to ignore, because if device mapper
-is missing then there can't be any multipath devices and thus we
-don't need to allow the deps in CGroups, nor create them in the
-domain private namespace, etc.
-
-Fixes: 22494556542c676d1b9e7f1c1f2ea13ac17e1e3e
-Reported-by: Andrea Bolognani <abologna@redhat.com>
-Reported-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
-Tested-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
----
- src/util/virdevmapper.c | 20 ++++++++++++++++++--
- 1 file changed, 18 insertions(+), 2 deletions(-)
-
-diff --git a/src/util/virdevmapper.c b/src/util/virdevmapper.c
-index b43dbefa9a..a81e2edee4 100644
---- a/src/util/virdevmapper.c
-+++ b/src/util/virdevmapper.c
-@@ -54,6 +54,9 @@ virDevMapperGetMajor(unsigned int *major)
-     VIR_AUTOSTRINGLIST lines = NULL;
-     size_t i;
- 
-+    if (!virFileExists(CONTROL_PATH))
-+        return -2;
-+
-     if (virFileReadAll(PROC_DEVICES, BUF_SIZE, &buf) < 0)
-         return -1;
- 
-@@ -126,8 +129,13 @@ virDMOpen(void)
- 
-     memset(&dm, 0, sizeof(dm));
- 
--    if ((controlFD = open(CONTROL_PATH, O_RDWR)) < 0)
-+    if ((controlFD = open(CONTROL_PATH, O_RDWR)) < 0) {
-+        if (errno == ENOENT)
-+            return -2;
-+
-+        virReportSystemError(errno, _("Unable to open %s"), CONTROL_PATH);
-         return -1;
-+    }
- 
-     if (!virDMIoctl(controlFD, DM_VERSION, &dm, &tmp)) {
-         virReportSystemError(errno, "%s",
-@@ -300,8 +308,16 @@ virDevMapperGetTargets(const char *path,
-      * consist of devices or yet another targets. If that's the
-      * case, we have to stop recursion somewhere. */
- 
--    if ((controlFD = virDMOpen()) < 0)
-+    if ((controlFD = virDMOpen()) < 0) {
-+        if (controlFD == -2) {
-+            /* The CONTROL_PATH doesn't exist. Probably the
-+             * module isn't loaded, yet. Don't error out, just
-+             * exit. */
-+            return 0;
-+        }
-+
-         return -1;
-+    }
- 
-     return virDevMapperGetTargetsImpl(controlFD, path, devPaths, ttl);
- }
--- 
-2.27.0
-
diff --git a/vireventglib-Remove-handles-with-the-highest-priorit.patch b/vireventglib-Remove-handles-with-the-highest-priorit.patch
deleted file mode 100644
index 09aa7a36688048d491820ae3d0c441c4bc3e1206..0000000000000000000000000000000000000000
--- a/vireventglib-Remove-handles-with-the-highest-priorit.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-From 1a419107d7f9620cb6694c931450521a60b5c5f8 Mon Sep 17 00:00:00 2001
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Thu, 7 Oct 2021 13:46:43 +0200
-Subject: [PATCH 101/108] vireventglib: Remove handles with the highest
- priority
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-When a server decides to close a client, the
-virNetServerClientCloseLocked() is called. In here various
-cleanup steps are taken, but the most important part (from this
-commit's POV at least) is the way that the socket is closed.
-Firstly, removal of the socket associated with the client from
-the event loop is signalized and then the socket is unrefed. The
-socket is not closed just yet though, because the event loop
-holds a reference to it. This reference will be freed as soon as
-the event loop wakes up and starts issuing callbacks (in this
-case virNetSocketEventFree()).
-
-So far, this is how things usually work. But if the daemon
-reaches the number of opened files limit, things start to work
-differently.
-
-If the RLIMIT_NOFILE limit is reached and there's a client that
-wants to connect then the event loop wakes up, sees POLLIN on the
-socket and calls virNetServerServiceAccept() which in turn calls
-virNetSocketAccept(). But because of the limit, accept() fails
-with EMFILE leaving the POLLIN event unhandled. The dispatch then
-continues to next FDs with events on them. BUT, it will NOT call
-the socket removal callback (virNetSocketEventFree()) because it
-has low priority (G_PRIORITY_DEFAULT_IDLE). Per glib's
-documentation:
-
- * Each event source is assigned a priority. The default priority,
- * %G_PRIORITY_DEFAULT, is 0. Values less than 0 denote higher priorities.
- * Values greater than 0 denote lower priorities. Events from high priority
- * sources are always processed before events from lower priority sources.
-
-and per g_idle_add() documentation:
-
- * Adds a function to be called whenever there are no higher priority
- * events pending to the default main loop. The function is given the
- * default idle priority, %G_PRIORITY_DEFAULT_IDLE.
-
-Now, because we did not accept() the client we are constantly
-seeing POLLIN on the main socket and thus the removal of the
-client socket won't ever happen.
-
-The fix is to set at least the same priority as other sources,
-but since we want to just close an FD, let's give it the highest
-priority and call it before handling other events.
-
-This issue can be easily reproduced, for instance:
-
- # ulimit -S -n 40 (tweak this number if needed)
- # ./src/libvirtd
-
-from another terminal:
-
- # for ((i=0; i<100; i++)); do virsh list & done; virsh list
-
-The last `virsh list` must not get stuck.
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2007168
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
-(cherry picked from commit 5de203f8795d96229d2663e9ea1a24fba5db38fc)
----
- src/util/vireventglib.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/util/vireventglib.c b/src/util/vireventglib.c
-index 803332a6f8..47c2835552 100644
---- a/src/util/vireventglib.c
-+++ b/src/util/vireventglib.c
-@@ -283,7 +283,7 @@ virEventGLibHandleRemove(int watch)
-      * 'removed' to prevent reuse
-      */
-     data->removed = TRUE;
--    g_idle_add(virEventGLibHandleRemoveIdle, data);
-+    g_idle_add_full(G_PRIORITY_HIGH, virEventGLibHandleRemoveIdle, data, NULL);
- 
-     ret = 0;
- 
--- 
-2.33.0
-
diff --git a/virnetdevbridge-Ignore-EEXIST-when-adding-an-entry-t.patch b/virnetdevbridge-Ignore-EEXIST-when-adding-an-entry-t.patch
deleted file mode 100644
index 4529c29e53a0288ed5f3f5191dca4f17f6fabcca..0000000000000000000000000000000000000000
--- a/virnetdevbridge-Ignore-EEXIST-when-adding-an-entry-t.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 0cd5b4ef642e65e8e8ba35306700e2084a39fdab Mon Sep 17 00:00:00 2001
-From: Jiri Denemark <jdenemar@redhat.com>
-Date: Fri, 30 Apr 2021 17:25:29 +0200
-Subject: [PATCH 052/108] virnetdevbridge: Ignore EEXIST when adding an entry
- to fdb
-
-When updating entries in a bridge forwarding database (i.e., when
-macTableManager='libvirt' is configured for the bridge), we may end up
-in a situation when the entry we want to add is already present. Let's
-just ignore the error in such a case.
-
-This fixes an error to resume a domain when fdb entries were not
-properly removed when the domain was paused:
-
-    virsh # resume test
-    error: Failed to resume domain test
-    error: error adding fdb entry for vnet2: File exists
-
-For some reason, fdb entries are only removed when libvirt explicitly
-stops CPUs, but nothing happens when we just get STOP event from QEMU.
-An alternative approach would be to make sure we always remove the
-entries regardless on why a domain was paused (e.g., during migration),
-but that would be a significantly more disruptive change with possible
-side effects.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1603155
-
-Signed-off-by: Jiri Denemark <jdenemar@redhat.com>
-Reviewed-by: Laine Stump <laine@redhat.com>
-(cherry picked from commit 241c22a9a531cb39d2b6b892561fe856f32f310d)
----
- src/util/virnetdevbridge.c | 10 +++++++---
- 1 file changed, 7 insertions(+), 3 deletions(-)
-
-diff --git a/src/util/virnetdevbridge.c b/src/util/virnetdevbridge.c
-index e1ba119b8b..49e5f830ea 100644
---- a/src/util/virnetdevbridge.c
-+++ b/src/util/virnetdevbridge.c
-@@ -1065,9 +1065,13 @@ virNetDevBridgeFDBAddDel(const virMacAddr *mac, const char *ifname,
-         if (resp->nlmsg_len < NLMSG_LENGTH(sizeof(*err)))
-             goto malformed_resp;
-         if (err->error) {
--            virReportSystemError(-err->error,
--                                 _("error adding fdb entry for %s"), ifname);
--            return -1;
-+            if (isAdd && -err->error == EEXIST) {
-+                VIR_DEBUG("fdb entry for %s already exists", ifname);
-+            } else {
-+                virReportSystemError(-err->error,
-+                                     _("error adding fdb entry for %s"), ifname);
-+                return -1;
-+            }
-         }
-         break;
-     case NLMSG_DONE:
--- 
-2.33.0
-
diff --git a/virnetsshsession-Adapt-to-change-libssh2-API.patch b/virnetsshsession-Adapt-to-change-libssh2-API.patch
deleted file mode 100644
index dab79924c8c859b4d6492187eff68808f272a7c2..0000000000000000000000000000000000000000
--- a/virnetsshsession-Adapt-to-change-libssh2-API.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From a2588d430c3dea3c4c259adc9d54d48891712c42 Mon Sep 17 00:00:00 2001
-From: mayunlong <mayunlong6@huawei.com>
-Date: Wed, 9 Aug 2023 21:11:41 +0800
-Subject: [PATCH] virnetsshsession: Adapt to change libssh2 API
-
-In one of its commits [1] libssh2 changed the 'text' member of
-LIBSSH2_USERAUTH_KBDINT_PROMPT struct from 'char' to 'unsigned
-char'. But we g_strdup() the member in order to fill 'prompt'
-member of virConnectCredential struct. Typecast the value to
-avoid warnings. Also, drop @prompt variable, as it's needless.
-
-1: https://github.com/libssh2/libssh2/commit/83853f8aea0e2f739cacd491632eb7fd3d03ad2d
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Peter Krempa <pkrempa@redhat.com>
----
- src/rpc/virnetsshsession.c | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/src/rpc/virnetsshsession.c b/src/rpc/virnetsshsession.c
-index fabdc3ef22..e073f6dbf7 100644
---- a/src/rpc/virnetsshsession.c
-+++ b/src/rpc/virnetsshsession.c
-@@ -230,9 +230,7 @@ virNetSSHKbIntCb(const char *name G_GNUC_UNUSED,
- 
-     /* fill data structures for auth callback */
-     for (i = 0; i < num_prompts; i++) {
--        char *prompt;
--        prompt = g_strdup(prompts[i].text);
--        askcred[i].prompt = prompt;
-+        askcred[i].prompt = g_strdup((char *)prompts[i].text);
- 
-         /* remove colon and trailing spaces from prompts, as default behavior
-          * of libvirt's auth callback is to add them */
--- 
-2.41.0.windows.1
-
diff --git a/virnettlscontext-Don-t-pass-static-key-length-to-gnu.patch b/virnettlscontext-Don-t-pass-static-key-length-to-gnu.patch
deleted file mode 100644
index 7123f9515b14ad40e188e30402159cc8ded3a669..0000000000000000000000000000000000000000
--- a/virnettlscontext-Don-t-pass-static-key-length-to-gnu.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From 096e7bf2a9472f29b43c53fdf50ad349584677fe Mon Sep 17 00:00:00 2001
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Tue, 21 Dec 2021 10:04:21 +0100
-Subject: [PATCH 107/108] virnettlscontext: Don't pass static key length to
- gnutls_dh_params_generate2()
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-As encryption norms get more strict it's easy to fall on the
-insecure side. For instance, so far we are generating 2048 bits
-long prime for Diffie-Hellman keys. Some systems consider this
-not long enough. While we may just keep increasing the value
-passed to the corresponding gnutls_* function, that is not well
-maintainable. Instead, we may do what's recommended in the
-gnutls_* manpage. From gnutls_dh_params_generate2(3):
-
-  It is recommended not to set the number of bits directly, but
-  use gnutls_sec_param_to_pk_bits() instead.
-
-Looking into the gnutls_sec_param_to_pk_bits() then [1], 2048
-bits corresponds to parameter MEDIUM.
-
-1: https://www.gnutls.org/manual/gnutls.html#tab_003akey_002dsizes
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Ani Sinha <ani@anisinha.ca>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 4b77b194069f048e6efdaf5d363098ae039dc4f5)
----
- src/rpc/virnettlscontext.c | 13 ++++++++++---
- 1 file changed, 10 insertions(+), 3 deletions(-)
-
-diff --git a/src/rpc/virnettlscontext.c b/src/rpc/virnettlscontext.c
-index d648a3815c..06365e15fb 100644
---- a/src/rpc/virnettlscontext.c
-+++ b/src/rpc/virnettlscontext.c
-@@ -38,8 +38,6 @@
- #include "virthread.h"
- #include "configmake.h"
- 
--#define DH_BITS 2048
--
- #define LIBVIRT_PKI_DIR SYSCONFDIR "/pki"
- #define LIBVIRT_CACERT LIBVIRT_PKI_DIR "/CA/cacert.pem"
- #define LIBVIRT_CACRL LIBVIRT_PKI_DIR "/CA/cacrl.pem"
-@@ -720,6 +718,15 @@ static virNetTLSContextPtr virNetTLSContextNew(const char *cacert,
-      * security requirements.
-      */
-     if (isServer) {
-+        unsigned int bits = 0;
-+
-+        bits = gnutls_sec_param_to_pk_bits(GNUTLS_PK_DH, GNUTLS_SEC_PARAM_MEDIUM);
-+        if (bits == 0) {
-+            virReportError(VIR_ERR_SYSTEM_ERROR, "%s",
-+                           _("Unable to get key length for diffie-hellman parameters"));
-+            goto error;
-+        }
-+
-         err = gnutls_dh_params_init(&ctxt->dhParams);
-         if (err < 0) {
-             virReportError(VIR_ERR_SYSTEM_ERROR,
-@@ -727,7 +734,7 @@ static virNetTLSContextPtr virNetTLSContextNew(const char *cacert,
-                            gnutls_strerror(err));
-             goto error;
-         }
--        err = gnutls_dh_params_generate2(ctxt->dhParams, DH_BITS);
-+        err = gnutls_dh_params_generate2(ctxt->dhParams, bits);
-         if (err < 0) {
-             virReportError(VIR_ERR_SYSTEM_ERROR,
-                            _("Unable to generate diffie-hellman parameters: %s"),
--- 
-2.33.0
-
diff --git a/virnettlscontext-Drop-gnutls_dh_set_prime_bits.patch b/virnettlscontext-Drop-gnutls_dh_set_prime_bits.patch
deleted file mode 100644
index f0532965772836bcd5b831f1371288e6e7180b58..0000000000000000000000000000000000000000
--- a/virnettlscontext-Drop-gnutls_dh_set_prime_bits.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 249902c244d0ee0659c6f9907b7384d6453ce77c Mon Sep 17 00:00:00 2001
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Tue, 21 Dec 2021 10:05:00 +0100
-Subject: [PATCH 106/108] virnettlscontext: Drop gnutls_dh_set_prime_bits()
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-According to the gnutls_dh_set_prime_bits() manpage:
-
-  The function has no effect in server side.
-
-Therefore, don't call it when creating server side context.
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Ani Sinha <ani@anisinha.ca>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit fb474c33ccc2c2726a2d6f9396effed13bfff9e8)
----
- src/rpc/virnettlscontext.c | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/src/rpc/virnettlscontext.c b/src/rpc/virnettlscontext.c
-index 02c17124a1..d648a3815c 100644
---- a/src/rpc/virnettlscontext.c
-+++ b/src/rpc/virnettlscontext.c
-@@ -1235,8 +1235,6 @@ virNetTLSSessionPtr virNetTLSSessionNew(virNetTLSContextPtr ctxt,
-      */
-     if (ctxt->isServer) {
-         gnutls_certificate_server_set_request(sess->session, GNUTLS_CERT_REQUEST);
--
--        gnutls_dh_set_prime_bits(sess->session, DH_BITS);
-     }
- 
-     gnutls_transport_set_ptr(sess->session, sess);
--- 
-2.33.0
-
diff --git a/virnuma-Don-t-work-around-numa_node_to_cpus-for-non-.patch b/virnuma-Don-t-work-around-numa_node_to_cpus-for-non-.patch
deleted file mode 100644
index 04fd4f319b03fed7cab47c87d7cfebcda5930914..0000000000000000000000000000000000000000
--- a/virnuma-Don-t-work-around-numa_node_to_cpus-for-non-.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From 3e40b796a66a73fd2efd3a520f1f11a8a77fcea5 Mon Sep 17 00:00:00 2001
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Fri, 21 Aug 2020 14:43:21 +0200
-Subject: [PATCH 047/108] virnuma: Don't work around numa_node_to_cpus() for
- non-existent nodes
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-In a very distant past, we came around machines that has not
-continuous node IDs. This made us error out when constructing
-capabilities XML. We resolved it by utilizing strange behaviour
-of numa_node_to_cpus() in which it returned a mask with all bits
-set for a non-existent node. However, this is not the only case
-when it returns all ones mask - if the node exists and has enough
-CPUs to fill the mask up (e.g. 128 CPUs).
-
-The fix consists of using nodemask_isset(&numa_all_nodes, ..)
-prior to calling numa_node_to_cpus() to determine if the node
-exists.
-
-Fixes: 628c93574758abb59e71160042524d321a33543f
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1860231
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
-(cherry picked from commit 24d7d85208f812a45686b32a0561cc9c5c9a49c9)
----
- src/util/virnuma.c | 18 +++++-------------
- 1 file changed, 5 insertions(+), 13 deletions(-)
-
-diff --git a/src/util/virnuma.c b/src/util/virnuma.c
-index eeca438f25..75d5628cff 100644
---- a/src/util/virnuma.c
-+++ b/src/util/virnuma.c
-@@ -256,31 +256,23 @@ virNumaGetNodeCPUs(int node,
-     int mask_n_bytes = max_n_cpus / 8;
-     size_t i;
-     g_autofree unsigned long *mask = NULL;
--    g_autofree unsigned long *allonesmask = NULL;
-     g_autoptr(virBitmap) cpumap = NULL;
- 
-     *cpus = NULL;
- 
--    if (VIR_ALLOC_N(mask, mask_n_bytes / sizeof(*mask)) < 0)
--        return -1;
-+    if (!nodemask_isset(&numa_all_nodes, node)) {
-+        VIR_DEBUG("NUMA topology for cell %d is not available, ignoring", node);
-+        return -2;
-+    }
- 
--    if (VIR_ALLOC_N(allonesmask, mask_n_bytes / sizeof(*mask)) < 0)
-+    if (VIR_ALLOC_N(mask, mask_n_bytes / sizeof(*mask)) < 0)
-         return -1;
- 
--    memset(allonesmask, 0xff, mask_n_bytes);
--
--    /* The first time this returns -1, ENOENT if node doesn't exist... */
-     if (numa_node_to_cpus(node, mask, mask_n_bytes) < 0) {
-         VIR_WARN("NUMA topology for cell %d is not available, ignoring", node);
-         return -2;
-     }
- 
--    /* second, third... times it returns an all-1's mask */
--    if (memcmp(mask, allonesmask, mask_n_bytes) == 0) {
--        VIR_DEBUG("NUMA topology for cell %d is invalid, ignoring", node);
--        return -2;
--    }
--
-     if (!(cpumap = virBitmapNew(max_n_cpus)))
-         return -1;
- 
--- 
-2.33.0
-
diff --git a/virnuma-Use-numa_nodes_ptr-when-checking-available-N.patch b/virnuma-Use-numa_nodes_ptr-when-checking-available-N.patch
deleted file mode 100644
index fb13ec336462248cc9007a5174b8a00ecc38dbfe..0000000000000000000000000000000000000000
--- a/virnuma-Use-numa_nodes_ptr-when-checking-available-N.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 2481f6302d65f98d143aca9933a0fd17b492069a Mon Sep 17 00:00:00 2001
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Fri, 11 Sep 2020 11:50:33 +0200
-Subject: [PATCH 096/108] virnuma: Use numa_nodes_ptr when checking available
- NUMA nodes
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-In v6.7.0-rc1~86 I've tried to fix a problem where we were not
-detecting NUMA nodes properly because we misused behaviour of a
-libnuma API and as it turned out the behaviour was correct for
-hosts with 64 CPUs in one NUMA node. So I changed the code to use
-nodemask_isset(&numa_all_nodes, ..) instead and it fixed the
-problem on such hosts. However, what I did not realize is that
-numa_all_nodes does not reflect all NUMA nodes visible to
-userspace, it contains only those nodes that the process
-(libvirtd) an allocate memory from, which can be only a subset of
-all NUMA nodes. The bitmask that contains all NUMA nodes visible
-to userspace and which one I should have used is: numa_nodes_ptr.
-For curious ones:
-
-https://github.com/numactl/numactl/commit/4a22f2238234155e11e3e2717c011864722b767b
-
-And as I was fixing virNumaGetNodeCPUs() I came to realize that
-we already have a function that wraps the correct bitmask:
-virNumaNodeIsAvailable().
-
-Fixes: 24d7d85208f812a45686b32a0561cc9c5c9a49c9
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1876956
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
-(cherry picked from commit 551fb778f5451d40211867365b5eb9b8384b4e3b)
----
- src/util/virnuma.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/util/virnuma.c b/src/util/virnuma.c
-index 75d5628cff..b7e6473e77 100644
---- a/src/util/virnuma.c
-+++ b/src/util/virnuma.c
-@@ -260,7 +260,7 @@ virNumaGetNodeCPUs(int node,
- 
-     *cpus = NULL;
- 
--    if (!nodemask_isset(&numa_all_nodes, node)) {
-+    if (!virNumaNodeIsAvailable(node)) {
-         VIR_DEBUG("NUMA topology for cell %d is not available, ignoring", node);
-         return -2;
-     }
--- 
-2.33.0
-
diff --git a/virnwfilterbindingobj-Fix-virNWFilterBindingObjNew.patch b/virnwfilterbindingobj-Fix-virNWFilterBindingObjNew.patch
deleted file mode 100644
index ac5273a622e403a4c842dc18827332f877fca528..0000000000000000000000000000000000000000
--- a/virnwfilterbindingobj-Fix-virNWFilterBindingObjNew.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From cb72ee4b8e09b2a4246fc85235ae2a73cff4cb73 Mon Sep 17 00:00:00 2001
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Tue, 1 Feb 2022 10:21:02 +0100
-Subject: [PATCH 05/22] virnwfilterbindingobj: Fix virNWFilterBindingObjNew()
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The idea behind virNWFilterBindingObjNew() is to create and
-return an object of virNWFilterBindingObjClass class. The class
-is virObjectLockable (and the corresponding
-_virNWFilterBindingObj structure has virObjectLockable parent).
-But for some reason plain virObjectNew() is called. This is wrong
-because the mutex in the parent is left uninitialized.
-
-Next, the returned object is not locked. This is wrong because in
-some cases the returned object is added onto a list of bindings
-and then passed to virNWFilterBindingObjEndAPI() which unlocks it
-right away. This is potentially dangerous because we might just
-have unlocked the object for another thread.
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/conf/virnwfilterbindingobj.c | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/src/conf/virnwfilterbindingobj.c b/src/conf/virnwfilterbindingobj.c
-index 7cfc2e9efa..656398ed8b 100644
---- a/src/conf/virnwfilterbindingobj.c
-+++ b/src/conf/virnwfilterbindingobj.c
-@@ -57,10 +57,15 @@ VIR_ONCE_GLOBAL_INIT(virNWFilterBindingObj);
- virNWFilterBindingObjPtr
- virNWFilterBindingObjNew(void)
- {
-+    virNWFilterBindingObj *ret;
-     if (virNWFilterBindingObjInitialize() < 0)
-         return NULL;
- 
--    return virObjectNew(virNWFilterBindingObjClass);
-+    if (!(ret = virObjectLockableNew(virNWFilterBindingObjClass)))
-+        return NULL;
-+
-+    virObjectLock(ret);
-+    return ret;
- }
- 
- 
--- 
-2.33.0
-
diff --git a/virrandom-Fix-printf-format-string-in-virRandomGener.patch b/virrandom-Fix-printf-format-string-in-virRandomGener.patch
deleted file mode 100644
index 2cb27816419dd58b1cba1588fb193a243381eb77..0000000000000000000000000000000000000000
--- a/virrandom-Fix-printf-format-string-in-virRandomGener.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 4fa96d435fb3a60b4757b41b1d9f273225c79158 Mon Sep 17 00:00:00 2001
-From: zhujun2 <zhujun2@cmss.chinamobile.com>
-Date: Mon, 31 Jul 2023 20:08:11 -0700
-Subject: [PATCH] virrandom: Fix printf format string in virRandomGenerateWWN()
-
-Firstly, drop needless concatenation of two static strings.
-Secondly, use proper (portable) formatter for uint64_t so that
-typecast to ULL can be dropped.
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Peter Krempa <pkrempa@redhat.com>
-Signed-off-by: zhujun2 <zhujun2_yewu@cmss.chinamobile.com>
-(cherry-pick form b857ad0696ca5177eccf482f244665c246b3ace8)
----
- src/util/virrandom.c | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/src/util/virrandom.c b/src/util/virrandom.c
-index 0487b4e70b..1b4102cf58 100644
---- a/src/util/virrandom.c
-+++ b/src/util/virrandom.c
-@@ -158,7 +158,6 @@ virRandomGenerateWWN(char **wwn,
-         return -1;
-     }
- 
--    *wwn = g_strdup_printf("5" "%s%09llx", oui,
--                           (unsigned long long)virRandomBits(36));
-+    *wwn = g_strdup_printf("5%s%09" PRIx64, oui, virRandomBits(36));
-     return 0;
- }
--- 
-2.27.0
-
diff --git a/virsh-Check-whether-enough-arguments-was-passed-to-i.patch b/virsh-Check-whether-enough-arguments-was-passed-to-i.patch
deleted file mode 100644
index 8aef9f55e8650f84a669c7f03d7480511725bfbc..0000000000000000000000000000000000000000
--- a/virsh-Check-whether-enough-arguments-was-passed-to-i.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 6999dc861ad3cf77802f76cda028802355c4ee6d Mon Sep 17 00:00:00 2001
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Wed, 8 Jun 2022 15:01:00 +0200
-Subject: [PATCH 20/22] virsh: Check whether enough arguments was passed to
- iothreadset
-
-Virsh has iothreadset command which allows setting various
-attributes of IOThreads. However, when the command is called
-without any arguments (besides domain and IOThread IDs), then
-@params stays NULL and is passed to virDomainSetIOThreadParams()
-which produces rather user unfriendly error message:
-
-  error: params in virDomainSetIOThreadParams must not be NULL
-
-Introduce a check and produce better error message.
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Claudio Fontana <cfontana@suse.de>
----
- tools/virsh-domain.c | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
-index 6dd56168e3..0d58775289 100644
---- a/tools/virsh-domain.c
-+++ b/tools/virsh-domain.c
-@@ -7981,6 +7981,11 @@ cmdIOThreadSet(vshControl *ctl, const vshCmd *cmd)
- 
- #undef VSH_IOTHREAD_SET_UINT_PARAMS
- 
-+    if (nparams == 0) {
-+        vshError(ctl, _("Not enough arguments passed, nothing to set"));
-+        goto cleanup;
-+    }
-+
-     if (virDomainSetIOThreadParams(dom, id, params, nparams, flags) < 0)
-         goto cleanup;
- 
--- 
-2.33.0
-
diff --git a/virsh-Display-vhostuser-socket-path-in-domblklist.patch b/virsh-Display-vhostuser-socket-path-in-domblklist.patch
deleted file mode 100644
index ca6324c17a274452cec37ddb36bca3bc3e5b3645..0000000000000000000000000000000000000000
--- a/virsh-Display-vhostuser-socket-path-in-domblklist.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From d5de781c93c695ed92fa181764f9f0cfbb508074 Mon Sep 17 00:00:00 2001
-From: dinglimin <dinglimin@cmss.chinamobile.com>
-Date: Mon, 13 Dec 2021 11:18:09 +0800
-Subject: [PATCH] virsh: Display vhostuser socket path in domblklist
-
-The domblklist command is designed to show a brief information about the
-blocks of a domain. One piece of information that is shows is "Target
-"and "Source". Before the modification, the Vhost disk of SPDK is
-displayed as "-". After the modification, the socket associated with it
-can be displayed.
-
-Signed-off-by: dinglimin <dinglimin@cmss.chinamobile.com>
----
- tools/virsh-domain-monitor.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/tools/virsh-domain-monitor.c b/tools/virsh-domain-monitor.c
-index 9b8c69fa9d..74ff369597 100644
---- a/tools/virsh-domain-monitor.c
-+++ b/tools/virsh-domain-monitor.c
-@@ -665,7 +665,8 @@ cmdDomblklist(vshControl *ctl, const vshCmd *cmd)
-                                     "|./source/@dev"
-                                     "|./source/@dir"
-                                     "|./source/@name"
--                                    "|./source/@volume)", ctxt);
-+                                    "|./source/@volume"
-+                                    "|./source/@path)", ctxt);
-         }
- 
-         if (details) {
--- 
-2.27.0
-
diff --git a/virsh-Fix-XPATH-in-virshDomainDeviceAliasCompleter.patch b/virsh-Fix-XPATH-in-virshDomainDeviceAliasCompleter.patch
deleted file mode 100644
index 00c6d6471360b5993e304de587f2fdeb2cf66303..0000000000000000000000000000000000000000
--- a/virsh-Fix-XPATH-in-virshDomainDeviceAliasCompleter.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 97672f8da837bbe9e1a57714db3b2ce5f299b8d3 Mon Sep 17 00:00:00 2001
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Fri, 22 Jan 2021 09:29:54 +0100
-Subject: [PATCH 085/108] virsh: Fix XPATH in virshDomainDeviceAliasCompleter()
-
-The way this completer works is that it dumps XML of specified
-domain and then tries to look for @name attribute of <alias/>
-element. However, the XPATH it uses is not correct which results
-in no aliases returned by the completer.
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Peter Krempa <pkrempa@redhat.com>
-(cherry picked from commit f023a8acd9c08ea3bc72bf8f968ad63426b033bd)
----
- tools/virsh-completer-domain.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tools/virsh-completer-domain.c b/tools/virsh-completer-domain.c
-index 4472ee08f2..7e155d9ee2 100644
---- a/tools/virsh-completer-domain.c
-+++ b/tools/virsh-completer-domain.c
-@@ -266,7 +266,7 @@ virshDomainDeviceAliasCompleter(vshControl *ctl,
-     if (virshDomainGetXML(ctl, cmd, domainXMLFlags, &xmldoc, &ctxt) < 0)
-         return NULL;
- 
--    naliases = virXPathNodeSet("./devices//alias/@name", ctxt, &aliases);
-+    naliases = virXPathNodeSet("/domain/devices//alias[@name]", ctxt, &aliases);
-     if (naliases < 0)
-         return NULL;
- 
-@@ -274,7 +274,7 @@ virshDomainDeviceAliasCompleter(vshControl *ctl,
-         return NULL;
- 
-     for (i = 0; i < naliases; i++) {
--        if (!(tmp[i] = virXMLNodeContentString(aliases[i])))
-+        if (!(tmp[i] = virXMLPropString(aliases[i], "name")))
-             return NULL;
-     }
- 
--- 
-2.33.0
-
diff --git a/virsh-Fix-integer-overflow-in-allocpages.patch b/virsh-Fix-integer-overflow-in-allocpages.patch
deleted file mode 100644
index b7b7e89fd4855e1e7552ea896e5dfe0dcdbcc8f8..0000000000000000000000000000000000000000
--- a/virsh-Fix-integer-overflow-in-allocpages.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From e24d9516a286735716f388dcb403e2cf84841f25 Mon Sep 17 00:00:00 2001
-From: huangkai <huangkai101@huawei.com>
-Date: Tue, 2 Aug 2022 16:21:38 +0800
-Subject: [PATCH 15/22] virsh: Fix integer overflow in allocpages
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-I've came across an aarch64 system which supports hugepages up to
-16GiB of size. However, I was unable to allocate them using
-virsh allocpages. This is because cmdAllocpages() uses
-vshCommandOptScaledInt(), which scales passed value into bytes,
-but since the virNodeAllocPages() expects size in KiB the
-variable holding bytes is then divided by 1024. However, the
-limit for the biggest value passed to vshCommandOptScaledInt() is
-UINT_MAX which is now obviously wrong, as it needs to be UINT_MAX
-* 1024.
-
-The same bug is in completer. But here, let's use ULLONG_MAX so
-that we don't have to care about it anymore.
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- tools/virsh-completer-host.c | 2 +-
- tools/virsh-host.c           | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tools/virsh-completer-host.c b/tools/virsh-completer-host.c
-index 8893888ec2..7d2ef01be1 100644
---- a/tools/virsh-completer-host.c
-+++ b/tools/virsh-completer-host.c
-@@ -41,7 +41,7 @@ virshPagesizeNodeToString(xmlNodePtr node)
-     unit = virXMLPropString(node, "unit");
-     if (virStrToLong_ull(pagesize, NULL, 10, &byteval) < 0)
-         return NULL;
--    if (virScaleInteger(&byteval, unit, 1024, UINT_MAX) < 0)
-+    if (virScaleInteger(&byteval, unit, 1024, ULLONG_MAX) < 0)
-         return NULL;
-     size = vshPrettyCapacity(byteval, &suffix);
-     ret = g_strdup_printf("%.0f%s", size, suffix);
-diff --git a/tools/virsh-host.c b/tools/virsh-host.c
-index 0fd77cbae5..67d5466be2 100644
---- a/tools/virsh-host.c
-+++ b/tools/virsh-host.c
-@@ -519,7 +519,7 @@ cmdAllocpages(vshControl *ctl, const vshCmd *cmd)
-     if (cellno && vshCommandOptInt(ctl, cmd, "cellno", &startCell) < 0)
-         return false;
- 
--    if (vshCommandOptScaledInt(ctl, cmd, "pagesize", &tmp, 1024, UINT_MAX) < 0)
-+    if (vshCommandOptScaledInt(ctl, cmd, "pagesize", &tmp, 1024, UINT_MAX * 1024ULL) < 0)
-         return false;
-     pageSizes[0] = VIR_DIV_UP(tmp, 1024);
- 
--- 
-2.33.0
-
diff --git a/virsh-Fix-typo-of-metadata.patch b/virsh-Fix-typo-of-metadata.patch
deleted file mode 100644
index d326a6fd8ff409be427a82d185f9162af28b7f4d..0000000000000000000000000000000000000000
--- a/virsh-Fix-typo-of-metadata.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From ddd1504fd4b0e779e42ec72b49ad1b1c485021cd Mon Sep 17 00:00:00 2001
-From: tangbin <tangbin_yewu@cmss.chinamobile.com>
-Date: Wed, 23 Nov 2022 16:00:29 +0200
-Subject: [PATCH 10/23] virsh: Fix typo of metadata
-
-Signed-off-by: Han Han <hhan@redhat.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-
-Signed-off-by: tangbin <tangbin_yewu@cmss.chinamobile.com>
-(cherry-pick from f57a8cd3df0167d72b87fdd868a287608a741b73)
----
- tools/virsh-domain.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
-index 8db1362314..50568203aa 100644
---- a/tools/virsh-domain.c
-+++ b/tools/virsh-domain.c
-@@ -13558,7 +13558,7 @@ virshEventMetadataChangePrint(virConnectPtr conn G_GNUC_UNUSED,
- {
-     virBuffer buf = VIR_BUFFER_INITIALIZER;
- 
--    virBufferAsprintf(&buf, _("event 'metdata-change' for domain %s: %s %s\n"),
-+    virBufferAsprintf(&buf, _("event 'metadata-change' for domain %s: %s %s\n"),
-                       virDomainGetName(dom),
-                       UNKNOWNSTR(virshEventMetadataChangeTypeTypeToString(type)),
-                       NULLSTR(nsuri));
--- 
-2.27.0
-
diff --git a/virsh-cmdBlock-Remove-error-prefix-for-an-empty-line.patch b/virsh-cmdBlock-Remove-error-prefix-for-an-empty-line.patch
deleted file mode 100644
index ed9d7e3c53d6245c524ab29d23b9530e0bb1489f..0000000000000000000000000000000000000000
--- a/virsh-cmdBlock-Remove-error-prefix-for-an-empty-line.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 72d16dabd48f8916e7296f19ec48ff3109a040c1 Mon Sep 17 00:00:00 2001
-From: tangbin <tangbin_yewu@cmss.chinamobile.com>
-Date: Wed, 23 Nov 2022 16:00:29 +0200
-Subject: [PATCH 11/23] virsh: cmdBlock*: Remove 'error:' prefix for an empty
- line
-
-When a block copy job fails prior to reaching the synchronized phase
-while we are waiting for the job to finish virsh would print the
-following:
-
- $ virsh blockcopy backup-test vda /tmp/dst.qcow2 --wait --reuse-external --transient-job
- error:
- Copy failed
-
-The above message looks like we've forgot to print the error message
-itself as the line ends after 'error:'. Unfortunately with the current
-API design clients have no way of actually getting the error message as
-the VIR_DOMAIN_EVENT_ID_BLOCK_JOB(_2) event only reports the status but
-not an error and the job then vanishes.
-
-Fix the expectations by using vshPrintExtra instead of vshError:
-
- $ virsh blockcopy backup-test vda /tmp/dst.qcow2 --wait --reuse-external --transient-job
-
- Copy failed
-
-Note that the newline is required to avoid printing the 'Copy failed'
-message on the same line when printing the job progress percentage.
-
-Inspired by https://bugzilla.redhat.com/show_bug.cgi?id=1847867
-
-Fix the same issue also for block pull and block commit job
-
-Signed-off-by: Peter Krempa <pkrempa@redhat.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-
-Signed-off-by: tangbin <tangbin_yewu@cmss.chinamobile.com>
-(cherry-pick from fc09f3d823aba430d38db0d5ba8cdc5b0a71b9e5)
----
- tools/virsh-domain.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
-index 50568203aa..7033232015 100644
---- a/tools/virsh-domain.c
-+++ b/tools/virsh-domain.c
-@@ -2140,7 +2140,7 @@ cmdBlockcommit(vshControl *ctl, const vshCmd *cmd)
-             break;
- 
-         case VIR_DOMAIN_BLOCK_JOB_FAILED:
--            vshError(ctl, "\n%s", _("Commit failed"));
-+            vshPrintExtra(ctl, "\n%s", _("Commit failed"));
-             goto cleanup;
-             break;
- 
-@@ -2457,7 +2457,7 @@ cmdBlockcopy(vshControl *ctl, const vshCmd *cmd)
-             break;
- 
-         case VIR_DOMAIN_BLOCK_JOB_FAILED:
--            vshError(ctl, "\n%s", _("Copy failed"));
-+            vshPrintExtra(ctl, "\n%s", _("Copy failed"));
-             goto cleanup;
-             break;
- 
-@@ -2865,7 +2865,7 @@ cmdBlockpull(vshControl *ctl, const vshCmd *cmd)
-             break;
- 
-         case VIR_DOMAIN_BLOCK_JOB_FAILED:
--            vshError(ctl, "\n%s", _("Pull failed"));
-+            vshPrintExtra(ctl, "\n%s", _("Pull failed"));
-             goto cleanup;
-             break;
- 
--- 
-2.27.0
-
diff --git a/virsh-cmdScreenshot-fix-cbdata-passing-to-virshStrea.patch b/virsh-cmdScreenshot-fix-cbdata-passing-to-virshStrea.patch
deleted file mode 100644
index bb935d8f1a78daa1c5aa62072933cfd5514c4647..0000000000000000000000000000000000000000
--- a/virsh-cmdScreenshot-fix-cbdata-passing-to-virshStrea.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 9fb4749f7ee4bbc75e0ad571a87abd76a0ae1b81 Mon Sep 17 00:00:00 2001
-From: tangbinzy <tangbin_yewu@cmss.chinamobile.com>
-Date: Tue, 29 Nov 2022 08:15:11 +0000
-Subject: [PATCH 01/24] virsh: cmdScreenshot: fix cbdata passing to 
- virshStreamSink The changes for sparse stream support started passing
- virshStreamCallbackDataPtr to virshStreamSink instead of passing a simple
- file descriptor, but forgot to adjust all the callers.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Fix it in cmdScreenshot as well.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1875195
-
-Signed-off-by: Ján Tomko <jtomko@redhat.com>
-Fixes: 9e745a97171e10f050962c166082439d6724e245
-Reviewed-by: Martin Kletzander <mkletzan@redhat.com>
-
-Signed-off-by: tangbin <tangbin_yewu@cmss.chinamobile.com>
-(cherry-pick from 3144e881b137123b0326157ce6dc23ca649c9270)
----
- tools/virsh-domain.c | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
-index 7033232015..c043ad3ce5 100644
---- a/tools/virsh-domain.c
-+++ b/tools/virsh-domain.c
-@@ -5632,6 +5632,7 @@ cmdScreenshot(vshControl *ctl, const vshCmd *cmd)
-     bool generated = false;
-     char *mime = NULL;
-     virshControlPtr priv = ctl->privData;
-+    virshStreamCallbackData cbdata;
- 
-     if (vshCommandOptStringReq(ctl, cmd, "file", (const char **) &file) < 0)
-         return false;
-@@ -5667,7 +5668,10 @@ cmdScreenshot(vshControl *ctl, const vshCmd *cmd)
-         created = true;
-     }
- 
--    if (virStreamRecvAll(st, virshStreamSink, &fd) < 0) {
-+    cbdata.ctl = ctl;
-+    cbdata.fd = fd;
-+
-+    if (virStreamRecvAll(st, virshStreamSink, &cbdata) < 0) {
-         vshError(ctl, _("could not receive data from domain %s"), name);
-         goto cleanup;
-     }
--- 
-2.27.0
-
diff --git a/virsh-completer-use-signed-variable-for-XPathNodeSet.patch b/virsh-completer-use-signed-variable-for-XPathNodeSet.patch
deleted file mode 100644
index 359794de06dbfda5491ec4ff39b380fdb433f9b7..0000000000000000000000000000000000000000
--- a/virsh-completer-use-signed-variable-for-XPathNodeSet.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From d9012d5897fc600853526079fe01fa477acd4eb6 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
-Date: Sun, 2 Aug 2020 23:30:17 +0200
-Subject: [PATCH 042/108] virsh: completer: use signed variable for
- XPathNodeSet errors
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Although virXPathNodeSet is unlikely to return -1, we should
-check for it properly or not at all.
-
-Signed-off-by: Ján Tomko <jtomko@redhat.com>
-Reviewed-by: Martin Kletzander <mkletzan@redhat.com>
-(cherry picked from commit ce2483f6199a2d623f142a992a6afe41015d9ad8)
----
- tools/virsh-completer-host.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tools/virsh-completer-host.c b/tools/virsh-completer-host.c
-index 35e6bba661..8893888ec2 100644
---- a/tools/virsh-completer-host.c
-+++ b/tools/virsh-completer-host.c
-@@ -55,7 +55,7 @@ virshAllocpagesPagesizeCompleter(vshControl *ctl,
- {
-     g_autoptr(xmlXPathContext) ctxt = NULL;
-     virshControlPtr priv = ctl->privData;
--    unsigned int npages = 0;
-+    int npages = 0;
-     g_autofree xmlNodePtr *pages = NULL;
-     g_autoptr(xmlDoc) doc = NULL;
-     size_t i = 0;
-@@ -106,7 +106,7 @@ virshCellnoCompleter(vshControl *ctl,
- {
-     g_autoptr(xmlXPathContext) ctxt = NULL;
-     virshControlPtr priv = ctl->privData;
--    unsigned int ncells = 0;
-+    int ncells = 0;
-     g_autofree xmlNodePtr *cells = NULL;
-     g_autoptr(xmlDoc) doc = NULL;
-     size_t i = 0;
--- 
-2.33.0
-
diff --git a/virsh-do-not-return-bool-in-virshNetworkPortUUIDComp.patch b/virsh-do-not-return-bool-in-virshNetworkPortUUIDComp.patch
deleted file mode 100644
index 09a2a7ce264713ae9e0485b5e1fb50de30c9d2be..0000000000000000000000000000000000000000
--- a/virsh-do-not-return-bool-in-virshNetworkPortUUIDComp.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 5e44cc4ad52cb0acb43367ddccdc034f3a967594 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
-Date: Tue, 22 Sep 2020 22:19:26 +0200
-Subject: [PATCH 032/108] virsh: do not return bool in
- virshNetworkPortUUIDCompleter
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-portability: Returning an integer in a function with pointer
-return type is not portable. [CastIntegerToAddressAtReturn]
-
-Signed-off-by: Ján Tomko <jtomko@redhat.com>
-Reviewed-by: Peter Krempa <pkrempa@redhat.com>
-(cherry picked from commit dbe3cf6c64a38c571062557770d64fed837f9c3d)
----
- tools/virsh-completer-network.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tools/virsh-completer-network.c b/tools/virsh-completer-network.c
-index 8f0048ed6f..7be36d7ad8 100644
---- a/tools/virsh-completer-network.c
-+++ b/tools/virsh-completer-network.c
-@@ -106,7 +106,7 @@ virshNetworkPortUUIDCompleter(vshControl *ctl,
-         return NULL;
- 
-     if (!(net = virshCommandOptNetwork(ctl, cmd, NULL)))
--        return false;
-+        return NULL;
- 
-     if ((nports = virNetworkListAllPorts(net, &ports, flags)) < 0)
-         return NULL;
--- 
-2.33.0
-
diff --git a/virsh-domain-Fix-error-handling-of-pthread_sigmask.patch b/virsh-domain-Fix-error-handling-of-pthread_sigmask.patch
deleted file mode 100644
index 97c1f4acc4551fe04217a68e4debf621323b1546..0000000000000000000000000000000000000000
--- a/virsh-domain-Fix-error-handling-of-pthread_sigmask.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 4e69b1be71fd431614aaf6d69208dabc4d7bf053 Mon Sep 17 00:00:00 2001
-From: Tim Wiederhake <twiederh@redhat.com>
-Date: Mon, 1 Feb 2021 13:42:01 +0100
-Subject: [PATCH 086/108] virsh-domain: Fix error handling of pthread_sigmask
-
-pthread_sigmask() returns 0 on success and "a non-zero value
-on failure", but not neccessarily a negative one.
-
-Found by clang-tidy's "bugprone-posix-return" check.
-
-Signed-off-by: Tim Wiederhake <twiederh@redhat.com>
-Reviewed-by: Peter Krempa <pkrempa@redhat.com>
-(cherry picked from commit 4f5c22b27c7580a93d45e7475580b4dd55fd0da5)
----
- tools/virsh-domain.c | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
-index 622972bdd4..49b2ed3a3f 100644
---- a/tools/virsh-domain.c
-+++ b/tools/virsh-domain.c
-@@ -4238,7 +4238,7 @@ doSave(void *opaque)
- 
-     sigemptyset(&sigmask);
-     sigaddset(&sigmask, SIGINT);
--    if (pthread_sigmask(SIG_BLOCK, &sigmask, &oldsigmask) < 0)
-+    if (pthread_sigmask(SIG_BLOCK, &sigmask, &oldsigmask) != 0)
-         goto out_sig;
- #endif /* !WIN32 */
- 
-@@ -4768,7 +4768,7 @@ doManagedsave(void *opaque)
- 
-     sigemptyset(&sigmask);
-     sigaddset(&sigmask, SIGINT);
--    if (pthread_sigmask(SIG_BLOCK, &sigmask, &oldsigmask) < 0)
-+    if (pthread_sigmask(SIG_BLOCK, &sigmask, &oldsigmask) != 0)
-         goto out_sig;
- #endif /* !WIN32 */
- 
-@@ -5450,7 +5450,7 @@ doDump(void *opaque)
- 
-     sigemptyset(&sigmask);
-     sigaddset(&sigmask, SIGINT);
--    if (pthread_sigmask(SIG_BLOCK, &sigmask, &oldsigmask) < 0)
-+    if (pthread_sigmask(SIG_BLOCK, &sigmask, &oldsigmask) != 0)
-         goto out_sig;
- #endif /* !WIN32 */
- 
-@@ -10740,7 +10740,7 @@ doMigrate(void *opaque)
- 
-     sigemptyset(&sigmask);
-     sigaddset(&sigmask, SIGINT);
--    if (pthread_sigmask(SIG_BLOCK, &sigmask, &oldsigmask) < 0)
-+    if (pthread_sigmask(SIG_BLOCK, &sigmask, &oldsigmask) != 0)
-         goto out_sig;
- #endif /* !WIN32 */
- 
--- 
-2.33.0
-
diff --git a/virsh-domain-fix-mistake-in-cmdMigrateSetMaxDowntime.patch b/virsh-domain-fix-mistake-in-cmdMigrateSetMaxDowntime.patch
deleted file mode 100644
index 7fb90637e0e24c97a54f4754a5f0e95fd5d20fc4..0000000000000000000000000000000000000000
--- a/virsh-domain-fix-mistake-in-cmdMigrateSetMaxDowntime.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 59d5adb4620c57743d88dda8e1ac2d20ce7bd9d3 Mon Sep 17 00:00:00 2001
-From: wangmeiyang <wangmeiyang_yewu@cmss.chinamobile.com>
-Date: Wed, 30 Nov 2022 20:17:09 +0800
-Subject: [PATCH 21/24] virsh: domain: fix mistake in
- cmdMigrateSetMaxDowntime()
-
-If there was added a new return value indicating success to the
-function virDomainMigrateSetMaxDowntime() in the future, because
-of the way the function is called it would be treated it as an
-error state and would return false (indicating failure). This
-patch fixes it, so that the call of the function follows the same
-pattern as is currently set in libvirt.
-
-cherry-pick from 0987edbedf96fc920a73213fdad1ad9a119cbee7
-
-Signed-off-by: Kristina Hanicova <khanicov@redhat.com>
-Signed-off-by: Meiyang Wang <wangmeiyang_yewu@cmss.chinamobile.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
----
- tools/virsh-domain.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
-index c043ad3ce5..6dd56168e3 100644
---- a/tools/virsh-domain.c
-+++ b/tools/virsh-domain.c
-@@ -11221,7 +11221,7 @@ cmdMigrateSetMaxDowntime(vshControl *ctl, const vshCmd *cmd)
-         goto done;
-     }
- 
--    if (virDomainMigrateSetMaxDowntime(dom, downtime, 0))
-+    if (virDomainMigrateSetMaxDowntime(dom, downtime, 0) < 0)
-         goto done;
- 
-     ret = true;
--- 
-2.27.0
-
diff --git a/virsh-fflush-stdout-after-fputs.patch b/virsh-fflush-stdout-after-fputs.patch
deleted file mode 100644
index 49a0c9fcd8ff4cc0183df2b10ba9079df2ae2275..0000000000000000000000000000000000000000
--- a/virsh-fflush-stdout-after-fputs.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From b50bad542e62e13c55f5b9057f7ca869f818c3e9 Mon Sep 17 00:00:00 2001
-From: xuyinghao <xuyinghao2@huawei.com>
-Date: Tue, 9 Aug 2022 18:59:08 +0800
-Subject: [PATCH 12/22] virsh: fflush(stdout) after fputs()
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Description: We are not guaranteed that the string we are printing onto stdout contains '\n' and thus that the stdout is flushed. Flush stdout after all fputs()-s  which do not flush stdout.
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- tools/vsh.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/tools/vsh.c b/tools/vsh.c
-index 9bb4ff043a..3646f37cea 100644
---- a/tools/vsh.c
-+++ b/tools/vsh.c
-@@ -1829,6 +1829,7 @@ vshDebug(vshControl *ctl, int level, const char *format, ...)
-     str = g_strdup_vprintf(format, ap);
-     va_end(ap);
-     fputs(str, stdout);
-+    fflush(stdout);
-     VIR_FREE(str);
- }
- 
-@@ -1845,6 +1846,7 @@ vshPrintExtra(vshControl *ctl, const char *format, ...)
-     str = g_strdup_vprintf(format, ap);
-     va_end(ap);
-     fputs(str, stdout);
-+    fflush(stdout);
-     VIR_FREE(str);
- }
- 
-@@ -1859,6 +1861,7 @@ vshPrint(vshControl *ctl G_GNUC_UNUSED, const char *format, ...)
-     str = g_strdup_vprintf(format, ap);
-     va_end(ap);
-     fputs(str, stdout);
-+    fflush(stdout);
-     VIR_FREE(str);
- }
- 
-@@ -2950,6 +2953,7 @@ vshReadline(vshControl *ctl G_GNUC_UNUSED,
-     int len;
- 
-     fputs(prompt, stdout);
-+    fflush(stdout);
-     r = fgets(line, sizeof(line), stdin);
-     if (r == NULL) return NULL; /* EOF */
- 
--- 
-2.33.0
-
diff --git a/virsh-guest-agent-timeout-set-default-value-for-opti.patch b/virsh-guest-agent-timeout-set-default-value-for-opti.patch
deleted file mode 100644
index d30db7cdd566c58f3cd2e83c916d05fd59f077b7..0000000000000000000000000000000000000000
--- a/virsh-guest-agent-timeout-set-default-value-for-opti.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 6545b7b8501bdbdf12cbaf2098ef4617764de591 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Golembiovsk=C3=BD?= <tgolembi@redhat.com>
-Date: Fri, 21 Aug 2020 14:34:51 +0200
-Subject: [PATCH 048/108] virsh: guest-agent-timeout: set default value for
- optional argument
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The timeout argument for guest-agent-timeout is optional but it did not
-have proper default value specified. Also update the virsh man page
-accordingly.
-
-Signed-off-by: Tomáš Golembiovský <tgolembi@redhat.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-(cherry picked from commit c7547a16f8a30cf573a7d11d9497fca2f28d9bf3)
----
- docs/manpages/virsh.rst | 7 ++++---
- tools/virsh-domain.c    | 2 +-
- 2 files changed, 5 insertions(+), 4 deletions(-)
-
-diff --git a/docs/manpages/virsh.rst b/docs/manpages/virsh.rst
-index dc404ddfe8..db15cc6507 100644
---- a/docs/manpages/virsh.rst
-+++ b/docs/manpages/virsh.rst
-@@ -2622,15 +2622,16 @@ guest
- 
- .. code-block::
- 
--   guest-agent-timeout domain --timeout value
-+   guest-agent-timeout domain [--timeout value]
- 
- Set how long to wait for a response from guest agent commands. By default,
- agent commands block forever waiting for a response. ``value`` must be a
- positive value (wait for given amount of seconds) or one of the following
- values:
- 
--* -2 - block forever waiting for a result,
--* -1 - reset timeout to the default value,
-+* -2 - block forever waiting for a result (used when --timeout is omitted),
-+* -1 - reset timeout to the default value (currently defined as 5 seconds in
-+  libvirt daemon),
- * 0 - do not wait at all,
- 
- 
-diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
-index b5375ebd3e..622972bdd4 100644
---- a/tools/virsh-domain.c
-+++ b/tools/virsh-domain.c
-@@ -14227,7 +14227,7 @@ static bool
- cmdGuestAgentTimeout(vshControl *ctl, const vshCmd *cmd)
- {
-     virDomainPtr dom = NULL;
--    int timeout;
-+    int timeout = VIR_DOMAIN_AGENT_RESPONSE_TIMEOUT_BLOCK;
-     const unsigned int flags = 0;
-     bool ret = false;
- 
--- 
-2.33.0
-
diff --git a/virsh-snapshot-Don-t-leak-then-in-cmdSnapshotList.patch b/virsh-snapshot-Don-t-leak-then-in-cmdSnapshotList.patch
deleted file mode 100644
index 59a4222041530707ef35dd4e17214b13b010c3fb..0000000000000000000000000000000000000000
--- a/virsh-snapshot-Don-t-leak-then-in-cmdSnapshotList.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 66b196dfcfe3cc6281cfeb31c07465074d7a4b2d Mon Sep 17 00:00:00 2001
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Mon, 23 Aug 2021 14:08:10 +0200
-Subject: [PATCH 099/108] virsh-snapshot: Don't leak @then in cmdSnapshotList()
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-The variable is used inside a loop in which it's allocated in
-each iteration. Bring it inside the loop so that g_autoptr()
-kicks in each iteration.
-
-Fixes: 3caa28dc50df7ec215713075d669b20bef6473a2
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-(cherry picked from commit 6d7a16361b54d1ea8cb0ae15a4d4d90a6f282ce0)
----
- tools/virsh-snapshot.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tools/virsh-snapshot.c b/tools/virsh-snapshot.c
-index 376290d468..c7d3e01fa8 100644
---- a/tools/virsh-snapshot.c
-+++ b/tools/virsh-snapshot.c
-@@ -1492,7 +1492,6 @@ cmdSnapshotList(vshControl *ctl, const vshCmd *cmd)
-     virDomainSnapshotPtr snapshot = NULL;
-     char *state = NULL;
-     long long creation_longlong;
--    g_autoptr(GDateTime) then = NULL;
-     bool tree = vshCommandOptBool(cmd, "tree");
-     bool name = vshCommandOptBool(cmd, "name");
-     bool from = vshCommandOptBool(cmd, "from");
-@@ -1587,6 +1586,7 @@ cmdSnapshotList(vshControl *ctl, const vshCmd *cmd)
-     }
- 
-     for (i = 0; i < snaplist->nsnaps; i++) {
-+        g_autoptr(GDateTime) then = NULL;
-         g_autofree gchar *thenstr = NULL;
-         const char *snap_name;
- 
--- 
-2.33.0
-
diff --git a/virshCheckpointListCollect-Do-not-pass-NULL-to-qsort.patch b/virshCheckpointListCollect-Do-not-pass-NULL-to-qsort.patch
deleted file mode 100644
index 57486961fdf21953560c5266948034e01bcdd63e..0000000000000000000000000000000000000000
--- a/virshCheckpointListCollect-Do-not-pass-NULL-to-qsort.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From f64a491232e5aeca4d0d86523564bdea9913bb73 Mon Sep 17 00:00:00 2001
-From: Tim Wiederhake <twiederh@redhat.com>
-Date: Mon, 19 Apr 2021 13:54:15 +0200
-Subject: [PATCH 063/108] virshCheckpointListCollect: Do not pass NULL to qsort
-
-Signed-off-by: Tim Wiederhake <twiederh@redhat.com>
-Reviewed-by: Laine Stump <laine@redhat.com>
-(cherry picked from commit 1c34211c22de28127a509edbf2cf2f44cb0d891e)
----
- tools/virsh-checkpoint.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/tools/virsh-checkpoint.c b/tools/virsh-checkpoint.c
-index 1a3a74b2d5..6effbdc26c 100644
---- a/tools/virsh-checkpoint.c
-+++ b/tools/virsh-checkpoint.c
-@@ -622,7 +622,8 @@ virshCheckpointListCollect(vshControl *ctl,
-         }
-     }
- 
--    if (!(orig_flags & VIR_DOMAIN_CHECKPOINT_LIST_TOPOLOGICAL))
-+    if (!(orig_flags & VIR_DOMAIN_CHECKPOINT_LIST_TOPOLOGICAL) &&
-+        checkpointlist->chks)
-         qsort(checkpointlist->chks, checkpointlist->nchks,
-               sizeof(*checkpointlist->chks), virshChkSorter);
- 
--- 
-2.33.0
-
diff --git a/virsocketaddr-Zero-netmask-in-virSocketAddrPrefixToN.patch b/virsocketaddr-Zero-netmask-in-virSocketAddrPrefixToN.patch
deleted file mode 100644
index bfb38112ecac7759d4d93a90a239d6203f71b435..0000000000000000000000000000000000000000
--- a/virsocketaddr-Zero-netmask-in-virSocketAddrPrefixToN.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 7abf979f6a787890f20407848a8595e3a6c8aee5 Mon Sep 17 00:00:00 2001
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Fri, 9 Oct 2020 16:16:58 +0200
-Subject: [PATCH 035/108] virsocketaddr: Zero @netmask in
- virSocketAddrPrefixToNetmask()
-
-The aim of virSocketAddrPrefixToNetmask() is to initialize passed
-virSocketAddr structure based on prefix length and family.
-However, it doesn't set all members in the struct which may lead
-to reads of uninitialized values:
-
-==15421== Use of uninitialised value of size 8
-==15421==    at 0x50F297A: _itoa_word (in /lib64/libc-2.31.so)
-==15421==    by 0x510C8FE: __vfprintf_internal (in /lib64/libc-2.31.so)
-==15421==    by 0x5120295: __vsnprintf_internal (in /lib64/libc-2.31.so)
-==15421==    by 0x50F8969: snprintf (in /lib64/libc-2.31.so)
-==15421==    by 0x51BB602: getnameinfo (in /lib64/libc-2.31.so)
-==15421==    by 0x496DEE0: virSocketAddrFormatFull (virsocketaddr.c:486)
-==15421==    by 0x496DD9F: virSocketAddrFormat (virsocketaddr.c:444)
-==15421==    by 0x11871F: networkDnsmasqConfContents (bridge_driver.c:1404)
-==15421==    by 0x1118F5: testCompareXMLToConfFiles (networkxml2conftest.c:48)
-==15421==    by 0x111BAF: testCompareXMLToConfHelper (networkxml2conftest.c:112)
-==15421==    by 0x112679: virTestRun (testutils.c:142)
-==15421==    by 0x111D09: mymain (networkxml2conftest.c:144)
-==15421==  Uninitialised value was created by a stack allocation
-==15421==    at 0x1175D2: networkDnsmasqConfContents (bridge_driver.c:1056)
-
-All callers expect the function to initialize the structure
-fully.
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Laine Stump <laine@redhat.com>
-(cherry picked from commit 14506720717f2a86ab64ae3d5cdef3a4b2641b11)
----
- src/util/virsocketaddr.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/util/virsocketaddr.c b/src/util/virsocketaddr.c
-index 4c9f124e88..9183687e18 100644
---- a/src/util/virsocketaddr.c
-+++ b/src/util/virsocketaddr.c
-@@ -1100,6 +1100,8 @@ virSocketAddrPrefixToNetmask(unsigned int prefix,
-                              virSocketAddrPtr netmask,
-                              int family)
- {
-+    memset(netmask, 0, sizeof(*netmask));
-+
-     netmask->data.stor.ss_family = AF_UNSPEC; /* assume failure */
- 
-     if (family == AF_INET) {
-@@ -1138,7 +1140,7 @@ virSocketAddrPrefixToNetmask(unsigned int prefix,
-     }
- 
-     return 0;
-- }
-+}
- 
- /**
-  * virSocketAddrGetIPPrefix:
--- 
-2.33.0
-
diff --git a/virt-login-shell-correctly-calculate-string-length.patch b/virt-login-shell-correctly-calculate-string-length.patch
deleted file mode 100644
index e7708fe522b9f3e26d479c85dd76005bb653f571..0000000000000000000000000000000000000000
--- a/virt-login-shell-correctly-calculate-string-length.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From c28905b5363ded3347a1bf8846c57f0122c6cbfe Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
-Date: Sun, 2 Aug 2020 14:58:38 +0200
-Subject: [PATCH 043/108] virt-login-shell: correctly calculate string length
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-virLoginShellGetShellArgv was not dereferencing the pointer
-to the string list containing the shell parameters from the
-config file, thus setting some random number as shargvlen.
-
-Signed-off-by: Ján Tomko <jtomko@redhat.com>
-Fixes: 740e4d705284ba0598258291c2656f50075486f0
-Reviewed-by: Martin Kletzander <mkletzan@redhat.com>
-(cherry picked from commit d339113ab050107fcc4e2a3e9ab939cd92352efe)
----
- tools/virt-login-shell-helper.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tools/virt-login-shell-helper.c b/tools/virt-login-shell-helper.c
-index d9db883ee6..2db349754e 100644
---- a/tools/virt-login-shell-helper.c
-+++ b/tools/virt-login-shell-helper.c
-@@ -104,7 +104,7 @@ static int virLoginShellGetShellArgv(virConfPtr conf,
-         (*shargv)[0] = g_strdup("/bin/sh");
-         *shargvlen = 1;
-     } else {
--        *shargvlen = virStringListLength((const char *const *)shargv);
-+        *shargvlen = virStringListLength((const char *const *)*shargv);
-     }
-     return 0;
- }
--- 
-2.33.0
-
diff --git a/virtpm-Fix-path-handling-in-virTPMEmulatorInit.patch b/virtpm-Fix-path-handling-in-virTPMEmulatorInit.patch
deleted file mode 100644
index 9697233d5d2647b613112928271dc6387d582d3e..0000000000000000000000000000000000000000
--- a/virtpm-Fix-path-handling-in-virTPMEmulatorInit.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 4fe54e0e98050bf4529d67a266b6b10286312eaa Mon Sep 17 00:00:00 2001
-From: Michal Privoznik <mprivozn@redhat.com>
-Date: Thu, 25 Feb 2021 11:58:38 +0100
-Subject: [PATCH 6/6] virtpm: Fix @path handling in virTPMEmulatorInit()
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This function finds "swtmp", "swtpm_setup" and "swtpm_ioctl"
-binaries in $PATH and stores resolved paths in global variables
-so that they can be obtainer later. Anyway, the resolved path is
-marked as g_autofree and to avoid its freeing later on in the
-function the variable is set to NULL manually. Well, we have
-g_steal_pointer() for that.
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Signed-off-by: yezengruan <yezengruan@huawei.com>
----
- src/util/virtpm.c | 6 ++----
- 1 file changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/src/util/virtpm.c b/src/util/virtpm.c
-index c734bf941a..1a61a92f69 100644
---- a/src/util/virtpm.c
-+++ b/src/util/virtpm.c
-@@ -325,16 +325,14 @@ virTPMEmulatorInit(void)
-                                      _("Could not stat %s"), path);
-                 goto cleanup;
-             }
--            *prgs[i].path = path;
-+            *prgs[i].path = g_steal_pointer(&path);
- 
-             if (prgs[i].caps) {
-                 *prgs[i].caps = virTPMGetCaps(prgs[i].typeFromStringFn,
--                                              path, prgs[i].parm);
--                path = NULL;
-+                                              *prgs[i].path, prgs[i].parm);
-                 if (!*prgs[i].caps)
-                     goto cleanup;
-             }
--            path = NULL;
-         }
-     }
- 
--- 
-2.27.0
-
diff --git a/vmx-Require-networkName-for-bridged-and-custom-NICs.patch b/vmx-Require-networkName-for-bridged-and-custom-NICs.patch
deleted file mode 100644
index cad3b9928db0e53bdd9a1e310af796b7f4de1702..0000000000000000000000000000000000000000
--- a/vmx-Require-networkName-for-bridged-and-custom-NICs.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 6620c7cc62f11f1eda32c4b1c8006c0fdafb1c59 Mon Sep 17 00:00:00 2001
-From: jipengfei <jipengfei_yewu@cmss.chinamobile.com>
-Date: Thu, 24 Nov 2022 17:19:05 +0800
-Subject: [PATCH 18/23] vmx: Require networkName for bridged and custom NICs
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-cherry-pick from db0564b4d34fb94fe59f04a4e411374ec1b6fc19
-
-Commit 70768cda9740 marked this particular config string optional, but
-forgot that two of the interface types still require this name to
-exist.  Mark it as optional only if there is no connectionType.
-
-Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
-Signed-off-by: jipengfei <jipengfei_yewu@cmss.chinamobile.com>
-Reviewed-by: Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- src/vmx/vmx.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c
-index fbc8366f2b..5f2ada6630 100644
---- a/src/vmx/vmx.c
-+++ b/src/vmx/vmx.c
-@@ -2667,7 +2667,7 @@ virVMXParseEthernet(virConfPtr conf, int controller, virDomainNetDefPtr *def)
-         STRCASEEQ(connectionType, "bridged") ||
-         STRCASEEQ(connectionType, "custom")) {
-         if (virVMXGetConfigString(conf, networkName_name, &networkName,
--                                  true) < 0)
-+                                  connectionType == NULL) < 0)
-             goto cleanup;
- 
-         if (!networkName)
--- 
-2.27.0
-
diff --git a/vsh-Fix-completion-error-in-case-of-multiple-mac-add.patch b/vsh-Fix-completion-error-in-case-of-multiple-mac-add.patch
deleted file mode 100644
index 6256b5c2d5f9f85fbc503cd8310ef711de8176cf..0000000000000000000000000000000000000000
--- a/vsh-Fix-completion-error-in-case-of-multiple-mac-add.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 35d3169072522ad6a2bd6f046fde7881c2837c74 Mon Sep 17 00:00:00 2001
-From: tangbinzy <tangbin_yewu@cmss.chinamobile.com>
-Date: Wed, 30 Nov 2022 08:25:26 +0000
-Subject: [PATCH 11/24] vsh: Fix completion error in case of multiple mac 
- addresses We know that the bash completer automatically handle colon by
- preceding it with an escape character backslash. While our bash autompletion
- file vsh completes multiple items, In case there're multiple items which have
- same prefix and the content of completion items contain colon(say mac
- address), The vsh needs to correctly hands the backslash which are added by
- bash completer, Otherwise the completion won't be successful. This patch
- fixes this problem.
-
-e.g.:
-
- # virsh domiflist --domain VM
- Interface   Type      Source    Model    MAC
--------------------------------------------------------------
- vnet0       network   default   virtio   52:54:00:fb:7b:f5
- vnet1       bridge    br0       virtio   52:54:00:80:1b:21
-
-Before:
- # virsh detach-interface --domain VM --mac <TAB>
- # virsh detach-interface --domain VM --mac 52\:54\:00\:<TAB><TAB>
-
-After:
- # virsh detach-interface --domain VM --mac <TAB>
- # virsh detach-interface --domain VM --mac 52\:54\:00\:<TAB><TAB>
- 52:54:00:80:1b:21  52:54:00:fb:7b:f5
- # virsh detach-interface --domain VM --mac 52\:54\:00\:
-
-Signed-off-by: Lin Ma <lma@suse.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-
-Signed-off-by: tangbin <tangbin_yewu@cmss.chinamobile.com>
-(cherry-pick from 8a4343a4366580644bde3ba9b6a21bf740503416)
----
- tools/bash-completion/vsh | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/tools/bash-completion/vsh b/tools/bash-completion/vsh
-index 363097c601..ca9d37a7ff 100644
---- a/tools/bash-completion/vsh
-+++ b/tools/bash-completion/vsh
-@@ -39,6 +39,7 @@ _vsh_complete()
-     fi
- 
-     INPUT=( "${COMP_WORDS[@]:$i:$COMP_CWORD}" )
-+    INPUT[-1]=${INPUT[-1]//\\:/:}
- 
-     # Uncomment these lines for easy debug.
- #    echo;
--- 
-2.27.0
-
diff --git a/vsh-fix-memory-leak-in-vshCommandParse.patch b/vsh-fix-memory-leak-in-vshCommandParse.patch
deleted file mode 100644
index 8417f4a1a08b5453c23d747512fbb90b84f4d49c..0000000000000000000000000000000000000000
--- a/vsh-fix-memory-leak-in-vshCommandParse.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 4f1111061f293b26850958feb80f56f75f6cf9ff Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?J=C3=A1n=20Tomko?= <jtomko@redhat.com>
-Date: Tue, 6 Apr 2021 14:23:31 +0200
-Subject: [PATCH 055/108] vsh: fix memory leak in vshCommandParse
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-One of the error branches used a plain free where vshCommandFree
-was required.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=1943415
-
-Signed-off-by: Ján Tomko <jtomko@redhat.com>
-Reviewed-by: Erik Skultety <eskultet@redhat.com>
-(cherry picked from commit a131b8b517a88685ddb5f1b17c4d1a16b9a97b61)
----
- tools/vsh.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tools/vsh.c b/tools/vsh.c
-index 65f4a48d62..9bb4ff043a 100644
---- a/tools/vsh.c
-+++ b/tools/vsh.c
-@@ -1555,7 +1555,7 @@ vshCommandParse(vshControl *ctl, vshCommandParser *parser, vshCmd **partial)
- 
-             if (!partial &&
-                 vshCommandCheckOpts(ctl, c, opts_required, opts_seen) < 0) {
--                VIR_FREE(c);
-+                vshCommandFree(c);
-                 goto syntaxError;
-             }
- 
--- 
-2.33.0
-
diff --git a/vshtabletest-Fix-potential-memleak.patch b/vshtabletest-Fix-potential-memleak.patch
deleted file mode 100644
index b29ba2996c48e2876ced4b9ee8670f57bda5ae7a..0000000000000000000000000000000000000000
--- a/vshtabletest-Fix-potential-memleak.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From e210025037fbd00c81e8faa0a5339dccdc0c75a1 Mon Sep 17 00:00:00 2001
-From: wangmeiyang <wangmeiyang_yewu@cmss.chinamobile.com>
-Date: Thu, 24 Nov 2022 09:10:25 +0800
-Subject: [PATCH 12/23] vshtabletest: Fix potential memleak
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-In testVshTableNew() we test whether vshTableNew(NULL) allocates
-a table. This is expected to fail (and return NULL), because
-passing nothing but NULL to vshTableNew() is viewed as error.
-Nevertheless, if vshTableNew() did not fail and returned an
-allocated table it would be leaked.
-
-cherry-pick from eb9bbde7721af765d88086dc3055cff092436c58
-
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
-Signed-off-by: Meiyang Wang <wangmeiyang_yewu@cmss.chinamobile.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
----
- tests/vshtabletest.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/tests/vshtabletest.c b/tests/vshtabletest.c
-index 15369d8eb2..348f525234 100644
---- a/tests/vshtabletest.c
-+++ b/tests/vshtabletest.c
-@@ -33,11 +33,12 @@
- static int
- testVshTableNew(const void *opaque G_GNUC_UNUSED)
- {
--    if (vshTableNew(NULL)) {
-+    vshTablePtr table = vshTableNew(NULL);
-+    if (table) {
-         fprintf(stderr, "expected failure when passing null to vshTableNew\n");
-         return -1;
-     }
--
-+    vshTableFree(table);
-     return 0;
- }
- 
--- 
-2.27.0
-