qemu: command: Always assume support for '-name guest=' and '-name debug-threads=on'

All QEMU versions we support have these and it's very unlikely that they
will be removed. Remove the capability checks.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Martin Kletzander <mkletzan@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

src/qemu/qemu_command.c

@@ -6774,24 +6774,20 @@ qemuAppendLoadparmMachineParm(virBuffer *buf,
 static int
 qemuBuildNameCommandLine(virCommand *cmd,
                          virQEMUDriverConfig *cfg,
-                         const virDomainDef *def,
-                         virQEMUCaps *qemuCaps)
+                         const virDomainDef *def)
 {
     g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
 
     virCommandAddArg(cmd, "-name");
 
     /* The 'guest' option let's us handle a name with '=' embedded in it */
-    if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_NAME_GUEST))
-        virBufferAddLit(&buf, "guest=");
-
+    virBufferAddLit(&buf, "guest=");
     virQEMUBuildBufferEscapeComma(&buf, def->name);
 
     if (cfg->setProcessName)
         virBufferAsprintf(&buf, ",process=qemu:%s", def->name);
 
-    if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_NAME_DEBUG_THREADS))
-        virBufferAddLit(&buf, ",debug-threads=on");
+    virBufferAddLit(&buf, ",debug-threads=on");
 
     virCommandAddArgBuffer(cmd, &buf);
 
@@ -10476,7 +10472,7 @@ qemuBuildCommandLine(virQEMUDriver *driver,
         virCommandAddEnvXDG(cmd, priv->libDir);
     }
 
-    if (qemuBuildNameCommandLine(cmd, cfg, def, qemuCaps) < 0)
+    if (qemuBuildNameCommandLine(cmd, cfg, def) < 0)
         return NULL;
 
     qemuBuildCompatDeprecatedCommandLine(cmd, cfg, def, qemuCaps);

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

@@ -8,7 +8,7 @@ XDG_CACHE_HOME=/tmp/lib/domain--1-aarch64test/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-aarch64test/.config \
 QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-aarch64 \
--name aarch64test \
+-name guest=aarch64test,debug-threads=on \
 -S \
 -machine virt,accel=tcg,usb=off,dump-guest-core=off,gic-version=2 \
 -cpu cortex-a53 \

tests/qemuxml2argvdata/aarch64-acpi-uefi.args

@@ -8,7 +8,7 @@ XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
 QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-aarch64 \
--name guest \
+-name guest=guest,debug-threads=on \
 -S \
 -machine virt,accel=tcg,usb=off,dump-guest-core=off,gic-version=2 \
 -cpu cortex-a57 \

tests/qemuxml2argvdata/aarch64-cpu-passthrough.args

@@ -8,7 +8,7 @@ XDG_CACHE_HOME=/tmp/lib/domain--1-aarch64test/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-aarch64test/.config \
 QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-aarch64 \
--name aarch64test \
+-name guest=aarch64test,debug-threads=on \
 -S \
 -machine virt,accel=kvm,usb=off,dump-guest-core=off,gic-version=2 \
 -cpu host \

tests/qemuxml2argvdata/aarch64-gic-host.args

@@ -8,7 +8,7 @@ XDG_CACHE_HOME=/tmp/lib/domain--1-aarch64test/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-aarch64test/.config \
 QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-aarch64 \
--name aarch64test \
+-name guest=aarch64test,debug-threads=on \
 -S \
 -machine virt,accel=kvm,usb=off,dump-guest-core=off,gic-version=host \
 -cpu host \

tests/qemuxml2argvdata/aarch64-gic-none-tcg.args

@@ -8,7 +8,7 @@ XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
 QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-aarch64 \
--name guest \
+-name guest=guest,debug-threads=on \
 -S \
 -machine virt,accel=tcg,usb=off,dump-guest-core=off,gic-version=2 \
 -cpu cortex-a57 \

tests/qemuxml2argvdata/aarch64-gic-v2.args

@@ -8,7 +8,7 @@ XDG_CACHE_HOME=/tmp/lib/domain--1-aarch64test/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-aarch64test/.config \
 QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-aarch64 \
--name aarch64test \
+-name guest=aarch64test,debug-threads=on \
 -S \
 -machine virt,accel=kvm,usb=off,dump-guest-core=off,gic-version=2 \
 -cpu host \

tests/qemuxml2argvdata/aarch64-gic-v3.args

@@ -8,7 +8,7 @@ XDG_CACHE_HOME=/tmp/lib/domain--1-aarch64test/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-aarch64test/.config \
 QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-aarch64 \
--name aarch64test \
+-name guest=aarch64test,debug-threads=on \
 -S \
 -machine virt,accel=kvm,usb=off,dump-guest-core=off,gic-version=3 \
 -cpu host \

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

@@ -8,7 +8,7 @@ XDG_CACHE_HOME=/tmp/lib/domain--1-armtest/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-armtest/.config \
 QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-arm \
--name armtest \
+-name guest=armtest,debug-threads=on \
 -S \
 -machine virt,accel=kvm,usb=off,dump-guest-core=off \
 -cpu host,aarch64=off \

tests/qemuxml2argvdata/aarch64-noacpi-nouefi.args

@@ -8,7 +8,7 @@ XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
 QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-aarch64 \
--name guest \
+-name guest=guest,debug-threads=on \
 -S \
 -machine virt,accel=tcg,usb=off,dump-guest-core=off,gic-version=2 \
 -cpu cortex-a57 \

tests/qemuxml2argvdata/aarch64-noacpi-uefi.args

@@ -8,7 +8,7 @@ XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
 QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-aarch64 \
--name guest \
+-name guest=guest,debug-threads=on \
 -S \
 -machine virt,accel=tcg,usb=off,dump-guest-core=off,gic-version=2 \
 -cpu cortex-a57 \

tests/qemuxml2argvdata/aarch64-pci-serial.args

@@ -8,7 +8,7 @@ XDG_CACHE_HOME=/tmp/lib/domain--1-aarch64test/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-aarch64test/.config \
 QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-aarch64 \
--name aarch64test \
+-name guest=aarch64test,debug-threads=on \
 -S \
 -machine virt,accel=tcg,usb=off,dump-guest-core=off,gic-version=2 \
 -m 1024 \

tests/qemuxml2argvdata/aarch64-traditional-pci.args

@@ -8,7 +8,7 @@ XDG_CACHE_HOME=/tmp/lib/domain--1-guest/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-guest/.config \
 QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-aarch64 \
--name guest \
+-name guest=guest,debug-threads=on \
 -S \
 -machine virt,accel=tcg,usb=off,dump-guest-core=off,gic-version=2 \
 -m 1024 \

tests/qemuxml2argvdata/aarch64-usb-controller-nec-xhci.args

@@ -8,7 +8,7 @@ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-aarch64 \
--name QEMUGuest1 \
+-name guest=QEMUGuest1,debug-threads=on \
 -S \
 -machine virt,accel=tcg,usb=off,dump-guest-core=off,gic-version=2 \
 -m 214 \

tests/qemuxml2argvdata/aarch64-usb-controller-qemu-xhci.args

@@ -8,7 +8,7 @@ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-aarch64 \
--name QEMUGuest1 \
+-name guest=QEMUGuest1,debug-threads=on \
 -S \
 -machine virt,accel=tcg,usb=off,dump-guest-core=off,gic-version=2 \
 -m 214 \

tests/qemuxml2argvdata/aarch64-video-default.args

@@ -8,7 +8,7 @@ XDG_CACHE_HOME=/tmp/lib/domain--1-aarch64-vgpu/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-aarch64-vgpu/.config \
 QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-aarch64 \
--name aarch64-vgpu \
+-name guest=aarch64-vgpu,debug-threads=on \
 -S \
 -machine virt,accel=tcg,usb=off,dump-guest-core=off,gic-version=2 \
 -cpu cortex-a57 \

tests/qemuxml2argvdata/aarch64-video-virtio-gpu-pci.args

@@ -8,7 +8,7 @@ XDG_CACHE_HOME=/tmp/lib/domain--1-aarch64-vgpu/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-aarch64-vgpu/.config \
 QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-aarch64 \
--name aarch64-vgpu \
+-name guest=aarch64-vgpu,debug-threads=on \
 -S \
 -machine virt,accel=tcg,usb=off,dump-guest-core=off,gic-version=2 \
 -cpu cortex-a57 \

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

@@ -8,7 +8,7 @@ XDG_CACHE_HOME=/tmp/lib/domain--1-aarch64test/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-aarch64test/.config \
 QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-aarch64 \
--name aarch64test \
+-name guest=aarch64test,debug-threads=on \
 -S \
 -machine virt-2.6,accel=tcg,usb=off,dump-guest-core=off,gic-version=2 \
 -cpu cortex-a53 \

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

@@ -8,7 +8,7 @@ XDG_CACHE_HOME=/tmp/lib/domain--1-aarch64-virt-default/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-aarch64-virt-default/.config \
 QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-aarch64 \
--name aarch64-virt-default-nic \
+-name guest=aarch64-virt-default-nic,debug-threads=on \
 -S \
 -machine virt,accel=tcg,usb=off,dump-guest-core=off,gic-version=2 \
 -cpu cortex-a53 \

tests/qemuxml2argvdata/aarch64-virt-virtio.args

@@ -8,7 +8,7 @@ XDG_CACHE_HOME=/tmp/lib/domain--1-aarch64test/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-aarch64test/.config \
 QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-aarch64 \
--name aarch64test \
+-name guest=aarch64test,debug-threads=on \
 -S \
 -machine virt,accel=tcg,usb=off,dump-guest-core=off,gic-version=2 \
 -cpu cortex-a53 \

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

@@ -8,7 +8,7 @@ XDG_CACHE_HOME=/tmp/lib/domain--1-aarch64test/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-aarch64test/.config \
 QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-aarch64 \
--name aarch64test \
+-name guest=aarch64test,debug-threads=on \
 -S \
 -machine virt,accel=tcg,usb=off,dump-guest-core=off,gic-version=2 \
 -cpu cortex-a53 \

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

@@ -8,7 +8,7 @@ XDG_CACHE_HOME=/tmp/lib/domain--1-aarch64test/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-aarch64test/.config \
 QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-aarch64 \
--name aarch64test \
+-name guest=aarch64test,debug-threads=on \
 -S \
 -machine virt,accel=tcg,usb=off,dump-guest-core=off,gic-version=2 \
 -cpu cortex-a53 \

tests/qemuxml2argvdata/acpi-table.args

@@ -8,7 +8,7 @@ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-x86_64 \
--name QEMUGuest1 \
+-name guest=QEMUGuest1,debug-threads=on \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \
 -m 214 \

tests/qemuxml2argvdata/arm-vexpressa9-basic.args

@@ -8,7 +8,7 @@ XDG_CACHE_HOME=/tmp/lib/domain--1-armtest/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-armtest/.config \
 QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-arm \
--name armtest \
+-name guest=armtest,debug-threads=on \
 -S \
 -machine vexpress-a9,accel=tcg,usb=off,dump-guest-core=off \
 -m 1024 \

tests/qemuxml2argvdata/arm-vexpressa9-nodevs.args

@@ -8,7 +8,7 @@ XDG_CACHE_HOME=/tmp/lib/domain--1-armtest/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-armtest/.config \
 QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-arm \
--name armtest \
+-name guest=armtest,debug-threads=on \
 -S \
 -machine vexpress-a9,accel=tcg,usb=off,dump-guest-core=off \
 -m 1024 \

tests/qemuxml2argvdata/arm-vexpressa9-virtio.args

@@ -8,7 +8,7 @@ XDG_CACHE_HOME=/tmp/lib/domain--1-armtest/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-armtest/.config \
 QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-arm \
--name armtest \
+-name guest=armtest,debug-threads=on \
 -S \
 -machine vexpress-a9,accel=tcg,usb=off,dump-guest-core=off \
 -m 1024 \

tests/qemuxml2argvdata/arm-virt-virtio.args

@@ -8,7 +8,7 @@ XDG_CACHE_HOME=/tmp/lib/domain--1-armtest/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-armtest/.config \
 QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-arm \
--name armtest \
+-name guest=armtest,debug-threads=on \
 -S \
 -machine virt,accel=tcg,usb=off,dump-guest-core=off \
 -m 1024 \

tests/qemuxml2argvdata/audio-alsa-best.args

@@ -21,7 +21,7 @@ QEMU_AUDIO_DAC_FIXED_FMT=f32 \
 QEMU_AUDIO_ADC_DEV=/dev/dsp0 \
 QEMU_AUDIO_DAC_DEV=/dev/dsp1 \
 /usr/bin/qemu-system-i386 \
--name QEMUGuest1 \
+-name guest=QEMUGuest1,debug-threads=on \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \
 -m 214 \

tests/qemuxml2argvdata/audio-alsa-minimal.args

@@ -8,7 +8,7 @@ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=alsa \
 /usr/bin/qemu-system-i386 \
--name QEMUGuest1 \
+-name guest=QEMUGuest1,debug-threads=on \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \
 -m 214 \

tests/qemuxml2argvdata/audio-coreaudio-best.args

@@ -21,7 +21,7 @@ QEMU_AUDIO_DAC_FIXED_FMT=f32 \
 QEMU_COREAUDIO_BUFFER_COUNT=42 \
 QEMU_COREAUDIO_BUFFER_SIZE=200 \
 /usr/bin/qemu-system-i386 \
--name QEMUGuest1 \
+-name guest=QEMUGuest1,debug-threads=on \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \
 -m 214 \

tests/qemuxml2argvdata/audio-coreaudio-minimal.args

@@ -8,7 +8,7 @@ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=coreaudio \
 /usr/bin/qemu-system-i386 \
--name QEMUGuest1 \
+-name guest=QEMUGuest1,debug-threads=on \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \
 -m 214 \

tests/qemuxml2argvdata/audio-default-nographics.args

@@ -8,7 +8,7 @@ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=alsa \
 /usr/bin/qemu-system-i386 \
--name QEMUGuest1 \
+-name guest=QEMUGuest1,debug-threads=on \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \
 -m 214 \

tests/qemuxml2argvdata/audio-default-sdl.args

@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=sdl \
 SDL_AUDIODRIVER=esd \
 /usr/bin/qemu-system-i386 \
--name QEMUGuest1 \
+-name guest=QEMUGuest1,debug-threads=on \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \
 -m 214 \

tests/qemuxml2argvdata/audio-default-spice.args

@@ -8,7 +8,7 @@ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=spice \
 /usr/bin/qemu-system-i386 \
--name QEMUGuest1 \
+-name guest=QEMUGuest1,debug-threads=on \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \
 -m 214 \

tests/qemuxml2argvdata/audio-default-vnc.args

@@ -8,7 +8,7 @@ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=alsa \
 /usr/bin/qemu-system-i386 \
--name QEMUGuest1 \
+-name guest=QEMUGuest1,debug-threads=on \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \
 -m 214 \

tests/qemuxml2argvdata/audio-file-best.args

@@ -20,7 +20,7 @@ QEMU_AUDIO_DAC_FIXED_CHANNELS=4 \
 QEMU_AUDIO_DAC_FIXED_FMT=f32 \
 QEMU_WAV_PATH=audio.wav \
 /usr/bin/qemu-system-i386 \
--name QEMUGuest1 \
+-name guest=QEMUGuest1,debug-threads=on \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \
 -m 214 \

tests/qemuxml2argvdata/audio-file-minimal.args

@@ -8,7 +8,7 @@ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=wav \
 /usr/bin/qemu-system-i386 \
--name QEMUGuest1 \
+-name guest=QEMUGuest1,debug-threads=on \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \
 -m 214 \

tests/qemuxml2argvdata/audio-none-best.args

@@ -19,7 +19,7 @@ QEMU_AUDIO_DAC_FIXED_FREQ=22050 \
 QEMU_AUDIO_DAC_FIXED_CHANNELS=4 \
 QEMU_AUDIO_DAC_FIXED_FMT=f32 \
 /usr/bin/qemu-system-i386 \
--name QEMUGuest1 \
+-name guest=QEMUGuest1,debug-threads=on \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \
 -m 214 \

tests/qemuxml2argvdata/audio-none-minimal.args

@@ -8,7 +8,7 @@ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-i386 \
--name QEMUGuest1 \
+-name guest=QEMUGuest1,debug-threads=on \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \
 -m 214 \

tests/qemuxml2argvdata/audio-oss-best.args

@@ -24,7 +24,7 @@ QEMU_OSS_DAC_DEV=/dev/dsp1 \
 QEMU_AUDIO_DAC_TRY_POLL=off \
 QEMU_OSS_NFRAGS=30 \
 /usr/bin/qemu-system-i386 \
--name QEMUGuest1 \
+-name guest=QEMUGuest1,debug-threads=on \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \
 -m 214 \

tests/qemuxml2argvdata/audio-oss-minimal.args

@@ -8,7 +8,7 @@ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=oss \
 /usr/bin/qemu-system-i386 \
--name QEMUGuest1 \
+-name guest=QEMUGuest1,debug-threads=on \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \
 -m 214 \

tests/qemuxml2argvdata/audio-pulseaudio-best.args

@@ -23,7 +23,7 @@ QEMU_PA_SINK=fish \
 QEMU_PA_SAMPLES=200 \
 QEMU_PA_SERVER=%s=acme.example.org \
 /usr/bin/qemu-system-i386 \
--name QEMUGuest1 \
+-name guest=QEMUGuest1,debug-threads=on \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \
 -m 214 \

tests/qemuxml2argvdata/audio-pulseaudio-minimal.args

@@ -8,7 +8,7 @@ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=pa \
 /usr/bin/qemu-system-i386 \
--name QEMUGuest1 \
+-name guest=QEMUGuest1,debug-threads=on \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \
 -m 214 \

tests/qemuxml2argvdata/audio-sdl-best.args

@@ -21,7 +21,7 @@ QEMU_AUDIO_DAC_FIXED_FMT=f32 \
 QEMU_SDL_SAMPLES=200 \
 SDL_AUDIODRIVER=pulseaudio \
 /usr/bin/qemu-system-i386 \
--name QEMUGuest1 \
+-name guest=QEMUGuest1,debug-threads=on \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \
 -m 214 \

tests/qemuxml2argvdata/audio-sdl-minimal.args

@@ -8,7 +8,7 @@ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=sdl \
 /usr/bin/qemu-system-i386 \
--name QEMUGuest1 \
+-name guest=QEMUGuest1,debug-threads=on \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \
 -m 214 \

tests/qemuxml2argvdata/audio-spice-best.args

@@ -19,7 +19,7 @@ QEMU_AUDIO_DAC_FIXED_FREQ=22050 \
 QEMU_AUDIO_DAC_FIXED_CHANNELS=4 \
 QEMU_AUDIO_DAC_FIXED_FMT=f32 \
 /usr/bin/qemu-system-i386 \
--name QEMUGuest1 \
+-name guest=QEMUGuest1,debug-threads=on \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \
 -m 214 \

tests/qemuxml2argvdata/audio-spice-minimal.args

@@ -8,7 +8,7 @@ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=spice \
 /usr/bin/qemu-system-i386 \
--name QEMUGuest1 \
+-name guest=QEMUGuest1,debug-threads=on \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \
 -m 214 \

tests/qemuxml2argvdata/autoindex.args

@@ -8,7 +8,7 @@ XDG_CACHE_HOME=/tmp/lib/domain--1-q35-test/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-q35-test/.config \
 QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-x86_64 \
--name q35-test \
+-name guest=q35-test,debug-threads=on \
 -S \
 -machine q35,accel=tcg,usb=off,dump-guest-core=off \
 -m 2048 \

tests/qemuxml2argvdata/balloon-ccw-deflate.args

@@ -8,7 +8,7 @@ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-s390x \
--name QEMUGuest1 \
+-name guest=QEMUGuest1,debug-threads=on \
 -S \
 -machine s390-ccw,accel=tcg,usb=off,dump-guest-core=off \
 -m 214 \

tests/qemuxml2argvdata/balloon-device-auto.args

@@ -8,7 +8,7 @@ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-i386 \
--name QEMUGuest1 \
+-name guest=QEMUGuest1,debug-threads=on \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \
 -m 214 \

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

@@ -8,7 +8,7 @@ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-i386 \
--name QEMUGuest1 \
+-name guest=QEMUGuest1,debug-threads=on \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \
 -m 214 \

tests/qemuxml2argvdata/balloon-device-deflate.args

@@ -8,7 +8,7 @@ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-i386 \
--name QEMUGuest1 \
+-name guest=QEMUGuest1,debug-threads=on \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \
 -m 214 \

tests/qemuxml2argvdata/balloon-device-period.args

@@ -8,7 +8,7 @@ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-i386 \
--name QEMUGuest1 \
+-name guest=QEMUGuest1,debug-threads=on \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \
 -m 214 \

tests/qemuxml2argvdata/balloon-device.args

@@ -8,7 +8,7 @@ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-i386 \
--name QEMUGuest1 \
+-name guest=QEMUGuest1,debug-threads=on \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \
 -m 214 \

tests/qemuxml2argvdata/balloon-mmio-deflate.args

@@ -8,7 +8,7 @@ XDG_CACHE_HOME=/tmp/lib/domain--1-aarch64test/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-aarch64test/.config \
 QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-aarch64 \
--name aarch64test \
+-name guest=aarch64test,debug-threads=on \
 -S \
 -machine virt,accel=tcg,usb=off,dump-guest-core=off,gic-version=2 \
 -cpu cortex-a53 \

tests/qemuxml2argvdata/bios-nvram-secure.args

@@ -8,7 +8,7 @@ XDG_CACHE_HOME=/tmp/lib/domain--1-test-bios/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-test-bios/.config \
 QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-x86_64 \
--name test-bios \
+-name guest=test-bios,debug-threads=on \
 -S \
 -machine pc-q35-2.5,accel=tcg,usb=off,smm=on,dump-guest-core=off \
 -global driver=cfi.pflash01,property=secure,value=on \

tests/qemuxml2argvdata/bios-nvram.args

@@ -8,7 +8,7 @@ XDG_CACHE_HOME=/tmp/lib/domain--1-test-bios/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-test-bios/.config \
 QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-x86_64 \
--name test-bios \
+-name guest=test-bios,debug-threads=on \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \
 -drive file=/usr/share/OVMF/OVMF_CODE.fd,if=pflash,format=raw,unit=0,readonly=on \

tests/qemuxml2argvdata/bios.args

@@ -8,7 +8,7 @@ XDG_CACHE_HOME=/tmp/lib/domain--1-test-bios/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-test-bios/.config \
 QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-i386 \
--name test-bios \
+-name guest=test-bios,debug-threads=on \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \
 -bios /usr/share/seabios/bios.bin \

tests/qemuxml2argvdata/blkiotune-device.args

@@ -8,7 +8,7 @@ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-i386 \
--name QEMUGuest1 \
+-name guest=QEMUGuest1,debug-threads=on \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \
 -m 214 \

tests/qemuxml2argvdata/blkiotune.args

@@ -8,7 +8,7 @@ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-i386 \
--name QEMUGuest1 \
+-name guest=QEMUGuest1,debug-threads=on \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \
 -m 214 \

tests/qemuxml2argvdata/boot-cdrom.args

@@ -8,7 +8,7 @@ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-i386 \
--name QEMUGuest1 \
+-name guest=QEMUGuest1,debug-threads=on \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \
 -m 214 \

tests/qemuxml2argvdata/boot-complex.args

@@ -8,7 +8,7 @@ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-i386 \
--name QEMUGuest1 \
+-name guest=QEMUGuest1,debug-threads=on \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \
 -m 214 \

tests/qemuxml2argvdata/boot-floppy-q35.args

@@ -8,7 +8,7 @@ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-x86_64 \
--name QEMUGuest1 \
+-name guest=QEMUGuest1,debug-threads=on \
 -S \
 -machine pc-q35-2.4,accel=tcg,usb=off,dump-guest-core=off \
 -m 214 \

tests/qemuxml2argvdata/boot-floppy.args

@@ -8,7 +8,7 @@ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-i386 \
--name QEMUGuest1 \
+-name guest=QEMUGuest1,debug-threads=on \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \
 -m 214 \

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

@@ -8,7 +8,7 @@ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-i386 \
--name QEMUGuest1 \
+-name guest=QEMUGuest1,debug-threads=on \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \
 -m 214 \

tests/qemuxml2argvdata/boot-menu-disable.args

@@ -8,7 +8,7 @@ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-i386 \
--name QEMUGuest1 \
+-name guest=QEMUGuest1,debug-threads=on \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \
 -m 214 \

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

@@ -8,7 +8,7 @@ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-i386 \
--name QEMUGuest1 \
+-name guest=QEMUGuest1,debug-threads=on \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \
 -m 214 \

tests/qemuxml2argvdata/boot-menu-enable.args

@@ -8,7 +8,7 @@ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-i386 \
--name QEMUGuest1 \
+-name guest=QEMUGuest1,debug-threads=on \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \
 -m 214 \

tests/qemuxml2argvdata/boot-multi.args

@@ -8,7 +8,7 @@ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-i386 \
--name QEMUGuest1 \
+-name guest=QEMUGuest1,debug-threads=on \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \
 -m 214 \

tests/qemuxml2argvdata/boot-network.args

@@ -8,7 +8,7 @@ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-i386 \
--name QEMUGuest1 \
+-name guest=QEMUGuest1,debug-threads=on \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \
 -m 214 \

tests/qemuxml2argvdata/boot-order.args

@@ -8,7 +8,7 @@ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-i386 \
--name QEMUGuest1 \
+-name guest=QEMUGuest1,debug-threads=on \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \
 -m 214 \

tests/qemuxml2argvdata/boot-strict.args

@@ -8,7 +8,7 @@ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-i386 \
--name QEMUGuest1 \
+-name guest=QEMUGuest1,debug-threads=on \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \
 -m 214 \

tests/qemuxml2argvdata/channel-guestfwd.args

@@ -8,7 +8,7 @@ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-i386 \
--name QEMUGuest1 \
+-name guest=QEMUGuest1,debug-threads=on \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \
 -m 214 \

tests/qemuxml2argvdata/channel-spicevmc.args

@@ -8,7 +8,7 @@ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=spice \
 /usr/bin/qemu-system-i386 \
--name QEMUGuest1 \
+-name guest=QEMUGuest1,debug-threads=on \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \
 -m 214 \

tests/qemuxml2argvdata/channel-virtio-auto.args

@@ -8,7 +8,7 @@ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-i386 \
--name QEMUGuest1 \
+-name guest=QEMUGuest1,debug-threads=on \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \
 -m 214 \

tests/qemuxml2argvdata/channel-virtio-autoadd.args

@@ -8,7 +8,7 @@ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-i386 \
--name QEMUGuest1 \
+-name guest=QEMUGuest1,debug-threads=on \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \
 -m 214 \

tests/qemuxml2argvdata/channel-virtio-autoassign.args

@@ -8,7 +8,7 @@ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-i386 \
--name QEMUGuest1 \
+-name guest=QEMUGuest1,debug-threads=on \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \
 -m 214 \

tests/qemuxml2argvdata/channel-virtio-default.args

@@ -8,7 +8,7 @@ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-i386 \
--name QEMUGuest1 \
+-name guest=QEMUGuest1,debug-threads=on \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \
 -m 214 \

tests/qemuxml2argvdata/channel-virtio-state.args

@@ -8,7 +8,7 @@ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-i386 \
--name QEMUGuest1 \
+-name guest=QEMUGuest1,debug-threads=on \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \
 -m 214 \

tests/qemuxml2argvdata/channel-virtio-unix.args

@@ -8,7 +8,7 @@ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-i386 \
--name QEMUGuest1 \
+-name guest=QEMUGuest1,debug-threads=on \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \
 -m 214 \

tests/qemuxml2argvdata/channel-virtio.args

@@ -8,7 +8,7 @@ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-i386 \
--name QEMUGuest1 \
+-name guest=QEMUGuest1,debug-threads=on \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \
 -m 214 \

tests/qemuxml2argvdata/chardev-reconnect.args

@@ -8,7 +8,7 @@ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-i386 \
--name QEMUGuest1 \
+-name guest=QEMUGuest1,debug-threads=on \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \
 -m 214 \

tests/qemuxml2argvdata/clock-catchup.args

@@ -8,7 +8,7 @@ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-i386 \
--name QEMUGuest1 \
+-name guest=QEMUGuest1,debug-threads=on \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \
 -m 214 \

tests/qemuxml2argvdata/clock-france.args

@@ -9,7 +9,7 @@ XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 TZ=Europe/Paris \
 QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-i386 \
--name QEMUGuest1 \
+-name guest=QEMUGuest1,debug-threads=on \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \
 -m 214 \

tests/qemuxml2argvdata/clock-hpet-off.args

@@ -8,7 +8,7 @@ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-i386 \
--name QEMUGuest1 \
+-name guest=QEMUGuest1,debug-threads=on \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \
 -m 214 \

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

@@ -8,7 +8,7 @@ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-i386 \
--name QEMUGuest1 \
+-name guest=QEMUGuest1,debug-threads=on \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \
 -m 214 \

tests/qemuxml2argvdata/clock-localtime.args

@@ -8,7 +8,7 @@ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-i386 \
--name QEMUGuest1 \
+-name guest=QEMUGuest1,debug-threads=on \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \
 -m 214 \

tests/qemuxml2argvdata/clock-realtime.args

@@ -8,7 +8,7 @@ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-i386 \
--name QEMUGuest1 \
+-name guest=QEMUGuest1,debug-threads=on \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \
 -m 214 \

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

@@ -8,7 +8,7 @@ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-i386 \
--name QEMUGuest1 \
+-name guest=QEMUGuest1,debug-threads=on \
 -S \
 -machine pc,accel=kvm,usb=off,dump-guest-core=off \
 -cpu qemu32,hv-time \

tests/qemuxml2argvdata/clock-utc.args

@@ -8,7 +8,7 @@ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-i386 \
--name QEMUGuest1 \
+-name guest=QEMUGuest1,debug-threads=on \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \
 -m 214 \

tests/qemuxml2argvdata/clock-variable.args

@@ -8,7 +8,7 @@ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-i386 \
--name QEMUGuest1 \
+-name guest=QEMUGuest1,debug-threads=on \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \
 -m 214 \

tests/qemuxml2argvdata/console-compat-auto.args

@@ -8,7 +8,7 @@ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-i386 \
--name QEMUGuest1 \
+-name guest=QEMUGuest1,debug-threads=on \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \
 -m 214 \

tests/qemuxml2argvdata/console-compat-chardev.args

@@ -8,7 +8,7 @@ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-i386 \
--name QEMUGuest1 \
+-name guest=QEMUGuest1,debug-threads=on \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \
 -m 214 \

tests/qemuxml2argvdata/console-compat.args

@@ -8,7 +8,7 @@ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-i386 \
--name QEMUGuest1 \
+-name guest=QEMUGuest1,debug-threads=on \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \
 -m 214 \

tests/qemuxml2argvdata/console-virtio-ccw.args

@@ -8,7 +8,7 @@ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-s390x \
--name QEMUGuest1 \
+-name guest=QEMUGuest1,debug-threads=on \
 -S \
 -machine s390-ccw,accel=tcg,usb=off,dump-guest-core=off \
 -m 214 \

tests/qemuxml2argvdata/console-virtio-many.args

@@ -8,7 +8,7 @@ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-i386 \
--name QEMUGuest1 \
+-name guest=QEMUGuest1,debug-threads=on \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \
 -m 214 \

tests/qemuxml2argvdata/console-virtio.args

@@ -8,7 +8,7 @@ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-i386 \
--name QEMUGuest1 \
+-name guest=QEMUGuest1,debug-threads=on \
 -S \
 -machine pc,accel=tcg,usb=off,dump-guest-core=off \
 -m 214 \

tests/qemuxml2argvdata/controller-order.args

@@ -8,7 +8,7 @@ XDG_CACHE_HOME=/tmp/lib/domain--1-fdr/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-fdr/.config \
 QEMU_AUDIO_DRV=spice \
 /usr/bin/qemu-system-x86_64 \
--name fdr \
+-name guest=fdr,debug-threads=on \
 -S \
 -machine pc,accel=kvm,usb=off,dump-guest-core=off \
 -m 4096 \

tests/qemuxml2argvdata/cpu-Haswell-noTSX.args

@@ -8,7 +8,7 @@ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-x86_64 \
--name QEMUGuest1 \
+-name guest=QEMUGuest1,debug-threads=on \
 -S \
 -machine pc,accel=kvm,usb=off,dump-guest-core=off \
 -cpu Haswell-noTSX \

tests/qemuxml2argvdata/cpu-Haswell.args

@@ -8,7 +8,7 @@ XDG_CACHE_HOME=/tmp/lib/domain--1-QEMUGuest1/.cache \
 XDG_CONFIG_HOME=/tmp/lib/domain--1-QEMUGuest1/.config \
 QEMU_AUDIO_DRV=none \
 /usr/bin/qemu-system-x86_64 \
--name QEMUGuest1 \
+-name guest=QEMUGuest1,debug-threads=on \
 -S \
 -machine pc,accel=kvm,usb=off,dump-guest-core=off \
 -cpu Haswell \