conf: add support for specifying CPU "dies" parameter

Recently CPU hardware vendors have started to support a new structure
inside the CPU package topology known as a "die". Thus the hierarchy
is now:

  sockets > dies > cores > threads

This adds support for "dies" in the XML parser, with the value
defaulting to 1 if not specified for backwards compatibility.

For example a system with 64 logical CPUs might report

   <topology sockets="4" dies="2" cores="4" threads="2"/>

Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
Reviewed-by: Daniel Henrique Barboza <danielhb413@gmail.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>

diff --git a/docs/formatcaps.html.in b/docs/formatcaps.html.in
index 2a0aa963bb540d549a7b75aa7ec7fdd14df86bac..59d21a7d9e43191dd670c6a49e4f2d9c1819d9c8 100644 (file)
--- a/docs/formatcaps.html.in
+++ b/docs/formatcaps.html.in
@@ -173,7 +173,7 @@
       </features>
       <model>core2duo</model>
       <vendor>Intel</vendor>
-      <topology sockets="1" cores="2" threads="1"/>
+      <topology sockets="1" dies="1" cores="2" threads="1"/>
       <feature name="lahf_lm"/>
       <feature name='xtpr'/>
       ...

diff --git a/docs/formatdomain.html.in b/docs/formatdomain.html.in
index 6e86d057a812c2d1caa2964427ece1916d394e25..4db9c292b7ff4125d9d26dc11b5d829359a223e1 100644 (file)
--- a/docs/formatdomain.html.in
+++ b/docs/formatdomain.html.in
@@ -1470,7 +1470,7 @@
 <cpu match='exact'>
   <model fallback='allow'>core2duo</model>
   <vendor>Intel</vendor>
-  <topology sockets='1' cores='2' threads='1'/>
+  <topology sockets='1' dies='1' cores='2' threads='1'/>
   <cache level='3' mode='emulate'/>
   <feature policy='disable' name='lahf_lm'/>
 </cpu>
@@ -1479,7 +1479,7 @@
 <pre>
 &lt;cpu mode='host-model'&gt;
   &lt;model fallback='forbid'/&gt;
-  &lt;topology sockets='1' cores='2' threads='1'/&gt;
+  &lt;topology sockets='1' dies='1' cores='2' threads='1'/&gt;
 &lt;/cpu&gt;
 ...</pre>
 
@@ -1498,7 +1498,7 @@
 <pre>
 ...
 &lt;cpu&gt;
-  &lt;topology sockets='1' cores='2' threads='1'/&gt;
+  &lt;topology sockets='1' dies='1' cores='2' threads='1'/&gt;
 &lt;/cpu&gt;
 ...</pre>
 
@@ -1673,13 +1673,15 @@
 
       <dt><code>topology</code></dt>
       <dd>The <code>topology</code> element specifies requested topology of
-        virtual CPU provided to the guest. Three non-zero values have to be
-        given for <code>sockets</code>, <code>cores</code>, and
-        <code>threads</code>: total number of CPU sockets, number of cores per
-        socket, and number of threads per core, respectively. Hypervisors may
-        require that the maximum number of vCPUs specified by the
-        <code>cpus</code> element equals to the number of vcpus resulting
-        from the topology.</dd>
+        virtual CPU provided to the guest. Four attributes, <code>sockets</code>,
+        <code>dies</code>, <code>cores</code>, and <code>threads</code>,
+        accept non-zero positive integer values. They refer to the total number
+        of CPU sockets, number of dies per socket, number of cores per die, and
+        number of threads per core, respectively. The <code>dies</code>
+        attribute is optional and will default to 1 if omitted, while the other
+        attributes are all mandatory. Hypervisors may require that the maximum
+        number of vCPUs specified by the <code>cpus</code> element equals to
+        the number of vcpus resulting from the topology.</dd>
 
       <dt><code>feature</code></dt>
       <dd>The <code>cpu</code> element can contain zero or more

diff --git a/docs/schemas/cputypes.rng b/docs/schemas/cputypes.rng
index 1f1e0e36d59bf60ebd0a349f720a9001ded8fd17..e2744acad3350f375ada69617b009baf630008f1 100644 (file)
--- a/docs/schemas/cputypes.rng
+++ b/docs/schemas/cputypes.rng
@@ -86,6 +86,11 @@
       <attribute name="sockets">
         <ref name="positiveInteger"/>
       </attribute>
+      <optional>
+        <attribute name="dies">
+          <ref name="positiveInteger"/>
+        </attribute>
+      </optional>
       <attribute name="cores">
         <ref name="positiveInteger"/>
       </attribute>

diff --git a/src/bhyve/bhyve_command.c b/src/bhyve/bhyve_command.c
index 48336ffa1bb99e5bbc2d4949015fbbd4e86667ed..d78221aea8748b027ef5725aec4099bb49559f83 100644 (file)
--- a/src/bhyve/bhyve_command.c
+++ b/src/bhyve/bhyve_command.c
@@ -453,6 +453,11 @@ virBhyveProcessBuildBhyveCmd(virConnectPtr conn,
     /* CPUs */
     virCommandAddArg(cmd, "-c");
     if (def->cpu && def->cpu->sockets) {
+        if (def->dies != 1) {
+            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+                           _("Only 1 die per socket is supported"));
+            goto cleanup;
+        }
         if (nvcpus != def->cpu->sockets * def->cpu->cores * def->cpu->threads) {
             virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
                            _("Invalid CPU topology: total number of vCPUs "

diff --git a/src/conf/cpu_conf.c b/src/conf/cpu_conf.c
index b463981de0965807a569b666c0509da0f52ba14c..837d77581cbfa92b7a42dac4f7b1dd205a03dad6 100644 (file)
--- a/src/conf/cpu_conf.c
+++ b/src/conf/cpu_conf.c
@@ -239,6 +239,7 @@ virCPUDefCopyWithoutModel(const virCPUDef *cpu)
     copy->check = cpu->check;
     copy->fallback = cpu->fallback;
     copy->sockets = cpu->sockets;
+    copy->dies = cpu->dies;
     copy->cores = cpu->cores;
     copy->threads = cpu->threads;
     copy->arch = cpu->arch;
@@ -535,6 +536,17 @@ virCPUDefParseXML(xmlXPathContextPtr ctxt,
         }
         def->sockets = (unsigned int) ul;
 
+        if (virXPathNode("./topology[1]/@dies", ctxt)) {
+            if (virXPathULong("string(./topology[1]/@dies)", ctxt, &ul) < 0) {
+                virReportError(VIR_ERR_XML_ERROR, "%s",
+                               _("Malformed 'dies' attribute in CPU topology"));
+                goto cleanup;
+            }
+            def->dies = (unsigned int) ul;
+        } else {
+            def->dies = 1;
+        }
+
         if (virXPathULong("string(./topology[1]/@cores)", ctxt, &ul) < 0) {
             virReportError(VIR_ERR_XML_ERROR, "%s",
                            _("Missing 'cores' attribute in CPU topology"));
@@ -549,7 +561,7 @@ virCPUDefParseXML(xmlXPathContextPtr ctxt,
         }
         def->threads = (unsigned int) ul;
 
-        if (!def->sockets || !def->cores || !def->threads) {
+        if (!def->sockets || !def->cores || !def->threads || !def->dies) {
             virReportError(VIR_ERR_XML_ERROR, "%s",
                            _("Invalid CPU topology"));
             goto cleanup;
@@ -817,9 +829,10 @@ virCPUDefFormatBuf(virBufferPtr buf,
         virBufferAddLit(buf, "/>\n");
     }
 
-    if (def->sockets && def->cores && def->threads) {
+    if (def->sockets && def->dies && def->cores && def->threads) {
         virBufferAddLit(buf, "<topology");
         virBufferAsprintf(buf, " sockets='%u'", def->sockets);
+        virBufferAsprintf(buf, " dies='%u'", def->dies);
         virBufferAsprintf(buf, " cores='%u'", def->cores);
         virBufferAsprintf(buf, " threads='%u'", def->threads);
         virBufferAddLit(buf, "/>\n");
@@ -1058,6 +1071,12 @@ virCPUDefIsEqual(virCPUDefPtr src,
         return false;
     }
 
+    if (src->dies != dst->dies) {
+        MISMATCH(_("Target CPU dies %d does not match source %d"),
+                 dst->dies, src->dies);
+        return false;
+    }
+
     if (src->cores != dst->cores) {
         MISMATCH(_("Target CPU cores %d does not match source %d"),
                  dst->cores, src->cores);

diff --git a/src/conf/cpu_conf.h b/src/conf/cpu_conf.h
index ec3d2379cf699535c059ff327bd5965d2f776448..6cef9e9726ae749678994d5596f8472e19a99b23 100644 (file)
--- a/src/conf/cpu_conf.h
+++ b/src/conf/cpu_conf.h
@@ -134,6 +134,7 @@ struct _virCPUDef {
     char *vendor;
     unsigned int microcodeVersion;
     unsigned int sockets;
+    unsigned int dies;
     unsigned int cores;
     unsigned int threads;
     size_t nfeatures;

diff --git a/src/conf/domain_conf.c b/src/conf/domain_conf.c
index 2a8a04cacbb67977903f23d2408ad80271d8a849..e5bba9ed977fe61740e727644c620f492f39c080 100644 (file)
--- a/src/conf/domain_conf.c
+++ b/src/conf/domain_conf.c
@@ -2053,7 +2053,8 @@ virDomainDefGetVcpusTopology(const virDomainDef *def,
     tmp = def->cpu->sockets;
 
     /* multiplication of 32bit numbers fits into a 64bit variable */
-    if ((tmp *= def->cpu->cores) > UINT_MAX ||
+    if ((tmp *= def->cpu->dies) > UINT_MAX ||
+        (tmp *= def->cpu->cores) > UINT_MAX ||
         (tmp *= def->cpu->threads) > UINT_MAX) {
         virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
                        _("cpu topology results in more than %u cpus"), UINT_MAX);

diff --git a/src/cpu/cpu.c b/src/cpu/cpu.c
index a2ae5b8c07873a771116c69e8a08fac32fec881e..d9288cc85a61ab8b3526da8379680f6f71b53c57 100644 (file)
--- a/src/cpu/cpu.c
+++ b/src/cpu/cpu.c
@@ -421,6 +421,7 @@ virCPUGetHost(virArch arch,
 
     if (nodeInfo) {
         cpu->sockets = nodeInfo->sockets;
+        cpu->dies = 1;
         cpu->cores = nodeInfo->cores;
         cpu->threads = nodeInfo->threads;
     }

diff --git a/src/libxl/libxl_capabilities.c b/src/libxl/libxl_capabilities.c
index e9f958cd8a526bce12d2e8dd6746a51d2635a1df..beac8c8cfc731ded116ba77e0364c08bc2d8435e 100644 (file)
--- a/src/libxl/libxl_capabilities.c
+++ b/src/libxl/libxl_capabilities.c
@@ -186,6 +186,7 @@ libxlCapsInitCPU(virCapsPtr caps, libxl_physinfo *phy_info,
     cpu->type = VIR_CPU_TYPE_HOST;
     cpu->cores = phy_info->cores_per_socket;
     cpu->threads = phy_info->threads_per_core;
+    cpu->dies = 1;
     cpu->sockets = phy_info->nr_cpus / (cpu->cores * cpu->threads);
     caps->host.cpu = cpu;
 

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 904d2beab5bc018bbb5401e6bf7723f78aa01437..6157dc402a409abd37e4b923675dec496d1d7c12 100644 (file)
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -7109,6 +7109,11 @@ qemuBuildSmpCommandLine(virCommandPtr cmd,
     /* sockets, cores, and threads are either all zero
      * or all non-zero, thus checking one of them is enough */
     if (def->cpu && def->cpu->sockets) {
+        if (def->cpu->dies != 1) {
+            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+                           _("Only 1 die per socket is supported"));
+            return -1;
+        }
         virBufferAsprintf(&buf, ",sockets=%u", def->cpu->sockets);
         virBufferAsprintf(&buf, ",cores=%u", def->cpu->cores);
         virBufferAsprintf(&buf, ",threads=%u", def->cpu->threads);

diff --git a/src/vmx/vmx.c b/src/vmx/vmx.c
index aa88dfcb5d3622666f8262fabac49617a1fa0e0e..4362da6ceeb1ecd5eb0166778c8cf2f6a6734e7d 100644 (file)
--- a/src/vmx/vmx.c
+++ b/src/vmx/vmx.c
@@ -1485,6 +1485,7 @@ virVMXParseConfig(virVMXContext *ctx,
                              "'numvcpus'"));
             goto cleanup;
         }
+        cpu->dies = 1;
         cpu->cores = coresPerSocket;
         cpu->threads = 1;
 
@@ -3206,6 +3207,12 @@ virVMXFormatConfig(virVMXContext *ctx, virDomainXMLOptionPtr xmlopt, virDomainDe
             goto cleanup;
         }
 
+        if (def->cpu->dies != 1) {
+            virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
+                           _("Only 1 die per socket is supported"));
+            goto cleanup;
+        }
+
         calculated_vcpus = def->cpu->sockets * def->cpu->cores;
         if (calculated_vcpus != maxvcpus) {
             virReportError(VIR_ERR_INTERNAL_ERROR,

diff --git a/tests/cputestdata/x86_64-host+guest,model486-result.xml b/tests/cputestdata/x86_64-host+guest,model486-result.xml
index 85564ff45897cd50253ce7fec85809c9515f8293..ea8e2d3a48cd4de214afad6f435b47f10451a084 100644 (file)
--- a/tests/cputestdata/x86_64-host+guest,model486-result.xml
+++ b/tests/cputestdata/x86_64-host+guest,model486-result.xml
@@ -1,6 +1,6 @@
 <cpu mode='custom' match='exact'>
   <model fallback='allow'>486</model>
-  <topology sockets='2' cores='4' threads='1'/>
+  <topology sockets='2' dies='1' cores='4' threads='1'/>
   <feature policy='require' name='de'/>
   <feature policy='require' name='tsc'/>
   <feature policy='require' name='msr'/>

diff --git a/tests/cputestdata/x86_64-host+guest,models-result.xml b/tests/cputestdata/x86_64-host+guest,models-result.xml
index f79ed324c158eb15b398c4cc163b5c7ca6c1bcf0..0dd6955898c6308ad9e57aaa6aa3aae9a65f228a 100644 (file)
--- a/tests/cputestdata/x86_64-host+guest,models-result.xml
+++ b/tests/cputestdata/x86_64-host+guest,models-result.xml
@@ -1,6 +1,6 @@
 <cpu mode='custom' match='exact'>
   <model fallback='allow'>Nehalem</model>
-  <topology sockets='2' cores='4' threads='1'/>
+  <topology sockets='2' dies='1' cores='4' threads='1'/>
   <feature policy='force' name='pbe'/>
   <feature policy='force' name='monitor'/>
   <feature policy='require' name='xtpr'/>

diff --git a/tests/cputestdata/x86_64-host+guest-result.xml b/tests/cputestdata/x86_64-host+guest-result.xml
index 137a3d6647f47db83caf922e89b3562e62824a1b..28e3152cbfa04792ae5c35c04f227b6c97d049c6 100644 (file)
--- a/tests/cputestdata/x86_64-host+guest-result.xml
+++ b/tests/cputestdata/x86_64-host+guest-result.xml
@@ -1,6 +1,6 @@
 <cpu mode='custom' match='exact'>
   <model fallback='allow'>Penryn</model>
-  <topology sockets='2' cores='4' threads='1'/>
+  <topology sockets='2' dies='1' cores='4' threads='1'/>
   <feature policy='require' name='dca'/>
   <feature policy='require' name='xtpr'/>
   <feature policy='disable' name='sse4.2'/>

diff --git a/tests/cputestdata/x86_64-host+guest.xml b/tests/cputestdata/x86_64-host+guest.xml
index 137a3d6647f47db83caf922e89b3562e62824a1b..28e3152cbfa04792ae5c35c04f227b6c97d049c6 100644 (file)
--- a/tests/cputestdata/x86_64-host+guest.xml
+++ b/tests/cputestdata/x86_64-host+guest.xml
@@ -1,6 +1,6 @@
 <cpu mode='custom' match='exact'>
   <model fallback='allow'>Penryn</model>
-  <topology sockets='2' cores='4' threads='1'/>
+  <topology sockets='2' dies='1' cores='4' threads='1'/>
   <feature policy='require' name='dca'/>
   <feature policy='require' name='xtpr'/>
   <feature policy='disable' name='sse4.2'/>

diff --git a/tests/cputestdata/x86_64-host+host-model-nofallback.xml b/tests/cputestdata/x86_64-host+host-model-nofallback.xml
index 0c3ede0f6a96b316a2e35d8944e14db27024150d..16d6e1daf2dac3fa36fdc37da38d588f9f7c86d7 100644 (file)
--- a/tests/cputestdata/x86_64-host+host-model-nofallback.xml
+++ b/tests/cputestdata/x86_64-host+host-model-nofallback.xml
@@ -1,7 +1,7 @@
 <cpu mode='custom' match='exact'>
   <model fallback='forbid'>Penryn</model>
   <vendor>Intel</vendor>
-  <topology sockets='1' cores='2' threads='1'/>
+  <topology sockets='1' dies='1' cores='2' threads='1'/>
   <feature policy='require' name='dca'/>
   <feature policy='require' name='xtpr'/>
   <feature policy='require' name='tm2'/>

diff --git a/tests/cputestdata/x86_64-host-Haswell-noTSX+Haswell,haswell-result.xml b/tests/cputestdata/x86_64-host-Haswell-noTSX+Haswell,haswell-result.xml
index 2dbe06c314b1ccad621b0386a4c887629eccea95..8eda6684a01029482e43a6a26461e5bab3f399de 100644 (file)
--- a/tests/cputestdata/x86_64-host-Haswell-noTSX+Haswell,haswell-result.xml
+++ b/tests/cputestdata/x86_64-host-Haswell-noTSX+Haswell,haswell-result.xml
@@ -1,6 +1,6 @@
 <cpu mode='custom' match='exact'>
   <model fallback='allow'>Haswell</model>
-  <topology sockets='1' cores='2' threads='2'/>
+  <topology sockets='1' dies='1' cores='2' threads='2'/>
   <feature policy='disable' name='rtm'/>
   <feature policy='disable' name='hle'/>
 </cpu>

diff --git a/tests/cputestdata/x86_64-host-Haswell-noTSX+Haswell-noTSX,haswell-result.xml b/tests/cputestdata/x86_64-host-Haswell-noTSX+Haswell-noTSX,haswell-result.xml
index 5d149bb295d89c1954174cba42da2cae5607422c..cb02449d609dae74df3139cd297220c84806187e 100644 (file)
--- a/tests/cputestdata/x86_64-host-Haswell-noTSX+Haswell-noTSX,haswell-result.xml
+++ b/tests/cputestdata/x86_64-host-Haswell-noTSX+Haswell-noTSX,haswell-result.xml
@@ -1,6 +1,6 @@
 <cpu mode='custom' match='exact'>
   <model fallback='allow'>Haswell</model>
-  <topology sockets='1' cores='2' threads='2'/>
+  <topology sockets='1' dies='1' cores='2' threads='2'/>
   <feature policy='disable' name='hle'/>
   <feature policy='disable' name='rtm'/>
 </cpu>

diff --git a/tests/cputestdata/x86_64-host-Haswell-noTSX+Haswell-noTSX-result.xml b/tests/cputestdata/x86_64-host-Haswell-noTSX+Haswell-noTSX-result.xml
index 3b7408964763b4a7e0e1a44c7b06c531570ea416..7ee926aba8dc5c1a71a560866a8d4ddd1edf70ae 100644 (file)
--- a/tests/cputestdata/x86_64-host-Haswell-noTSX+Haswell-noTSX-result.xml
+++ b/tests/cputestdata/x86_64-host-Haswell-noTSX+Haswell-noTSX-result.xml
@@ -1,4 +1,4 @@
 <cpu mode='custom' match='exact'>
   <model fallback='allow'>Haswell-noTSX</model>
-  <topology sockets='1' cores='2' threads='2'/>
+  <topology sockets='1' dies='1' cores='2' threads='2'/>
 </cpu>

diff --git a/tests/cputestdata/x86_64-host-worse+guest-result.xml b/tests/cputestdata/x86_64-host-worse+guest-result.xml
index 2edc8756c44f832e3c15ed6f21ccebd7c937171a..9d54c66a8fbb957580a3d755e5f7a0a205c33079 100644 (file)
--- a/tests/cputestdata/x86_64-host-worse+guest-result.xml
+++ b/tests/cputestdata/x86_64-host-worse+guest-result.xml
@@ -1,6 +1,6 @@
 <cpu mode='custom' match='exact'>
   <model fallback='allow'>Penryn</model>
-  <topology sockets='2' cores='4' threads='1'/>
+  <topology sockets='2' dies='1' cores='4' threads='1'/>
   <feature policy='disable' name='dca'/>
   <feature policy='disable' name='xtpr'/>
   <feature policy='disable' name='sse4.2'/>

diff --git a/tests/qemuhotplugtestcpus/ppc64-modern-bulk-result-conf.xml b/tests/qemuhotplugtestcpus/ppc64-modern-bulk-result-conf.xml
index 1a769235a3a3c99cad6863d27d676233ad357501..f80c4367df90b4cb4a28169260c6ababa70d7e3e 100644 (file)
--- a/tests/qemuhotplugtestcpus/ppc64-modern-bulk-result-conf.xml
+++ b/tests/qemuhotplugtestcpus/ppc64-modern-bulk-result-conf.xml
@@ -43,7 +43,7 @@
     <boot dev='network'/>
   </os>
   <cpu>
-    <topology sockets='1' cores='4' threads='8'/>
+    <topology sockets='1' dies='1' cores='4' threads='8'/>
   </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>

diff --git a/tests/qemuhotplugtestcpus/ppc64-modern-bulk-result-live.xml b/tests/qemuhotplugtestcpus/ppc64-modern-bulk-result-live.xml
index 43e62672501bd7b99c9073e4ac25d8d6679faf70..7998b978fb9fd7de88a6070e62529d8d787335b9 100644 (file)
--- a/tests/qemuhotplugtestcpus/ppc64-modern-bulk-result-live.xml
+++ b/tests/qemuhotplugtestcpus/ppc64-modern-bulk-result-live.xml
@@ -43,7 +43,7 @@
     <boot dev='network'/>
   </os>
   <cpu>
-    <topology sockets='1' cores='4' threads='8'/>
+    <topology sockets='1' dies='1' cores='4' threads='8'/>
   </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>

diff --git a/tests/qemuhotplugtestcpus/ppc64-modern-individual-result-conf.xml b/tests/qemuhotplugtestcpus/ppc64-modern-individual-result-conf.xml
index cfb44cc433d6ec11ca95c1e34d33af432eadb2a7..2a48a97eefdcafd27093d4f76088a9193ff460b7 100644 (file)
--- a/tests/qemuhotplugtestcpus/ppc64-modern-individual-result-conf.xml
+++ b/tests/qemuhotplugtestcpus/ppc64-modern-individual-result-conf.xml
@@ -43,7 +43,7 @@
     <boot dev='network'/>
   </os>
   <cpu>
-    <topology sockets='1' cores='4' threads='8'/>
+    <topology sockets='1' dies='1' cores='4' threads='8'/>
   </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>

diff --git a/tests/qemuhotplugtestcpus/ppc64-modern-individual-result-live.xml b/tests/qemuhotplugtestcpus/ppc64-modern-individual-result-live.xml
index 0a8d37214981774d49aeb6c6a5a3b9de8e0815c2..90518d1fa9ebe892a678d5bff8add0f230d8cdfe 100644 (file)
--- a/tests/qemuhotplugtestcpus/ppc64-modern-individual-result-live.xml
+++ b/tests/qemuhotplugtestcpus/ppc64-modern-individual-result-live.xml
@@ -43,7 +43,7 @@
     <boot dev='network'/>
   </os>
   <cpu>
-    <topology sockets='1' cores='4' threads='8'/>
+    <topology sockets='1' dies='1' cores='4' threads='8'/>
   </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>

diff --git a/tests/qemuhotplugtestcpus/x86-modern-bulk-result-conf.xml b/tests/qemuhotplugtestcpus/x86-modern-bulk-result-conf.xml
index 6457f4056b9917249cd61d2fd797743e0f4544e4..0d622fc8ae35f75fc5340c3c7d279e04675be336 100644 (file)
--- a/tests/qemuhotplugtestcpus/x86-modern-bulk-result-conf.xml
+++ b/tests/qemuhotplugtestcpus/x86-modern-bulk-result-conf.xml
@@ -19,7 +19,7 @@
     <boot dev='network'/>
   </os>
   <cpu>
-    <topology sockets='4' cores='2' threads='1'/>
+    <topology sockets='4' dies='1' cores='2' threads='1'/>
   </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>

diff --git a/tests/qemuhotplugtestcpus/x86-modern-bulk-result-live.xml b/tests/qemuhotplugtestcpus/x86-modern-bulk-result-live.xml
index fe9a81a0916ba045925eaca38e8d3387bf04e0d5..ed9deaea4ad248b8ecd58057123e5cbc6d4dd879 100644 (file)
--- a/tests/qemuhotplugtestcpus/x86-modern-bulk-result-live.xml
+++ b/tests/qemuhotplugtestcpus/x86-modern-bulk-result-live.xml
@@ -19,7 +19,7 @@
     <boot dev='network'/>
   </os>
   <cpu>
-    <topology sockets='4' cores='2' threads='1'/>
+    <topology sockets='4' dies='1' cores='2' threads='1'/>
   </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>

diff --git a/tests/qemuhotplugtestcpus/x86-modern-individual-add-result-conf.xml b/tests/qemuhotplugtestcpus/x86-modern-individual-add-result-conf.xml
index 58c088de88a18789a26b6e48fd23268b644846f3..342f172108640c3b1a1316cf0e13626d05201fc1 100644 (file)
--- a/tests/qemuhotplugtestcpus/x86-modern-individual-add-result-conf.xml
+++ b/tests/qemuhotplugtestcpus/x86-modern-individual-add-result-conf.xml
@@ -19,7 +19,7 @@
     <boot dev='network'/>
   </os>
   <cpu>
-    <topology sockets='4' cores='2' threads='1'/>
+    <topology sockets='4' dies='1' cores='2' threads='1'/>
   </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>

diff --git a/tests/qemuhotplugtestcpus/x86-modern-individual-add-result-live.xml b/tests/qemuhotplugtestcpus/x86-modern-individual-add-result-live.xml
index 12b28be5fe733192a3835466c36ce5fd5ae0a26b..b8341c74e5fbbe41e8bac9700d325264fb4ac744 100644 (file)
--- a/tests/qemuhotplugtestcpus/x86-modern-individual-add-result-live.xml
+++ b/tests/qemuhotplugtestcpus/x86-modern-individual-add-result-live.xml
@@ -19,7 +19,7 @@
     <boot dev='network'/>
   </os>
   <cpu>
-    <topology sockets='4' cores='2' threads='1'/>
+    <topology sockets='4' dies='1' cores='2' threads='1'/>
   </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>

diff --git a/tests/qemuhotplugtestcpus/x86-old-bulk-result-conf.xml b/tests/qemuhotplugtestcpus/x86-old-bulk-result-conf.xml
index f635e37b82b592e6813f527a8ed576e3d2e74e6e..29da89f5bc3148441b00059c9f2415dac1e58425 100644 (file)
--- a/tests/qemuhotplugtestcpus/x86-old-bulk-result-conf.xml
+++ b/tests/qemuhotplugtestcpus/x86-old-bulk-result-conf.xml
@@ -9,7 +9,7 @@
     <boot dev='network'/>
   </os>
   <cpu>
-    <topology sockets='4' cores='2' threads='1'/>
+    <topology sockets='4' dies='1' cores='2' threads='1'/>
   </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>

diff --git a/tests/qemuhotplugtestcpus/x86-old-bulk-result-live.xml b/tests/qemuhotplugtestcpus/x86-old-bulk-result-live.xml
index 6f50bb5c12e910fdbeb79266e56238bc61cb9a4d..f81194db5b7eb699fce658da1498d3bdc369963e 100644 (file)
--- a/tests/qemuhotplugtestcpus/x86-old-bulk-result-live.xml
+++ b/tests/qemuhotplugtestcpus/x86-old-bulk-result-live.xml
@@ -9,7 +9,7 @@
     <boot dev='network'/>
   </os>
   <cpu>
-    <topology sockets='4' cores='2' threads='1'/>
+    <topology sockets='4' dies='1' cores='2' threads='1'/>
   </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>

diff --git a/tests/qemuxml2argvdata/cpu-hotplug-granularity.xml b/tests/qemuxml2argvdata/cpu-hotplug-granularity.xml
index a94f41e46ac145056e456320acbfba008d4af4be..bf6a42c306132e8aae8e51ab9aeccd19fd3cfbc0 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-hotplug-granularity.xml
+++ b/tests/qemuxml2argvdata/cpu-hotplug-granularity.xml
@@ -7,7 +7,7 @@
     <type arch='ppc64' machine='pseries'>hvm</type>
   </os>
   <cpu>
-    <topology sockets='1' cores='2' threads='4'/>
+    <topology sockets='1' dies='1' cores='2' threads='4'/>
   </cpu>
   <devices>
     <emulator>/usr/bin/qemu-system-ppc64</emulator>

diff --git a/tests/qemuxml2argvdata/cpu-hotplug-startup.xml b/tests/qemuxml2argvdata/cpu-hotplug-startup.xml
index 99987ba15abfb4f293ba427cde2ccb2c80da85e4..9d764e2f8c5c8168f4560d9493b519184e8812b7 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-hotplug-startup.xml
+++ b/tests/qemuxml2argvdata/cpu-hotplug-startup.xml
@@ -17,7 +17,7 @@
     <boot dev='network'/>
   </os>
   <cpu>
-    <topology sockets="3" cores="2" threads="1"/>
+    <topology sockets="3" dies="1" cores="2" threads="1"/>
   </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>

diff --git a/tests/qemuxml2argvdata/cpu-numa-disjoint.xml b/tests/qemuxml2argvdata/cpu-numa-disjoint.xml
index b022384e972ddb15b3eb347f83180d7001505f86..c164b15e82a85dd7f13610cc76be2322ee0178ae 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-numa-disjoint.xml
+++ b/tests/qemuxml2argvdata/cpu-numa-disjoint.xml
@@ -9,7 +9,7 @@
     <boot dev='network'/>
   </os>
   <cpu>
-    <topology sockets='2' cores='4' threads='2'/>
+    <topology sockets='2' dies='1' cores='4' threads='2'/>
     <numa>
       <cell id='0' cpus='0-3,8-11' memory='109550' unit='KiB'/>
       <cell id='1' cpus='4-7,12-15' memory='109550' unit='KiB'/>

diff --git a/tests/qemuxml2argvdata/cpu-numa-disordered.xml b/tests/qemuxml2argvdata/cpu-numa-disordered.xml
index e209150a55181fb0eef78ae6b9ad978c069dfb4a..6e00b91281dc0402cb21577d72fbf12c0f950c2a 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-numa-disordered.xml
+++ b/tests/qemuxml2argvdata/cpu-numa-disordered.xml
@@ -9,7 +9,7 @@
     <boot dev='network'/>
   </os>
   <cpu>
-    <topology sockets='2' cores='4' threads='2'/>
+    <topology sockets='2' dies='1' cores='4' threads='2'/>
     <numa>
       <cell id='0' cpus='0-5' memory='109550' unit='KiB'/>
       <cell id='2' cpus='6-10' memory='109550' unit='KiB'/>

diff --git a/tests/qemuxml2argvdata/cpu-numa-memshared.xml b/tests/qemuxml2argvdata/cpu-numa-memshared.xml
index 7e05916f786cc8d2f530655bb7c52d6315d2857f..f2ef035b005c769761abf939c04ee8904f0e0fb1 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-numa-memshared.xml
+++ b/tests/qemuxml2argvdata/cpu-numa-memshared.xml
@@ -9,7 +9,7 @@
     <boot dev='network'/>
   </os>
   <cpu>
-    <topology sockets='2' cores='4' threads='2'/>
+    <topology sockets='2' dies='1' cores='4' threads='2'/>
     <numa>
       <cell id='0' cpus='0-7' memory='109550' unit='KiB' memAccess='shared'/>
       <cell id='1' cpus='8-15' memory='109550' unit='KiB' memAccess='private'/>

diff --git a/tests/qemuxml2argvdata/cpu-numa-no-memory-element.xml b/tests/qemuxml2argvdata/cpu-numa-no-memory-element.xml
index ee6b6aa870462462c25dc252dd65ef8418083379..97dac01e84d9a6b962c7f43e5e3a53cbb05b5eeb 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-numa-no-memory-element.xml
+++ b/tests/qemuxml2argvdata/cpu-numa-no-memory-element.xml
@@ -8,7 +8,7 @@
     <boot dev='network'/>
   </os>
   <cpu>
-    <topology sockets='2' cores='4' threads='2'/>
+    <topology sockets='2' dies='1' cores='4' threads='2'/>
     <numa>
       <cell id='1' cpus='8-15' memory='109550' unit='KiB'/>
       <cell id='0' cpus='0-7' memory='109550' unit='KiB'/>

diff --git a/tests/qemuxml2argvdata/cpu-numa1.xml b/tests/qemuxml2argvdata/cpu-numa1.xml
index b21941d51a81cd7fbc1eee54598228aa533ede80..867d21e152f67326f9a7e6478a03b40c971b7498 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-numa1.xml
+++ b/tests/qemuxml2argvdata/cpu-numa1.xml
@@ -9,7 +9,7 @@
     <boot dev='network'/>
   </os>
   <cpu>
-    <topology sockets='2' cores='4' threads='2'/>
+    <topology sockets='2' dies='1' cores='4' threads='2'/>
     <numa>
       <cell cpus='0-7' memory='109550' unit='KiB'/>
       <cell cpus='8-15' memory='109550' unit='KiB'/>

diff --git a/tests/qemuxml2argvdata/cpu-numa2.xml b/tests/qemuxml2argvdata/cpu-numa2.xml
index b85b19f5e08f6cfef148eeea479b833b94690dc8..e589948dc71b41091a43d2a80278f2fcb098c7a7 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-numa2.xml
+++ b/tests/qemuxml2argvdata/cpu-numa2.xml
@@ -9,7 +9,7 @@
     <boot dev='network'/>
   </os>
   <cpu>
-    <topology sockets='2' cores='4' threads='2'/>
+    <topology sockets='2' dies='1' cores='4' threads='2'/>
     <numa>
       <cell id='1' cpus='8-15' memory='109550' unit='KiB'/>
       <cell id='0' cpus='0-7' memory='109550' unit='KiB'/>

diff --git a/tests/qemuxml2argvdata/cpu-numa3.xml b/tests/qemuxml2argvdata/cpu-numa3.xml
index e2b9e9014dd8ebcbfbc1d99b03ccf3e8dca6a41b..350fbe7c07127dd17278256d2fa410e69b96de3f 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-numa3.xml
+++ b/tests/qemuxml2argvdata/cpu-numa3.xml
@@ -9,7 +9,7 @@
     <boot dev='network'/>
   </os>
   <cpu>
-    <topology sockets='2' cores='4' threads='2'/>
+    <topology sockets='2' dies='1' cores='4' threads='2'/>
     <numa>
       <cell id='1' cpus='0-7' memory='109550' unit='KiB'/>
       <cell id='2' cpus='8-15' memory='109550' unit='KiB'/>

diff --git a/tests/qemuxml2argvdata/cpu-topology1.xml b/tests/qemuxml2argvdata/cpu-topology1.xml
index 9d77d10a5cb5d4dde82da63225a73bfe89365fca..af82a1c51a11e7a7f1df3396bd9de03938155d65 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-topology1.xml
+++ b/tests/qemuxml2argvdata/cpu-topology1.xml
@@ -9,7 +9,7 @@
     <boot dev='network'/>
   </os>
   <cpu>
-    <topology sockets="3" cores="2" threads="1"/>
+    <topology sockets="3" dies="1" cores="2" threads="1"/>
   </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>

diff --git a/tests/qemuxml2argvdata/cpu-topology2.xml b/tests/qemuxml2argvdata/cpu-topology2.xml
index 9d9701914a03e7ccec491ce2e074220d2a33ebea..1b113b8b1303754cde77688ca81df915a9297815 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-topology2.xml
+++ b/tests/qemuxml2argvdata/cpu-topology2.xml
@@ -10,7 +10,7 @@
   </os>
   <cpu match='exact'>
     <model>core2duo</model>
-    <topology sockets="1" cores="2" threads="3"/>
+    <topology sockets="1" dies="1" cores="2" threads="3"/>
   </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>

diff --git a/tests/qemuxml2argvdata/cpu-topology3.xml b/tests/qemuxml2argvdata/cpu-topology3.xml
index 9d77d10a5cb5d4dde82da63225a73bfe89365fca..af82a1c51a11e7a7f1df3396bd9de03938155d65 100644 (file)
--- a/tests/qemuxml2argvdata/cpu-topology3.xml
+++ b/tests/qemuxml2argvdata/cpu-topology3.xml
@@ -9,7 +9,7 @@
     <boot dev='network'/>
   </os>
   <cpu>
-    <topology sockets="3" cores="2" threads="1"/>
+    <topology sockets="3" dies="1" cores="2" threads="1"/>
   </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>

diff --git a/tests/qemuxml2argvdata/fd-memory-no-numa-topology.xml b/tests/qemuxml2argvdata/fd-memory-no-numa-topology.xml
index 4c30761110d8749b457124c68acc047182d6027f..eb3300b1fb8ea3846e3dcffa9c87f1b41b0d11c3 100644 (file)
--- a/tests/qemuxml2argvdata/fd-memory-no-numa-topology.xml
+++ b/tests/qemuxml2argvdata/fd-memory-no-numa-topology.xml
@@ -14,7 +14,7 @@
     <boot dev='hd'/>
   </os>
   <cpu>
-    <topology sockets='8' cores='1' threads='1'/>
+    <topology sockets='8' dies='1' cores='1' threads='1'/>
   </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>

diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology.xml b/tests/qemuxml2argvdata/fd-memory-numa-topology.xml
index f22a8e81f8e370c7f346039a71f86c8a572a720d..b7b5a19166ff647cdc5b21d6b7e946da2c4703ef 100644 (file)
--- a/tests/qemuxml2argvdata/fd-memory-numa-topology.xml
+++ b/tests/qemuxml2argvdata/fd-memory-numa-topology.xml
@@ -14,7 +14,7 @@
     <boot dev='hd'/>
   </os>
   <cpu>
-    <topology sockets='1' cores='8' threads='1'/>
+    <topology sockets='1' dies='1' cores='8' threads='1'/>
     <numa>
       <cell id='0' cpus='0-7' memory='14680064' unit='KiB'/>
     </numa>

diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology2.xml b/tests/qemuxml2argvdata/fd-memory-numa-topology2.xml
index 925f39b6abdb636690b3529e4b6cb6bcf911d245..07de0bd7174baaeea93dd50489da418ade10e5be 100644 (file)
--- a/tests/qemuxml2argvdata/fd-memory-numa-topology2.xml
+++ b/tests/qemuxml2argvdata/fd-memory-numa-topology2.xml
@@ -14,7 +14,7 @@
     <boot dev='hd'/>
   </os>
   <cpu>
-    <topology sockets='1' cores='8' threads='1'/>
+    <topology sockets='1' dies='1' cores='8' threads='1'/>
     <numa>
       <cell id='0' cpus='0-7' memory='14680064' unit='KiB'/>
       <cell id='1' cpus='8-15' memory='14680064' unit='KiB' memAccess='shared'/>

diff --git a/tests/qemuxml2argvdata/fd-memory-numa-topology3.xml b/tests/qemuxml2argvdata/fd-memory-numa-topology3.xml
index 71a8e083c94dfbead82860e2f4e6384957b63903..8711641b682b5025e8f1c208724cbda8fba0ac48 100644 (file)
--- a/tests/qemuxml2argvdata/fd-memory-numa-topology3.xml
+++ b/tests/qemuxml2argvdata/fd-memory-numa-topology3.xml
@@ -14,7 +14,7 @@
     <boot dev='hd'/>
   </os>
   <cpu>
-    <topology sockets='1' cores='24' threads='1'/>
+    <topology sockets='1' dies='1' cores='24' threads='1'/>
     <numa>
       <cell id='0' cpus='0-1' memory='14680064' unit='KiB'/>
       <cell id='1' cpus='2-3' memory='14680064' unit='KiB' memAccess='shared'/>

diff --git a/tests/qemuxml2argvdata/graphics-spice-timeout.xml b/tests/qemuxml2argvdata/graphics-spice-timeout.xml
index 6bb4eb8f4c3b41bf5bc8b62efe3ec907d850ad8a..d96f519bf88c14d8f696c2a502fe2fee0ae2c6d2 100644 (file)
--- a/tests/qemuxml2argvdata/graphics-spice-timeout.xml
+++ b/tests/qemuxml2argvdata/graphics-spice-timeout.xml
@@ -18,7 +18,7 @@
   <cpu match='exact'>
     <model>core2duo</model>
     <vendor>Intel</vendor>
-    <topology sockets='1' cores='2' threads='1'/>
+    <topology sockets='1' dies='1' cores='2' threads='1'/>
     <feature policy='require' name='ds'/>
     <feature policy='require' name='acpi'/>
     <feature policy='require' name='ss'/>

diff --git a/tests/qemuxml2argvdata/hugepages-nvdimm.xml b/tests/qemuxml2argvdata/hugepages-nvdimm.xml
index b78477780566a65e5e1b3ee377dbf85aabff85a9..144d02b56eecbcd295f5285cb2fc2065ef9fe7fc 100644 (file)
--- a/tests/qemuxml2argvdata/hugepages-nvdimm.xml
+++ b/tests/qemuxml2argvdata/hugepages-nvdimm.xml
@@ -16,7 +16,7 @@
     <boot dev='hd'/>
   </os>
   <cpu>
-    <topology sockets='2' cores='1' threads='1'/>
+    <topology sockets='2' dies='1' cores='1' threads='1'/>
     <numa>
       <cell id='0' cpus='0-1' memory='1048576' unit='KiB'/>
     </numa>

diff --git a/tests/qemuxml2argvdata/memfd-memory-default-hugepage.xml b/tests/qemuxml2argvdata/memfd-memory-default-hugepage.xml
index 45ff0127119be0e74edef17e98c176521107e270..ded56dd5387fbbd1dd95c1c7065e2adceb2dc385 100644 (file)
--- a/tests/qemuxml2argvdata/memfd-memory-default-hugepage.xml
+++ b/tests/qemuxml2argvdata/memfd-memory-default-hugepage.xml
@@ -18,7 +18,7 @@
     <boot dev='hd'/>
   </os>
   <cpu>
-    <topology sockets='1' cores='8' threads='1'/>
+    <topology sockets='1' dies='1' cores='8' threads='1'/>
     <numa>
       <cell id='0' cpus='0-7' memory='14680064' unit='KiB'/>
     </numa>

diff --git a/tests/qemuxml2argvdata/memfd-memory-numa.xml b/tests/qemuxml2argvdata/memfd-memory-numa.xml
index f088f01d1105bc618cc837da12d66414d6a9e0e1..ebe638f600ff1439c9b5bf6811f16d54d88ee3fb 100644 (file)
--- a/tests/qemuxml2argvdata/memfd-memory-numa.xml
+++ b/tests/qemuxml2argvdata/memfd-memory-numa.xml
@@ -20,7 +20,7 @@
     <boot dev='hd'/>
   </os>
   <cpu>
-    <topology sockets='1' cores='8' threads='1'/>
+    <topology sockets='1' dies='1' cores='8' threads='1'/>
     <numa>
       <cell id='0' cpus='0-7' memory='14680064' unit='KiB'/>
     </numa>

diff --git a/tests/qemuxml2argvdata/memory-align-fail.xml b/tests/qemuxml2argvdata/memory-align-fail.xml
index 75c1a46068cf7f31dfc043a463139e9f476c335a..636f0e3d8e013c2e1b9a3ed046aa56ceed36b7ed 100644 (file)
--- a/tests/qemuxml2argvdata/memory-align-fail.xml
+++ b/tests/qemuxml2argvdata/memory-align-fail.xml
@@ -10,7 +10,7 @@
     <boot dev='hd'/>
   </os>
   <cpu>
-    <topology sockets='2' cores='1' threads='1'/>
+    <topology sockets='2' dies='1' cores='1' threads='1'/>
     <numa>
       <cell id='0' cpus='0-1' memory='9007199254740991' unit='KiB'/>
     </numa>

diff --git a/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.xml b/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.xml
index c289fdd5ff4a88dc428645ac80ea2986f7eb9efc..ea4f4fd745663664e9bc3de084a14fb854efc865 100644 (file)
--- a/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.xml
+++ b/tests/qemuxml2argvdata/memory-hotplug-dimm-addr.xml
@@ -10,7 +10,7 @@
     <boot dev='hd'/>
   </os>
   <cpu>
-    <topology sockets='2' cores='1' threads='1'/>
+    <topology sockets='2' dies='1' cores='1' threads='1'/>
     <numa>
       <cell id='0' cpus='0-1' memory='219136' unit='KiB'/>
     </numa>

diff --git a/tests/qemuxml2argvdata/memory-hotplug-dimm.xml b/tests/qemuxml2argvdata/memory-hotplug-dimm.xml
index c68336f871a416947ceeb277f139441a15332d3a..585e0a5f5154b8c7ba941592503ff92e519ec0c7 100644 (file)
--- a/tests/qemuxml2argvdata/memory-hotplug-dimm.xml
+++ b/tests/qemuxml2argvdata/memory-hotplug-dimm.xml
@@ -14,7 +14,7 @@
     <gid start='0' target='1000' count='10'/>
   </idmap>
   <cpu>
-    <topology sockets='2' cores='1' threads='1'/>
+    <topology sockets='2' dies='1' cores='1' threads='1'/>
     <numa>
       <cell id='0' cpus='0-1' memory='219136' unit='KiB'/>
     </numa>

diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.xml b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.xml
index 4e62dd0e18430c7537702f9ecae6c6468dd7e972..a1cc1264eb87dad3cd69915eb02c7a4096755212 100644 (file)
--- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.xml
+++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-access.xml
@@ -14,7 +14,7 @@
     <gid start='0' target='1000' count='10'/>
   </idmap>
   <cpu>
-    <topology sockets='2' cores='1' threads='1'/>
+    <topology sockets='2' dies='1' cores='1' threads='1'/>
     <numa>
       <cell id='0' cpus='0-1' memory='219136' unit='KiB'/>
     </numa>

diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.xml b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.xml
index defa109e80881325c2947424c487d29ed97e1ede..018a693aaf2e8c7b4449b11bfc123f9a5b9fd4c5 100644 (file)
--- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.xml
+++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-align.xml
@@ -14,7 +14,7 @@
     <gid start='0' target='1000' count='10'/>
   </idmap>
   <cpu>
-    <topology sockets='2' cores='1' threads='1'/>
+    <topology sockets='2' dies='1' cores='1' threads='1'/>
     <numa>
       <cell id='0' cpus='0-1' memory='219136' unit='KiB'/>
     </numa>

diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.xml b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.xml
index 89d01d672f960d6c330273348bdf58af5d0d8dee..c9d54a6088238ccfead24364460ab683167f0fec 100644 (file)
--- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.xml
+++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-label.xml
@@ -14,7 +14,7 @@
     <gid start='0' target='1000' count='10'/>
   </idmap>
   <cpu>
-    <topology sockets='2' cores='1' threads='1'/>
+    <topology sockets='2' dies='1' cores='1' threads='1'/>
     <numa>
       <cell id='0' cpus='0-1' memory='219136' unit='KiB'/>
     </numa>

diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.xml b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.xml
index e6a4f7901aa01606476e9cb1e13b72d21ba6b66a..391d70f20e40fabd743b9d6529273e372bef33b1 100644 (file)
--- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.xml
+++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-pmem.xml
@@ -14,7 +14,7 @@
     <gid start='0' target='1000' count='10'/>
   </idmap>
   <cpu>
-    <topology sockets='2' cores='1' threads='1'/>
+    <topology sockets='2' dies='1' cores='1' threads='1'/>
     <numa>
       <cell id='0' cpus='0-1' memory='219136' unit='KiB'/>
     </numa>

diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.xml b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.xml
index dd48540712b095cb307d8aa7bef84732c89558b2..09b2c5c833b8246534a113a97daa69ac67d770f6 100644 (file)
--- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.xml
+++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm-readonly.xml
@@ -14,7 +14,7 @@
     <gid start='0' target='1000' count='10'/>
   </idmap>
   <cpu>
-    <topology sockets='2' cores='1' threads='1'/>
+    <topology sockets='2' dies='1' cores='1' threads='1'/>
     <numa>
       <cell id='0' cpus='0-1' memory='219136' unit='KiB'/>
     </numa>

diff --git a/tests/qemuxml2argvdata/memory-hotplug-nvdimm.xml b/tests/qemuxml2argvdata/memory-hotplug-nvdimm.xml
index 9c76dda6c82b55d5999a149137ddc163252627fa..a32474da063c5ba8728110ace5710874a8025b71 100644 (file)
--- a/tests/qemuxml2argvdata/memory-hotplug-nvdimm.xml
+++ b/tests/qemuxml2argvdata/memory-hotplug-nvdimm.xml
@@ -14,7 +14,7 @@
     <gid start='0' target='1000' count='10'/>
   </idmap>
   <cpu>
-    <topology sockets='2' cores='1' threads='1'/>
+    <topology sockets='2' dies='1' cores='1' threads='1'/>
     <numa>
       <cell id='0' cpus='0-1' memory='1048576' unit='KiB'/>
     </numa>

diff --git a/tests/qemuxml2argvdata/memory-hotplug.xml b/tests/qemuxml2argvdata/memory-hotplug.xml
index e1f086567bf82aa4cdd8fe9972caa9567cb738b0..8d09856e957ad1bbb8ad1de06d81a32277d2a66e 100644 (file)
--- a/tests/qemuxml2argvdata/memory-hotplug.xml
+++ b/tests/qemuxml2argvdata/memory-hotplug.xml
@@ -10,7 +10,7 @@
     <boot dev='hd'/>
   </os>
   <cpu>
-    <topology sockets='2' cores='1' threads='1'/>
+    <topology sockets='2' dies='1' cores='1' threads='1'/>
     <numa>
       <cell id='0' cpus='0-1' memory='219136' unit='KiB'/>
     </numa>

diff --git a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.xml b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.xml
index 50dbc3c466f5e5e33dffb139f6cdde26f3139a9e..5758e65d0957ac2c9543b5cc5f1b37829c1faf19 100644 (file)
--- a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.xml
+++ b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-cpuset.xml
@@ -12,7 +12,7 @@
     <boot dev='hd'/>
   </os>
   <cpu>
-    <topology sockets='2' cores='1' threads='1'/>
+    <topology sockets='2' dies='1' cores='1' threads='1'/>
   </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>

diff --git a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-placement.xml b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-placement.xml
index d9cd6b83f18d8a35f989e1ec4881ef031da5fad4..80314d05a325bbaff8cdd94206f50057d6038a38 100644 (file)
--- a/tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-placement.xml
+++ b/tests/qemuxml2argvdata/numad-auto-memory-vcpu-no-cpuset-and-placement.xml
@@ -12,7 +12,7 @@
     <boot dev='hd'/>
   </os>
   <cpu>
-    <topology sockets='2' cores='1' threads='1'/>
+    <topology sockets='2' dies='1' cores='1' threads='1'/>
   </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>

diff --git a/tests/qemuxml2argvdata/numad-auto-vcpu-no-numatune.xml b/tests/qemuxml2argvdata/numad-auto-vcpu-no-numatune.xml
index f21ba0a7865c8adce500c974d4c21abafc88163f..0edf8ee46fbcbfdffbd859e4693a804c5397486c 100644 (file)
--- a/tests/qemuxml2argvdata/numad-auto-vcpu-no-numatune.xml
+++ b/tests/qemuxml2argvdata/numad-auto-vcpu-no-numatune.xml
@@ -9,7 +9,7 @@
     <boot dev='hd'/>
   </os>
   <cpu>
-    <topology sockets='2' cores='1' threads='1'/>
+    <topology sockets='2' dies='1' cores='1' threads='1'/>
   </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>

diff --git a/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune-no-nodeset.xml b/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune-no-nodeset.xml
index 378d17facef488a5eb150937c47b0bda6bc6c14e..517dd5dbd715e232c38693c2a199d93e4565d240 100644 (file)
--- a/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune-no-nodeset.xml
+++ b/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune-no-nodeset.xml
@@ -12,7 +12,7 @@
     <boot dev='hd'/>
   </os>
   <cpu>
-    <topology sockets='2' cores='1' threads='1'/>
+    <topology sockets='2' dies='1' cores='1' threads='1'/>
   </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>

diff --git a/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.xml b/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.xml
index e20bd8db0b8c6ab51ad9a40adce24f1729ee6d4d..a7f32b6802ae6a5b51f704ccaf1413b65ec21e6d 100644 (file)
--- a/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.xml
+++ b/tests/qemuxml2argvdata/numad-auto-vcpu-static-numatune.xml
@@ -12,7 +12,7 @@
     <boot dev='hd'/>
   </os>
   <cpu>
-    <topology sockets='2' cores='1' threads='1'/>
+    <topology sockets='2' dies='1' cores='1' threads='1'/>
   </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>

diff --git a/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.xml b/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.xml
index 50dbc3c466f5e5e33dffb139f6cdde26f3139a9e..5758e65d0957ac2c9543b5cc5f1b37829c1faf19 100644 (file)
--- a/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.xml
+++ b/tests/qemuxml2argvdata/numad-static-memory-auto-vcpu.xml
@@ -12,7 +12,7 @@
     <boot dev='hd'/>
   </os>
   <cpu>
-    <topology sockets='2' cores='1' threads='1'/>
+    <topology sockets='2' dies='1' cores='1' threads='1'/>
   </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>

diff --git a/tests/qemuxml2argvdata/numad-static-vcpu-no-numatune.xml b/tests/qemuxml2argvdata/numad-static-vcpu-no-numatune.xml
index 7ccaa5aff4e3ab005a1e87a91b222e6e8237eb11..3237e7c7c588d9162502910bd055cc2e50c2e240 100644 (file)
--- a/tests/qemuxml2argvdata/numad-static-vcpu-no-numatune.xml
+++ b/tests/qemuxml2argvdata/numad-static-vcpu-no-numatune.xml
@@ -9,7 +9,7 @@
     <boot dev='hd'/>
   </os>
   <cpu>
-    <topology sockets='2' cores='1' threads='1'/>
+    <topology sockets='2' dies='1' cores='1' threads='1'/>
   </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>

diff --git a/tests/qemuxml2argvdata/numad.xml b/tests/qemuxml2argvdata/numad.xml
index 081a59a0139cfb9fb01e9408b939083548098b7e..ae995e2d6bb8f9de8036ffd3a107371b133a60fb 100644 (file)
--- a/tests/qemuxml2argvdata/numad.xml
+++ b/tests/qemuxml2argvdata/numad.xml
@@ -12,7 +12,7 @@
     <boot dev='hd'/>
   </os>
   <cpu>
-    <topology sockets='2' cores='1' threads='1'/>
+    <topology sockets='2' dies='1' cores='1' threads='1'/>
   </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>

diff --git a/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.xml b/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.xml
index 44ec55a81042990548c047735b271c60248f53f2..e6ca895b0debbf68ea3977088069dca2667b88b5 100644 (file)
--- a/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.xml
+++ b/tests/qemuxml2argvdata/numatune-auto-nodeset-invalid.xml
@@ -12,7 +12,7 @@
     <boot dev='hd'/>
   </os>
   <cpu>
-    <topology sockets='2' cores='1' threads='1'/>
+    <topology sockets='2' dies='1' cores='1' threads='1'/>
   </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>

diff --git a/tests/qemuxml2argvdata/numatune-memory-invalid-nodeset.xml b/tests/qemuxml2argvdata/numatune-memory-invalid-nodeset.xml
index 441f2b89891aa2467c6a2bc69fc294e153b9c1bd..70e7b92f34c1b387f44a70c7b6af91dbead507d2 100644 (file)
--- a/tests/qemuxml2argvdata/numatune-memory-invalid-nodeset.xml
+++ b/tests/qemuxml2argvdata/numatune-memory-invalid-nodeset.xml
@@ -12,7 +12,7 @@
     <boot dev='hd'/>
   </os>
   <cpu>
-    <topology sockets='2' cores='1' threads='1'/>
+    <topology sockets='2' dies='1' cores='1' threads='1'/>
   </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>

diff --git a/tests/qemuxml2argvdata/numatune-memory.xml b/tests/qemuxml2argvdata/numatune-memory.xml
index c9887dbebc2ced8d508c3926c6c4d058c2511d16..93ee70cc0b52fe1944de3dcf9daa7ff98ea95097 100644 (file)
--- a/tests/qemuxml2argvdata/numatune-memory.xml
+++ b/tests/qemuxml2argvdata/numatune-memory.xml
@@ -12,7 +12,7 @@
     <boot dev='hd'/>
   </os>
   <cpu>
-    <topology sockets='2' cores='1' threads='1'/>
+    <topology sockets='2' dies='1' cores='1' threads='1'/>
   </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>

diff --git a/tests/qemuxml2argvdata/pci-expander-bus-bad-machine.xml b/tests/qemuxml2argvdata/pci-expander-bus-bad-machine.xml
index 606ddfd73cbb25d32da83d887df34db3e72ee58b..5093944a1c8a716baff64f901f9add454e0e84c9 100644 (file)
--- a/tests/qemuxml2argvdata/pci-expander-bus-bad-machine.xml
+++ b/tests/qemuxml2argvdata/pci-expander-bus-bad-machine.xml
@@ -8,7 +8,7 @@
     <type arch='x86_64' machine='q35'>hvm</type>
   </os>
   <cpu>
-    <topology sockets='2' cores='4' threads='2'/>
+    <topology sockets='2' dies='1' cores='4' threads='2'/>
     <numa>
       <cell cpus='0-7' memory='109550' unit='KiB'/>
       <cell cpus='8-15' memory='109550' unit='KiB'/>

diff --git a/tests/qemuxml2argvdata/pci-expander-bus.xml b/tests/qemuxml2argvdata/pci-expander-bus.xml
index 79c959346d17765b767c722d81d69a49abe58d28..d9aeda1757bb79a4dab7188e74c7a72de3956183 100644 (file)
--- a/tests/qemuxml2argvdata/pci-expander-bus.xml
+++ b/tests/qemuxml2argvdata/pci-expander-bus.xml
@@ -8,7 +8,7 @@
     <type arch='x86_64' machine='pc-i440fx-2.5'>hvm</type>
   </os>
   <cpu>
-    <topology sockets='2' cores='4' threads='2'/>
+    <topology sockets='2' dies='1' cores='4' threads='2'/>
     <numa>
       <cell cpus='0-7' memory='109550' unit='KiB'/>
       <cell cpus='8-15' memory='109550' unit='KiB'/>

diff --git a/tests/qemuxml2argvdata/pcie-expander-bus-bad-bus.xml b/tests/qemuxml2argvdata/pcie-expander-bus-bad-bus.xml
index f0ab0a16d191910c8efe0bdb945b23eb921c0325..4a6cb492bbce4eb540502cae252f7485b4d5428c 100644 (file)
--- a/tests/qemuxml2argvdata/pcie-expander-bus-bad-bus.xml
+++ b/tests/qemuxml2argvdata/pcie-expander-bus-bad-bus.xml
@@ -9,7 +9,7 @@
     <boot dev='hd'/>
   </os>
   <cpu>
-    <topology sockets='2' cores='4' threads='2'/>
+    <topology sockets='2' dies='1' cores='4' threads='2'/>
     <numa>
       <cell cpus='0-7' memory='109550' unit='KiB'/>
       <cell cpus='8-15' memory='109550' unit='KiB'/>

diff --git a/tests/qemuxml2argvdata/pcie-expander-bus-bad-machine.xml b/tests/qemuxml2argvdata/pcie-expander-bus-bad-machine.xml
index dc64d97b832738efa7095a0b5631b4cecd58980d..1c27047b757a6554808d7e0b53f2b0b4518206bd 100644 (file)
--- a/tests/qemuxml2argvdata/pcie-expander-bus-bad-machine.xml
+++ b/tests/qemuxml2argvdata/pcie-expander-bus-bad-machine.xml
@@ -8,7 +8,7 @@
     <type arch='x86_64' machine='pc-i440fx-2.5'>hvm</type>
   </os>
   <cpu>
-    <topology sockets='2' cores='4' threads='2'/>
+    <topology sockets='2' dies='1' cores='4' threads='2'/>
     <numa>
       <cell cpus='0-7' memory='109550' unit='KiB'/>
       <cell cpus='8-15' memory='109550' unit='KiB'/>

diff --git a/tests/qemuxml2argvdata/pcie-expander-bus.xml b/tests/qemuxml2argvdata/pcie-expander-bus.xml
index 5c5d34d1e099f1dd60c3e73eec4cfa10cd3eed09..80693f8a1cd3afdafe2d595676af702d959d3f23 100644 (file)
--- a/tests/qemuxml2argvdata/pcie-expander-bus.xml
+++ b/tests/qemuxml2argvdata/pcie-expander-bus.xml
@@ -9,7 +9,7 @@
     <boot dev='hd'/>
   </os>
   <cpu>
-    <topology sockets='2' cores='4' threads='2'/>
+    <topology sockets='2' dies='1' cores='4' threads='2'/>
     <numa>
       <cell cpus='0-7' memory='109550' unit='KiB'/>
       <cell cpus='8-15' memory='109550' unit='KiB'/>

diff --git a/tests/qemuxml2argvdata/pseries-default-phb-numa-node.xml b/tests/qemuxml2argvdata/pseries-default-phb-numa-node.xml
index 12d277aaf805a020400681cc0359e413fd41f007..27f211d59d17e51ea305cb2c52edb7ae576b6ef4 100644 (file)
--- a/tests/qemuxml2argvdata/pseries-default-phb-numa-node.xml
+++ b/tests/qemuxml2argvdata/pseries-default-phb-numa-node.xml
@@ -7,7 +7,7 @@
     <memnode cellid="0" mode="strict" nodeset="1"/>
   </numatune>
   <cpu>
-    <topology sockets='3' cores='1' threads='8'/>
+    <topology sockets='3' dies='1' cores='1' threads='8'/>
     <numa>
       <cell id='0' cpus='0-23' memory='1048576' unit='KiB'/>
     </numa>

diff --git a/tests/qemuxml2argvdata/pseries-phb-numa-node.xml b/tests/qemuxml2argvdata/pseries-phb-numa-node.xml
index aeccb14dfb808735f1ad8b44c62f8faf0dab35da..52c39d5dbdd95033a611abeb6a3c1a7ffd5e7590 100644 (file)
--- a/tests/qemuxml2argvdata/pseries-phb-numa-node.xml
+++ b/tests/qemuxml2argvdata/pseries-phb-numa-node.xml
@@ -8,7 +8,7 @@
     <memnode cellid="1" mode="strict" nodeset="2"/>
   </numatune>
   <cpu>
-    <topology sockets='2' cores='1' threads='4'/>
+    <topology sockets='2' dies='1' cores='1' threads='4'/>
     <numa>
       <cell id='0' cpus='0-3' memory='1048576' unit='KiB'/>
       <cell id='1' cpus='4-7' memory='1048576' unit='KiB'/>

diff --git a/tests/qemuxml2argvdata/smp.xml b/tests/qemuxml2argvdata/smp.xml
index 55d5cdeff2f29521066be615cb5134f796604be6..6041506ed844e3ec9033deae8a6b4d6e9a1d4cd0 100644 (file)
--- a/tests/qemuxml2argvdata/smp.xml
+++ b/tests/qemuxml2argvdata/smp.xml
@@ -9,7 +9,7 @@
     <boot dev='hd'/>
   </os>
   <cpu>
-    <topology sockets='2' cores='1' threads='1'/>
+    <topology sockets='2' dies='1' cores='1' threads='1'/>
   </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>

diff --git a/tests/qemuxml2xmloutdata/cpu-numa-disjoint.xml b/tests/qemuxml2xmloutdata/cpu-numa-disjoint.xml
index f0ca39b5d36f592967fdb54ae643a97852c4e37e..d7f5372fbc9d358147458d9cc78cdbb435017acb 100644 (file)
--- a/tests/qemuxml2xmloutdata/cpu-numa-disjoint.xml
+++ b/tests/qemuxml2xmloutdata/cpu-numa-disjoint.xml
@@ -9,7 +9,7 @@
     <boot dev='network'/>
   </os>
   <cpu>
-    <topology sockets='2' cores='4' threads='2'/>
+    <topology sockets='2' dies='1' cores='4' threads='2'/>
     <numa>
       <cell id='0' cpus='0-3,8-11' memory='109550' unit='KiB'/>
       <cell id='1' cpus='4-7,12-15' memory='109550' unit='KiB'/>

diff --git a/tests/qemuxml2xmloutdata/cpu-numa-disordered.xml b/tests/qemuxml2xmloutdata/cpu-numa-disordered.xml
index 1e672adc44f0813f2c24a15304784cab5abcb539..487ced100877a6a095f15fc283247593518a1b0d 100644 (file)
--- a/tests/qemuxml2xmloutdata/cpu-numa-disordered.xml
+++ b/tests/qemuxml2xmloutdata/cpu-numa-disordered.xml
@@ -9,7 +9,7 @@
     <boot dev='network'/>
   </os>
   <cpu>
-    <topology sockets='2' cores='4' threads='2'/>
+    <topology sockets='2' dies='1' cores='4' threads='2'/>
     <numa>
       <cell id='0' cpus='0-5' memory='109550' unit='KiB'/>
       <cell id='1' cpus='11-15' memory='109550' unit='KiB'/>

diff --git a/tests/qemuxml2xmloutdata/cpu-numa-memshared.xml b/tests/qemuxml2xmloutdata/cpu-numa-memshared.xml
index 3db0db047c968404bd1d4f9dc5c8132c498658ec..f472bffec3b49529d3ee7681e1fc398f5456c01f 100644 (file)
--- a/tests/qemuxml2xmloutdata/cpu-numa-memshared.xml
+++ b/tests/qemuxml2xmloutdata/cpu-numa-memshared.xml
@@ -9,7 +9,7 @@
     <boot dev='network'/>
   </os>
   <cpu>
-    <topology sockets='2' cores='4' threads='2'/>
+    <topology sockets='2' dies='1' cores='4' threads='2'/>
     <numa>
       <cell id='0' cpus='0-7' memory='109550' unit='KiB' memAccess='shared'/>
       <cell id='1' cpus='8-15' memory='109550' unit='KiB' memAccess='private'/>

diff --git a/tests/qemuxml2xmloutdata/cpu-numa-no-memory-element.xml b/tests/qemuxml2xmloutdata/cpu-numa-no-memory-element.xml
index 8596baae6cd5d3da4bb0f05e22fc921a8de5d0a7..2ef7f846465e406bbd5d644b18f25352efabab60 100644 (file)
--- a/tests/qemuxml2xmloutdata/cpu-numa-no-memory-element.xml
+++ b/tests/qemuxml2xmloutdata/cpu-numa-no-memory-element.xml
@@ -9,7 +9,7 @@
     <boot dev='network'/>
   </os>
   <cpu>
-    <topology sockets='2' cores='4' threads='2'/>
+    <topology sockets='2' dies='1' cores='4' threads='2'/>
     <numa>
       <cell id='0' cpus='0-7' memory='109550' unit='KiB'/>
       <cell id='1' cpus='8-15' memory='109550' unit='KiB'/>

diff --git a/tests/qemuxml2xmloutdata/cpu-numa1.xml b/tests/qemuxml2xmloutdata/cpu-numa1.xml
index 8596baae6cd5d3da4bb0f05e22fc921a8de5d0a7..2ef7f846465e406bbd5d644b18f25352efabab60 100644 (file)
--- a/tests/qemuxml2xmloutdata/cpu-numa1.xml
+++ b/tests/qemuxml2xmloutdata/cpu-numa1.xml
@@ -9,7 +9,7 @@
     <boot dev='network'/>
   </os>
   <cpu>
-    <topology sockets='2' cores='4' threads='2'/>
+    <topology sockets='2' dies='1' cores='4' threads='2'/>
     <numa>
       <cell id='0' cpus='0-7' memory='109550' unit='KiB'/>
       <cell id='1' cpus='8-15' memory='109550' unit='KiB'/>

diff --git a/tests/qemuxml2xmloutdata/cpu-numa2.xml b/tests/qemuxml2xmloutdata/cpu-numa2.xml
index 8596baae6cd5d3da4bb0f05e22fc921a8de5d0a7..2ef7f846465e406bbd5d644b18f25352efabab60 100644 (file)
--- a/tests/qemuxml2xmloutdata/cpu-numa2.xml
+++ b/tests/qemuxml2xmloutdata/cpu-numa2.xml
@@ -9,7 +9,7 @@
     <boot dev='network'/>
   </os>
   <cpu>
-    <topology sockets='2' cores='4' threads='2'/>
+    <topology sockets='2' dies='1' cores='4' threads='2'/>
     <numa>
       <cell id='0' cpus='0-7' memory='109550' unit='KiB'/>
       <cell id='1' cpus='8-15' memory='109550' unit='KiB'/>

diff --git a/tests/qemuxml2xmloutdata/graphics-spice-timeout.xml b/tests/qemuxml2xmloutdata/graphics-spice-timeout.xml
index 3f0babd8fcf58dabd81b2065c07a2396e03796b2..6e23652448fbd7588abe76e3abcb29d3a864503f 100644 (file)
--- a/tests/qemuxml2xmloutdata/graphics-spice-timeout.xml
+++ b/tests/qemuxml2xmloutdata/graphics-spice-timeout.xml
@@ -18,7 +18,7 @@
   <cpu mode='custom' match='exact' check='partial'>
     <model fallback='allow'>core2duo</model>
     <vendor>Intel</vendor>
-    <topology sockets='1' cores='2' threads='1'/>
+    <topology sockets='1' dies='1' cores='2' threads='1'/>
     <feature policy='require' name='ds'/>
     <feature policy='require' name='acpi'/>
     <feature policy='require' name='ss'/>

diff --git a/tests/qemuxml2xmloutdata/memory-hotplug-dimm.xml b/tests/qemuxml2xmloutdata/memory-hotplug-dimm.xml
index f4a118cea5fbfde1bb5c9e2b7cb89886556267b7..326b5c954c38d9a0f6117c4cd9acec9ce454b8bd 100644 (file)
--- a/tests/qemuxml2xmloutdata/memory-hotplug-dimm.xml
+++ b/tests/qemuxml2xmloutdata/memory-hotplug-dimm.xml
@@ -14,7 +14,7 @@
     <gid start='0' target='1000' count='10'/>
   </idmap>
   <cpu>
-    <topology sockets='2' cores='1' threads='1'/>
+    <topology sockets='2' dies='1' cores='1' threads='1'/>
     <numa>
       <cell id='0' cpus='0-1' memory='219136' unit='KiB'/>
     </numa>

diff --git a/tests/qemuxml2xmloutdata/memory-hotplug.xml b/tests/qemuxml2xmloutdata/memory-hotplug.xml
index 0e02f210bcd7f352f1dedec3a51879ebc379ed0c..0e5295dcd08b171b6249e6d5254fa40b7d01f06b 100644 (file)
--- a/tests/qemuxml2xmloutdata/memory-hotplug.xml
+++ b/tests/qemuxml2xmloutdata/memory-hotplug.xml
@@ -10,7 +10,7 @@
     <boot dev='hd'/>
   </os>
   <cpu>
-    <topology sockets='2' cores='1' threads='1'/>
+    <topology sockets='2' dies='1' cores='1' threads='1'/>
     <numa>
       <cell id='0' cpus='0-1' memory='219136' unit='KiB'/>
     </numa>

diff --git a/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-cpuset.xml b/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-cpuset.xml
index 133177b679cdb75724777144dcdfb2bdbc73ec80..841ea699a19e07147998b1e05c4629b0eee3b726 100644 (file)
--- a/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-cpuset.xml
+++ b/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-cpuset.xml
@@ -12,7 +12,7 @@
     <boot dev='hd'/>
   </os>
   <cpu>
-    <topology sockets='2' cores='1' threads='1'/>
+    <topology sockets='2' dies='1' cores='1' threads='1'/>
   </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>

diff --git a/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-no-cpuset-and-placement.xml b/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-no-cpuset-and-placement.xml
index dc14ecd1398a2efa4e2f8bd118ca2c25c16ab0ec..2e3998e155bfb176a406007d6dae63dd7193d7dd 100644 (file)
--- a/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-no-cpuset-and-placement.xml
+++ b/tests/qemuxml2xmloutdata/numad-auto-memory-vcpu-no-cpuset-and-placement.xml
@@ -12,7 +12,7 @@
     <boot dev='hd'/>
   </os>
   <cpu>
-    <topology sockets='2' cores='1' threads='1'/>
+    <topology sockets='2' dies='1' cores='1' threads='1'/>
   </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>

diff --git a/tests/qemuxml2xmloutdata/numad-auto-vcpu-no-numatune.xml b/tests/qemuxml2xmloutdata/numad-auto-vcpu-no-numatune.xml
index 76d7c3b83567466e2bca5c156da61ac77ca5ae6d..7c1f18c21641a7ab4348de4d95f3db27a505ead1 100644 (file)
--- a/tests/qemuxml2xmloutdata/numad-auto-vcpu-no-numatune.xml
+++ b/tests/qemuxml2xmloutdata/numad-auto-vcpu-no-numatune.xml
@@ -12,7 +12,7 @@
     <boot dev='hd'/>
   </os>
   <cpu>
-    <topology sockets='2' cores='1' threads='1'/>
+    <topology sockets='2' dies='1' cores='1' threads='1'/>
   </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>

diff --git a/tests/qemuxml2xmloutdata/numad-static-vcpu-no-numatune.xml b/tests/qemuxml2xmloutdata/numad-static-vcpu-no-numatune.xml
index 523962117eda1623edc5f6c5a7a3edd38b042e68..3d05790c0ed3d38e411f2c386205025e7fc4856d 100644 (file)
--- a/tests/qemuxml2xmloutdata/numad-static-vcpu-no-numatune.xml
+++ b/tests/qemuxml2xmloutdata/numad-static-vcpu-no-numatune.xml
@@ -9,7 +9,7 @@
     <boot dev='hd'/>
   </os>
   <cpu>
-    <topology sockets='2' cores='1' threads='1'/>
+    <topology sockets='2' dies='1' cores='1' threads='1'/>
   </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>

diff --git a/tests/qemuxml2xmloutdata/pci-expander-bus.xml b/tests/qemuxml2xmloutdata/pci-expander-bus.xml
index e0d787e57c3968452b0d3e463fd65acfc2621479..60e4e4af7f532939eff1509f97059b6f8e75bd2f 100644 (file)
--- a/tests/qemuxml2xmloutdata/pci-expander-bus.xml
+++ b/tests/qemuxml2xmloutdata/pci-expander-bus.xml
@@ -9,7 +9,7 @@
     <boot dev='hd'/>
   </os>
   <cpu>
-    <topology sockets='2' cores='4' threads='2'/>
+    <topology sockets='2' dies='1' cores='4' threads='2'/>
     <numa>
       <cell id='0' cpus='0-7' memory='109550' unit='KiB'/>
       <cell id='1' cpus='8-15' memory='109550' unit='KiB'/>

diff --git a/tests/qemuxml2xmloutdata/pcie-expander-bus.xml b/tests/qemuxml2xmloutdata/pcie-expander-bus.xml
index 643b4823bb87a0dd63e84e3c530d0b2a74ed1c9b..452d476da61d015275bf101311bc529dd4d4ffe8 100644 (file)
--- a/tests/qemuxml2xmloutdata/pcie-expander-bus.xml
+++ b/tests/qemuxml2xmloutdata/pcie-expander-bus.xml
@@ -9,7 +9,7 @@
     <boot dev='hd'/>
   </os>
   <cpu>
-    <topology sockets='2' cores='4' threads='2'/>
+    <topology sockets='2' dies='1' cores='4' threads='2'/>
     <numa>
       <cell id='0' cpus='0-7' memory='109550' unit='KiB'/>
       <cell id='1' cpus='8-15' memory='109550' unit='KiB'/>

diff --git a/tests/qemuxml2xmloutdata/pseries-phb-numa-node.xml b/tests/qemuxml2xmloutdata/pseries-phb-numa-node.xml
index 80b771e89d38b5c966d30335d084b422edb62af1..b05ac334a6e10be39500c7d5212ee9a9746f4973 100644 (file)
--- a/tests/qemuxml2xmloutdata/pseries-phb-numa-node.xml
+++ b/tests/qemuxml2xmloutdata/pseries-phb-numa-node.xml
@@ -13,7 +13,7 @@
     <boot dev='hd'/>
   </os>
   <cpu>
-    <topology sockets='2' cores='1' threads='4'/>
+    <topology sockets='2' dies='1' cores='1' threads='4'/>
     <numa>
       <cell id='0' cpus='0-3' memory='1048576' unit='KiB'/>
       <cell id='1' cpus='4-7' memory='1048576' unit='KiB'/>

diff --git a/tests/qemuxml2xmloutdata/smp.xml b/tests/qemuxml2xmloutdata/smp.xml
index d3712cb7dfe2624c097dc39ee89381209aaa9f9f..3e00f578e549ebf109a35d5780c0ede4f9add3c5 100644 (file)
--- a/tests/qemuxml2xmloutdata/smp.xml
+++ b/tests/qemuxml2xmloutdata/smp.xml
@@ -9,7 +9,7 @@
     <boot dev='hd'/>
   </os>
   <cpu>
-    <topology sockets='2' cores='1' threads='1'/>
+    <topology sockets='2' dies='1' cores='1' threads='1'/>
   </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>

diff --git a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-8.xml b/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-8.xml
index eba5f4734a9948ddc9dd067d8bc48ffbd6e39465..2011bfb3b97e9a2b45b29ed20de2167960122a17 100644 (file)
--- a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-8.xml
+++ b/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-8.xml
@@ -11,7 +11,7 @@
     <type arch='x86_64'>hvm</type>
   </os>
   <cpu>
-    <topology sockets='4' cores='2' threads='1'/>
+    <topology sockets='4' dies='1' cores='2' threads='1'/>
   </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>

diff --git a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-9.xml b/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-9.xml
index f1fe6dd4c91f310a4a936b07aa6dcdf6c644ff04..fa428c1986eba9d48b44eb2354e36ded5ce29b0c 100644 (file)
--- a/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-9.xml
+++ b/tests/vmx2xmldata/vmx2xml-esx-in-the-wild-9.xml
@@ -12,7 +12,7 @@
     <type arch='x86_64'>hvm</type>
   </os>
   <cpu>
-    <topology sockets='4' cores='4' threads='1'/>
+    <topology sockets='4' dies='1' cores='4' threads='1'/>
   </cpu>
   <clock offset='utc'/>
   <on_poweroff>destroy</on_poweroff>