src/qemu/qemu_capabilities.c | 3 ++- src/qemu/qemu_capabilities.h | 2 +- src/qemu/qemu_command.c | 8 +++++--- tests/qemucapabilitiesdata/caps_10.0.0_aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_10.0.0_ppc64.xml | 1 + tests/qemucapabilitiesdata/caps_10.0.0_s390x.xml | 1 + tests/qemucapabilitiesdata/caps_10.0.0_x86_64+amdsev.xml | 1 + tests/qemucapabilitiesdata/caps_10.0.0_x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_10.1.0_s390x.xml | 1 + .../qemucapabilitiesdata/caps_10.1.0_x86_64+inteltdx.xml | 1 + tests/qemucapabilitiesdata/caps_10.1.0_x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_10.2.0_aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_10.2.0_x86_64+mshv.xml | 1 + tests/qemucapabilitiesdata/caps_10.2.0_x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_11.0.0_aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_11.0.0_s390x.xml | 1 + tests/qemucapabilitiesdata/caps_11.0.0_x86_64+sgx.xml | 1 + tests/qemucapabilitiesdata/caps_11.0.0_x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_11.1.0_aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_11.1.0_s390x.xml | 1 + tests/qemucapabilitiesdata/caps_11.1.0_x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml | 1 + tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml | 1 + tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml | 1 + tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_8.2.0_aarch64.xml | 1 + tests/qemucapabilitiesdata/caps_8.2.0_armv7l.xml | 1 + tests/qemucapabilitiesdata/caps_8.2.0_loongarch64.xml | 1 + tests/qemucapabilitiesdata/caps_8.2.0_s390x.xml | 1 + tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_9.0.0_sparc.xml | 1 + tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_9.1.0_riscv64.xml | 1 + tests/qemucapabilitiesdata/caps_9.1.0_s390x.xml | 1 + tests/qemucapabilitiesdata/caps_9.1.0_x86_64.xml | 1 + tests/qemucapabilitiesdata/caps_9.2.0_aarch64+hvf.xml | 1 + tests/qemucapabilitiesdata/caps_9.2.0_s390x.xml | 1 + tests/qemucapabilitiesdata/caps_9.2.0_x86_64+amdsev.xml | 1 + tests/qemucapabilitiesdata/caps_9.2.0_x86_64.xml | 1 + 41 files changed, 46 insertions(+), 5 deletions(-)
From: Ján Tomko <jtomko@redhat.com>
The option is being removed from QEMU.
Since QEMU 11.2 it has been a no-op and always enabled.
Stop assuming it's always present so that running VMs won't
break with the new QEMU versions.
Signed-off-by: Ján Tomko <jtomko@redhat.com>
---
src/qemu/qemu_capabilities.c | 3 ++-
src/qemu/qemu_capabilities.h | 2 +-
src/qemu/qemu_command.c | 8 +++++---
tests/qemucapabilitiesdata/caps_10.0.0_aarch64.xml | 1 +
tests/qemucapabilitiesdata/caps_10.0.0_ppc64.xml | 1 +
tests/qemucapabilitiesdata/caps_10.0.0_s390x.xml | 1 +
tests/qemucapabilitiesdata/caps_10.0.0_x86_64+amdsev.xml | 1 +
tests/qemucapabilitiesdata/caps_10.0.0_x86_64.xml | 1 +
tests/qemucapabilitiesdata/caps_10.1.0_s390x.xml | 1 +
.../qemucapabilitiesdata/caps_10.1.0_x86_64+inteltdx.xml | 1 +
tests/qemucapabilitiesdata/caps_10.1.0_x86_64.xml | 1 +
tests/qemucapabilitiesdata/caps_10.2.0_aarch64.xml | 1 +
tests/qemucapabilitiesdata/caps_10.2.0_x86_64+mshv.xml | 1 +
tests/qemucapabilitiesdata/caps_10.2.0_x86_64.xml | 1 +
tests/qemucapabilitiesdata/caps_11.0.0_aarch64.xml | 1 +
tests/qemucapabilitiesdata/caps_11.0.0_s390x.xml | 1 +
tests/qemucapabilitiesdata/caps_11.0.0_x86_64+sgx.xml | 1 +
tests/qemucapabilitiesdata/caps_11.0.0_x86_64.xml | 1 +
tests/qemucapabilitiesdata/caps_11.1.0_aarch64.xml | 1 +
tests/qemucapabilitiesdata/caps_11.1.0_s390x.xml | 1 +
tests/qemucapabilitiesdata/caps_11.1.0_x86_64.xml | 1 +
tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml | 1 +
tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml | 1 +
tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml | 1 +
tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml | 1 +
tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml | 1 +
tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml | 1 +
tests/qemucapabilitiesdata/caps_8.2.0_aarch64.xml | 1 +
tests/qemucapabilitiesdata/caps_8.2.0_armv7l.xml | 1 +
tests/qemucapabilitiesdata/caps_8.2.0_loongarch64.xml | 1 +
tests/qemucapabilitiesdata/caps_8.2.0_s390x.xml | 1 +
tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml | 1 +
tests/qemucapabilitiesdata/caps_9.0.0_sparc.xml | 1 +
tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml | 1 +
tests/qemucapabilitiesdata/caps_9.1.0_riscv64.xml | 1 +
tests/qemucapabilitiesdata/caps_9.1.0_s390x.xml | 1 +
tests/qemucapabilitiesdata/caps_9.1.0_x86_64.xml | 1 +
tests/qemucapabilitiesdata/caps_9.2.0_aarch64+hvf.xml | 1 +
tests/qemucapabilitiesdata/caps_9.2.0_s390x.xml | 1 +
tests/qemucapabilitiesdata/caps_9.2.0_x86_64+amdsev.xml | 1 +
tests/qemucapabilitiesdata/caps_9.2.0_x86_64.xml | 1 +
41 files changed, 46 insertions(+), 5 deletions(-)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index bc2b0412dc..9bbb0f6591 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -374,7 +374,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
"chardev-logfile", /* X_QEMU_CAPS_CHARDEV_LOGFILE */
/* 215 */
- "debug-threads", /* X_QEMU_CAPS_NAME_DEBUG_THREADS */
+ "debug-threads", /* QEMU_CAPS_NAME_DEBUG_THREADS */
"secret", /* X_QEMU_CAPS_OBJECT_SECRET */
"pxb", /* QEMU_CAPS_DEVICE_PXB */
"pxb-pcie", /* QEMU_CAPS_DEVICE_PXB_PCIE */
@@ -3628,6 +3628,7 @@ struct virQEMUCapsCommandLineProps {
* in qemu and thus isn't being properly extended. Other means to detect
* features should be used if possible. */
static struct virQEMUCapsCommandLineProps virQEMUCapsCommandLine[] = {
+ { "name", "debug-threads", QEMU_CAPS_NAME_DEBUG_THREADS },
{ "fsdev", "multidevs", QEMU_CAPS_FSDEV_MULTIDEVS },
{ "machine", "hpet", QEMU_CAPS_MACHINE_HPET },
{ "sandbox", NULL, QEMU_CAPS_SECCOMP_SANDBOX },
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index 28303fd8f0..95a3cc2f8d 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -348,7 +348,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
X_QEMU_CAPS_CHARDEV_LOGFILE, /* -chardev logfile=xxxx */
/* 215 */
- X_QEMU_CAPS_NAME_DEBUG_THREADS, /* Is -name debug-threads= available */
+ QEMU_CAPS_NAME_DEBUG_THREADS, /* Is -name debug-threads= available */
X_QEMU_CAPS_OBJECT_SECRET, /* -object secret */
QEMU_CAPS_DEVICE_PXB, /* -device pxb */
QEMU_CAPS_DEVICE_PXB_PCIE, /* -device pxb-pcie */
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index bcddb9c922..9adb18be4f 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -6969,7 +6969,8 @@ qemuAppendLoadparmMachineParm(virBuffer *buf,
static int
qemuBuildNameCommandLine(virCommand *cmd,
virQEMUDriverConfig *cfg,
- const virDomainDef *def)
+ const virDomainDef *def,
+ virQEMUCaps *qemuCaps)
{
g_auto(virBuffer) buf = VIR_BUFFER_INITIALIZER;
@@ -6982,7 +6983,8 @@ qemuBuildNameCommandLine(virCommand *cmd,
if (cfg->setProcessName)
virBufferAsprintf(&buf, ",process=qemu:%s", def->name);
- virBufferAddLit(&buf, ",debug-threads=on");
+ if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_NAME_DEBUG_THREADS))
+ virBufferAddLit(&buf, ",debug-threads=on");
virCommandAddArgBuffer(cmd, &buf);
@@ -10878,7 +10880,7 @@ qemuBuildCommandLine(virDomainObj *vm,
virCommandAddEnvXDG(cmd, priv->libDir);
}
- if (qemuBuildNameCommandLine(cmd, cfg, def) < 0)
+ if (qemuBuildNameCommandLine(cmd, cfg, def, qemuCaps) < 0)
return NULL;
qemuBuildCompatDeprecatedCommandLine(cmd, cfg, def);
diff --git a/tests/qemucapabilitiesdata/caps_10.0.0_aarch64.xml b/tests/qemucapabilitiesdata/caps_10.0.0_aarch64.xml
index 48629e494d..c3994e2129 100644
--- a/tests/qemucapabilitiesdata/caps_10.0.0_aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_10.0.0_aarch64.xml
@@ -54,6 +54,7 @@
<flag name='virtio-input-host'/>
<flag name='virtio-balloon-pci.deflate-on-oom'/>
<flag name='mptsas1068'/>
+ <flag name='debug-threads'/>
<flag name='pxb'/>
<flag name='pxb-pcie'/>
<flag name='ivshmem-plain'/>
diff --git a/tests/qemucapabilitiesdata/caps_10.0.0_ppc64.xml b/tests/qemucapabilitiesdata/caps_10.0.0_ppc64.xml
index 70bf98c404..e332a96899 100644
--- a/tests/qemucapabilitiesdata/caps_10.0.0_ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_10.0.0_ppc64.xml
@@ -58,6 +58,7 @@
<flag name='virtio-input-host'/>
<flag name='virtio-balloon-pci.deflate-on-oom'/>
<flag name='mptsas1068'/>
+ <flag name='debug-threads'/>
<flag name='virtio-vga'/>
<flag name='ivshmem-plain'/>
<flag name='ivshmem-doorbell'/>
diff --git a/tests/qemucapabilitiesdata/caps_10.0.0_s390x.xml b/tests/qemucapabilitiesdata/caps_10.0.0_s390x.xml
index 25d73b6e1d..f483b7ac6a 100644
--- a/tests/qemucapabilitiesdata/caps_10.0.0_s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_10.0.0_s390x.xml
@@ -33,6 +33,7 @@
<flag name='virtio-tablet'/>
<flag name='virtio-input-host'/>
<flag name='virtio-balloon-pci.deflate-on-oom'/>
+ <flag name='debug-threads'/>
<flag name='vhost-scsi'/>
<flag name='query-cpu-model-expansion'/>
<flag name='query-cpu-definitions'/>
diff --git a/tests/qemucapabilitiesdata/caps_10.0.0_x86_64+amdsev.xml b/tests/qemucapabilitiesdata/caps_10.0.0_x86_64+amdsev.xml
index 53fd51122c..e417ec6c3f 100644
--- a/tests/qemucapabilitiesdata/caps_10.0.0_x86_64+amdsev.xml
+++ b/tests/qemucapabilitiesdata/caps_10.0.0_x86_64+amdsev.xml
@@ -69,6 +69,7 @@
<flag name='mptsas1068'/>
<flag name='spice-gl'/>
<flag name='qxl.vram64_size_mb'/>
+ <flag name='debug-threads'/>
<flag name='pxb'/>
<flag name='pxb-pcie'/>
<flag name='intel-iommu'/>
diff --git a/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.xml
index ad3fe67638..46f8c9ada9 100644
--- a/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_10.0.0_x86_64.xml
@@ -69,6 +69,7 @@
<flag name='mptsas1068'/>
<flag name='spice-gl'/>
<flag name='qxl.vram64_size_mb'/>
+ <flag name='debug-threads'/>
<flag name='pxb'/>
<flag name='pxb-pcie'/>
<flag name='intel-iommu'/>
diff --git a/tests/qemucapabilitiesdata/caps_10.1.0_s390x.xml b/tests/qemucapabilitiesdata/caps_10.1.0_s390x.xml
index 0d46b3b20e..cbebc0b9b4 100644
--- a/tests/qemucapabilitiesdata/caps_10.1.0_s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_10.1.0_s390x.xml
@@ -34,6 +34,7 @@
<flag name='virtio-tablet'/>
<flag name='virtio-input-host'/>
<flag name='virtio-balloon-pci.deflate-on-oom'/>
+ <flag name='debug-threads'/>
<flag name='vhost-scsi'/>
<flag name='query-cpu-model-expansion'/>
<flag name='query-cpu-definitions'/>
diff --git a/tests/qemucapabilitiesdata/caps_10.1.0_x86_64+inteltdx.xml b/tests/qemucapabilitiesdata/caps_10.1.0_x86_64+inteltdx.xml
index 242215f7a8..2e6f605fd0 100644
--- a/tests/qemucapabilitiesdata/caps_10.1.0_x86_64+inteltdx.xml
+++ b/tests/qemucapabilitiesdata/caps_10.1.0_x86_64+inteltdx.xml
@@ -58,6 +58,7 @@
<flag name='virtio-input-host'/>
<flag name='virtio-balloon-pci.deflate-on-oom'/>
<flag name='mptsas1068'/>
+ <flag name='debug-threads'/>
<flag name='pxb'/>
<flag name='pxb-pcie'/>
<flag name='intel-iommu'/>
diff --git a/tests/qemucapabilitiesdata/caps_10.1.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_10.1.0_x86_64.xml
index a2faddcced..254d5dad06 100644
--- a/tests/qemucapabilitiesdata/caps_10.1.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_10.1.0_x86_64.xml
@@ -69,6 +69,7 @@
<flag name='mptsas1068'/>
<flag name='spice-gl'/>
<flag name='qxl.vram64_size_mb'/>
+ <flag name='debug-threads'/>
<flag name='pxb'/>
<flag name='pxb-pcie'/>
<flag name='intel-iommu'/>
diff --git a/tests/qemucapabilitiesdata/caps_10.2.0_aarch64.xml b/tests/qemucapabilitiesdata/caps_10.2.0_aarch64.xml
index 3bbba5ddb1..dc638b2bdf 100644
--- a/tests/qemucapabilitiesdata/caps_10.2.0_aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_10.2.0_aarch64.xml
@@ -61,6 +61,7 @@
<flag name='virtio-balloon-pci.deflate-on-oom'/>
<flag name='mptsas1068'/>
<flag name='spice-gl'/>
+ <flag name='debug-threads'/>
<flag name='pxb'/>
<flag name='pxb-pcie'/>
<flag name='ivshmem-plain'/>
diff --git a/tests/qemucapabilitiesdata/caps_10.2.0_x86_64+mshv.xml b/tests/qemucapabilitiesdata/caps_10.2.0_x86_64+mshv.xml
index 530c0366ea..bc7b2c6907 100644
--- a/tests/qemucapabilitiesdata/caps_10.2.0_x86_64+mshv.xml
+++ b/tests/qemucapabilitiesdata/caps_10.2.0_x86_64+mshv.xml
@@ -60,6 +60,7 @@
<flag name='virtio-input-host'/>
<flag name='virtio-balloon-pci.deflate-on-oom'/>
<flag name='mptsas1068'/>
+ <flag name='debug-threads'/>
<flag name='pxb'/>
<flag name='pxb-pcie'/>
<flag name='intel-iommu'/>
diff --git a/tests/qemucapabilitiesdata/caps_10.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_10.2.0_x86_64.xml
index b2cd261b99..f52aa62045 100644
--- a/tests/qemucapabilitiesdata/caps_10.2.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_10.2.0_x86_64.xml
@@ -69,6 +69,7 @@
<flag name='mptsas1068'/>
<flag name='spice-gl'/>
<flag name='qxl.vram64_size_mb'/>
+ <flag name='debug-threads'/>
<flag name='pxb'/>
<flag name='pxb-pcie'/>
<flag name='intel-iommu'/>
diff --git a/tests/qemucapabilitiesdata/caps_11.0.0_aarch64.xml b/tests/qemucapabilitiesdata/caps_11.0.0_aarch64.xml
index d77884f401..350427c1ab 100644
--- a/tests/qemucapabilitiesdata/caps_11.0.0_aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_11.0.0_aarch64.xml
@@ -61,6 +61,7 @@
<flag name='virtio-balloon-pci.deflate-on-oom'/>
<flag name='mptsas1068'/>
<flag name='spice-gl'/>
+ <flag name='debug-threads'/>
<flag name='pxb'/>
<flag name='pxb-pcie'/>
<flag name='ivshmem-plain'/>
diff --git a/tests/qemucapabilitiesdata/caps_11.0.0_s390x.xml b/tests/qemucapabilitiesdata/caps_11.0.0_s390x.xml
index 07ee859318..0e1de31062 100644
--- a/tests/qemucapabilitiesdata/caps_11.0.0_s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_11.0.0_s390x.xml
@@ -34,6 +34,7 @@
<flag name='virtio-tablet'/>
<flag name='virtio-input-host'/>
<flag name='virtio-balloon-pci.deflate-on-oom'/>
+ <flag name='debug-threads'/>
<flag name='vhost-scsi'/>
<flag name='query-cpu-model-expansion'/>
<flag name='query-cpu-definitions'/>
diff --git a/tests/qemucapabilitiesdata/caps_11.0.0_x86_64+sgx.xml b/tests/qemucapabilitiesdata/caps_11.0.0_x86_64+sgx.xml
index 108f4b0b86..109219d018 100644
--- a/tests/qemucapabilitiesdata/caps_11.0.0_x86_64+sgx.xml
+++ b/tests/qemucapabilitiesdata/caps_11.0.0_x86_64+sgx.xml
@@ -69,6 +69,7 @@
<flag name='mptsas1068'/>
<flag name='spice-gl'/>
<flag name='qxl.vram64_size_mb'/>
+ <flag name='debug-threads'/>
<flag name='pxb'/>
<flag name='pxb-pcie'/>
<flag name='intel-iommu'/>
diff --git a/tests/qemucapabilitiesdata/caps_11.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_11.0.0_x86_64.xml
index 29fdaf20d8..e4a45e244c 100644
--- a/tests/qemucapabilitiesdata/caps_11.0.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_11.0.0_x86_64.xml
@@ -69,6 +69,7 @@
<flag name='mptsas1068'/>
<flag name='spice-gl'/>
<flag name='qxl.vram64_size_mb'/>
+ <flag name='debug-threads'/>
<flag name='pxb'/>
<flag name='pxb-pcie'/>
<flag name='intel-iommu'/>
diff --git a/tests/qemucapabilitiesdata/caps_11.1.0_aarch64.xml b/tests/qemucapabilitiesdata/caps_11.1.0_aarch64.xml
index 31d4d2fd26..3634a37a8e 100644
--- a/tests/qemucapabilitiesdata/caps_11.1.0_aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_11.1.0_aarch64.xml
@@ -61,6 +61,7 @@
<flag name='virtio-balloon-pci.deflate-on-oom'/>
<flag name='mptsas1068'/>
<flag name='spice-gl'/>
+ <flag name='debug-threads'/>
<flag name='pxb'/>
<flag name='pxb-pcie'/>
<flag name='ivshmem-plain'/>
diff --git a/tests/qemucapabilitiesdata/caps_11.1.0_s390x.xml b/tests/qemucapabilitiesdata/caps_11.1.0_s390x.xml
index aae4dd0b80..d440b07b4f 100644
--- a/tests/qemucapabilitiesdata/caps_11.1.0_s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_11.1.0_s390x.xml
@@ -34,6 +34,7 @@
<flag name='virtio-tablet'/>
<flag name='virtio-input-host'/>
<flag name='virtio-balloon-pci.deflate-on-oom'/>
+ <flag name='debug-threads'/>
<flag name='vhost-scsi'/>
<flag name='query-cpu-model-expansion'/>
<flag name='query-cpu-definitions'/>
diff --git a/tests/qemucapabilitiesdata/caps_11.1.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_11.1.0_x86_64.xml
index 05e6749a17..ff7402ba11 100644
--- a/tests/qemucapabilitiesdata/caps_11.1.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_11.1.0_x86_64.xml
@@ -69,6 +69,7 @@
<flag name='mptsas1068'/>
<flag name='spice-gl'/>
<flag name='qxl.vram64_size_mb'/>
+ <flag name='debug-threads'/>
<flag name='pxb'/>
<flag name='pxb-pcie'/>
<flag name='intel-iommu'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml b/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml
index bf67b3d295..d0c53f804c 100644
--- a/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml
+++ b/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml
@@ -59,6 +59,7 @@
<flag name='virtio-balloon-pci.deflate-on-oom'/>
<flag name='mptsas1068'/>
<flag name='spice-gl'/>
+ <flag name='debug-threads'/>
<flag name='ivshmem-plain'/>
<flag name='ivshmem-doorbell'/>
<flag name='vhost-scsi'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml
index f40d77baa5..629fb1b86b 100644
--- a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml
+++ b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml
@@ -69,6 +69,7 @@
<flag name='mptsas1068'/>
<flag name='spice-gl'/>
<flag name='qxl.vram64_size_mb'/>
+ <flag name='debug-threads'/>
<flag name='pxb'/>
<flag name='pxb-pcie'/>
<flag name='intel-iommu'/>
diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml
index 8d44ed71e0..bfa7125d99 100644
--- a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml
@@ -70,6 +70,7 @@
<flag name='mptsas1068'/>
<flag name='spice-gl'/>
<flag name='qxl.vram64_size_mb'/>
+ <flag name='debug-threads'/>
<flag name='pxb'/>
<flag name='pxb-pcie'/>
<flag name='intel-iommu'/>
diff --git a/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml
index fcbb68e415..0eb099635a 100644
--- a/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml
@@ -70,6 +70,7 @@
<flag name='mptsas1068'/>
<flag name='spice-gl'/>
<flag name='qxl.vram64_size_mb'/>
+ <flag name='debug-threads'/>
<flag name='pxb'/>
<flag name='pxb-pcie'/>
<flag name='intel-iommu'/>
diff --git a/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml b/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml
index 65f73d1af8..3a43691165 100644
--- a/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml
@@ -30,6 +30,7 @@
<flag name='virtio-tablet'/>
<flag name='virtio-input-host'/>
<flag name='virtio-balloon-pci.deflate-on-oom'/>
+ <flag name='debug-threads'/>
<flag name='vhost-scsi'/>
<flag name='query-cpu-model-expansion'/>
<flag name='query-cpu-definitions'/>
diff --git a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml
index c730dd7174..73b8f253f3 100644
--- a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml
@@ -70,6 +70,7 @@
<flag name='mptsas1068'/>
<flag name='spice-gl'/>
<flag name='qxl.vram64_size_mb'/>
+ <flag name='debug-threads'/>
<flag name='pxb'/>
<flag name='pxb-pcie'/>
<flag name='intel-iommu'/>
diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_aarch64.xml b/tests/qemucapabilitiesdata/caps_8.2.0_aarch64.xml
index 1f0f68092d..a46ecaf067 100644
--- a/tests/qemucapabilitiesdata/caps_8.2.0_aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_8.2.0_aarch64.xml
@@ -57,6 +57,7 @@
<flag name='virtio-input-host'/>
<flag name='virtio-balloon-pci.deflate-on-oom'/>
<flag name='mptsas1068'/>
+ <flag name='debug-threads'/>
<flag name='pxb'/>
<flag name='pxb-pcie'/>
<flag name='ivshmem-plain'/>
diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_armv7l.xml b/tests/qemucapabilitiesdata/caps_8.2.0_armv7l.xml
index 254ec27545..f65ca505d0 100644
--- a/tests/qemucapabilitiesdata/caps_8.2.0_armv7l.xml
+++ b/tests/qemucapabilitiesdata/caps_8.2.0_armv7l.xml
@@ -60,6 +60,7 @@
<flag name='virtio-balloon-pci.deflate-on-oom'/>
<flag name='mptsas1068'/>
<flag name='spice-gl'/>
+ <flag name='debug-threads'/>
<flag name='pxb'/>
<flag name='pxb-pcie'/>
<flag name='ivshmem-plain'/>
diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_loongarch64.xml b/tests/qemucapabilitiesdata/caps_8.2.0_loongarch64.xml
index 95eb2dfa21..778193d6b2 100644
--- a/tests/qemucapabilitiesdata/caps_8.2.0_loongarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_8.2.0_loongarch64.xml
@@ -57,6 +57,7 @@
<flag name='virtio-input-host'/>
<flag name='virtio-balloon-pci.deflate-on-oom'/>
<flag name='mptsas1068'/>
+ <flag name='debug-threads'/>
<flag name='virtio-vga'/>
<flag name='ivshmem-plain'/>
<flag name='ivshmem-doorbell'/>
diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_s390x.xml b/tests/qemucapabilitiesdata/caps_8.2.0_s390x.xml
index 45ab66ec29..3f1f93184c 100644
--- a/tests/qemucapabilitiesdata/caps_8.2.0_s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_8.2.0_s390x.xml
@@ -30,6 +30,7 @@
<flag name='virtio-tablet'/>
<flag name='virtio-input-host'/>
<flag name='virtio-balloon-pci.deflate-on-oom'/>
+ <flag name='debug-threads'/>
<flag name='vhost-scsi'/>
<flag name='query-cpu-model-expansion'/>
<flag name='query-cpu-definitions'/>
diff --git a/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml
index b46505d24b..908dc789d4 100644
--- a/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml
@@ -70,6 +70,7 @@
<flag name='mptsas1068'/>
<flag name='spice-gl'/>
<flag name='qxl.vram64_size_mb'/>
+ <flag name='debug-threads'/>
<flag name='pxb'/>
<flag name='pxb-pcie'/>
<flag name='intel-iommu'/>
diff --git a/tests/qemucapabilitiesdata/caps_9.0.0_sparc.xml b/tests/qemucapabilitiesdata/caps_9.0.0_sparc.xml
index 44ddfb0f76..51819e6907 100644
--- a/tests/qemucapabilitiesdata/caps_9.0.0_sparc.xml
+++ b/tests/qemucapabilitiesdata/caps_9.0.0_sparc.xml
@@ -12,6 +12,7 @@
<flag name='rng-random'/>
<flag name='rng-egd'/>
<flag name='spice-gl'/>
+ <flag name='debug-threads'/>
<flag name='spice-rendernode'/>
<flag name='nbd-tls'/>
<flag name='pr-manager-helper'/>
diff --git a/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml
index 2f361bd1c8..8b59aeb051 100644
--- a/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml
@@ -70,6 +70,7 @@
<flag name='mptsas1068'/>
<flag name='spice-gl'/>
<flag name='qxl.vram64_size_mb'/>
+ <flag name='debug-threads'/>
<flag name='pxb'/>
<flag name='pxb-pcie'/>
<flag name='intel-iommu'/>
diff --git a/tests/qemucapabilitiesdata/caps_9.1.0_riscv64.xml b/tests/qemucapabilitiesdata/caps_9.1.0_riscv64.xml
index f04b2fd302..6bc824cae1 100644
--- a/tests/qemucapabilitiesdata/caps_9.1.0_riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_9.1.0_riscv64.xml
@@ -58,6 +58,7 @@
<flag name='virtio-balloon-pci.deflate-on-oom'/>
<flag name='mptsas1068'/>
<flag name='spice-gl'/>
+ <flag name='debug-threads'/>
<flag name='virtio-vga'/>
<flag name='ivshmem-plain'/>
<flag name='ivshmem-doorbell'/>
diff --git a/tests/qemucapabilitiesdata/caps_9.1.0_s390x.xml b/tests/qemucapabilitiesdata/caps_9.1.0_s390x.xml
index 990fe255f6..b1e8e37147 100644
--- a/tests/qemucapabilitiesdata/caps_9.1.0_s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_9.1.0_s390x.xml
@@ -33,6 +33,7 @@
<flag name='virtio-tablet'/>
<flag name='virtio-input-host'/>
<flag name='virtio-balloon-pci.deflate-on-oom'/>
+ <flag name='debug-threads'/>
<flag name='vhost-scsi'/>
<flag name='query-cpu-model-expansion'/>
<flag name='query-cpu-definitions'/>
diff --git a/tests/qemucapabilitiesdata/caps_9.1.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_9.1.0_x86_64.xml
index 07d7562c84..f613955e15 100644
--- a/tests/qemucapabilitiesdata/caps_9.1.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_9.1.0_x86_64.xml
@@ -69,6 +69,7 @@
<flag name='mptsas1068'/>
<flag name='spice-gl'/>
<flag name='qxl.vram64_size_mb'/>
+ <flag name='debug-threads'/>
<flag name='pxb'/>
<flag name='pxb-pcie'/>
<flag name='intel-iommu'/>
diff --git a/tests/qemucapabilitiesdata/caps_9.2.0_aarch64+hvf.xml b/tests/qemucapabilitiesdata/caps_9.2.0_aarch64+hvf.xml
index c9e85ff9b3..1162e5a1b6 100644
--- a/tests/qemucapabilitiesdata/caps_9.2.0_aarch64+hvf.xml
+++ b/tests/qemucapabilitiesdata/caps_9.2.0_aarch64+hvf.xml
@@ -47,6 +47,7 @@
<flag name='virtio-tablet'/>
<flag name='virtio-balloon-pci.deflate-on-oom'/>
<flag name='mptsas1068'/>
+ <flag name='debug-threads'/>
<flag name='pxb'/>
<flag name='pxb-pcie'/>
<flag name='query-cpu-model-expansion'/>
diff --git a/tests/qemucapabilitiesdata/caps_9.2.0_s390x.xml b/tests/qemucapabilitiesdata/caps_9.2.0_s390x.xml
index a8f830076e..7ed1a57ae9 100644
--- a/tests/qemucapabilitiesdata/caps_9.2.0_s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_9.2.0_s390x.xml
@@ -33,6 +33,7 @@
<flag name='virtio-tablet'/>
<flag name='virtio-input-host'/>
<flag name='virtio-balloon-pci.deflate-on-oom'/>
+ <flag name='debug-threads'/>
<flag name='vhost-scsi'/>
<flag name='query-cpu-model-expansion'/>
<flag name='query-cpu-definitions'/>
diff --git a/tests/qemucapabilitiesdata/caps_9.2.0_x86_64+amdsev.xml b/tests/qemucapabilitiesdata/caps_9.2.0_x86_64+amdsev.xml
index f67222578d..c4a351d52c 100644
--- a/tests/qemucapabilitiesdata/caps_9.2.0_x86_64+amdsev.xml
+++ b/tests/qemucapabilitiesdata/caps_9.2.0_x86_64+amdsev.xml
@@ -69,6 +69,7 @@
<flag name='mptsas1068'/>
<flag name='spice-gl'/>
<flag name='qxl.vram64_size_mb'/>
+ <flag name='debug-threads'/>
<flag name='pxb'/>
<flag name='pxb-pcie'/>
<flag name='intel-iommu'/>
diff --git a/tests/qemucapabilitiesdata/caps_9.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_9.2.0_x86_64.xml
index efd3eeb9c7..834de87584 100644
--- a/tests/qemucapabilitiesdata/caps_9.2.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_9.2.0_x86_64.xml
@@ -69,6 +69,7 @@
<flag name='mptsas1068'/>
<flag name='spice-gl'/>
<flag name='qxl.vram64_size_mb'/>
+ <flag name='debug-threads'/>
<flag name='pxb'/>
<flag name='pxb-pcie'/>
<flag name='intel-iommu'/>
--
2.56.0
On 10/20/26 10:39, Ján Tomko via Devel wrote: > From: Ján Tomko <jtomko@redhat.com> > > The option is being removed from QEMU. > Since QEMU 11.2 it has been a no-op and always enabled. > > Stop assuming it's always present so that running VMs won't > break with the new QEMU versions. > > Signed-off-by: Ján Tomko <jtomko@redhat.com> > --- > src/qemu/qemu_capabilities.c | 3 ++- > src/qemu/qemu_capabilities.h | 2 +- > src/qemu/qemu_command.c | 8 +++++--- > tests/qemucapabilitiesdata/caps_10.0.0_aarch64.xml | 1 + > tests/qemucapabilitiesdata/caps_10.0.0_ppc64.xml | 1 + > tests/qemucapabilitiesdata/caps_10.0.0_s390x.xml | 1 + > tests/qemucapabilitiesdata/caps_10.0.0_x86_64+amdsev.xml | 1 + > tests/qemucapabilitiesdata/caps_10.0.0_x86_64.xml | 1 + > tests/qemucapabilitiesdata/caps_10.1.0_s390x.xml | 1 + > .../qemucapabilitiesdata/caps_10.1.0_x86_64+inteltdx.xml | 1 + > tests/qemucapabilitiesdata/caps_10.1.0_x86_64.xml | 1 + > tests/qemucapabilitiesdata/caps_10.2.0_aarch64.xml | 1 + > tests/qemucapabilitiesdata/caps_10.2.0_x86_64+mshv.xml | 1 + > tests/qemucapabilitiesdata/caps_10.2.0_x86_64.xml | 1 + > tests/qemucapabilitiesdata/caps_11.0.0_aarch64.xml | 1 + > tests/qemucapabilitiesdata/caps_11.0.0_s390x.xml | 1 + > tests/qemucapabilitiesdata/caps_11.0.0_x86_64+sgx.xml | 1 + > tests/qemucapabilitiesdata/caps_11.0.0_x86_64.xml | 1 + > tests/qemucapabilitiesdata/caps_11.1.0_aarch64.xml | 1 + > tests/qemucapabilitiesdata/caps_11.1.0_s390x.xml | 1 + > tests/qemucapabilitiesdata/caps_11.1.0_x86_64.xml | 1 + > tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml | 1 + > tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml | 1 + > tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml | 1 + > tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml | 1 + > tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml | 1 + > tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml | 1 + > tests/qemucapabilitiesdata/caps_8.2.0_aarch64.xml | 1 + > tests/qemucapabilitiesdata/caps_8.2.0_armv7l.xml | 1 + > tests/qemucapabilitiesdata/caps_8.2.0_loongarch64.xml | 1 + > tests/qemucapabilitiesdata/caps_8.2.0_s390x.xml | 1 + > tests/qemucapabilitiesdata/caps_8.2.0_x86_64.xml | 1 + > tests/qemucapabilitiesdata/caps_9.0.0_sparc.xml | 1 + > tests/qemucapabilitiesdata/caps_9.0.0_x86_64.xml | 1 + > tests/qemucapabilitiesdata/caps_9.1.0_riscv64.xml | 1 + > tests/qemucapabilitiesdata/caps_9.1.0_s390x.xml | 1 + > tests/qemucapabilitiesdata/caps_9.1.0_x86_64.xml | 1 + > tests/qemucapabilitiesdata/caps_9.2.0_aarch64+hvf.xml | 1 + > tests/qemucapabilitiesdata/caps_9.2.0_s390x.xml | 1 + > tests/qemucapabilitiesdata/caps_9.2.0_x86_64+amdsev.xml | 1 + > tests/qemucapabilitiesdata/caps_9.2.0_x86_64.xml | 1 + > 41 files changed, 46 insertions(+), 5 deletions(-) Reviewed-by: Michal Privoznik <mprivozn@redhat.com> Michal
Reviewed-by: Philippe Mathieu-Daudé <philmd@oss.qualcomm.com>
On Tue, Oct 20, 2026 at 10:39:35 +0200, Ján Tomko wrote: > From: Ján Tomko <jtomko@redhat.com> > > The option is being removed from QEMU. > Since QEMU 11.2 it has been a no-op and always enabled. > > Stop assuming it's always present so that running VMs won't > break with the new QEMU versions. > > Signed-off-by: Ján Tomko <jtomko@redhat.com> Reviewed-by: Jiri Denemark <jdenemar@redhat.com>
© 2016 - 2026 Red Hat, Inc.