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