qemu: capabilities: Retire QEMU_CAPS_NAME*

Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Martin Kletzander <mkletzan@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2024-07-11 12:25:52 +00:00 · 2021-08-10 16:52:20 +02:00 · 2021-08-10 16:52:20 +02:00 · 5d87897591
commit 5d87897591
parent d5a6145900
42 changed files with 4 additions and 86 deletions
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@ -368,7 +368,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
              "chardev-logfile", /* QEMU_CAPS_CHARDEV_LOGFILE */

              /* 215 */
-              "debug-threads", /* QEMU_CAPS_NAME_DEBUG_THREADS */
+              "debug-threads", /* X_QEMU_CAPS_NAME_DEBUG_THREADS */
              "secret", /* QEMU_CAPS_OBJECT_SECRET */
              "pxb", /* QEMU_CAPS_DEVICE_PXB */
              "pxb-pcie", /* QEMU_CAPS_DEVICE_PXB_PCIE */
@ -377,7 +377,7 @@ VIR_ENUM_IMPL(virQEMUCaps,
              /* 220 */
              "nec-usb-xhci-ports", /* QEMU_CAPS_NEC_USB_XHCI_PORTS */
              "virtio-scsi-pci.iothread", /* QEMU_CAPS_VIRTIO_SCSI_IOTHREAD */
-              "name-guest", /* QEMU_CAPS_NAME_GUEST */
+              "name-guest", /* X_QEMU_CAPS_NAME_GUEST */
              "qxl.max_outputs", /* QEMU_CAPS_QXL_MAX_OUTPUTS */
              "qxl-vga.max_outputs", /* X_QEMU_CAPS_QXL_VGA_MAX_OUTPUTS */

@ -3246,8 +3246,6 @@ static struct virQEMUCapsCommandLineProps virQEMUCapsCommandLine[] = {
    { "machine", "kernel_irqchip", QEMU_CAPS_MACHINE_KERNEL_IRQCHIP },
    { "machine", "loadparm", QEMU_CAPS_LOADPARM },
    { "msg", "timestamp", QEMU_CAPS_MSG_TIMESTAMP },
-    { "name", "debug-threads", QEMU_CAPS_NAME_DEBUG_THREADS },
-    { "name", "guest", QEMU_CAPS_NAME_GUEST },
    { "numa", NULL, QEMU_CAPS_NUMA }, /* not needed after qemuCaps->version < 3000000 */
    { "overcommit", NULL, QEMU_CAPS_OVERCOMMIT },
    { "sandbox", "enable", QEMU_CAPS_SECCOMP_SANDBOX },
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@ -348,7 +348,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
    QEMU_CAPS_CHARDEV_LOGFILE, /* -chardev logfile=xxxx */

    /* 215 */
-    QEMU_CAPS_NAME_DEBUG_THREADS, /* Is -name debug-threads= available */
+    X_QEMU_CAPS_NAME_DEBUG_THREADS, /* Is -name debug-threads= available */
    QEMU_CAPS_OBJECT_SECRET, /* -object secret */
    QEMU_CAPS_DEVICE_PXB, /* -device pxb */
    QEMU_CAPS_DEVICE_PXB_PCIE, /* -device pxb-pcie */
@ -357,7 +357,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
    /* 220 */
    QEMU_CAPS_NEC_USB_XHCI_PORTS, /* -device nec-usb-xhci.p3 ports setting */
    QEMU_CAPS_VIRTIO_SCSI_IOTHREAD, /* virtio-scsi-{pci,ccw}.iothread */
-    QEMU_CAPS_NAME_GUEST, /* -name guest= */
+    X_QEMU_CAPS_NAME_GUEST, /* -name guest= */
    QEMU_CAPS_QXL_MAX_OUTPUTS, /* -device qxl,max-outputs= */
    X_QEMU_CAPS_QXL_VGA_MAX_OUTPUTS, /* -device qxl-vga,max-outputs= */

--- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
@ -55,10 +55,8 @@
  <flag name='vserport-change-event'/>
  <flag name='virtio-balloon-pci.deflate-on-oom'/>
  <flag name='chardev-logfile'/>
-  <flag name='debug-threads'/>
  <flag name='secret'/>
  <flag name='virtio-scsi-pci.iothread'/>
-  <flag name='name-guest'/>
  <flag name='drive-detect-zeroes'/>
  <flag name='tls-creds-x509'/>
  <flag name='virtio-pci-disable-legacy'/>
--- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
@ -114,13 +114,11 @@
  <flag name='spice-gl'/>
  <flag name='qxl.vram64_size_mb'/>
  <flag name='chardev-logfile'/>
-  <flag name='debug-threads'/>
  <flag name='secret'/>
  <flag name='pxb'/>
  <flag name='pxb-pcie'/>
  <flag name='nec-usb-xhci-ports'/>
  <flag name='virtio-scsi-pci.iothread'/>
-  <flag name='name-guest'/>
  <flag name='qxl.max_outputs'/>
  <flag name='spice-unix'/>
  <flag name='drive-detect-zeroes'/>
--- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
@ -88,11 +88,9 @@
  <flag name='virtio-balloon-pci.deflate-on-oom'/>
  <flag name='mptsas1068'/>
  <flag name='chardev-logfile'/>
-  <flag name='debug-threads'/>
  <flag name='secret'/>
  <flag name='nec-usb-xhci-ports'/>
  <flag name='virtio-scsi-pci.iothread'/>
-  <flag name='name-guest'/>
  <flag name='drive-detect-zeroes'/>
  <flag name='tls-creds-x509'/>
  <flag name='virtio-pci-disable-legacy'/>
--- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
@ -82,11 +82,9 @@
  <flag name='virtio-balloon-pci.deflate-on-oom'/>
  <flag name='mptsas1068'/>
  <flag name='chardev-logfile'/>
-  <flag name='debug-threads'/>
  <flag name='secret'/>
  <flag name='nec-usb-xhci-ports'/>
  <flag name='virtio-scsi-pci.iothread'/>
-  <flag name='name-guest'/>
  <flag name='drive-detect-zeroes'/>
  <flag name='tls-creds-x509'/>
  <flag name='virtio-pci-disable-legacy'/>
--- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
@ -55,10 +55,8 @@
  <flag name='vserport-change-event'/>
  <flag name='virtio-balloon-pci.deflate-on-oom'/>
  <flag name='chardev-logfile'/>
-  <flag name='debug-threads'/>
  <flag name='secret'/>
  <flag name='virtio-scsi-pci.iothread'/>
-  <flag name='name-guest'/>
  <flag name='drive-detect-zeroes'/>
  <flag name='tls-creds-x509'/>
  <flag name='virtio-pci-disable-legacy'/>
--- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
@ -112,13 +112,11 @@
  <flag name='mptsas1068'/>
  <flag name='qxl.vram64_size_mb'/>
  <flag name='chardev-logfile'/>
-  <flag name='debug-threads'/>
  <flag name='secret'/>
  <flag name='pxb'/>
  <flag name='pxb-pcie'/>
  <flag name='nec-usb-xhci-ports'/>
  <flag name='virtio-scsi-pci.iothread'/>
-  <flag name='name-guest'/>
  <flag name='qxl.max_outputs'/>
  <flag name='spice-unix'/>
  <flag name='drive-detect-zeroes'/>
--- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
@ -81,11 +81,9 @@
  <flag name='virtio-balloon-pci.deflate-on-oom'/>
  <flag name='mptsas1068'/>
  <flag name='chardev-logfile'/>
-  <flag name='debug-threads'/>
  <flag name='secret'/>
  <flag name='nec-usb-xhci-ports'/>
  <flag name='virtio-scsi-pci.iothread'/>
-  <flag name='name-guest'/>
  <flag name='drive-detect-zeroes'/>
  <flag name='tls-creds-x509'/>
  <flag name='virtio-pci-disable-legacy'/>
--- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
@ -45,9 +45,7 @@
  <flag name='vserport-change-event'/>
  <flag name='virtio-balloon-pci.deflate-on-oom'/>
  <flag name='chardev-logfile'/>
-  <flag name='debug-threads'/>
  <flag name='secret'/>
-  <flag name='name-guest'/>
  <flag name='drive-detect-zeroes'/>
  <flag name='tls-creds-x509'/>
  <flag name='query-hotpluggable-cpus'/>
--- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
@ -45,9 +45,7 @@
  <flag name='vserport-change-event'/>
  <flag name='virtio-balloon-pci.deflate-on-oom'/>
  <flag name='chardev-logfile'/>
-  <flag name='debug-threads'/>
  <flag name='secret'/>
-  <flag name='name-guest'/>
  <flag name='drive-detect-zeroes'/>
  <flag name='tls-creds-x509'/>
  <flag name='query-hotpluggable-cpus'/>
--- a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
@ -57,10 +57,8 @@
  <flag name='vserport-change-event'/>
  <flag name='virtio-balloon-pci.deflate-on-oom'/>
  <flag name='chardev-logfile'/>
-  <flag name='debug-threads'/>
  <flag name='secret'/>
  <flag name='virtio-scsi-pci.iothread'/>
-  <flag name='name-guest'/>
  <flag name='drive-detect-zeroes'/>
  <flag name='tls-creds-x509'/>
  <flag name='virtio-pci-disable-legacy'/>
--- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
@ -113,13 +113,11 @@
  <flag name='spice-gl'/>
  <flag name='qxl.vram64_size_mb'/>
  <flag name='chardev-logfile'/>
-  <flag name='debug-threads'/>
  <flag name='secret'/>
  <flag name='pxb'/>
  <flag name='pxb-pcie'/>
  <flag name='nec-usb-xhci-ports'/>
  <flag name='virtio-scsi-pci.iothread'/>
-  <flag name='name-guest'/>
  <flag name='qxl.max_outputs'/>
  <flag name='spice-unix'/>
  <flag name='drive-detect-zeroes'/>
--- a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
@ -82,11 +82,9 @@
  <flag name='virtio-balloon-pci.deflate-on-oom'/>
  <flag name='mptsas1068'/>
  <flag name='chardev-logfile'/>
-  <flag name='debug-threads'/>
  <flag name='secret'/>
  <flag name='nec-usb-xhci-ports'/>
  <flag name='virtio-scsi-pci.iothread'/>
-  <flag name='name-guest'/>
  <flag name='drive-detect-zeroes'/>
  <flag name='tls-creds-x509'/>
  <flag name='virtio-pci-disable-legacy'/>
--- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
@ -113,13 +113,11 @@
  <flag name='spice-gl'/>
  <flag name='qxl.vram64_size_mb'/>
  <flag name='chardev-logfile'/>
-  <flag name='debug-threads'/>
  <flag name='secret'/>
  <flag name='pxb'/>
  <flag name='pxb-pcie'/>
  <flag name='nec-usb-xhci-ports'/>
  <flag name='virtio-scsi-pci.iothread'/>
-  <flag name='name-guest'/>
  <flag name='qxl.max_outputs'/>
  <flag name='spice-unix'/>
  <flag name='drive-detect-zeroes'/>
--- a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
@ -90,11 +90,9 @@
  <flag name='virtio-balloon-pci.deflate-on-oom'/>
  <flag name='mptsas1068'/>
  <flag name='chardev-logfile'/>
-  <flag name='debug-threads'/>
  <flag name='secret'/>
  <flag name='nec-usb-xhci-ports'/>
  <flag name='virtio-scsi-pci.iothread'/>
-  <flag name='name-guest'/>
  <flag name='drive-detect-zeroes'/>
  <flag name='tls-creds-x509'/>
  <flag name='virtio-pci-disable-legacy'/>
--- a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
@ -87,11 +87,9 @@
  <flag name='virtio-balloon-pci.deflate-on-oom'/>
  <flag name='mptsas1068'/>
  <flag name='chardev-logfile'/>
-  <flag name='debug-threads'/>
  <flag name='secret'/>
  <flag name='nec-usb-xhci-ports'/>
  <flag name='virtio-scsi-pci.iothread'/>
-  <flag name='name-guest'/>
  <flag name='drive-detect-zeroes'/>
  <flag name='tls-creds-x509'/>
  <flag name='virtio-pci-disable-legacy'/>
--- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
@ -94,11 +94,9 @@
  <flag name='mptsas1068'/>
  <flag name='spice-gl'/>
  <flag name='chardev-logfile'/>
-  <flag name='debug-threads'/>
  <flag name='secret'/>
  <flag name='nec-usb-xhci-ports'/>
  <flag name='virtio-scsi-pci.iothread'/>
-  <flag name='name-guest'/>
  <flag name='spice-unix'/>
  <flag name='drive-detect-zeroes'/>
  <flag name='tls-creds-x509'/>
--- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
@ -94,11 +94,9 @@
  <flag name='mptsas1068'/>
  <flag name='spice-gl'/>
  <flag name='chardev-logfile'/>
-  <flag name='debug-threads'/>
  <flag name='secret'/>
  <flag name='nec-usb-xhci-ports'/>
  <flag name='virtio-scsi-pci.iothread'/>
-  <flag name='name-guest'/>
  <flag name='spice-unix'/>
  <flag name='drive-detect-zeroes'/>
  <flag name='tls-creds-x509'/>
--- a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
@ -57,10 +57,8 @@
  <flag name='vserport-change-event'/>
  <flag name='virtio-balloon-pci.deflate-on-oom'/>
  <flag name='chardev-logfile'/>
-  <flag name='debug-threads'/>
  <flag name='secret'/>
  <flag name='virtio-scsi-pci.iothread'/>
-  <flag name='name-guest'/>
  <flag name='drive-detect-zeroes'/>
  <flag name='tls-creds-x509'/>
  <flag name='virtio-pci-disable-legacy'/>
--- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
@ -112,13 +112,11 @@
  <flag name='spice-gl'/>
  <flag name='qxl.vram64_size_mb'/>
  <flag name='chardev-logfile'/>
-  <flag name='debug-threads'/>
  <flag name='secret'/>
  <flag name='pxb'/>
  <flag name='pxb-pcie'/>
  <flag name='nec-usb-xhci-ports'/>
  <flag name='virtio-scsi-pci.iothread'/>
-  <flag name='name-guest'/>
  <flag name='qxl.max_outputs'/>
  <flag name='spice-unix'/>
  <flag name='drive-detect-zeroes'/>
--- a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
@ -112,13 +112,11 @@
  <flag name='spice-gl'/>
  <flag name='qxl.vram64_size_mb'/>
  <flag name='chardev-logfile'/>
-  <flag name='debug-threads'/>
  <flag name='secret'/>
  <flag name='pxb'/>
  <flag name='pxb-pcie'/>
  <flag name='nec-usb-xhci-ports'/>
  <flag name='virtio-scsi-pci.iothread'/>
-  <flag name='name-guest'/>
  <flag name='qxl.max_outputs'/>
  <flag name='spice-unix'/>
  <flag name='drive-detect-zeroes'/>
--- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
@ -91,11 +91,9 @@
  <flag name='virtio-balloon-pci.deflate-on-oom'/>
  <flag name='mptsas1068'/>
  <flag name='chardev-logfile'/>
-  <flag name='debug-threads'/>
  <flag name='secret'/>
  <flag name='nec-usb-xhci-ports'/>
  <flag name='virtio-scsi-pci.iothread'/>
-  <flag name='name-guest'/>
  <flag name='drive-detect-zeroes'/>
  <flag name='tls-creds-x509'/>
  <flag name='virtio-pci-disable-legacy'/>
--- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
@ -87,11 +87,9 @@
  <flag name='virtio-balloon-pci.deflate-on-oom'/>
  <flag name='mptsas1068'/>
  <flag name='chardev-logfile'/>
-  <flag name='debug-threads'/>
  <flag name='secret'/>
  <flag name='nec-usb-xhci-ports'/>
  <flag name='virtio-scsi-pci.iothread'/>
-  <flag name='name-guest'/>
  <flag name='drive-detect-zeroes'/>
  <flag name='tls-creds-x509'/>
  <flag name='virtio-pci-disable-legacy'/>
--- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
@ -57,10 +57,8 @@
  <flag name='vserport-change-event'/>
  <flag name='virtio-balloon-pci.deflate-on-oom'/>
  <flag name='chardev-logfile'/>
-  <flag name='debug-threads'/>
  <flag name='secret'/>
  <flag name='virtio-scsi-pci.iothread'/>
-  <flag name='name-guest'/>
  <flag name='drive-detect-zeroes'/>
  <flag name='tls-creds-x509'/>
  <flag name='virtio-pci-disable-legacy'/>
--- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
@ -113,13 +113,11 @@
  <flag name='spice-gl'/>
  <flag name='qxl.vram64_size_mb'/>
  <flag name='chardev-logfile'/>
-  <flag name='debug-threads'/>
  <flag name='secret'/>
  <flag name='pxb'/>
  <flag name='pxb-pcie'/>
  <flag name='nec-usb-xhci-ports'/>
  <flag name='virtio-scsi-pci.iothread'/>
-  <flag name='name-guest'/>
  <flag name='qxl.max_outputs'/>
  <flag name='spice-unix'/>
  <flag name='drive-detect-zeroes'/>
--- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
@ -93,11 +93,9 @@
  <flag name='virtio-balloon-pci.deflate-on-oom'/>
  <flag name='mptsas1068'/>
  <flag name='chardev-logfile'/>
-  <flag name='debug-threads'/>
  <flag name='secret'/>
  <flag name='nec-usb-xhci-ports'/>
  <flag name='virtio-scsi-pci.iothread'/>
-  <flag name='name-guest'/>
  <flag name='drive-detect-zeroes'/>
  <flag name='tls-creds-x509'/>
  <flag name='virtio-pci-disable-legacy'/>
--- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
@ -88,11 +88,9 @@
  <flag name='virtio-balloon-pci.deflate-on-oom'/>
  <flag name='mptsas1068'/>
  <flag name='chardev-logfile'/>
-  <flag name='debug-threads'/>
  <flag name='secret'/>
  <flag name='nec-usb-xhci-ports'/>
  <flag name='virtio-scsi-pci.iothread'/>
-  <flag name='name-guest'/>
  <flag name='drive-detect-zeroes'/>
  <flag name='tls-creds-x509'/>
  <flag name='virtio-pci-disable-legacy'/>
--- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
@ -94,11 +94,9 @@
  <flag name='mptsas1068'/>
  <flag name='spice-gl'/>
  <flag name='chardev-logfile'/>
-  <flag name='debug-threads'/>
  <flag name='secret'/>
  <flag name='nec-usb-xhci-ports'/>
  <flag name='virtio-scsi-pci.iothread'/>
-  <flag name='name-guest'/>
  <flag name='spice-unix'/>
  <flag name='drive-detect-zeroes'/>
  <flag name='tls-creds-x509'/>
--- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
@ -113,13 +113,11 @@
  <flag name='spice-gl'/>
  <flag name='qxl.vram64_size_mb'/>
  <flag name='chardev-logfile'/>
-  <flag name='debug-threads'/>
  <flag name='secret'/>
  <flag name='pxb'/>
  <flag name='pxb-pcie'/>
  <flag name='nec-usb-xhci-ports'/>
  <flag name='virtio-scsi-pci.iothread'/>
-  <flag name='name-guest'/>
  <flag name='qxl.max_outputs'/>
  <flag name='spice-unix'/>
  <flag name='drive-detect-zeroes'/>
--- a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
@ -39,9 +39,7 @@
  <flag name='vserport-change-event'/>
  <flag name='spice-gl'/>
  <flag name='chardev-logfile'/>
-  <flag name='debug-threads'/>
  <flag name='secret'/>
-  <flag name='name-guest'/>
  <flag name='spice-unix'/>
  <flag name='drive-detect-zeroes'/>
  <flag name='tls-creds-x509'/>
--- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
@ -113,13 +113,11 @@
  <flag name='spice-gl'/>
  <flag name='qxl.vram64_size_mb'/>
  <flag name='chardev-logfile'/>
-  <flag name='debug-threads'/>
  <flag name='secret'/>
  <flag name='pxb'/>
  <flag name='pxb-pcie'/>
  <flag name='nec-usb-xhci-ports'/>
  <flag name='virtio-scsi-pci.iothread'/>
-  <flag name='name-guest'/>
  <flag name='qxl.max_outputs'/>
  <flag name='spice-unix'/>
  <flag name='drive-detect-zeroes'/>
--- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
@ -92,11 +92,9 @@
  <flag name='virtio-balloon-pci.deflate-on-oom'/>
  <flag name='mptsas1068'/>
  <flag name='chardev-logfile'/>
-  <flag name='debug-threads'/>
  <flag name='secret'/>
  <flag name='nec-usb-xhci-ports'/>
  <flag name='virtio-scsi-pci.iothread'/>
-  <flag name='name-guest'/>
  <flag name='drive-detect-zeroes'/>
  <flag name='tls-creds-x509'/>
  <flag name='virtio-pci-disable-legacy'/>
--- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
@ -87,11 +87,9 @@
  <flag name='virtio-balloon-pci.deflate-on-oom'/>
  <flag name='mptsas1068'/>
  <flag name='chardev-logfile'/>
-  <flag name='debug-threads'/>
  <flag name='secret'/>
  <flag name='nec-usb-xhci-ports'/>
  <flag name='virtio-scsi-pci.iothread'/>
-  <flag name='name-guest'/>
  <flag name='drive-detect-zeroes'/>
  <flag name='tls-creds-x509'/>
  <flag name='virtio-pci-disable-legacy'/>
--- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
@ -93,11 +93,9 @@
  <flag name='mptsas1068'/>
  <flag name='spice-gl'/>
  <flag name='chardev-logfile'/>
-  <flag name='debug-threads'/>
  <flag name='secret'/>
  <flag name='nec-usb-xhci-ports'/>
  <flag name='virtio-scsi-pci.iothread'/>
-  <flag name='name-guest'/>
  <flag name='spice-unix'/>
  <flag name='drive-detect-zeroes'/>
  <flag name='tls-creds-x509'/>
--- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
@ -56,10 +56,8 @@
  <flag name='vserport-change-event'/>
  <flag name='virtio-balloon-pci.deflate-on-oom'/>
  <flag name='chardev-logfile'/>
-  <flag name='debug-threads'/>
  <flag name='secret'/>
  <flag name='virtio-scsi-pci.iothread'/>
-  <flag name='name-guest'/>
  <flag name='drive-detect-zeroes'/>
  <flag name='tls-creds-x509'/>
  <flag name='virtio-pci-disable-legacy'/>
--- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
@ -113,13 +113,11 @@
  <flag name='spice-gl'/>
  <flag name='qxl.vram64_size_mb'/>
  <flag name='chardev-logfile'/>
-  <flag name='debug-threads'/>
  <flag name='secret'/>
  <flag name='pxb'/>
  <flag name='pxb-pcie'/>
  <flag name='nec-usb-xhci-ports'/>
  <flag name='virtio-scsi-pci.iothread'/>
-  <flag name='name-guest'/>
  <flag name='qxl.max_outputs'/>
  <flag name='spice-unix'/>
  <flag name='drive-detect-zeroes'/>
--- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
@ -91,13 +91,11 @@
  <flag name='virtio-balloon-pci.deflate-on-oom'/>
  <flag name='mptsas1068'/>
  <flag name='chardev-logfile'/>
-  <flag name='debug-threads'/>
  <flag name='secret'/>
  <flag name='pxb'/>
  <flag name='pxb-pcie'/>
  <flag name='nec-usb-xhci-ports'/>
  <flag name='virtio-scsi-pci.iothread'/>
-  <flag name='name-guest'/>
  <flag name='drive-detect-zeroes'/>
  <flag name='tls-creds-x509'/>
  <flag name='virtio-pci-disable-legacy'/>
--- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
@ -56,10 +56,8 @@
  <flag name='vserport-change-event'/>
  <flag name='virtio-balloon-pci.deflate-on-oom'/>
  <flag name='chardev-logfile'/>
-  <flag name='debug-threads'/>
  <flag name='secret'/>
  <flag name='virtio-scsi-pci.iothread'/>
-  <flag name='name-guest'/>
  <flag name='drive-detect-zeroes'/>
  <flag name='tls-creds-x509'/>
  <flag name='virtio-pci-disable-legacy'/>
--- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
@ -112,13 +112,11 @@
  <flag name='spice-gl'/>
  <flag name='qxl.vram64_size_mb'/>
  <flag name='chardev-logfile'/>
-  <flag name='debug-threads'/>
  <flag name='secret'/>
  <flag name='pxb'/>
  <flag name='pxb-pcie'/>
  <flag name='nec-usb-xhci-ports'/>
  <flag name='virtio-scsi-pci.iothread'/>
-  <flag name='name-guest'/>
  <flag name='qxl.max_outputs'/>
  <flag name='spice-unix'/>
  <flag name='drive-detect-zeroes'/>
--- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
@ -111,13 +111,11 @@
  <flag name='spice-gl'/>
  <flag name='qxl.vram64_size_mb'/>
  <flag name='chardev-logfile'/>
-  <flag name='debug-threads'/>
  <flag name='secret'/>
  <flag name='pxb'/>
  <flag name='pxb-pcie'/>
  <flag name='nec-usb-xhci-ports'/>
  <flag name='virtio-scsi-pci.iothread'/>
-  <flag name='name-guest'/>
  <flag name='qxl.max_outputs'/>
  <flag name='spice-unix'/>
  <flag name='drive-detect-zeroes'/>
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@ -3261,10 +3261,8 @@ mymain(void)
                 ARG_QEMU_CAPS, NONE);

    DO_TEST("name-escape",
-            QEMU_CAPS_NAME_DEBUG_THREADS,
            QEMU_CAPS_OBJECT_SECRET,
            QEMU_CAPS_VNC,
-            QEMU_CAPS_NAME_GUEST,
            QEMU_CAPS_DEVICE_CIRRUS_VGA,
            QEMU_CAPS_SPICE,
            QEMU_CAPS_SPICE_UNIX,