qemu: caps: Always assume QEMU_CAPS_SMP_TOPOLOGY

Support for SMP topology was added by qemu commit dc6b1c09849484fbbc50
prior to 0.12.0, our minimum supported qemu version.

$ git describe --tags dc6b1c09849484fbbc50803307e4c7a3d81eab62
v0.11.0-rc0-449-gdc6b1c0
$ git describe --tags --contains dc6b1c09849484fbbc50803307e4c7a3d81eab
v0.12.0-rc0~1477

src/qemu/qemu_capabilities.c

@@ -1232,10 +1232,6 @@ virQEMUCapsComputeCmdFlags(const char *help,
 
     if (strstr(help, "-sdl"))
         virQEMUCapsSet(qemuCaps, QEMU_CAPS_SDL);
-    if (strstr(help, "cores=") &&
-        strstr(help, "threads=") &&
-        strstr(help, "sockets="))
-        virQEMUCapsSet(qemuCaps, QEMU_CAPS_SMP_TOPOLOGY);
 
     if (strstr(help, ",vhost="))
         virQEMUCapsSet(qemuCaps, QEMU_CAPS_VHOST_NET);
@@ -3384,7 +3380,6 @@ virQEMUCapsInitQMPBasic(virQEMUCapsPtr qemuCaps)
     virQEMUCapsSet(qemuCaps, QEMU_CAPS_CHARDEV);
     virQEMUCapsSet(qemuCaps, QEMU_CAPS_MONITOR_JSON);
     virQEMUCapsSet(qemuCaps, QEMU_CAPS_SDL);
-    virQEMUCapsSet(qemuCaps, QEMU_CAPS_SMP_TOPOLOGY);
     virQEMUCapsSet(qemuCaps, QEMU_CAPS_NETDEV);
     virQEMUCapsSet(qemuCaps, QEMU_CAPS_RTC);
     virQEMUCapsSet(qemuCaps, QEMU_CAPS_VHOST_NET);

src/qemu/qemu_capabilities.h

@@ -85,7 +85,7 @@ typedef enum {
     X_QEMU_CAPS_BALLOON, /* -balloon available */
     X_QEMU_CAPS_DEVICE, /* Is the -device arg available */
     QEMU_CAPS_SDL, /* Is the new -sdl arg available */
-    QEMU_CAPS_SMP_TOPOLOGY, /* -smp has sockets/cores/threads */
+    X_QEMU_CAPS_SMP_TOPOLOGY, /* -smp has sockets/cores/threads */
     QEMU_CAPS_NETDEV, /* -netdev flag & netdev_add/remove */
 
     /* 30 */

src/qemu/qemu_command.c

@@ -6862,8 +6862,7 @@ qemuBuildMachineCommandLine(virCommandPtr cmd,
 
 static int
 qemuBuildSmpCommandLine(virCommandPtr cmd,
-                        const virDomainDef *def,
-                        virQEMUCapsPtr qemuCaps)
+                        const virDomainDef *def)
 {
     char *smp;
     virBuffer buf = VIR_BUFFER_INITIALIZER;
@@ -6872,29 +6871,18 @@ qemuBuildSmpCommandLine(virCommandPtr cmd,
 
     virBufferAsprintf(&buf, "%u", virDomainDefGetVcpus(def));
 
-    if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_SMP_TOPOLOGY)) {
-        if (virDomainDefHasVcpusOffline(def))
-            virBufferAsprintf(&buf, ",maxcpus=%u",
-                              virDomainDefGetVcpusMax(def));
-        /* 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) {
-            virBufferAsprintf(&buf, ",sockets=%u", def->cpu->sockets);
-            virBufferAsprintf(&buf, ",cores=%u", def->cpu->cores);
-            virBufferAsprintf(&buf, ",threads=%u", def->cpu->threads);
-        } else {
-            virBufferAsprintf(&buf, ",sockets=%u",
-                              virDomainDefGetVcpusMax(def));
-            virBufferAsprintf(&buf, ",cores=%u", 1);
-            virBufferAsprintf(&buf, ",threads=%u", 1);
-        }
-    } else if (virDomainDefHasVcpusOffline(def)) {
-        virBufferFreeAndReset(&buf);
-        /* FIXME - consider hot-unplugging cpus after boot for older qemu */
-        virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                       _("setting current vcpu count less than maximum is "
-                         "not supported with this QEMU binary"));
-        return -1;
+    if (virDomainDefHasVcpusOffline(def))
+        virBufferAsprintf(&buf, ",maxcpus=%u", virDomainDefGetVcpusMax(def));
+    /* 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) {
+        virBufferAsprintf(&buf, ",sockets=%u", def->cpu->sockets);
+        virBufferAsprintf(&buf, ",cores=%u", def->cpu->cores);
+        virBufferAsprintf(&buf, ",threads=%u", def->cpu->threads);
+    } else {
+        virBufferAsprintf(&buf, ",sockets=%u", virDomainDefGetVcpusMax(def));
+        virBufferAsprintf(&buf, ",cores=%u", 1);
+        virBufferAsprintf(&buf, ",threads=%u", 1);
     }
 
     if (virBufferCheckError(&buf) < 0)
@@ -9183,7 +9171,7 @@ qemuBuildCommandLine(virQEMUDriverPtr driver,
     if (qemuBuildMemCommandLine(cmd, cfg, def, qemuCaps) < 0)
         goto error;
 
-    if (qemuBuildSmpCommandLine(cmd, def, qemuCaps) < 0)
+    if (qemuBuildSmpCommandLine(cmd, def) < 0)
         goto error;
 
     if (qemuBuildIOThreadCommandLine(cmd, def, qemuCaps) < 0)

tests/qemucapabilitiesdata/caps_1.2.2.x86_64.xml

@@ -9,7 +9,6 @@
   <flag name='enable-kvm'/>
   <flag name='monitor-json'/>
   <flag name='sdl'/>
-  <flag name='smp-topology'/>
   <flag name='netdev'/>
   <flag name='rtc'/>
   <flag name='vhost-net'/>

tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml

@@ -9,7 +9,6 @@
   <flag name='enable-kvm'/>
   <flag name='monitor-json'/>
   <flag name='sdl'/>
-  <flag name='smp-topology'/>
   <flag name='netdev'/>
   <flag name='rtc'/>
   <flag name='vhost-net'/>

tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml

@@ -9,7 +9,6 @@
   <flag name='enable-kvm'/>
   <flag name='monitor-json'/>
   <flag name='sdl'/>
-  <flag name='smp-topology'/>
   <flag name='netdev'/>
   <flag name='rtc'/>
   <flag name='vhost-net'/>

tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml

@@ -9,7 +9,6 @@
   <flag name='enable-kvm'/>
   <flag name='monitor-json'/>
   <flag name='sdl'/>
-  <flag name='smp-topology'/>
   <flag name='netdev'/>
   <flag name='rtc'/>
   <flag name='vhost-net'/>

tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml

@@ -9,7 +9,6 @@
   <flag name='enable-kvm'/>
   <flag name='monitor-json'/>
   <flag name='sdl'/>
-  <flag name='smp-topology'/>
   <flag name='netdev'/>
   <flag name='rtc'/>
   <flag name='vhost-net'/>

tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml

@@ -9,7 +9,6 @@
   <flag name='enable-kvm'/>
   <flag name='monitor-json'/>
   <flag name='sdl'/>
-  <flag name='smp-topology'/>
   <flag name='netdev'/>
   <flag name='rtc'/>
   <flag name='vhost-net'/>

tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml

@@ -9,7 +9,6 @@
   <flag name='enable-kvm'/>
   <flag name='monitor-json'/>
   <flag name='sdl'/>
-  <flag name='smp-topology'/>
   <flag name='netdev'/>
   <flag name='rtc'/>
   <flag name='vhost-net'/>

tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml

@@ -9,7 +9,6 @@
   <flag name='enable-kvm'/>
   <flag name='monitor-json'/>
   <flag name='sdl'/>
-  <flag name='smp-topology'/>
   <flag name='netdev'/>
   <flag name='rtc'/>
   <flag name='vhost-net'/>

tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml

@@ -9,7 +9,6 @@
   <flag name='enable-kvm'/>
   <flag name='monitor-json'/>
   <flag name='sdl'/>
-  <flag name='smp-topology'/>
   <flag name='netdev'/>
   <flag name='rtc'/>
   <flag name='vhost-net'/>

tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.xml

@@ -9,7 +9,6 @@
   <flag name='enable-kvm'/>
   <flag name='monitor-json'/>
   <flag name='sdl'/>
-  <flag name='smp-topology'/>
   <flag name='netdev'/>
   <flag name='rtc'/>
   <flag name='vhost-net'/>

tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.xml

@@ -9,7 +9,6 @@
   <flag name='enable-kvm'/>
   <flag name='monitor-json'/>
   <flag name='sdl'/>
-  <flag name='smp-topology'/>
   <flag name='netdev'/>
   <flag name='rtc'/>
   <flag name='vhost-net'/>

tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml

@@ -9,7 +9,6 @@
   <flag name='enable-kvm'/>
   <flag name='monitor-json'/>
   <flag name='sdl'/>
-  <flag name='smp-topology'/>
   <flag name='netdev'/>
   <flag name='rtc'/>
   <flag name='vhost-net'/>

tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml

@@ -9,7 +9,6 @@
   <flag name='enable-kvm'/>
   <flag name='monitor-json'/>
   <flag name='sdl'/>
-  <flag name='smp-topology'/>
   <flag name='netdev'/>
   <flag name='rtc'/>
   <flag name='vhost-net'/>

tests/qemuhelptest.c

@@ -154,7 +154,6 @@ mymain(void)
             QEMU_CAPS_ENABLE_KVM,
             QEMU_CAPS_SDL,
             QEMU_CAPS_CHARDEV,
-            QEMU_CAPS_SMP_TOPOLOGY,
             QEMU_CAPS_RTC,
             QEMU_CAPS_NO_HPET,
             QEMU_CAPS_BOOT_MENU,
@@ -173,7 +172,6 @@ mymain(void)
             QEMU_CAPS_CHARDEV,
             QEMU_CAPS_ENABLE_KVM,
             QEMU_CAPS_MONITOR_JSON,
-            QEMU_CAPS_SMP_TOPOLOGY,
             QEMU_CAPS_NETDEV,
             QEMU_CAPS_RTC,
             QEMU_CAPS_VHOST_NET,
@@ -214,7 +212,6 @@ mymain(void)
             QEMU_CAPS_MEM_PATH,
             QEMU_CAPS_SDL,
             QEMU_CAPS_CHARDEV,
-            QEMU_CAPS_SMP_TOPOLOGY,
             QEMU_CAPS_RTC,
             QEMU_CAPS_VHOST_NET,
             QEMU_CAPS_NO_HPET,
@@ -239,7 +236,6 @@ mymain(void)
             QEMU_CAPS_CHARDEV,
             QEMU_CAPS_ENABLE_KVM,
             QEMU_CAPS_MONITOR_JSON,
-            QEMU_CAPS_SMP_TOPOLOGY,
             QEMU_CAPS_NETDEV,
             QEMU_CAPS_RTC,
             QEMU_CAPS_VHOST_NET,
@@ -290,7 +286,6 @@ mymain(void)
             QEMU_CAPS_CHARDEV,
             QEMU_CAPS_ENABLE_KVM,
             QEMU_CAPS_MONITOR_JSON,
-            QEMU_CAPS_SMP_TOPOLOGY,
             QEMU_CAPS_NETDEV,
             QEMU_CAPS_RTC,
             QEMU_CAPS_VHOST_NET,
@@ -339,7 +334,6 @@ mymain(void)
             QEMU_CAPS_CHARDEV,
             QEMU_CAPS_ENABLE_KVM,
             QEMU_CAPS_MONITOR_JSON,
-            QEMU_CAPS_SMP_TOPOLOGY,
             QEMU_CAPS_NETDEV,
             QEMU_CAPS_RTC,
             QEMU_CAPS_VHOST_NET,
@@ -396,7 +390,6 @@ mymain(void)
             QEMU_CAPS_CHARDEV,
             QEMU_CAPS_ENABLE_KVM,
             QEMU_CAPS_MONITOR_JSON,
-            QEMU_CAPS_SMP_TOPOLOGY,
             QEMU_CAPS_NETDEV,
             QEMU_CAPS_RTC,
             QEMU_CAPS_VHOST_NET,
@@ -470,7 +463,6 @@ mymain(void)
             QEMU_CAPS_CHARDEV,
             QEMU_CAPS_ENABLE_KVM,
             QEMU_CAPS_MONITOR_JSON,
-            QEMU_CAPS_SMP_TOPOLOGY,
             QEMU_CAPS_NETDEV,
             QEMU_CAPS_RTC,
             QEMU_CAPS_VHOST_NET,

tests/qemuxml2argvdata/qemuxml2argv-aarch64-aavmf-virtio-mmio.args

@@ -10,7 +10,7 @@ QEMU_AUDIO_DRV=none \
 -M virt \
 -cpu cortex-a53 \
 -m 1024 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-aarch64-cpu-passthrough.args

@@ -10,7 +10,7 @@ QEMU_AUDIO_DRV=none \
 -M virt \
 -cpu host \
 -m 1024 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-host.args

@@ -10,7 +10,7 @@ QEMU_AUDIO_DRV=none \
 -machine virt,accel=kvm,gic-version=host \
 -cpu host \
 -m 1024 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-v2.args

@@ -10,7 +10,7 @@ QEMU_AUDIO_DRV=none \
 -machine virt,accel=kvm \
 -cpu host \
 -m 1024 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-aarch64-gic-v3.args

@@ -10,7 +10,7 @@ QEMU_AUDIO_DRV=none \
 -machine virt,accel=kvm,gic-version=3 \
 -cpu host \
 -m 1024 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-aarch64-kvm-32-on-64.args

@@ -10,7 +10,7 @@ QEMU_AUDIO_DRV=none \
 -M virt \
 -cpu host,aarch64=off \
 -m 1024 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid 496d7ea8-9739-544b-4ebd-ef08be936e6a \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-2.6-virtio-pci-default.args

@@ -10,7 +10,7 @@ QEMU_AUDIO_DRV=none \
 -M virt-2.6 \
 -cpu cortex-a53 \
 -m 1024 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-default-nic.args

@@ -10,7 +10,7 @@ QEMU_AUDIO_DRV=none \
 -M virt \
 -cpu cortex-a53 \
 -m 1024 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid 6ba410c5-1e5c-4d57-bee7-2228e7ffa32f \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-aarch64-virt-virtio.args

@@ -10,7 +10,7 @@ QEMU_AUDIO_DRV=none \
 -M virt \
 -cpu cortex-a53 \
 -m 1024 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-aarch64-virtio-pci-default.args

@@ -10,7 +10,7 @@ QEMU_AUDIO_DRV=none \
 -M virt \
 -cpu cortex-a53 \
 -m 1024 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-aarch64-virtio-pci-manual-addresses.args

@@ -10,7 +10,7 @@ QEMU_AUDIO_DRV=none \
 -M virt \
 -cpu cortex-a53 \
 -m 1024 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-acpi-table.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-basic.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M vexpress-a9 \
 -m 1024 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid 496d7ea8-9739-544b-4ebd-ef08be936e6a \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-nodevs.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M vexpress-a9 \
 -m 1024 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid 496d7ea8-9739-544b-4ebd-ef08be936e6a \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-arm-vexpressa9-virtio.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M vexpress-a9 \
 -m 1024 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid 496d7ea8-9739-544b-4ebd-ef08be936e6a \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-arm-virt-virtio.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M virt \
 -m 1024 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid 496d7ea8-9739-544b-4ebd-ef08be936e6a \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-autoindex.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M q35 \
 -m 2048 \
--smp 2 \
+-smp 2,sockets=2,cores=1,threads=1 \
 -uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-balloon-ccw-deflate.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M s390-ccw \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-balloon-device-auto.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-balloon-device-deflate-off.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-balloon-device-deflate.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-balloon-device-period.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-balloon-device.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-balloon-mmio-deflate.args

@@ -10,7 +10,7 @@ QEMU_AUDIO_DRV=none \
 -M virt \
 -cpu cortex-a53 \
 -m 1024 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid 496d7ea8-9739-544b-4ebd-ef08be936e8b \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-bios-nvram.args

@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -drive file=/usr/share/OVMF/OVMF_CODE.fd,if=pflash,format=raw,unit=0,readonly=on \
 -drive file=/usr/share/OVMF/OVMF_VARS.fd,if=pflash,format=raw,unit=1 \
 -m 1024 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid 362d1fc1-df7d-193e-5c18-49a71bd1da66 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-bios.args

@@ -10,7 +10,7 @@ QEMU_AUDIO_DRV=none \
 -M pc \
 -bios /usr/share/seabios/bios.bin \
 -m 1024 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid 362d1fc1-df7d-193e-5c18-49a71bd1da66 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune-max.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-blkdeviotune.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-blkiotune-device.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-blkiotune.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-boot-cdrom.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-boot-complex-bootindex.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-boot-complex.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-boot-floppy-q35.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc-q35-2.4 \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-boot-floppy.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive-bootindex.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable-drive.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-boot-menu-disable.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable-bootindex.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable-with-timeout.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-boot-menu-enable.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-boot-multi.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-boot-network.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-boot-order.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-boot-strict.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-bootindex-floppy-q35.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc-q35-2.4 \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-channel-guestfwd.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc-old.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=spice \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nodefconfig \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-channel-spicevmc.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=spice \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nodefconfig \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-auto.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-autoadd.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-autoassign.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-default.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-state.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-channel-virtio-unix.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-channel-virtio.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-clock-catchup.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-clock-france.args

@@ -10,7 +10,7 @@ TZ=Europe/Paris \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-clock-hpet-off.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-clock-localtime-basis-localtime.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid 1c15a1f6-f4f0-4d3c-9002-667ddb458736 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-clock-localtime.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-clock-timer-hyperv-rtc.args

@@ -10,7 +10,7 @@ QEMU_AUDIO_DRV=none \
 -M pc \
 -cpu qemu32,hv_time \
 -m 214 \
--smp 6 \
+-smp 6,sockets=6,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-clock-utc.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-clock-variable.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-console-compat-auto.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-console-compat-chardev.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-console-compat.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-console-sclp.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M s390-virtio \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-console-virtio-ccw.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M s390-ccw \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-console-virtio-many.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-console-virtio-s390.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M s390-virtio \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-console-virtio.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-controller-order.args

@@ -10,7 +10,7 @@ QEMU_AUDIO_DRV=spice \
 -M rhel6.1.0 \
 -enable-kvm \
 -m 4096 \
--smp 4 \
+-smp 4,sockets=4,cores=1,threads=1 \
 -uuid d091ea82-29e6-2e34-3005-f02617b36e87 \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-fdr/monitor.sock,server,\

tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell-noTSX.args

@@ -10,7 +10,7 @@ QEMU_AUDIO_DRV=none \
 -M pc \
 -cpu Haswell-noTSX \
 -m 214 \
--smp 6 \
+-smp 6,sockets=6,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell.args

@@ -10,7 +10,7 @@ QEMU_AUDIO_DRV=none \
 -M pc \
 -cpu Haswell \
 -m 214 \
--smp 6 \
+-smp 6,sockets=6,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell2.args

@@ -10,7 +10,7 @@ QEMU_AUDIO_DRV=none \
 -M pc \
 -cpu Haswell,-hle,-rtm \
 -m 214 \
--smp 6 \
+-smp 6,sockets=6,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-cpu-Haswell3.args

@@ -10,7 +10,7 @@ QEMU_AUDIO_DRV=none \
 -M pc \
 -cpu Haswell \
 -m 214 \
--smp 6 \
+-smp 6,sockets=6,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-cpu-eoi-disabled.args

@@ -10,7 +10,7 @@ QEMU_AUDIO_DRV=none \
 -M pc \
 -cpu qemu32,-kvm_pv_eoi \
 -m 214 \
--smp 6 \
+-smp 6,sockets=6,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-cpu-eoi-enabled.args

@@ -10,7 +10,7 @@ QEMU_AUDIO_DRV=none \
 -M pc \
 -cpu qemu32,+kvm_pv_eoi \
 -m 214 \
--smp 6 \
+-smp 6,sockets=6,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-cpu-exact1.args

@@ -10,7 +10,7 @@ QEMU_AUDIO_DRV=none \
 -M pc \
 -cpu qemu64,-mca,-pse36,-clflush,-syscall,-nx,-lm,-svm \
 -m 214 \
--smp 6 \
+-smp 6,sockets=6,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2-nofallback.args

@@ -10,7 +10,7 @@ QEMU_AUDIO_DRV=none \
 -M pc \
 -cpu core2duo,+ds,+ht,+tm,+ds_cpl,+xtpr,+3dnowext,+lahf_lm,-nx \
 -m 214 \
--smp 6 \
+-smp 6,sockets=6,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-cpu-exact2.args

@@ -10,7 +10,7 @@ QEMU_AUDIO_DRV=none \
 -M pc \
 -cpu core2duo,+ds,+ht,+tm,+ds_cpl,+xtpr,+3dnowext,+lahf_lm,-nx \
 -m 214 \
--smp 6 \
+-smp 6,sockets=6,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-cpu-fallback.args

@@ -10,7 +10,7 @@ QEMU_AUDIO_DRV=none \
 -M pc \
 -cpu Penryn,-sse4.1 \
 -m 214 \
--smp 6 \
+-smp 6,sockets=6,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-cpu-host-kvmclock.args

@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -enable-kvm \
 -cpu host,-kvmclock \
 -m 214 \
--smp 6 \
+-smp 6,sockets=6,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-fallback.args

@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -cpu Penryn,+vme,+ds,+acpi,+ss,+ht,+tm,+pbe,+monitor,+ds_cpl,+vmx,+est,+tm2,\
 +xtpr,-sse4.1 \
 -m 214 \
--smp 6 \
+-smp 6,sockets=6,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model-vendor.args

@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -cpu 'core2duo,vendor=Libvirt QEMU,+ds,+acpi,+ss,+ht,+tm,+pbe,+ds_cpl,+vmx,+est,\
 +tm2,+cx16,+xtpr,+lahf_lm' \
 -m 214 \
--smp 6 \
+-smp 6,sockets=6,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-cpu-host-model.args

@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -cpu core2duo,+ds,+acpi,+ss,+ht,+tm,+pbe,+ds_cpl,+vmx,+est,+tm2,+cx16,+xtpr,\
 +lahf_lm \
 -m 214 \
--smp 6 \
+-smp 6,sockets=6,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-cpu-host-passthrough-features.args

@@ -10,7 +10,7 @@ QEMU_AUDIO_DRV=none \
 -M pc \
 -cpu host,+abm,+ds,-invtsc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-cpu-host-passthrough.args

@@ -10,7 +10,7 @@ QEMU_AUDIO_DRV=none \
 -M pc \
 -cpu host \
 -m 214 \
--smp 6 \
+-smp 6,sockets=6,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-cpu-kvmclock.args

@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -enable-kvm \
 -cpu core2duo,-kvmclock \
 -m 214 \
--smp 6 \
+-smp 6,sockets=6,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum1.args

@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -cpu core2duo,+ds,+acpi,+ss,+ht,+tm,+pbe,+ds_cpl,+vmx,+est,+tm2,+cx16,+xtpr,\
 +lahf_lm \
 -m 214 \
--smp 6 \
+-smp 6,sockets=6,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-cpu-minimum2.args

@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -cpu core2duo,+ds,+acpi,+ss,+ht,+tm,+pbe,+ds_cpl,+vmx,+est,+tm2,+cx16,+xtpr,\
 +lahf_lm,-syscall,-nx,-lm \
 -m 214 \
--smp 6 \
+-smp 6,sockets=6,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-cpu-numa-disjoint.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 16 \
+-smp 16,sockets=2,cores=4,threads=2 \
 -numa node,nodeid=0,cpus=0-3,cpus=8-11,mem=107 \
 -numa node,nodeid=1,cpus=4-7,cpus=12-15,mem=107 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \

tests/qemuxml2argvdata/qemuxml2argv-cpu-numa1.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 16 \
+-smp 16,sockets=2,cores=4,threads=2 \
 -numa node,nodeid=0,cpus=0-7,mem=107 \
 -numa node,nodeid=1,cpus=8-15,mem=107 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \

tests/qemuxml2argvdata/qemuxml2argv-cpu-strict1.args

@@ -10,7 +10,7 @@ QEMU_AUDIO_DRV=none \
 -M pc \
 -cpu core2duo,+ds,+acpi,+ht,+tm,+ds_cpl,+vmx,+est,+xtpr,+3dnowext,+lahf_lm,-nx \
 -m 214 \
--smp 6 \
+-smp 6,sockets=6,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-cpu-topology3.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 6 \
+-smp 6,sockets=3,cores=2,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-cputune-zero-shares.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 2 \
+-smp 2,sockets=2,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-cputune.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 2 \
+-smp 2,sockets=2,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-debug-threads.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-default-kvm-host-arch.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -machine pc,accel=kvm \
 -m 4096 \
--smp 4 \
+-smp 4,sockets=4,cores=1,threads=1 \
 -uuid d091ea82-29e6-2e34-3005-f02617b36e87 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-default-qemu-host-arch.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -machine pc-0.11,accel=tcg \
 -m 4096 \
--smp 4 \
+-smp 4,sockets=4,cores=1,threads=1 \
 -uuid d091ea82-29e6-2e34-3005-f02617b36e87 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-disk-aio.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-disk-blockio.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-empty.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-ftp.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc-1.2 \
 -m 1024 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-ftps.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc-1.2 \
 -m 1024 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-http.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc-1.2 \
 -m 1024 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-https.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc-1.2 \
 -m 1024 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-network-tftp.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc-1.2 \
 -m 1024 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-tray-no-device-cap.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom-tray.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc-0.13 \
 -m 1024 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid 3fa02811-7832-34bd-004d-1ff56a9286ff \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-disk-cdrom.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-disk-copy_on_read.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc-0.13 \
 -m 1024 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid 468404ad-d49c-40f2-9e14-02294f9c1be3 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-cdrom.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-disk-drive-boot-disk.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-directsync.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-unsafe.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-none.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wb.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-disk-drive-cache-v2-wt.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-disk-drive-copy-on-read.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-disk-drive-detect-zeroes.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc-0.13 \
 -m 1024 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid 92d7a226-cfae-425b-a6d3-00bbf9ec5c9e \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-disk-drive-discard.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc-0.13 \
 -m 1024 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid 92d7a226-cfae-425b-a6d3-00bbf9ec5c9e \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-enospace.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-stop.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-disk-drive-error-policy-wreport-rignore.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-disk-drive-fmt-qcow.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-gluster.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi-auth.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi-lun.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-iscsi.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-export.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-ipv6-export.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-ipv6.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd-unix.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-nbd.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-auth-AES.args

@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-auth.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd-ipv6.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-rbd.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-disk-drive-network-sheepdog.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-disk-drive-no-boot.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-disk-drive-readonly-disk.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-disk-drive-readonly-no-device.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-disk-drive-shared.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-tray-no-device-cap.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-disk-floppy-tray.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-disk-floppy.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-disk-geometry.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-disk-ide-drive-split.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-disk-ide-wwn.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-disk-ioeventfd.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc-0.13 \
 -m 1024 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid 8c273d77-39b0-47c4-9714-6dddcad56b88 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-disk-iscsi.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-disk-many.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-disk-order.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-disk-sata-device.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device-auto.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-device.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-split.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-vpd.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-disk-wwn.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-lun-passthrough.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-megasas.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-mptsas1068.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-virtio-scsi.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-disk-scsi-vscsi.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-disk-serial.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-disk-snapshot.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool-mode.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-disk-source-pool.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-disk-usb-device-removable.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-disk-usb-device.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-ccw-many.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M s390-ccw \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-ccw.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M s390-ccw \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-s390.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M s390-virtio \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-ccw.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M s390-ccw \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-cmd_per_lun.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 8 \
+-smp 8,sockets=8,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-ioeventfd.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 8 \
+-smp 8,sockets=8,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-max_sectors.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 8 \
+-smp 8,sockets=8,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-disk-virtio-scsi-num_queues.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 8 \
+-smp 8,sockets=8,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-disk-virtio.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-encrypted-disk-usage.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 1024 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid 496898a6-e6ff-f7c8-5dc2-3cf410945ee9 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-encrypted-disk.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 1024 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid 496898a6-e6ff-f7c8-5dc2-3cf410945ee9 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-eoi-disabled.args

@@ -10,7 +10,7 @@ QEMU_AUDIO_DRV=none \
 -M pc \
 -cpu qemu32,-kvm_pv_eoi \
 -m 214 \
--smp 6 \
+-smp 6,sockets=6,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-eoi-enabled.args

@@ -10,7 +10,7 @@ QEMU_AUDIO_DRV=none \
 -M pc \
 -cpu qemu32,+kvm_pv_eoi \
 -m 214 \
--smp 6 \
+-smp 6,sockets=6,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-event_idx.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc-0.13 \
 -m 1024 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid bba65c0e-c049-934f-b6aa-4e2c0582acdf \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-fips-enabled.args

@@ -10,7 +10,7 @@ QEMU_AUDIO_DRV=none \
 -enable-fips \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-floppy-drive-fat.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-fs9p-ccw.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M s390-ccw-virtio \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-fs9p.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl-fullscreen.args

@@ -10,7 +10,7 @@ DISPLAY=:0.1 \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nodefaults \
 -monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \

tests/qemuxml2argvdata/qemuxml2argv-graphics-sdl.args

@@ -10,7 +10,7 @@ DISPLAY=:0.1 \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nodefaults \
 -monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \

tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-agent-file-xfer.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=spice \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nodefaults \
 -monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \

tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-agentmouse.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=spice \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nodefconfig \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-auto-socket-cfg.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=spice \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nodefaults \
 -monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \

tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-auto-socket.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=spice \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nodefaults \
 -monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \

tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-compression.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=spice \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nodefaults \
 -monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \

tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-no-args.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=spice \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nodefaults \
 -monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \

tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-qxl-vga.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=spice \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nodefaults \
 -monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \

tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-sasl.args

@@ -10,7 +10,7 @@ QEMU_AUDIO_DRV=spice \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nodefaults \
 -monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \

tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-socket.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=spice \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nodefaults \
 -monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \

tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-timeout.args

@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=spice \
 -cpu core2duo,+ds,+acpi,+ss,+ht,+tm,+pbe,+ds_cpl,+vmx,+est,+tm2,+cx16,+xtpr,\
 +lahf_lm \
 -m 1024 \
--smp 2 \
+-smp 2,sockets=1,cores=2,threads=1 \
 -uuid 553effab-b5e1-2d80-dfe3-da4344826c43 \
 -nodefaults \
 -monitor unix:/tmp/lib/domain--1-f14/monitor.sock,server,nowait \

tests/qemuxml2argvdata/qemuxml2argv-graphics-spice-usb-redir.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=spice \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nodefconfig \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-graphics-spice.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=spice \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nodefaults \
 -monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \

tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-auto-socket-cfg.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nodefaults \
 -monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \

tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-auto-socket.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nodefaults \
 -monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \

tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-no-listen-attr.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nodefaults \
 -monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \

tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-none.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nodefaults \
 -monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \

tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-policy.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nodefaults \
 -monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \

tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-remove-generated-socket.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nodefaults \
 -monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \

tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-sasl.args

@@ -10,7 +10,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nodefaults \
 -monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \

tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-socket.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nodefaults \
 -monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \

tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-tls.args

@@ -10,7 +10,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nodefaults \
 -monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \

tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc-websocket.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nodefaults \
 -monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \

tests/qemuxml2argvdata/qemuxml2argv-graphics-vnc.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nodefaults \
 -monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \

tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address-device.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9466-926a-d65c16db1809 \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-hostdev-pci-address.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9466-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi-iscsi-auth.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9466-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi-iscsi.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9466-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-lsi.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9466-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-readonly.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9466-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-iscsi-auth.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9466-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-iscsi.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9466-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-hostdev-scsi-virtio-scsi.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9466-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address-device-boot.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address-device.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-hostdev-usb-address.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-hostdev-vfio-multidomain.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9466-926a-d65c16db1809 \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-hostdev-vfio.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9466-926a-d65c16db1809 \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-hotplug-base.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 4096 \
--smp 4 \
+-smp 4,sockets=4,cores=1,threads=1 \
 -uuid d091ea82-29e6-2e34-3005-f02617b36e87 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-hugepages-numa.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=spice \
 -S \
 -M pc-i440fx-2.3 \
 -m size=1048576k,slots=16,maxmem=1099511627776k \
--smp 2 \
+-smp 2,sockets=2,cores=1,threads=1 \
 -mem-prealloc \
 -mem-path /dev/hugepages2M/libvirt/qemu \
 -numa node,nodeid=0,cpus=0-1,mem=1024 \

tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 4096 \
--smp 4 \
+-smp 4,sockets=4,cores=1,threads=1 \
 -object memory-backend-file,id=ram-node0,prealloc=yes,\
 mem-path=/dev/hugepages1G/libvirt/qemu,size=1073741824,host-nodes=0-3,\
 policy=bind \

tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages2.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 1024 \
--smp 2 \
+-smp 2,sockets=2,cores=1,threads=1 \
 -object memory-backend-file,id=ram-node0,prealloc=yes,\
 mem-path=/dev/hugepages2M/libvirt/qemu,size=268435456 \
 -numa node,nodeid=0,cpus=0,memdev=ram-node0 \

tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages3.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 1024 \
--smp 2 \
+-smp 2,sockets=2,cores=1,threads=1 \
 -object memory-backend-ram,id=ram-node0,size=268435456 \
 -numa node,nodeid=0,cpus=0,memdev=ram-node0 \
 -object memory-backend-file,id=ram-node1,prealloc=yes,\

tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages5.args

@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -m 1024 \
 -mem-prealloc \
 -mem-path /dev/hugepages2M/libvirt/qemu \
--smp 2 \
+-smp 2,sockets=2,cores=1,threads=1 \
 -uuid ef1bdff4-27f3-4e85-a807-5fb4d58463cc \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-hugepages-pages6.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 1024 \
--smp 2 \
+-smp 2,sockets=2,cores=1,threads=1 \
 -uuid ef1bdff4-27f3-4e85-a807-5fb4d58463cc \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-hugepages-shared.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 4096 \
--smp 4 \
+-smp 4,sockets=4,cores=1,threads=1 \
 -object memory-backend-file,id=ram-node0,prealloc=yes,\
 mem-path=/dev/hugepages1G/libvirt/qemu,size=1073741824,host-nodes=0-3,\
 policy=bind \

tests/qemuxml2argvdata/qemuxml2argv-hugepages.args

@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -m 214 \
 -mem-prealloc \
 -mem-path /dev/hugepages2M/libvirt/qemu \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-hyperv-off.args

@@ -10,7 +10,7 @@ QEMU_AUDIO_DRV=none \
 -M pc \
 -cpu qemu32 \
 -m 214 \
--smp 6 \
+-smp 6,sockets=6,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-hyperv-panic.args

@@ -10,7 +10,7 @@ QEMU_AUDIO_DRV=none \
 -M pc \
 -cpu qemu32,hv_crash \
 -m 214 \
--smp 6 \
+-smp 6,sockets=6,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-hyperv.args

@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -cpu 'qemu32,hv_relaxed,hv_vapic,hv_spinlocks=0x2fff,hv_vpindex,hv_runtime,\
 hv_synic,hv_stimer,hv_reset,hv_vendor_id=KVM Hv' \
 -m 214 \
--smp 6 \
+-smp 6,sockets=6,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse-addr.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-input-usbmouse.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-input-usbtablet.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-iothreads-disk-virtio-ccw.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M s390-ccw \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -object iothread,id=iothread1 \
 -object iothread,id=iothread2 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \

tests/qemuxml2argvdata/qemuxml2argv-iothreads-disk.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 2 \
+-smp 2,sockets=2,cores=1,threads=1 \
 -object iothread,id=iothread1 \
 -object iothread,id=iothread2 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \

tests/qemuxml2argvdata/qemuxml2argv-iothreads-ids-partial.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 2 \
+-smp 2,sockets=2,cores=1,threads=1 \
 -object iothread,id=iothread5 \
 -object iothread,id=iothread6 \
 -object iothread,id=iothread1 \

tests/qemuxml2argvdata/qemuxml2argv-iothreads-ids.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 2 \
+-smp 2,sockets=2,cores=1,threads=1 \
 -object iothread,id=iothread2 \
 -object iothread,id=iothread4 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \

tests/qemuxml2argvdata/qemuxml2argv-iothreads-virtio-scsi-ccw.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M s390-ccw \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -object iothread,id=iothread1 \
 -object iothread,id=iothread2 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \

tests/qemuxml2argvdata/qemuxml2argv-iothreads-virtio-scsi-pci.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 2 \
+-smp 2,sockets=2,cores=1,threads=1 \
 -object iothread,id=iothread1 \
 -object iothread,id=iothread2 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \

tests/qemuxml2argvdata/qemuxml2argv-iothreads.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 2 \
+-smp 2,sockets=2,cores=1,threads=1 \
 -object iothread,id=iothread1 \
 -object iothread,id=iothread2 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \

tests/qemuxml2argvdata/qemuxml2argv-kvm-features-off.args

@@ -10,7 +10,7 @@ QEMU_AUDIO_DRV=none \
 -M pc \
 -cpu qemu32 \
 -m 214 \
--smp 6 \
+-smp 6,sockets=6,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-kvm-features.args

@@ -10,7 +10,7 @@ QEMU_AUDIO_DRV=none \
 -M pc \
 -cpu qemu32,kvm=off \
 -m 214 \
--smp 6 \
+-smp 6,sockets=6,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-kvm-pit-delay.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 2 \
+-smp 2,sockets=2,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-kvm-pit-device.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 2 \
+-smp 2,sockets=2,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-kvm.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -machine pc-1.0,accel=kvm \
 -m 4096 \
--smp 4 \
+-smp 4,sockets=4,cores=1,threads=1 \
 -uuid d091ea82-29e6-2e34-3005-f02617b36e87 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-kvmclock+eoi-disabled.args

@@ -10,7 +10,7 @@ QEMU_AUDIO_DRV=none \
 -M pc \
 -cpu qemu32,-kvmclock,-kvm_pv_eoi \
 -m 214 \
--smp 6 \
+-smp 6,sockets=6,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-kvmclock.args

@@ -10,7 +10,7 @@ QEMU_AUDIO_DRV=none \
 -M pc \
 -cpu qemu32,-kvmclock \
 -m 214 \
--smp 6 \
+-smp 6,sockets=6,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-off-cap.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -machine s390-ccw-virtio,accel=tcg,aes-key-wrap=off \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-off-caps.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -machine s390-ccw-virtio,accel=tcg,aes-key-wrap=off \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-on-cap.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -machine s390-ccw-virtio,accel=tcg,aes-key-wrap=on \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-machine-aeskeywrap-on-caps.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -machine s390-ccw-virtio,accel=tcg,aes-key-wrap=on \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-machine-aliases1.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc-0.11 \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-machine-aliases2.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-machine-core-off.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -machine pc,accel=tcg,dump-guest-core=off \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-machine-core-on.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -machine pc,accel=tcg,dump-guest-core=on \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-off-cap.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -machine s390-ccw-virtio,accel=tcg,dea-key-wrap=off \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-off-caps.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -machine s390-ccw-virtio,accel=tcg,dea-key-wrap=off \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-on-cap.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -machine s390-ccw-virtio,accel=tcg,dea-key-wrap=on \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-machine-deakeywrap-on-caps.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -machine s390-ccw-virtio,accel=tcg,dea-key-wrap=on \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-machine-keywrap-none-caps.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -machine s390-ccw-virtio,accel=tcg \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-machine-keywrap-none.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -machine s390-ccw-virtio,accel=tcg \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-machine-usb-opt.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -machine pc,accel=tcg,usb=off \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-machine-vmport-opt.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -machine pc,accel=tcg,vmport=off \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-master-key.args

@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 file=/tmp/lib/domain--1-QEMUGuest1/master-key.aes \
 -M pc \
 -m 214 \
--smp 2 \
+-smp 2,sockets=2,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-dimm-addr.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m size=219136k,slots=16,maxmem=1099511627776k \
--smp 2 \
+-smp 2,sockets=2,cores=1,threads=1 \
 -numa node,nodeid=0,cpus=0-1,mem=214 \
 -object memory-backend-file,id=memdimm0,prealloc=yes,\
 mem-path=/dev/hugepages2M/libvirt/qemu,size=536870912,host-nodes=1-3,policy=bind \

tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-dimm.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m size=219136k,slots=16,maxmem=1099511627776k \
--smp 2 \
+-smp 2,sockets=2,cores=1,threads=1 \
 -numa node,nodeid=0,cpus=0-1,mem=214 \
 -object memory-backend-ram,id=memdimm0,size=536870912 \
 -device pc-dimm,node=0,memdev=memdimm0,id=dimm0 \

tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug-ppc64-nonuma.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pseries \
 -m size=1310720k,slots=16,maxmem=4194304k \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -object memory-backend-ram,id=memdimm0,size=536870912 \
 -device pc-dimm,memdev=memdimm0,id=dimm0 \
 -object memory-backend-ram,id=memdimm1,size=536870912 \

tests/qemuxml2argvdata/qemuxml2argv-memory-hotplug.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m size=219136k,slots=16,maxmem=1099511627776k \
--smp 2 \
+-smp 2,sockets=2,cores=1,threads=1 \
 -numa node,nodeid=0,cpus=0-1,mem=214 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \

tests/qemuxml2argvdata/qemuxml2argv-memtune-unlimited.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-memtune.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-migrate-numa-unaligned.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 14338 \
--smp 32 \
+-smp 32,sockets=32,cores=1,threads=1 \
 -object memory-backend-ram,id=ram-node0,size=20482048,host-nodes=3,\
 policy=preferred \
 -numa node,nodeid=0,cpus=0,memdev=ram-node0 \

tests/qemuxml2argvdata/qemuxml2argv-migrate.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-minimal-msg-timestamp.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-minimal.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-misc-acpi.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-misc-disable-s3.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid 8caaa98c-e7bf-5845-126a-1fc316bd1089 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-misc-disable-suspends.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid 8caaa98c-e7bf-5845-126a-1fc316bd1089 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-misc-enable-s4.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid 8caaa98c-e7bf-5845-126a-1fc316bd1089 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-misc-no-reboot.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-misc-uuid.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-mlock-off.args

@@ -10,7 +10,7 @@ QEMU_AUDIO_DRV=none \
 -M pc \
 -m 214 \
 -realtime mlock=off \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-mlock-on.args

@@ -10,7 +10,7 @@ QEMU_AUDIO_DRV=none \
 -M pc \
 -m 214 \
 -realtime mlock=on \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-mlock-unsupported.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-monitor-json.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid 496898a6-e6ff-f7c8-5dc2-3cf410945ee9 \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-multifunction-pci-device.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-name-escape.args

@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 bar=2/master-key.aes \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nodefaults \
 -chardev socket,id=charmonitor,path=/tmp/lib/domain--1-foo=1,,bar=2/monitor.sock,\

tests/qemuxml2argvdata/qemuxml2argv-net-client.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-net-eth-hostip.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-net-eth-ifname.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-net-eth-names.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-net-eth.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-net-hostdev-multidomain.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-net-hostdev-vfio-multidomain.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-net-hostdev-vfio.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-net-hostdev.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-net-mcast.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-net-server.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-net-udp.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-net-user.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser-multiq.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-net-vhostuser.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-net-virtio-ccw.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M s390-ccw \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-net-virtio-device.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-net-virtio-disable-offloads.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-net-virtio-netdev.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-net-virtio-s390.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M s390-virtio \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-net-virtio.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-no-shutdown.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid 496898a6-e6ff-f7c8-5dc2-3cf410945ee9 \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-nographics-display.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -display none \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-nographics-vga.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-nographics.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-nosharepages.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -machine pc,accel=tcg,mem-merge=off \
 -m 215 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-numad-auto-memory-vcpu-cpuset.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 2 \
+-smp 2,sockets=2,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-numad-auto-memory-vcpu-no-cpuset-and-placement.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 2 \
+-smp 2,sockets=2,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-numad-auto-vcpu-static-numatune.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 2 \
+-smp 2,sockets=2,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-numad-static-memory-auto-vcpu.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 2 \
+-smp 2,sockets=2,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-numad.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 2 \
+-smp 2,sockets=2,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-numatune-auto-nodeset-invalid.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 2 \
+-smp 2,sockets=2,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-numatune-auto-prefer.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 64 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -numa node,nodeid=0,cpus=0,mem=64 \
 -uuid 9f4b6512-e73a-4a25-93e8-5307802821ce \
 -nographic \

tests/qemuxml2argvdata/qemuxml2argv-numatune-memnode-no-memory.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 64 \
--smp 2 \
+-smp 2,sockets=2,cores=1,threads=1 \
 -object memory-backend-ram,id=ram-node0,size=33554432,host-nodes=3,\
 policy=preferred \
 -numa node,nodeid=0,cpus=0,memdev=ram-node0 \

tests/qemuxml2argvdata/qemuxml2argv-numatune-memnode.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 24105 \
--smp 32 \
+-smp 32,sockets=32,cores=1,threads=1 \
 -object memory-backend-ram,id=ram-node0,size=20971520,host-nodes=3,\
 policy=preferred \
 -numa node,nodeid=0,cpus=0,memdev=ram-node0 \

tests/qemuxml2argvdata/qemuxml2argv-numatune-memory.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 2 \
+-smp 2,sockets=2,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-panic-double.args

@@ -10,7 +10,7 @@ QEMU_AUDIO_DRV=none \
 -M pc \
 -cpu qemu32,hv_crash \
 -m 214 \
--smp 6 \
+-smp 6,sockets=6,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-panic-no-address.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-panic.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-parallel-parport-chardev.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp-chardev.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-parallel-tcp.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-pci-autoadd-addr.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc-1.2 \
 -m 2048 \
--smp 2 \
+-smp 2,sockets=2,cores=1,threads=1 \
 -uuid 3ec6cbe1-b5a2-4515-b800-31a61855df41 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-pci-autoadd-idx.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc-1.2 \
 -m 2048 \
--smp 2 \
+-smp 2,sockets=2,cores=1,threads=1 \
 -uuid 3ec6cbe1-b5a2-4515-b800-31a61855df41 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-pci-autofill-addr.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc-1.2 \
 -m 2048 \
--smp 2 \
+-smp 2,sockets=2,cores=1,threads=1 \
 -uuid 3ec6cbe1-b5a2-4515-b800-31a61855df41 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-pci-bridge-many-disks.args

@@ -11,7 +11,7 @@ QEMU_AUDIO_DRV=none \
 -cpu qemu64,-kvmclock \
 -bios /usr/share/seabios/bios.bin \
 -m 3907 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid 04872dc1-e1de-434b-ab21-e3e80e416349 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-pci-expander-bus.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc-i440fx-2.5 \
 -m 214 \
--smp 16 \
+-smp 16,sockets=2,cores=4,threads=2 \
 -numa node,nodeid=0,cpus=0-7,mem=107 \
 -numa node,nodeid=1,cpus=8-15,mem=107 \
 -uuid 3ec6cbe1-b5a2-4515-b800-31a61855df41 \

tests/qemuxml2argvdata/qemuxml2argv-pci-many.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc-1.2 \
 -m 2048 \
--smp 2 \
+-smp 2,sockets=2,cores=1,threads=1 \
 -uuid 3ec6cbe1-b5a2-4515-b800-31a61855df41 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-pci-rom.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9466-926a-d65c16db1809 \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-pci-serial-dev-chardev.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-pcie-expander-bus.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M q35 \
 -m 214 \
--smp 16 \
+-smp 16,sockets=2,cores=4,threads=2 \
 -numa node,nodeid=0,cpus=0-7,mem=107 \
 -numa node,nodeid=1,cpus=8-15,mem=107 \
 -uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \

tests/qemuxml2argvdata/qemuxml2argv-pcie-root-port.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M q35 \
 -m 2048 \
--smp 2 \
+-smp 2,sockets=2,cores=1,threads=1 \
 -uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-pcie-root.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M q35 \
 -m 2048 \
--smp 2 \
+-smp 2,sockets=2,cores=1,threads=1 \
 -uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-pcie-switch-downstream-port.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M q35 \
 -m 2048 \
--smp 2 \
+-smp 2,sockets=2,cores=1,threads=1 \
 -uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-pcie-switch-upstream-port.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M q35 \
 -m 2048 \
--smp 2 \
+-smp 2,sockets=2,cores=1,threads=1 \
 -uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-pcihole64-q35.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M q35 \
 -m 2048 \
--smp 2 \
+-smp 2,sockets=2,cores=1,threads=1 \
 -uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-pcihole64.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc-1.2 \
 -m 2048 \
--smp 2 \
+-smp 2,sockets=2,cores=1,threads=1 \
 -uuid 3c7c30b5-7866-4b05-8a29-efebccba52a0 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-pmu-feature-off.args

@@ -10,7 +10,7 @@ QEMU_AUDIO_DRV=none \
 -M pc \
 -cpu qemu32,pmu=off \
 -m 214 \
--smp 6 \
+-smp 6,sockets=6,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-pmu-feature.args

@@ -10,7 +10,7 @@ QEMU_AUDIO_DRV=none \
 -M pc \
 -cpu qemu32,pmu=on \
 -m 214 \
--smp 6 \
+-smp 6,sockets=6,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-ppc-dtb.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M ppce500 \
 -m 256 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid 49545eb3-75e1-2d0a-acdd-f0294406c99e \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-ppc64-usb-controller-legacy.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pseries \
 -m 256 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-ppc64-usb-controller.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pseries \
 -m 256 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-ppce500-serial.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M ppce500 \
 -m 256 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-pseries-basic.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pseries \
 -m 512 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-compat.args

@@ -10,7 +10,7 @@ QEMU_AUDIO_DRV=none \
 -M pseries \
 -cpu host,compat=power7 \
 -m 256 \
--smp 4 \
+-smp 4,sockets=4,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-exact.args

@@ -10,7 +10,7 @@ QEMU_AUDIO_DRV=none \
 -M pseries \
 -cpu POWER7_v2.3 \
 -m 512 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-pseries-cpu-le.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pseries \
 -m 512 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-pseries-nvram.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pseries \
 -m 512 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-pseries-panic-missing.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pseries \
 -m 512 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-pseries-panic-no-address.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pseries \
 -m 512 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-default.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pseries \
 -m 512 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-kbd.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pseries \
 -m 512 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-pseries-usb-multi.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pseries \
 -m 512 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid 1ccfd97d-5eb4-478a-bbe6-88d254c16db7 \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-pseries-vio-user-assigned.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pseries \
 -m 512 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid 2754dd7b-ac8a-4850-aec0-1f3fcd43235b \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-pseries-vio.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pseries \
 -m 512 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid 2754dd7b-ac8a-4850-aec0-1f3fcd43235b \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-pv-spinlock-disabled.args

@@ -10,7 +10,7 @@ QEMU_AUDIO_DRV=none \
 -M pc \
 -cpu qemu32,-kvm_pv_unhalt \
 -m 214 \
--smp 6 \
+-smp 6,sockets=6,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-pv-spinlock-enabled.args

@@ -10,7 +10,7 @@ QEMU_AUDIO_DRV=none \
 -M pc \
 -cpu qemu32,+kvm_pv_unhalt \
 -m 214 \
--smp 6 \
+-smp 6,sockets=6,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-q35-pm-disable-fallback.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc-q35-2.5 \
 -m 1024 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid 56f5055c-1b8d-490c-844a-ad646a1caaaa \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-q35-pm-disable.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc-q35-2.5 \
 -m 1024 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid 56f5055c-1b8d-490c-844a-ad646a1caaaa \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-q35-usb2-multi.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M q35 \
 -m 2048 \
--smp 2 \
+-smp 2,sockets=2,cores=1,threads=1 \
 -uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-q35-usb2-reorder.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M q35 \
 -m 2048 \
--smp 2 \
+-smp 2,sockets=2,cores=1,threads=1 \
 -uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-q35-usb2.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M q35 \
 -m 2048 \
--smp 2 \
+-smp 2,sockets=2,cores=1,threads=1 \
 -uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-q35.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M q35 \
 -m 2048 \
--smp 2 \
+-smp 2,sockets=2,cores=1,threads=1 \
 -uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-commandline-ns0.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-commandline-ns1.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-commandline.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-domain-commandline-ns0.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-domain-commandline.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-domain-ns0.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-qemu-ns-no-env.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-qemu-ns.args

@@ -11,7 +11,7 @@ BAR='' \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-reboot-timeout-disabled.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 6 \
+-smp 6,sockets=6,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-reboot-timeout-enabled.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 6 \
+-smp 6,sockets=6,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-restore-v2-fd.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-restore-v2.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-s390-allow-bogus-usb-controller.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M s390-virtio \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-s390-allow-bogus-usb-none.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M s390-virtio \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-s390-panic-missing.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M s390-ccw-virtio \
 -m 256 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid 9aa4b45c-b9dd-45ef-91fe-862b27b4231f \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-s390-panic-no-address.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M s390-ccw-virtio \
 -m 256 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid 9aa4b45c-b9dd-45ef-91fe-862b27b4231f \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-seclabel-dac-none.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-baselabel.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-labelskip.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-override.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic-relabel.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-seclabel-dynamic.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-seclabel-none.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-seclabel-static-labelskip.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-seclabel-static-relabel.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-seclabel-static.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-serial-dev-chardev-iobase.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-serial-dev-chardev.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-serial-dev.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-serial-file-chardev.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-serial-file-log.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-serial-file.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-serial-many-chardev.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-serial-many.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-serial-pty-chardev.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-serial-pty.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-serial-spiceport-nospice.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-serial-spiceport.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=spice \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nodefconfig \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-chardev.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet-chardev.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-serial-tcp-telnet.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-serial-tcp.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-serial-udp-chardev.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-serial-udp.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-serial-unix-chardev.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-serial-unix.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-serial-vc-chardev.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-serial-vc.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-shmem.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-smartcard-controller.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-smartcard-host-certificates.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-smartcard-host.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-smartcard-passthrough-spicevmc.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-smartcard-passthrough-tcp.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-smbios.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -smbios 'type=0,vendor=LENOVO,version=6FET82WW (3.12 )' \
 -smbios 'type=1,manufacturer=Fedora,product=Virt-Manager,version=0.8.2-3.fc14,\

tests/qemuxml2argvdata/qemuxml2argv-sound-device.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-sound.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-tpm-passthrough.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc-0.12 \
 -m 2048 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid 11d7cd22-da89-3094-6212-079a48a309a1 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-usb-controller-default-q35.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M q35 \
 -m 2048 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-usb-controller-explicit-q35.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M q35 \
 -m 2048 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid 11dbdcdd-4c3b-482b-8903-9bdb8c0a2774 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-usb-controller-xhci.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-usb-controller.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-usb-hub.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-usb-ich9-companion.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-usb-ich9-ehci-addr.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-usb-long-port-path.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-usb-none.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-usb-piix3-controller.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-usb-ports.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-usb-redir-boot.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-usb-redir-filter-version.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-usb-redir-filter.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-usb-redir.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-usb1-usb2.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-video-device-pciaddr-default.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc-0.15 \
 -m 1024 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid cdbebdfa-1d6d-65c3-be0f-fd74b978a773 \
 -nodefaults \
 -monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \

tests/qemuxml2argvdata/qemuxml2argv-video-qxl-device-vgamem.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 1024 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-video-qxl-device.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 1024 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-video-qxl-heads.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-video-qxl-nodevice.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 1024 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-video-qxl-noheads.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-video-qxl-sec-device-vgamem.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 1024 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-video-qxl-sec-device.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 1024 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-video-vga-device-vgamem.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 1024 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-video-vga-device.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 1024 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-video-vga-nodevice.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 1024 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-video-virtio-gpu-device.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 1024 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-video-virtio-gpu-spice-gl.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=spice \
 -S \
 -M pc \
 -m 1024 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nodefaults \
 -monitor unix:/tmp/lib/domain--1-QEMUGuest1/monitor.sock,server,nowait \

tests/qemuxml2argvdata/qemuxml2argv-video-virtio-gpu-virgl.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 1024 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-virtio-input-passthrough.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-virtio-input.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-virtio-lun.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc-0.13 \
 -m 1024 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid bba65c0e-c049-934f-b6aa-4e2c0582acdf \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-ccw.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M s390-ccw \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-default.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-egd.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-multiple.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-virtio-rng-random.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-watchdog-device.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-watchdog-diag288.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M s390-virtio \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefconfig \

tests/qemuxml2argvdata/qemuxml2argv-watchdog-dump.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-watchdog-injectnmi.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvdata/qemuxml2argv-watchdog.args

@@ -9,7 +9,7 @@ QEMU_AUDIO_DRV=none \
 -S \
 -M pc \
 -m 214 \
--smp 1 \
+-smp 1,sockets=1,cores=1,threads=1 \
 -uuid c7a5fdbd-edaf-9455-926a-d65c16db1809 \
 -nographic \
 -nodefaults \

tests/qemuxml2argvtest.c

@@ -1290,7 +1290,7 @@ mymain(void)
     DO_TEST("qemu-ns", NONE);
     DO_TEST("qemu-ns-no-env", NONE);
 
-    DO_TEST("smp", QEMU_CAPS_SMP_TOPOLOGY);
+    DO_TEST("smp", NONE);
 
     DO_TEST("iothreads", QEMU_CAPS_OBJECT_IOTHREAD);
     DO_TEST("iothreads-ids", QEMU_CAPS_OBJECT_IOTHREAD);
@@ -1306,8 +1306,8 @@ mymain(void)
             QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_VIRTIO_SCSI_IOTHREAD,
             QEMU_CAPS_VIRTIO_CCW, QEMU_CAPS_VIRTIO_S390);
 
-    DO_TEST("cpu-topology1", QEMU_CAPS_SMP_TOPOLOGY);
-    DO_TEST("cpu-topology2", QEMU_CAPS_SMP_TOPOLOGY);
+    DO_TEST("cpu-topology1", NONE);
+    DO_TEST("cpu-topology2", NONE);
     DO_TEST("cpu-topology3", NONE);
     DO_TEST("cpu-minimum1", QEMU_CAPS_KVM);
     DO_TEST("cpu-minimum2", QEMU_CAPS_KVM);
@@ -1318,14 +1318,13 @@ mymain(void)
     DO_TEST_FAILURE("cpu-nofallback", QEMU_CAPS_KVM);
     DO_TEST("cpu-strict1", QEMU_CAPS_KVM);
     DO_TEST("cpu-numa1", NONE);
-    DO_TEST("cpu-numa2", QEMU_CAPS_SMP_TOPOLOGY);
-    DO_TEST("cpu-numa-no-memory-element", QEMU_CAPS_SMP_TOPOLOGY);
+    DO_TEST("cpu-numa2", NONE);
+    DO_TEST("cpu-numa-no-memory-element", NONE);
     DO_TEST_PARSE_ERROR("cpu-numa3", NONE);
     DO_TEST_FAILURE("cpu-numa-disjoint", NONE);
     DO_TEST("cpu-numa-disjoint", QEMU_CAPS_NUMA);
-    DO_TEST_FAILURE("cpu-numa-memshared", QEMU_CAPS_SMP_TOPOLOGY,
-                    QEMU_CAPS_OBJECT_MEMORY_RAM);
-    DO_TEST_FAILURE("cpu-numa-memshared", QEMU_CAPS_SMP_TOPOLOGY);
+    DO_TEST_FAILURE("cpu-numa-memshared", QEMU_CAPS_OBJECT_MEMORY_RAM);
+    DO_TEST_FAILURE("cpu-numa-memshared", NONE);
     DO_TEST("cpu-host-model", NONE);
     DO_TEST("cpu-host-model-vendor", NONE);
     skipLegacyCPUs = true;
@@ -1354,7 +1353,7 @@ mymain(void)
     DO_TEST("cputune-zero-shares", NONE);
     DO_TEST_PARSE_ERROR("cputune-iothreadsched-toomuch", NONE);
     DO_TEST_PARSE_ERROR("cputune-vcpusched-overlap", NONE);
-    DO_TEST("cputune-numatune", QEMU_CAPS_SMP_TOPOLOGY,
+    DO_TEST("cputune-numatune",
             QEMU_CAPS_KVM,
             QEMU_CAPS_OBJECT_IOTHREAD,
             QEMU_CAPS_OBJECT_MEMORY_RAM,