From 6884a7d7fac0516a73afb743a0f515d16f1829e5 Mon Sep 17 00:00:00 2001
From: Thomas Lamprecht <t.lamprecht@proxmox.com>
Date: Fri, 17 Jun 2022 14:25:49 +0200
Subject: [PATCH] fix #4115: enable option to name QEMU threads after their
 main purpose

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
---
 PVE/QemuServer.pm                                        | 2 +-
 test/cfg2cmd/bootorder-empty.conf.cmd                    | 2 +-
 test/cfg2cmd/bootorder-legacy.conf.cmd                   | 2 +-
 test/cfg2cmd/bootorder.conf.cmd                          | 2 +-
 test/cfg2cmd/custom-cpu-model-defaults.conf.cmd          | 2 +-
 test/cfg2cmd/custom-cpu-model-host-phys-bits.conf.cmd    | 2 +-
 test/cfg2cmd/custom-cpu-model.conf.cmd                   | 2 +-
 test/cfg2cmd/efi-raw-old.conf.cmd                        | 2 +-
 test/cfg2cmd/efi-raw-template.conf.cmd                   | 2 +-
 test/cfg2cmd/efi-raw.conf.cmd                            | 2 +-
 test/cfg2cmd/efi-secboot-and-tpm-q35.conf.cmd            | 2 +-
 test/cfg2cmd/efi-secboot-and-tpm.conf.cmd                | 2 +-
 test/cfg2cmd/efidisk-on-rbd.conf.cmd                     | 2 +-
 test/cfg2cmd/i440fx-win10-hostpci.conf.cmd               | 2 +-
 test/cfg2cmd/minimal-defaults.conf.cmd                   | 2 +-
 test/cfg2cmd/netdev.conf.cmd                             | 2 +-
 test/cfg2cmd/pinned-version-pxe-pve.conf.cmd             | 2 +-
 test/cfg2cmd/pinned-version-pxe.conf.cmd                 | 2 +-
 test/cfg2cmd/pinned-version.conf.cmd                     | 2 +-
 test/cfg2cmd/q35-linux-hostpci-multifunction.conf.cmd    | 2 +-
 test/cfg2cmd/q35-linux-hostpci-x-pci-overrides.conf.cmd  | 2 +-
 test/cfg2cmd/q35-linux-hostpci.conf.cmd                  | 2 +-
 test/cfg2cmd/q35-simple-6.0.conf.cmd                     | 2 +-
 test/cfg2cmd/q35-simple-7.0.conf.cmd                     | 2 +-
 test/cfg2cmd/q35-simple-pinned-6.1.conf.cmd              | 2 +-
 test/cfg2cmd/q35-simple.conf.cmd                         | 2 +-
 test/cfg2cmd/q35-win10-hostpci.conf.cmd                  | 2 +-
 test/cfg2cmd/seabios_serial.conf.cmd                     | 2 +-
 test/cfg2cmd/simple-balloon-free-page-reporting.conf.cmd | 2 +-
 test/cfg2cmd/simple-btrfs.conf.cmd                       | 2 +-
 test/cfg2cmd/simple-virtio-blk.conf.cmd                  | 2 +-
 test/cfg2cmd/simple1-template.conf.cmd                   | 2 +-
 test/cfg2cmd/simple1.conf.cmd                            | 2 +-
 test/cfg2cmd/spice-enhancments.conf.cmd                  | 2 +-
 test/cfg2cmd/spice-linux-4.1.conf.cmd                    | 2 +-
 test/cfg2cmd/spice-usb3.conf.cmd                         | 2 +-
 test/cfg2cmd/spice-win.conf.cmd                          | 2 +-
 37 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index e9aa248d..b3964bc6 100644
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -3540,7 +3540,7 @@ sub config_to_command {
 
     my $vmname = $conf->{name} || "vm$vmid";
 
-    push @$cmd, '-name', $vmname;
+    push @$cmd, '-name', "$vmname,debug-threads=on";
 
     push @$cmd, '-no-shutdown';
 
diff --git a/test/cfg2cmd/bootorder-empty.conf.cmd b/test/cfg2cmd/bootorder-empty.conf.cmd
index 42a9fde3..855c6e2d 100644
--- a/test/cfg2cmd/bootorder-empty.conf.cmd
+++ b/test/cfg2cmd/bootorder-empty.conf.cmd
@@ -1,6 +1,6 @@
 /usr/bin/kvm \
   -id 8006 \
-  -name simple \
+  -name 'simple,debug-threads=on' \
   -no-shutdown \
   -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
   -mon 'chardev=qmp,mode=control' \
diff --git a/test/cfg2cmd/bootorder-legacy.conf.cmd b/test/cfg2cmd/bootorder-legacy.conf.cmd
index 11c6ddb0..2320abb6 100644
--- a/test/cfg2cmd/bootorder-legacy.conf.cmd
+++ b/test/cfg2cmd/bootorder-legacy.conf.cmd
@@ -1,6 +1,6 @@
 /usr/bin/kvm \
   -id 8006 \
-  -name simple \
+  -name 'simple,debug-threads=on' \
   -no-shutdown \
   -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
   -mon 'chardev=qmp,mode=control' \
diff --git a/test/cfg2cmd/bootorder.conf.cmd b/test/cfg2cmd/bootorder.conf.cmd
index 44cffff5..8ba36dce 100644
--- a/test/cfg2cmd/bootorder.conf.cmd
+++ b/test/cfg2cmd/bootorder.conf.cmd
@@ -1,6 +1,6 @@
 /usr/bin/kvm \
   -id 8006 \
-  -name simple \
+  -name 'simple,debug-threads=on' \
   -no-shutdown \
   -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
   -mon 'chardev=qmp,mode=control' \
diff --git a/test/cfg2cmd/custom-cpu-model-defaults.conf.cmd b/test/cfg2cmd/custom-cpu-model-defaults.conf.cmd
index 74394584..15b31fb0 100644
--- a/test/cfg2cmd/custom-cpu-model-defaults.conf.cmd
+++ b/test/cfg2cmd/custom-cpu-model-defaults.conf.cmd
@@ -1,6 +1,6 @@
 /usr/bin/kvm \
   -id 8006 \
-  -name customcpu-defaults \
+  -name 'customcpu-defaults,debug-threads=on' \
   -no-shutdown \
   -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
   -mon 'chardev=qmp,mode=control' \
diff --git a/test/cfg2cmd/custom-cpu-model-host-phys-bits.conf.cmd b/test/cfg2cmd/custom-cpu-model-host-phys-bits.conf.cmd
index a28a1b7f..98230248 100644
--- a/test/cfg2cmd/custom-cpu-model-host-phys-bits.conf.cmd
+++ b/test/cfg2cmd/custom-cpu-model-host-phys-bits.conf.cmd
@@ -1,6 +1,6 @@
 /usr/bin/kvm \
   -id 8006 \
-  -name customcpu \
+  -name 'customcpu,debug-threads=on' \
   -no-shutdown \
   -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
   -mon 'chardev=qmp,mode=control' \
diff --git a/test/cfg2cmd/custom-cpu-model.conf.cmd b/test/cfg2cmd/custom-cpu-model.conf.cmd
index 9f439729..2e66a6b5 100644
--- a/test/cfg2cmd/custom-cpu-model.conf.cmd
+++ b/test/cfg2cmd/custom-cpu-model.conf.cmd
@@ -1,6 +1,6 @@
 /usr/bin/kvm \
   -id 8006 \
-  -name customcpu \
+  -name 'customcpu,debug-threads=on' \
   -no-shutdown \
   -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
   -mon 'chardev=qmp,mode=control' \
diff --git a/test/cfg2cmd/efi-raw-old.conf.cmd b/test/cfg2cmd/efi-raw-old.conf.cmd
index 0f8b7c7c..e1580f1e 100644
--- a/test/cfg2cmd/efi-raw-old.conf.cmd
+++ b/test/cfg2cmd/efi-raw-old.conf.cmd
@@ -1,6 +1,6 @@
 /usr/bin/kvm \
   -id 8006 \
-  -name vm8006 \
+  -name 'vm8006,debug-threads=on' \
   -no-shutdown \
   -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
   -mon 'chardev=qmp,mode=control' \
diff --git a/test/cfg2cmd/efi-raw-template.conf.cmd b/test/cfg2cmd/efi-raw-template.conf.cmd
index 82faebd1..a599fd51 100644
--- a/test/cfg2cmd/efi-raw-template.conf.cmd
+++ b/test/cfg2cmd/efi-raw-template.conf.cmd
@@ -1,6 +1,6 @@
 /usr/bin/kvm \
   -id 8006 \
-  -name vm8006 \
+  -name 'vm8006,debug-threads=on' \
   -no-shutdown \
   -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
   -mon 'chardev=qmp,mode=control' \
diff --git a/test/cfg2cmd/efi-raw.conf.cmd b/test/cfg2cmd/efi-raw.conf.cmd
index 4786fec5..5d63b7e2 100644
--- a/test/cfg2cmd/efi-raw.conf.cmd
+++ b/test/cfg2cmd/efi-raw.conf.cmd
@@ -1,6 +1,6 @@
 /usr/bin/kvm \
   -id 8006 \
-  -name vm8006 \
+  -name 'vm8006,debug-threads=on' \
   -no-shutdown \
   -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
   -mon 'chardev=qmp,mode=control' \
diff --git a/test/cfg2cmd/efi-secboot-and-tpm-q35.conf.cmd b/test/cfg2cmd/efi-secboot-and-tpm-q35.conf.cmd
index 560d390e..dd3b8279 100644
--- a/test/cfg2cmd/efi-secboot-and-tpm-q35.conf.cmd
+++ b/test/cfg2cmd/efi-secboot-and-tpm-q35.conf.cmd
@@ -1,6 +1,6 @@
 /usr/bin/kvm \
   -id 8006 \
-  -name vm8006 \
+  -name 'vm8006,debug-threads=on' \
   -no-shutdown \
   -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
   -mon 'chardev=qmp,mode=control' \
diff --git a/test/cfg2cmd/efi-secboot-and-tpm.conf.cmd b/test/cfg2cmd/efi-secboot-and-tpm.conf.cmd
index f94220ff..d35a907a 100644
--- a/test/cfg2cmd/efi-secboot-and-tpm.conf.cmd
+++ b/test/cfg2cmd/efi-secboot-and-tpm.conf.cmd
@@ -1,6 +1,6 @@
 /usr/bin/kvm \
   -id 8006 \
-  -name vm8006 \
+  -name 'vm8006,debug-threads=on' \
   -no-shutdown \
   -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
   -mon 'chardev=qmp,mode=control' \
diff --git a/test/cfg2cmd/efidisk-on-rbd.conf.cmd b/test/cfg2cmd/efidisk-on-rbd.conf.cmd
index b1bdf28e..b312d803 100644
--- a/test/cfg2cmd/efidisk-on-rbd.conf.cmd
+++ b/test/cfg2cmd/efidisk-on-rbd.conf.cmd
@@ -1,6 +1,6 @@
 /usr/bin/kvm \
   -id 8006 \
-  -name vm8006 \
+  -name 'vm8006,debug-threads=on' \
   -no-shutdown \
   -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
   -mon 'chardev=qmp,mode=control' \
diff --git a/test/cfg2cmd/i440fx-win10-hostpci.conf.cmd b/test/cfg2cmd/i440fx-win10-hostpci.conf.cmd
index c79576fb..200f17eb 100644
--- a/test/cfg2cmd/i440fx-win10-hostpci.conf.cmd
+++ b/test/cfg2cmd/i440fx-win10-hostpci.conf.cmd
@@ -1,6 +1,6 @@
 /usr/bin/kvm \
   -id 8006 \
-  -name vm8006 \
+  -name 'vm8006,debug-threads=on' \
   -no-shutdown \
   -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
   -mon 'chardev=qmp,mode=control' \
diff --git a/test/cfg2cmd/minimal-defaults.conf.cmd b/test/cfg2cmd/minimal-defaults.conf.cmd
index 1338cae8..8da69fee 100644
--- a/test/cfg2cmd/minimal-defaults.conf.cmd
+++ b/test/cfg2cmd/minimal-defaults.conf.cmd
@@ -1,6 +1,6 @@
 /usr/bin/kvm \
   -id 8006 \
-  -name vm8006 \
+  -name 'vm8006,debug-threads=on' \
   -no-shutdown \
   -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
   -mon 'chardev=qmp,mode=control' \
diff --git a/test/cfg2cmd/netdev.conf.cmd b/test/cfg2cmd/netdev.conf.cmd
index ab22751f..3ae60753 100644
--- a/test/cfg2cmd/netdev.conf.cmd
+++ b/test/cfg2cmd/netdev.conf.cmd
@@ -1,6 +1,6 @@
 /usr/bin/kvm \
   -id 8006 \
-  -name netdev \
+  -name 'netdev,debug-threads=on' \
   -no-shutdown \
   -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
   -mon 'chardev=qmp,mode=control' \
diff --git a/test/cfg2cmd/pinned-version-pxe-pve.conf.cmd b/test/cfg2cmd/pinned-version-pxe-pve.conf.cmd
index 095b72e6..d17d4deb 100644
--- a/test/cfg2cmd/pinned-version-pxe-pve.conf.cmd
+++ b/test/cfg2cmd/pinned-version-pxe-pve.conf.cmd
@@ -1,6 +1,6 @@
 /usr/bin/kvm \
   -id 8006 \
-  -name pinned \
+  -name 'pinned,debug-threads=on' \
   -no-shutdown \
   -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
   -mon 'chardev=qmp,mode=control' \
diff --git a/test/cfg2cmd/pinned-version-pxe.conf.cmd b/test/cfg2cmd/pinned-version-pxe.conf.cmd
index 5f738f38..892fc148 100644
--- a/test/cfg2cmd/pinned-version-pxe.conf.cmd
+++ b/test/cfg2cmd/pinned-version-pxe.conf.cmd
@@ -1,6 +1,6 @@
 /usr/bin/kvm \
   -id 8006 \
-  -name pinned \
+  -name 'pinned,debug-threads=on' \
   -no-shutdown \
   -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
   -mon 'chardev=qmp,mode=control' \
diff --git a/test/cfg2cmd/pinned-version.conf.cmd b/test/cfg2cmd/pinned-version.conf.cmd
index e072491e..13361edf 100644
--- a/test/cfg2cmd/pinned-version.conf.cmd
+++ b/test/cfg2cmd/pinned-version.conf.cmd
@@ -1,6 +1,6 @@
 /usr/bin/kvm \
   -id 8006 \
-  -name pinned \
+  -name 'pinned,debug-threads=on' \
   -no-shutdown \
   -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
   -mon 'chardev=qmp,mode=control' \
diff --git a/test/cfg2cmd/q35-linux-hostpci-multifunction.conf.cmd b/test/cfg2cmd/q35-linux-hostpci-multifunction.conf.cmd
index edfe4183..9b69d021 100644
--- a/test/cfg2cmd/q35-linux-hostpci-multifunction.conf.cmd
+++ b/test/cfg2cmd/q35-linux-hostpci-multifunction.conf.cmd
@@ -1,6 +1,6 @@
 /usr/bin/kvm \
   -id 8006 \
-  -name vm8006 \
+  -name 'vm8006,debug-threads=on' \
   -no-shutdown \
   -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
   -mon 'chardev=qmp,mode=control' \
diff --git a/test/cfg2cmd/q35-linux-hostpci-x-pci-overrides.conf.cmd b/test/cfg2cmd/q35-linux-hostpci-x-pci-overrides.conf.cmd
index 9b4b9947..30de58f2 100644
--- a/test/cfg2cmd/q35-linux-hostpci-x-pci-overrides.conf.cmd
+++ b/test/cfg2cmd/q35-linux-hostpci-x-pci-overrides.conf.cmd
@@ -1,6 +1,6 @@
 /usr/bin/kvm \
   -id 8006 \
-  -name vm8006 \
+  -name 'vm8006,debug-threads=on' \
   -no-shutdown \
   -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
   -mon 'chardev=qmp,mode=control' \
diff --git a/test/cfg2cmd/q35-linux-hostpci.conf.cmd b/test/cfg2cmd/q35-linux-hostpci.conf.cmd
index 82a0d7cb..96bb2df4 100644
--- a/test/cfg2cmd/q35-linux-hostpci.conf.cmd
+++ b/test/cfg2cmd/q35-linux-hostpci.conf.cmd
@@ -1,6 +1,6 @@
 /usr/bin/kvm \
   -id 8006 \
-  -name vm8006 \
+  -name 'vm8006,debug-threads=on' \
   -no-shutdown \
   -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
   -mon 'chardev=qmp,mode=control' \
diff --git a/test/cfg2cmd/q35-simple-6.0.conf.cmd b/test/cfg2cmd/q35-simple-6.0.conf.cmd
index 5045caf8..4af3b7ab 100644
--- a/test/cfg2cmd/q35-simple-6.0.conf.cmd
+++ b/test/cfg2cmd/q35-simple-6.0.conf.cmd
@@ -1,6 +1,6 @@
 /usr/bin/kvm \
   -id 8006 \
-  -name vm8006 \
+  -name 'vm8006,debug-threads=on' \
   -no-shutdown \
   -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
   -mon 'chardev=qmp,mode=control' \
diff --git a/test/cfg2cmd/q35-simple-7.0.conf.cmd b/test/cfg2cmd/q35-simple-7.0.conf.cmd
index be7a36cd..15bf8fac 100644
--- a/test/cfg2cmd/q35-simple-7.0.conf.cmd
+++ b/test/cfg2cmd/q35-simple-7.0.conf.cmd
@@ -1,6 +1,6 @@
 /usr/bin/kvm \
   -id 8006 \
-  -name vm8006 \
+  -name 'vm8006,debug-threads=on' \
   -no-shutdown \
   -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
   -mon 'chardev=qmp,mode=control' \
diff --git a/test/cfg2cmd/q35-simple-pinned-6.1.conf.cmd b/test/cfg2cmd/q35-simple-pinned-6.1.conf.cmd
index 26dfaaab..a23809a1 100644
--- a/test/cfg2cmd/q35-simple-pinned-6.1.conf.cmd
+++ b/test/cfg2cmd/q35-simple-pinned-6.1.conf.cmd
@@ -1,6 +1,6 @@
 /usr/bin/kvm \
   -id 8006 \
-  -name vm8006 \
+  -name 'vm8006,debug-threads=on' \
   -no-shutdown \
   -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
   -mon 'chardev=qmp,mode=control' \
diff --git a/test/cfg2cmd/q35-simple.conf.cmd b/test/cfg2cmd/q35-simple.conf.cmd
index f9232f51..faccdca3 100644
--- a/test/cfg2cmd/q35-simple.conf.cmd
+++ b/test/cfg2cmd/q35-simple.conf.cmd
@@ -1,6 +1,6 @@
 /usr/bin/kvm \
   -id 8006 \
-  -name vm8006 \
+  -name 'vm8006,debug-threads=on' \
   -no-shutdown \
   -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
   -mon 'chardev=qmp,mode=control' \
diff --git a/test/cfg2cmd/q35-win10-hostpci.conf.cmd b/test/cfg2cmd/q35-win10-hostpci.conf.cmd
index 37ef8f7d..1700cbbe 100644
--- a/test/cfg2cmd/q35-win10-hostpci.conf.cmd
+++ b/test/cfg2cmd/q35-win10-hostpci.conf.cmd
@@ -1,6 +1,6 @@
 /usr/bin/kvm \
   -id 8006 \
-  -name vm8006 \
+  -name 'vm8006,debug-threads=on' \
   -no-shutdown \
   -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
   -mon 'chardev=qmp,mode=control' \
diff --git a/test/cfg2cmd/seabios_serial.conf.cmd b/test/cfg2cmd/seabios_serial.conf.cmd
index c32d1b6f..68061577 100644
--- a/test/cfg2cmd/seabios_serial.conf.cmd
+++ b/test/cfg2cmd/seabios_serial.conf.cmd
@@ -1,6 +1,6 @@
 /usr/bin/kvm \
   -id 8006 \
-  -name seabiosserial \
+  -name 'seabiosserial,debug-threads=on' \
   -no-shutdown \
   -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
   -mon 'chardev=qmp,mode=control' \
diff --git a/test/cfg2cmd/simple-balloon-free-page-reporting.conf.cmd b/test/cfg2cmd/simple-balloon-free-page-reporting.conf.cmd
index 232e348d..a094704f 100644
--- a/test/cfg2cmd/simple-balloon-free-page-reporting.conf.cmd
+++ b/test/cfg2cmd/simple-balloon-free-page-reporting.conf.cmd
@@ -1,6 +1,6 @@
 /usr/bin/kvm \
   -id 8006 \
-  -name simple \
+  -name 'simple,debug-threads=on' \
   -no-shutdown \
   -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
   -mon 'chardev=qmp,mode=control' \
diff --git a/test/cfg2cmd/simple-btrfs.conf.cmd b/test/cfg2cmd/simple-btrfs.conf.cmd
index c1d3d91c..148e688d 100644
--- a/test/cfg2cmd/simple-btrfs.conf.cmd
+++ b/test/cfg2cmd/simple-btrfs.conf.cmd
@@ -1,6 +1,6 @@
 /usr/bin/kvm \
   -id 8006 \
-  -name simple \
+  -name 'simple,debug-threads=on' \
   -no-shutdown \
   -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
   -mon 'chardev=qmp,mode=control' \
diff --git a/test/cfg2cmd/simple-virtio-blk.conf.cmd b/test/cfg2cmd/simple-virtio-blk.conf.cmd
index 8c1bcbd3..4e063f39 100644
--- a/test/cfg2cmd/simple-virtio-blk.conf.cmd
+++ b/test/cfg2cmd/simple-virtio-blk.conf.cmd
@@ -1,6 +1,6 @@
 /usr/bin/kvm \
   -id 8006 \
-  -name simple \
+  -name 'simple,debug-threads=on' \
   -no-shutdown \
   -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
   -mon 'chardev=qmp,mode=control' \
diff --git a/test/cfg2cmd/simple1-template.conf.cmd b/test/cfg2cmd/simple1-template.conf.cmd
index 3bf2fc1a..a24151f8 100644
--- a/test/cfg2cmd/simple1-template.conf.cmd
+++ b/test/cfg2cmd/simple1-template.conf.cmd
@@ -1,6 +1,6 @@
 /usr/bin/kvm \
   -id 8006 \
-  -name simple \
+  -name 'simple,debug-threads=on' \
   -no-shutdown \
   -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
   -mon 'chardev=qmp,mode=control' \
diff --git a/test/cfg2cmd/simple1.conf.cmd b/test/cfg2cmd/simple1.conf.cmd
index 26a14d4a..2b1b185a 100644
--- a/test/cfg2cmd/simple1.conf.cmd
+++ b/test/cfg2cmd/simple1.conf.cmd
@@ -1,6 +1,6 @@
 /usr/bin/kvm \
   -id 8006 \
-  -name simple \
+  -name 'simple,debug-threads=on' \
   -no-shutdown \
   -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
   -mon 'chardev=qmp,mode=control' \
diff --git a/test/cfg2cmd/spice-enhancments.conf.cmd b/test/cfg2cmd/spice-enhancments.conf.cmd
index 1198fee1..81acdcc9 100644
--- a/test/cfg2cmd/spice-enhancments.conf.cmd
+++ b/test/cfg2cmd/spice-enhancments.conf.cmd
@@ -1,6 +1,6 @@
 /usr/bin/kvm \
   -id 8006 \
-  -name vm8006 \
+  -name 'vm8006,debug-threads=on' \
   -no-shutdown \
   -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
   -mon 'chardev=qmp,mode=control' \
diff --git a/test/cfg2cmd/spice-linux-4.1.conf.cmd b/test/cfg2cmd/spice-linux-4.1.conf.cmd
index c75036b0..e4a60a76 100644
--- a/test/cfg2cmd/spice-linux-4.1.conf.cmd
+++ b/test/cfg2cmd/spice-linux-4.1.conf.cmd
@@ -1,6 +1,6 @@
 /usr/bin/kvm \
   -id 8006 \
-  -name spicelinux \
+  -name 'spicelinux,debug-threads=on' \
   -no-shutdown \
   -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
   -mon 'chardev=qmp,mode=control' \
diff --git a/test/cfg2cmd/spice-usb3.conf.cmd b/test/cfg2cmd/spice-usb3.conf.cmd
index d7b7ab43..ab35b297 100644
--- a/test/cfg2cmd/spice-usb3.conf.cmd
+++ b/test/cfg2cmd/spice-usb3.conf.cmd
@@ -1,6 +1,6 @@
 /usr/bin/kvm \
   -id 8006 \
-  -name spiceusb3 \
+  -name 'spiceusb3,debug-threads=on' \
   -no-shutdown \
   -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
   -mon 'chardev=qmp,mode=control' \
diff --git a/test/cfg2cmd/spice-win.conf.cmd b/test/cfg2cmd/spice-win.conf.cmd
index 2d6143b3..544b30a7 100644
--- a/test/cfg2cmd/spice-win.conf.cmd
+++ b/test/cfg2cmd/spice-win.conf.cmd
@@ -1,6 +1,6 @@
 /usr/bin/kvm \
   -id 8006 \
-  -name spiceusb3 \
+  -name 'spiceusb3,debug-threads=on' \
   -no-shutdown \
   -chardev 'socket,id=qmp,path=/var/run/qemu-server/8006.qmp,server=on,wait=off' \
   -mon 'chardev=qmp,mode=control' \