[libvirt PATCH 02/16] qemu: report whether a machine type is deprecated in capabilities

Friday, 22 January 2021

QEMU has the ability to mark machine types as deprecated. This should be
exposed to management applications in the capabilities.

Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com&gt;
---
 docs/schemas/capability.rng                     |  8 ++++++++
 src/conf/capabilities.c                         |  2 ++
 src/conf/capabilities.h                         |  1 +
 src/qemu/qemu_capabilities.c                    | 17 ++++++++++++++---
 src/qemu/qemu_capspriv.h                        |  3 ++-
 src/qemu/qemu_monitor.h                         |  1 +
 src/qemu/qemu_monitor_json.c                    |  4 ++++
 .../qemucapabilitiesdata/caps_4.1.0.x86_64.xml  | 16 ++++++++--------
 tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml |  4 ++--
 .../qemucapabilitiesdata/caps_4.2.0.x86_64.xml  | 16 ++++++++--------
 .../qemucapabilitiesdata/caps_5.0.0.x86_64.xml  | 16 ++++++++--------
 .../qemucapabilitiesdata/caps_5.1.0.x86_64.xml  | 16 ++++++++--------
 .../qemucapabilitiesdata/caps_5.2.0.x86_64.xml  | 16 ++++++++--------
 tests/testutilsqemu.c                           |  8 +++++---
 14 files changed, 79 insertions(+), 49 deletions(-)

diff --git a/docs/schemas/capability.rng b/docs/schemas/capability.rng
index 91a046eb48..c4cafc47ee 100644
--- a/docs/schemas/capability.rng
+++ b/docs/schemas/capability.rng
@@ -407,6 +407,14 @@
           <ref name="unsignedInt"/>
         </attribute>
       </optional>
+      <optional>
+        <attribute name="deprecated">
+          <choice>
+            <value>yes</value>
+            <value>no</value>
+          </choice>
+        </attribute>
+      </optional>
       <text/>
     </element>
   </define>
diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c
index 425f34113a..1ea059ea6f 100644
--- a/src/conf/capabilities.c
+++ b/src/conf/capabilities.c
@@ -1244,6 +1244,8 @@ virCapabilitiesFormatGuestXML(virCapsGuestPtr *guests,
                 virBufferAsprintf(buf, " canonical='%s'",
machine->canonical);
             if (machine->maxCpus > 0)
                 virBufferAsprintf(buf, " maxCpus='%d'",
machine->maxCpus);
+            if (machine->deprecated)
+                virBufferAddLit(buf, " deprecated='yes'");
             virBufferAsprintf(buf, ">%s</machine>\n",
machine->name);
         }
 
diff --git a/src/conf/capabilities.h b/src/conf/capabilities.h
index e2581fac8b..5fd59efc05 100644
--- a/src/conf/capabilities.h
+++ b/src/conf/capabilities.h
@@ -56,6 +56,7 @@ struct _virCapsGuestMachine {
     char *name;
     char *canonical;
     unsigned int maxCpus;
+    bool deprecated;
 };
 
 struct _virCapsGuestDomainInfo {
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 61467eb6c2..e3d1de0779 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -624,6 +624,7 @@ struct _virQEMUCapsMachineType {
     char *defaultCPU;
     bool numaMemSupported;
     char *defaultRAMid;
+    bool deprecated;
 };
 
 typedef struct _virQEMUCapsHostCPUData virQEMUCapsHostCPUData;
@@ -943,6 +944,7 @@ virQEMUCapsGetMachineTypesCaps(virQEMUCapsPtr qemuCaps,
             mach->name = g_strdup(accel->machineTypes[i].name);
         }
         mach->maxCpus = accel->machineTypes[i].maxCpus;
+        mach->deprecated = accel->machineTypes[i].deprecated;
     }
 
     /* Make sure all canonical machine types also have their own entry so that
@@ -976,6 +978,7 @@ virQEMUCapsGetMachineTypesCaps(virQEMUCapsPtr qemuCaps,
             }
             mach->name = g_strdup(machine->canonical);
             mach->maxCpus = machine->maxCpus;
+            mach->deprecated = machine->deprecated;
             i++;
         }
         i++;
@@ -1874,6 +1877,7 @@ virQEMUCapsAccelCopyMachineTypes(virQEMUCapsAccelPtr dst,
         dst->machineTypes[i].qemuDefault = src->machineTypes[i].qemuDefault;
         dst->machineTypes[i].numaMemSupported =
src->machineTypes[i].numaMemSupported;
         dst->machineTypes[i].defaultRAMid =
g_strdup(src->machineTypes[i].defaultRAMid);
+        dst->machineTypes[i].deprecated = src->machineTypes[i].deprecated;
     }
 }
 
@@ -2708,7 +2712,8 @@ virQEMUCapsAddMachine(virQEMUCapsPtr qemuCaps,
                       bool hotplugCpus,
                       bool isDefault,
                       bool numaMemSupported,
-                      const char *defaultRAMid)
+                      const char *defaultRAMid,
+                      bool deprecated)
 {
     virQEMUCapsAccelPtr accel = virQEMUCapsGetAccel(qemuCaps, virtType);
     virQEMUCapsMachineTypePtr mach;
@@ -2731,6 +2736,7 @@ virQEMUCapsAddMachine(virQEMUCapsPtr qemuCaps,
     mach->numaMemSupported = numaMemSupported;
 
     mach->defaultRAMid = g_strdup(defaultRAMid);
+    mach->deprecated = deprecated;
 }
 
 /**
@@ -2778,7 +2784,8 @@ virQEMUCapsProbeQMPMachineTypes(virQEMUCapsPtr qemuCaps,
                               machines[i]->hotplugCpus,
                               machines[i]->isDefault,
                               machines[i]->numaMemSupported,
-                              machines[i]->defaultRAMid);
+                              machines[i]->defaultRAMid,
+                              machines[i]->deprecated);
 
         if (preferredMachine &&
             (STREQ_NULLABLE(machines[i]->alias, preferredMachine) ||
@@ -4010,6 +4017,7 @@ virQEMUCapsLoadMachines(virQEMUCapsAccelPtr caps,
 
         caps->machineTypes[i].defaultCPU = virXMLPropString(nodes[i],
"defaultCPU");
         caps->machineTypes[i].defaultRAMid = virXMLPropString(nodes[i],
"defaultRAMid");
+        caps->machineTypes[i].deprecated = virXMLPropString(nodes[i],
"deprecated");
     }
 
     return 0;
@@ -4500,6 +4508,8 @@ virQEMUCapsFormatMachines(virQEMUCapsAccelPtr caps,
             virBufferAddLit(buf, " numaMemSupported='yes'");
         virBufferEscapeString(buf, " defaultRAMid='%s'",
                               caps->machineTypes[i].defaultRAMid);
+        if (caps->machineTypes[i].deprecated)
+            virBufferAddLit(buf, " deprecated='yes'");
         virBufferAddLit(buf, "/>\n");
     }
 }
@@ -6324,7 +6334,8 @@ virQEMUCapsStripMachineAliasesForVirtType(virQEMUCapsPtr qemuCaps,
         if (name) {
             virQEMUCapsAddMachine(qemuCaps, virtType, name, NULL, mach->defaultCPU,
                                   mach->maxCpus, mach->hotplugCpus,
mach->qemuDefault,
-                                  mach->numaMemSupported, mach->defaultRAMid);
+                                  mach->numaMemSupported, mach->defaultRAMid,
+                                  mach->deprecated);
         }
     }
 }
diff --git a/src/qemu/qemu_capspriv.h b/src/qemu/qemu_capspriv.h
index 15fc79e88b..90ce35fa5d 100644
--- a/src/qemu/qemu_capspriv.h
+++ b/src/qemu/qemu_capspriv.h
@@ -120,4 +120,5 @@ virQEMUCapsAddMachine(virQEMUCapsPtr qemuCaps,
                       bool hotplugCpus,
                       bool isDefault,
                       bool numaMemSupported,
-                      const char *defaultRAMid);
+                      const char *defaultRAMid,
+                      bool deprecated);
diff --git a/src/qemu/qemu_monitor.h b/src/qemu/qemu_monitor.h
index 67f149ebde..b0068f2a82 100644
--- a/src/qemu/qemu_monitor.h
+++ b/src/qemu/qemu_monitor.h
@@ -1178,6 +1178,7 @@ struct _qemuMonitorMachineInfo {
     char *defaultCPU;
     bool numaMemSupported;
     char *defaultRAMid;
+    bool deprecated;
 };
 
 int qemuMonitorGetMachines(qemuMonitorPtr mon,
diff --git a/src/qemu/qemu_monitor_json.c b/src/qemu/qemu_monitor_json.c
index 6534878d45..97c5e5b36c 100644
--- a/src/qemu/qemu_monitor_json.c
+++ b/src/qemu/qemu_monitor_json.c
@@ -5814,6 +5814,10 @@ int qemuMonitorJSONGetMachines(qemuMonitorPtr mon,
 
             info->defaultRAMid = g_strdup(tmp);
         }
+
+        if (virJSONValueObjectHasKey(child, "deprecated") &&
+            virJSONValueObjectGetBoolean(child, "deprecated",
&info->deprecated) < 0)
+            goto cleanup;
     }
 
     ret = n;
diff --git a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
index 28a4b0ede0..b4f2092e7a 100644
--- a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
@@ -859,20 +859,20 @@
   <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'
numaMemSupported='yes'/>
-  <machine type='kvm' name='pc-0.15' hotplugCpus='yes'
maxCpus='255' numaMemSupported='yes'/>
+  <machine type='kvm' name='pc-0.15' hotplugCpus='yes'
maxCpus='255' numaMemSupported='yes' deprecated='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-0.12' hotplugCpus='yes'
maxCpus='255' numaMemSupported='yes' deprecated='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-0.14' hotplugCpus='yes'
maxCpus='255' numaMemSupported='yes' deprecated='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'/>
@@ -890,7 +890,7 @@
   <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-0.13' hotplugCpus='yes'
maxCpus='255' numaMemSupported='yes' deprecated='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'/>
@@ -1963,20 +1963,20 @@
   <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'
numaMemSupported='yes'/>
-  <machine type='tcg' name='pc-0.15' hotplugCpus='yes'
maxCpus='255' numaMemSupported='yes'/>
+  <machine type='tcg' name='pc-0.15' hotplugCpus='yes'
maxCpus='255' numaMemSupported='yes' deprecated='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-0.12' hotplugCpus='yes'
maxCpus='255' numaMemSupported='yes' deprecated='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-0.14' hotplugCpus='yes'
maxCpus='255' numaMemSupported='yes' deprecated='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'/>
@@ -1994,7 +1994,7 @@
   <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-0.13' hotplugCpus='yes'
maxCpus='255' numaMemSupported='yes' deprecated='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'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
index 15eaac77a6..c6c05c5383 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
@@ -649,7 +649,7 @@
   <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'
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='prep' maxCpus='1'
defaultCPU='602-powerpc64-cpu' deprecated='yes'/>
   <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'/>
@@ -1117,7 +1117,7 @@
   <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'
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='prep' maxCpus='1'
defaultCPU='602-powerpc64-cpu' deprecated='yes'/>
   <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'/>
diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
index e150741f11..836255f80b 100644
--- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
@@ -1114,13 +1114,13 @@
   <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' 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-0.15' hotplugCpus='yes'
maxCpus='255' defaultCPU='qemu64-x86_64-cpu'
numaMemSupported='yes' deprecated='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-0.12' hotplugCpus='yes'
maxCpus='255' defaultCPU='qemu64-x86_64-cpu'
numaMemSupported='yes' deprecated='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'/>
@@ -1128,7 +1128,7 @@
   <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-0.14' hotplugCpus='yes'
maxCpus='255' defaultCPU='qemu64-x86_64-cpu'
numaMemSupported='yes' deprecated='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'/>
@@ -1147,7 +1147,7 @@
   <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-0.13' hotplugCpus='yes'
maxCpus='255' defaultCPU='qemu64-x86_64-cpu'
numaMemSupported='yes' deprecated='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'/>
@@ -2577,13 +2577,13 @@
   <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' 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-0.15' hotplugCpus='yes'
maxCpus='255' defaultCPU='qemu64-x86_64-cpu'
numaMemSupported='yes' deprecated='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-0.12' hotplugCpus='yes'
maxCpus='255' defaultCPU='qemu64-x86_64-cpu'
numaMemSupported='yes' deprecated='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'/>
@@ -2591,7 +2591,7 @@
   <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-0.14' hotplugCpus='yes'
maxCpus='255' defaultCPU='qemu64-x86_64-cpu'
numaMemSupported='yes' deprecated='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'/>
@@ -2610,7 +2610,7 @@
   <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-0.13' hotplugCpus='yes'
maxCpus='255' defaultCPU='qemu64-x86_64-cpu'
numaMemSupported='yes' deprecated='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'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
index 7c56d110f4..c6dcbf1329 100644
--- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
@@ -1248,7 +1248,7 @@
   <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-1.1' hotplugCpus='yes'
maxCpus='255' defaultCPU='qemu64-x86_64-cpu'
numaMemSupported='yes' deprecated='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'/>
@@ -1258,7 +1258,7 @@
   <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-1.3' hotplugCpus='yes'
maxCpus='255' defaultCPU='qemu64-x86_64-cpu'
numaMemSupported='yes' deprecated='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'/>
@@ -1267,7 +1267,7 @@
   <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-1.0' hotplugCpus='yes'
maxCpus='255' defaultCPU='qemu64-x86_64-cpu'
numaMemSupported='yes' deprecated='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'/>
@@ -1278,7 +1278,7 @@
   <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'
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-1.2' hotplugCpus='yes'
maxCpus='255' defaultCPU='qemu64-x86_64-cpu'
numaMemSupported='yes' deprecated='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'/>
@@ -2890,7 +2890,7 @@
   <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-1.1' hotplugCpus='yes'
maxCpus='255' defaultCPU='qemu64-x86_64-cpu'
numaMemSupported='yes' deprecated='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'/>
@@ -2900,7 +2900,7 @@
   <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-1.3' hotplugCpus='yes'
maxCpus='255' defaultCPU='qemu64-x86_64-cpu'
numaMemSupported='yes' deprecated='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'/>
@@ -2909,7 +2909,7 @@
   <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-1.0' hotplugCpus='yes'
maxCpus='255' defaultCPU='qemu64-x86_64-cpu'
numaMemSupported='yes' deprecated='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'/>
@@ -2920,7 +2920,7 @@
   <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'
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-1.2' hotplugCpus='yes'
maxCpus='255' defaultCPU='qemu64-x86_64-cpu'
numaMemSupported='yes' deprecated='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'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
index 07466093c9..cded14a96a 100644
--- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
@@ -1421,7 +1421,7 @@
   <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-1.1' hotplugCpus='yes'
maxCpus='255' defaultCPU='qemu64-x86_64-cpu'
numaMemSupported='yes' deprecated='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'/>
@@ -1432,7 +1432,7 @@
   <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-1.3' hotplugCpus='yes'
maxCpus='255' defaultCPU='qemu64-x86_64-cpu'
numaMemSupported='yes' deprecated='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'/>
@@ -1441,7 +1441,7 @@
   <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-1.0' hotplugCpus='yes'
maxCpus='255' defaultCPU='qemu64-x86_64-cpu'
numaMemSupported='yes' deprecated='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'/>
@@ -1452,7 +1452,7 @@
   <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'
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-1.2' hotplugCpus='yes'
maxCpus='255' defaultCPU='qemu64-x86_64-cpu'
numaMemSupported='yes' deprecated='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-5.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'/>
@@ -3156,7 +3156,7 @@
   <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-1.1' hotplugCpus='yes'
maxCpus='255' defaultCPU='qemu64-x86_64-cpu'
numaMemSupported='yes' deprecated='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'/>
@@ -3167,7 +3167,7 @@
   <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-1.3' hotplugCpus='yes'
maxCpus='255' defaultCPU='qemu64-x86_64-cpu'
numaMemSupported='yes' deprecated='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'/>
@@ -3176,7 +3176,7 @@
   <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-1.0' hotplugCpus='yes'
maxCpus='255' defaultCPU='qemu64-x86_64-cpu'
numaMemSupported='yes' deprecated='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'/>
@@ -3187,7 +3187,7 @@
   <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'
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-1.2' hotplugCpus='yes'
maxCpus='255' defaultCPU='qemu64-x86_64-cpu'
numaMemSupported='yes' deprecated='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-5.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'/>
diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
index 7f15bcda09..69b1484d8b 100644
--- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
@@ -1424,7 +1424,7 @@
   <machine type='kvm' name='pc-i440fx-1.5' hotplugCpus='yes'
maxCpus='255' defaultCPU='qemu64-x86_64-cpu'
numaMemSupported='yes' defaultRAMid='pc.ram'/>
   <machine type='kvm' name='pc-q35-2.7' hotplugCpus='yes'
maxCpus='255' defaultCPU='qemu64-x86_64-cpu'
numaMemSupported='yes' defaultRAMid='pc.ram'/>
   <machine type='kvm' name='pc-i440fx-2.2' hotplugCpus='yes'
maxCpus='255' defaultCPU='qemu64-x86_64-cpu'
numaMemSupported='yes' defaultRAMid='pc.ram'/>
-  <machine type='kvm' name='pc-1.1' hotplugCpus='yes'
maxCpus='255' defaultCPU='qemu64-x86_64-cpu'
numaMemSupported='yes' defaultRAMid='pc.ram'/>
+  <machine type='kvm' name='pc-1.1' hotplugCpus='yes'
maxCpus='255' defaultCPU='qemu64-x86_64-cpu'
numaMemSupported='yes' defaultRAMid='pc.ram'
deprecated='yes'/>
   <machine type='kvm' name='pc-i440fx-2.7' hotplugCpus='yes'
maxCpus='255' defaultCPU='qemu64-x86_64-cpu'
numaMemSupported='yes' defaultRAMid='pc.ram'/>
   <machine type='kvm' name='pc-q35-2.4' hotplugCpus='yes'
maxCpus='255' defaultCPU='qemu64-x86_64-cpu'
numaMemSupported='yes' defaultRAMid='pc.ram'/>
   <machine type='kvm' name='pc-q35-2.10' hotplugCpus='yes'
maxCpus='288' defaultCPU='qemu64-x86_64-cpu'
numaMemSupported='yes' defaultRAMid='pc.ram'/>
@@ -1435,7 +1435,7 @@
   <machine type='kvm' name='pc-q35-3.1' hotplugCpus='yes'
maxCpus='288' defaultCPU='qemu64-x86_64-cpu'
numaMemSupported='yes' defaultRAMid='pc.ram'/>
   <machine type='kvm' name='pc-q35-4.1' hotplugCpus='yes'
maxCpus='288' defaultCPU='qemu64-x86_64-cpu'
numaMemSupported='yes' defaultRAMid='pc.ram'/>
   <machine type='kvm' name='pc-i440fx-2.4' hotplugCpus='yes'
maxCpus='255' defaultCPU='qemu64-x86_64-cpu'
numaMemSupported='yes' defaultRAMid='pc.ram'/>
-  <machine type='kvm' name='pc-1.3' hotplugCpus='yes'
maxCpus='255' defaultCPU='qemu64-x86_64-cpu'
numaMemSupported='yes' defaultRAMid='pc.ram'/>
+  <machine type='kvm' name='pc-1.3' hotplugCpus='yes'
maxCpus='255' defaultCPU='qemu64-x86_64-cpu'
numaMemSupported='yes' defaultRAMid='pc.ram'
deprecated='yes'/>
   <machine type='kvm' name='pc-i440fx-4.1' hotplugCpus='yes'
maxCpus='255' defaultCPU='qemu64-x86_64-cpu'
numaMemSupported='yes' defaultRAMid='pc.ram'/>
   <machine type='kvm' name='pc-i440fx-5.1' hotplugCpus='yes'
maxCpus='255' defaultCPU='qemu64-x86_64-cpu'
defaultRAMid='pc.ram'/>
   <machine type='kvm' name='pc-i440fx-2.9' hotplugCpus='yes'
maxCpus='255' defaultCPU='qemu64-x86_64-cpu'
numaMemSupported='yes' defaultRAMid='pc.ram'/>
@@ -1445,7 +1445,7 @@
   <machine type='kvm' name='pc-i440fx-3.1' hotplugCpus='yes'
maxCpus='255' defaultCPU='qemu64-x86_64-cpu'
numaMemSupported='yes' defaultRAMid='pc.ram'/>
   <machine type='kvm' name='pc-q35-2.12' hotplugCpus='yes'
maxCpus='288' defaultCPU='qemu64-x86_64-cpu'
numaMemSupported='yes' defaultRAMid='pc.ram'/>
   <machine type='kvm' name='pc-i440fx-2.1' hotplugCpus='yes'
maxCpus='255' defaultCPU='qemu64-x86_64-cpu'
numaMemSupported='yes' defaultRAMid='pc.ram'/>
-  <machine type='kvm' name='pc-1.0' hotplugCpus='yes'
maxCpus='255' defaultCPU='qemu64-x86_64-cpu'
numaMemSupported='yes' defaultRAMid='pc.ram'/>
+  <machine type='kvm' name='pc-1.0' hotplugCpus='yes'
maxCpus='255' defaultCPU='qemu64-x86_64-cpu'
numaMemSupported='yes' defaultRAMid='pc.ram'
deprecated='yes'/>
   <machine type='kvm' name='pc-i440fx-2.6' hotplugCpus='yes'
maxCpus='255' defaultCPU='qemu64-x86_64-cpu'
numaMemSupported='yes' defaultRAMid='pc.ram'/>
   <machine type='kvm' name='pc-q35-4.0.1' hotplugCpus='yes'
maxCpus='288' defaultCPU='qemu64-x86_64-cpu'
numaMemSupported='yes' defaultRAMid='pc.ram'/>
   <machine type='kvm' name='pc-i440fx-1.6' hotplugCpus='yes'
maxCpus='255' defaultCPU='qemu64-x86_64-cpu'
numaMemSupported='yes' defaultRAMid='pc.ram'/>
@@ -1456,7 +1456,7 @@
   <machine type='kvm' name='pc-q35-4.0' hotplugCpus='yes'
maxCpus='288' defaultCPU='qemu64-x86_64-cpu'
numaMemSupported='yes' defaultRAMid='pc.ram'/>
   <machine type='kvm' name='microvm' maxCpus='288'
defaultCPU='qemu64-x86_64-cpu' defaultRAMid='microvm.ram'/>
   <machine type='kvm' name='pc-i440fx-2.3' hotplugCpus='yes'
maxCpus='255' defaultCPU='qemu64-x86_64-cpu'
numaMemSupported='yes' defaultRAMid='pc.ram'/>
-  <machine type='kvm' name='pc-1.2' hotplugCpus='yes'
maxCpus='255' defaultCPU='qemu64-x86_64-cpu'
numaMemSupported='yes' defaultRAMid='pc.ram'/>
+  <machine type='kvm' name='pc-1.2' hotplugCpus='yes'
maxCpus='255' defaultCPU='qemu64-x86_64-cpu'
numaMemSupported='yes' defaultRAMid='pc.ram'
deprecated='yes'/>
   <machine type='kvm' name='pc-i440fx-4.0' hotplugCpus='yes'
maxCpus='255' defaultCPU='qemu64-x86_64-cpu'
numaMemSupported='yes' defaultRAMid='pc.ram'/>
   <machine type='kvm' name='pc-i440fx-5.0' hotplugCpus='yes'
maxCpus='255' defaultCPU='qemu64-x86_64-cpu'
numaMemSupported='yes' defaultRAMid='pc.ram'/>
   <machine type='kvm' name='pc-i440fx-2.8' hotplugCpus='yes'
maxCpus='255' defaultCPU='qemu64-x86_64-cpu'
numaMemSupported='yes' defaultRAMid='pc.ram'/>
@@ -3162,7 +3162,7 @@
   <machine type='tcg' name='pc-i440fx-1.5' hotplugCpus='yes'
maxCpus='255' defaultCPU='qemu64-x86_64-cpu'
numaMemSupported='yes' defaultRAMid='pc.ram'/>
   <machine type='tcg' name='pc-q35-2.7' hotplugCpus='yes'
maxCpus='255' defaultCPU='qemu64-x86_64-cpu'
numaMemSupported='yes' defaultRAMid='pc.ram'/>
   <machine type='tcg' name='pc-i440fx-2.2' hotplugCpus='yes'
maxCpus='255' defaultCPU='qemu64-x86_64-cpu'
numaMemSupported='yes' defaultRAMid='pc.ram'/>
-  <machine type='tcg' name='pc-1.1' hotplugCpus='yes'
maxCpus='255' defaultCPU='qemu64-x86_64-cpu'
numaMemSupported='yes' defaultRAMid='pc.ram'/>
+  <machine type='tcg' name='pc-1.1' hotplugCpus='yes'
maxCpus='255' defaultCPU='qemu64-x86_64-cpu'
numaMemSupported='yes' defaultRAMid='pc.ram'
deprecated='yes'/>
   <machine type='tcg' name='pc-i440fx-2.7' hotplugCpus='yes'
maxCpus='255' defaultCPU='qemu64-x86_64-cpu'
numaMemSupported='yes' defaultRAMid='pc.ram'/>
   <machine type='tcg' name='pc-q35-2.4' hotplugCpus='yes'
maxCpus='255' defaultCPU='qemu64-x86_64-cpu'
numaMemSupported='yes' defaultRAMid='pc.ram'/>
   <machine type='tcg' name='pc-q35-2.10' hotplugCpus='yes'
maxCpus='288' defaultCPU='qemu64-x86_64-cpu'
numaMemSupported='yes' defaultRAMid='pc.ram'/>
@@ -3173,7 +3173,7 @@
   <machine type='tcg' name='pc-q35-3.1' hotplugCpus='yes'
maxCpus='288' defaultCPU='qemu64-x86_64-cpu'
numaMemSupported='yes' defaultRAMid='pc.ram'/>
   <machine type='tcg' name='pc-q35-4.1' hotplugCpus='yes'
maxCpus='288' defaultCPU='qemu64-x86_64-cpu'
numaMemSupported='yes' defaultRAMid='pc.ram'/>
   <machine type='tcg' name='pc-i440fx-2.4' hotplugCpus='yes'
maxCpus='255' defaultCPU='qemu64-x86_64-cpu'
numaMemSupported='yes' defaultRAMid='pc.ram'/>
-  <machine type='tcg' name='pc-1.3' hotplugCpus='yes'
maxCpus='255' defaultCPU='qemu64-x86_64-cpu'
numaMemSupported='yes' defaultRAMid='pc.ram'/>
+  <machine type='tcg' name='pc-1.3' hotplugCpus='yes'
maxCpus='255' defaultCPU='qemu64-x86_64-cpu'
numaMemSupported='yes' defaultRAMid='pc.ram'
deprecated='yes'/>
   <machine type='tcg' name='pc-i440fx-4.1' hotplugCpus='yes'
maxCpus='255' defaultCPU='qemu64-x86_64-cpu'
numaMemSupported='yes' defaultRAMid='pc.ram'/>
   <machine type='tcg' name='pc-i440fx-5.1' hotplugCpus='yes'
maxCpus='255' defaultCPU='qemu64-x86_64-cpu'
defaultRAMid='pc.ram'/>
   <machine type='tcg' name='pc-i440fx-2.9' hotplugCpus='yes'
maxCpus='255' defaultCPU='qemu64-x86_64-cpu'
numaMemSupported='yes' defaultRAMid='pc.ram'/>
@@ -3183,7 +3183,7 @@
   <machine type='tcg' name='pc-i440fx-3.1' hotplugCpus='yes'
maxCpus='255' defaultCPU='qemu64-x86_64-cpu'
numaMemSupported='yes' defaultRAMid='pc.ram'/>
   <machine type='tcg' name='pc-q35-2.12' hotplugCpus='yes'
maxCpus='288' defaultCPU='qemu64-x86_64-cpu'
numaMemSupported='yes' defaultRAMid='pc.ram'/>
   <machine type='tcg' name='pc-i440fx-2.1' hotplugCpus='yes'
maxCpus='255' defaultCPU='qemu64-x86_64-cpu'
numaMemSupported='yes' defaultRAMid='pc.ram'/>
-  <machine type='tcg' name='pc-1.0' hotplugCpus='yes'
maxCpus='255' defaultCPU='qemu64-x86_64-cpu'
numaMemSupported='yes' defaultRAMid='pc.ram'/>
+  <machine type='tcg' name='pc-1.0' hotplugCpus='yes'
maxCpus='255' defaultCPU='qemu64-x86_64-cpu'
numaMemSupported='yes' defaultRAMid='pc.ram'
deprecated='yes'/>
   <machine type='tcg' name='pc-i440fx-2.6' hotplugCpus='yes'
maxCpus='255' defaultCPU='qemu64-x86_64-cpu'
numaMemSupported='yes' defaultRAMid='pc.ram'/>
   <machine type='tcg' name='pc-q35-4.0.1' hotplugCpus='yes'
maxCpus='288' defaultCPU='qemu64-x86_64-cpu'
numaMemSupported='yes' defaultRAMid='pc.ram'/>
   <machine type='tcg' name='pc-i440fx-1.6' hotplugCpus='yes'
maxCpus='255' defaultCPU='qemu64-x86_64-cpu'
numaMemSupported='yes' defaultRAMid='pc.ram'/>
@@ -3194,7 +3194,7 @@
   <machine type='tcg' name='pc-q35-4.0' hotplugCpus='yes'
maxCpus='288' defaultCPU='qemu64-x86_64-cpu'
numaMemSupported='yes' defaultRAMid='pc.ram'/>
   <machine type='tcg' name='microvm' maxCpus='288'
defaultCPU='qemu64-x86_64-cpu' defaultRAMid='microvm.ram'/>
   <machine type='tcg' name='pc-i440fx-2.3' hotplugCpus='yes'
maxCpus='255' defaultCPU='qemu64-x86_64-cpu'
numaMemSupported='yes' defaultRAMid='pc.ram'/>
-  <machine type='tcg' name='pc-1.2' hotplugCpus='yes'
maxCpus='255' defaultCPU='qemu64-x86_64-cpu'
numaMemSupported='yes' defaultRAMid='pc.ram'/>
+  <machine type='tcg' name='pc-1.2' hotplugCpus='yes'
maxCpus='255' defaultCPU='qemu64-x86_64-cpu'
numaMemSupported='yes' defaultRAMid='pc.ram'
deprecated='yes'/>
   <machine type='tcg' name='pc-i440fx-4.0' hotplugCpus='yes'
maxCpus='255' defaultCPU='qemu64-x86_64-cpu'
numaMemSupported='yes' defaultRAMid='pc.ram'/>
   <machine type='tcg' name='pc-i440fx-5.0' hotplugCpus='yes'
maxCpus='255' defaultCPU='qemu64-x86_64-cpu'
numaMemSupported='yes' defaultRAMid='pc.ram'/>
   <machine type='tcg' name='pc-i440fx-2.8' hotplugCpus='yes'
maxCpus='255' defaultCPU='qemu64-x86_64-cpu'
numaMemSupported='yes' defaultRAMid='pc.ram'/>
diff --git a/tests/testutilsqemu.c b/tests/testutilsqemu.c
index cea4f84b14..c2cf3be9ac 100644
--- a/tests/testutilsqemu.c
+++ b/tests/testutilsqemu.c
@@ -373,7 +373,8 @@ int qemuTestCapsCacheInsert(virFileCachePtr cache,
                                       false,
                                       false,
                                       true,
-                                      defaultRAMid);
+                                      defaultRAMid,
+                                      false);
                 virQEMUCapsSet(tmpCaps, QEMU_CAPS_TCG);
             }
             if (kvm_machines[i] != NULL) {
@@ -385,9 +386,10 @@ int qemuTestCapsCacheInsert(virFileCachePtr cache,
                                           NULL,
                                           0,
                                           false,
-                                      false,
+                                          false,
                                           true,
-                                          defaultRAMid);
+                                          defaultRAMid,
+                                          false);
                     virQEMUCapsSet(tmpCaps, QEMU_CAPS_KVM);
                 }
             }
-- 
2.29.2


    

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

[libvirt PATCH 02/16] qemu: report whether a machine type is deprecated in capabilities