qemu: capabilities: Retire QEMU_CAPS_OBJECT_SECRET

Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2024-08-07 09:19:19 +00:00 · 2021-09-21 17:53:26 +02:00 · 2021-09-21 17:53:26 +02:00 · b5411ce535
commit b5411ce535
parent 0ae3e1313f
41 changed files with 2 additions and 42 deletions
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@ -369,7 +369,7 @@ VIR_ENUM_IMPL(virQEMUCaps,

              /* 215 */
              "debug-threads", /* X_QEMU_CAPS_NAME_DEBUG_THREADS */
-              "secret", /* QEMU_CAPS_OBJECT_SECRET */
+              "secret", /* X_QEMU_CAPS_OBJECT_SECRET */
              "pxb", /* QEMU_CAPS_DEVICE_PXB */
              "pxb-pcie", /* QEMU_CAPS_DEVICE_PXB_PCIE */
              "device-tray-moved-event", /* X_QEMU_CAPS_DEVICE_TRAY_MOVED */
@ -1267,7 +1267,6 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = {
    { "virtio-input-host-device", QEMU_CAPS_VIRTIO_INPUT_HOST },
    { "virtio-input-host-pci", QEMU_CAPS_VIRTIO_INPUT_HOST },
    { "mptsas1068", QEMU_CAPS_SCSI_MPTSAS1068 },
-    { "secret", QEMU_CAPS_OBJECT_SECRET },
    { "pxb", QEMU_CAPS_DEVICE_PXB },
    { "pxb-pcie", QEMU_CAPS_DEVICE_PXB_PCIE },
    { "tls-creds-x509", QEMU_CAPS_OBJECT_TLS_CREDS_X509 },
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@ -349,7 +349,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */

    /* 215 */
    X_QEMU_CAPS_NAME_DEBUG_THREADS, /* Is -name debug-threads= available */
-    QEMU_CAPS_OBJECT_SECRET, /* -object secret */
+    X_QEMU_CAPS_OBJECT_SECRET, /* -object secret */
    QEMU_CAPS_DEVICE_PXB, /* -device pxb */
    QEMU_CAPS_DEVICE_PXB_PCIE, /* -device pxb-pcie */
    X_QEMU_CAPS_DEVICE_TRAY_MOVED, /* DEVICE_TRAY_MOVED event */
--- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
@ -50,7 +50,6 @@
  <flag name='vserport-change-event'/>
  <flag name='virtio-balloon-pci.deflate-on-oom'/>
  <flag name='chardev-logfile'/>
-  <flag name='secret'/>
  <flag name='virtio-scsi-pci.iothread'/>
  <flag name='drive-detect-zeroes'/>
  <flag name='tls-creds-x509'/>
--- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
@ -106,7 +106,6 @@
  <flag name='spice-gl'/>
  <flag name='qxl.vram64_size_mb'/>
  <flag name='chardev-logfile'/>
-  <flag name='secret'/>
  <flag name='pxb'/>
  <flag name='pxb-pcie'/>
  <flag name='nec-usb-xhci-ports'/>
--- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
@ -81,7 +81,6 @@
  <flag name='virtio-balloon-pci.deflate-on-oom'/>
  <flag name='mptsas1068'/>
  <flag name='chardev-logfile'/>
-  <flag name='secret'/>
  <flag name='nec-usb-xhci-ports'/>
  <flag name='virtio-scsi-pci.iothread'/>
  <flag name='drive-detect-zeroes'/>
--- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
@ -75,7 +75,6 @@
  <flag name='virtio-balloon-pci.deflate-on-oom'/>
  <flag name='mptsas1068'/>
  <flag name='chardev-logfile'/>
-  <flag name='secret'/>
  <flag name='nec-usb-xhci-ports'/>
  <flag name='virtio-scsi-pci.iothread'/>
  <flag name='drive-detect-zeroes'/>
--- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
@ -50,7 +50,6 @@
  <flag name='vserport-change-event'/>
  <flag name='virtio-balloon-pci.deflate-on-oom'/>
  <flag name='chardev-logfile'/>
-  <flag name='secret'/>
  <flag name='virtio-scsi-pci.iothread'/>
  <flag name='drive-detect-zeroes'/>
  <flag name='tls-creds-x509'/>
--- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
@ -104,7 +104,6 @@
  <flag name='mptsas1068'/>
  <flag name='qxl.vram64_size_mb'/>
  <flag name='chardev-logfile'/>
-  <flag name='secret'/>
  <flag name='pxb'/>
  <flag name='pxb-pcie'/>
  <flag name='nec-usb-xhci-ports'/>
--- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
@ -74,7 +74,6 @@
  <flag name='virtio-balloon-pci.deflate-on-oom'/>
  <flag name='mptsas1068'/>
  <flag name='chardev-logfile'/>
-  <flag name='secret'/>
  <flag name='nec-usb-xhci-ports'/>
  <flag name='virtio-scsi-pci.iothread'/>
  <flag name='drive-detect-zeroes'/>
--- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
@ -38,7 +38,6 @@
  <flag name='vserport-change-event'/>
  <flag name='virtio-balloon-pci.deflate-on-oom'/>
  <flag name='chardev-logfile'/>
-  <flag name='secret'/>
  <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
@ -38,7 +38,6 @@
  <flag name='vserport-change-event'/>
  <flag name='virtio-balloon-pci.deflate-on-oom'/>
  <flag name='chardev-logfile'/>
-  <flag name='secret'/>
  <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
@ -52,7 +52,6 @@
  <flag name='vserport-change-event'/>
  <flag name='virtio-balloon-pci.deflate-on-oom'/>
  <flag name='chardev-logfile'/>
-  <flag name='secret'/>
  <flag name='virtio-scsi-pci.iothread'/>
  <flag name='drive-detect-zeroes'/>
  <flag name='tls-creds-x509'/>
--- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
@ -105,7 +105,6 @@
  <flag name='spice-gl'/>
  <flag name='qxl.vram64_size_mb'/>
  <flag name='chardev-logfile'/>
-  <flag name='secret'/>
  <flag name='pxb'/>
  <flag name='pxb-pcie'/>
  <flag name='nec-usb-xhci-ports'/>
--- a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
@ -75,7 +75,6 @@
  <flag name='virtio-balloon-pci.deflate-on-oom'/>
  <flag name='mptsas1068'/>
  <flag name='chardev-logfile'/>
-  <flag name='secret'/>
  <flag name='nec-usb-xhci-ports'/>
  <flag name='virtio-scsi-pci.iothread'/>
  <flag name='drive-detect-zeroes'/>
--- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
@ -105,7 +105,6 @@
  <flag name='spice-gl'/>
  <flag name='qxl.vram64_size_mb'/>
  <flag name='chardev-logfile'/>
-  <flag name='secret'/>
  <flag name='pxb'/>
  <flag name='pxb-pcie'/>
  <flag name='nec-usb-xhci-ports'/>
--- a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
@ -83,7 +83,6 @@
  <flag name='virtio-balloon-pci.deflate-on-oom'/>
  <flag name='mptsas1068'/>
  <flag name='chardev-logfile'/>
-  <flag name='secret'/>
  <flag name='nec-usb-xhci-ports'/>
  <flag name='virtio-scsi-pci.iothread'/>
  <flag name='drive-detect-zeroes'/>
--- a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
@ -80,7 +80,6 @@
  <flag name='virtio-balloon-pci.deflate-on-oom'/>
  <flag name='mptsas1068'/>
  <flag name='chardev-logfile'/>
-  <flag name='secret'/>
  <flag name='nec-usb-xhci-ports'/>
  <flag name='virtio-scsi-pci.iothread'/>
  <flag name='drive-detect-zeroes'/>
--- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
@ -87,7 +87,6 @@
  <flag name='mptsas1068'/>
  <flag name='spice-gl'/>
  <flag name='chardev-logfile'/>
-  <flag name='secret'/>
  <flag name='nec-usb-xhci-ports'/>
  <flag name='virtio-scsi-pci.iothread'/>
  <flag name='spice-unix'/>
--- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
@ -87,7 +87,6 @@
  <flag name='mptsas1068'/>
  <flag name='spice-gl'/>
  <flag name='chardev-logfile'/>
-  <flag name='secret'/>
  <flag name='nec-usb-xhci-ports'/>
  <flag name='virtio-scsi-pci.iothread'/>
  <flag name='spice-unix'/>
--- a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
@ -52,7 +52,6 @@
  <flag name='vserport-change-event'/>
  <flag name='virtio-balloon-pci.deflate-on-oom'/>
  <flag name='chardev-logfile'/>
-  <flag name='secret'/>
  <flag name='virtio-scsi-pci.iothread'/>
  <flag name='drive-detect-zeroes'/>
  <flag name='tls-creds-x509'/>
--- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
@ -104,7 +104,6 @@
  <flag name='spice-gl'/>
  <flag name='qxl.vram64_size_mb'/>
  <flag name='chardev-logfile'/>
-  <flag name='secret'/>
  <flag name='pxb'/>
  <flag name='pxb-pcie'/>
  <flag name='nec-usb-xhci-ports'/>
--- a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
@ -104,7 +104,6 @@
  <flag name='spice-gl'/>
  <flag name='qxl.vram64_size_mb'/>
  <flag name='chardev-logfile'/>
-  <flag name='secret'/>
  <flag name='pxb'/>
  <flag name='pxb-pcie'/>
  <flag name='nec-usb-xhci-ports'/>
--- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
@ -84,7 +84,6 @@
  <flag name='virtio-balloon-pci.deflate-on-oom'/>
  <flag name='mptsas1068'/>
  <flag name='chardev-logfile'/>
-  <flag name='secret'/>
  <flag name='nec-usb-xhci-ports'/>
  <flag name='virtio-scsi-pci.iothread'/>
  <flag name='drive-detect-zeroes'/>
--- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
@ -80,7 +80,6 @@
  <flag name='virtio-balloon-pci.deflate-on-oom'/>
  <flag name='mptsas1068'/>
  <flag name='chardev-logfile'/>
-  <flag name='secret'/>
  <flag name='nec-usb-xhci-ports'/>
  <flag name='virtio-scsi-pci.iothread'/>
  <flag name='drive-detect-zeroes'/>
--- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
@ -52,7 +52,6 @@
  <flag name='vserport-change-event'/>
  <flag name='virtio-balloon-pci.deflate-on-oom'/>
  <flag name='chardev-logfile'/>
-  <flag name='secret'/>
  <flag name='virtio-scsi-pci.iothread'/>
  <flag name='drive-detect-zeroes'/>
  <flag name='tls-creds-x509'/>
--- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
@ -105,7 +105,6 @@
  <flag name='spice-gl'/>
  <flag name='qxl.vram64_size_mb'/>
  <flag name='chardev-logfile'/>
-  <flag name='secret'/>
  <flag name='pxb'/>
  <flag name='pxb-pcie'/>
  <flag name='nec-usb-xhci-ports'/>
--- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
@ -86,7 +86,6 @@
  <flag name='virtio-balloon-pci.deflate-on-oom'/>
  <flag name='mptsas1068'/>
  <flag name='chardev-logfile'/>
-  <flag name='secret'/>
  <flag name='nec-usb-xhci-ports'/>
  <flag name='virtio-scsi-pci.iothread'/>
  <flag name='drive-detect-zeroes'/>
--- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
@ -81,7 +81,6 @@
  <flag name='virtio-balloon-pci.deflate-on-oom'/>
  <flag name='mptsas1068'/>
  <flag name='chardev-logfile'/>
-  <flag name='secret'/>
  <flag name='nec-usb-xhci-ports'/>
  <flag name='virtio-scsi-pci.iothread'/>
  <flag name='drive-detect-zeroes'/>
--- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
@ -87,7 +87,6 @@
  <flag name='mptsas1068'/>
  <flag name='spice-gl'/>
  <flag name='chardev-logfile'/>
-  <flag name='secret'/>
  <flag name='nec-usb-xhci-ports'/>
  <flag name='virtio-scsi-pci.iothread'/>
  <flag name='spice-unix'/>
--- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
@ -105,7 +105,6 @@
  <flag name='spice-gl'/>
  <flag name='qxl.vram64_size_mb'/>
  <flag name='chardev-logfile'/>
-  <flag name='secret'/>
  <flag name='pxb'/>
  <flag name='pxb-pcie'/>
  <flag name='nec-usb-xhci-ports'/>
--- a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
@ -32,7 +32,6 @@
  <flag name='vserport-change-event'/>
  <flag name='spice-gl'/>
  <flag name='chardev-logfile'/>
-  <flag name='secret'/>
  <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
@ -105,7 +105,6 @@
  <flag name='spice-gl'/>
  <flag name='qxl.vram64_size_mb'/>
  <flag name='chardev-logfile'/>
-  <flag name='secret'/>
  <flag name='pxb'/>
  <flag name='pxb-pcie'/>
  <flag name='nec-usb-xhci-ports'/>
--- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
@ -85,7 +85,6 @@
  <flag name='virtio-balloon-pci.deflate-on-oom'/>
  <flag name='mptsas1068'/>
  <flag name='chardev-logfile'/>
-  <flag name='secret'/>
  <flag name='nec-usb-xhci-ports'/>
  <flag name='virtio-scsi-pci.iothread'/>
  <flag name='drive-detect-zeroes'/>
--- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
@ -80,7 +80,6 @@
  <flag name='virtio-balloon-pci.deflate-on-oom'/>
  <flag name='mptsas1068'/>
  <flag name='chardev-logfile'/>
-  <flag name='secret'/>
  <flag name='nec-usb-xhci-ports'/>
  <flag name='virtio-scsi-pci.iothread'/>
  <flag name='drive-detect-zeroes'/>
--- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
@ -86,7 +86,6 @@
  <flag name='mptsas1068'/>
  <flag name='spice-gl'/>
  <flag name='chardev-logfile'/>
-  <flag name='secret'/>
  <flag name='nec-usb-xhci-ports'/>
  <flag name='virtio-scsi-pci.iothread'/>
  <flag name='spice-unix'/>
--- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
@ -51,7 +51,6 @@
  <flag name='vserport-change-event'/>
  <flag name='virtio-balloon-pci.deflate-on-oom'/>
  <flag name='chardev-logfile'/>
-  <flag name='secret'/>
  <flag name='virtio-scsi-pci.iothread'/>
  <flag name='drive-detect-zeroes'/>
  <flag name='tls-creds-x509'/>
--- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
@ -105,7 +105,6 @@
  <flag name='spice-gl'/>
  <flag name='qxl.vram64_size_mb'/>
  <flag name='chardev-logfile'/>
-  <flag name='secret'/>
  <flag name='pxb'/>
  <flag name='pxb-pcie'/>
  <flag name='nec-usb-xhci-ports'/>
--- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
@ -84,7 +84,6 @@
  <flag name='virtio-balloon-pci.deflate-on-oom'/>
  <flag name='mptsas1068'/>
  <flag name='chardev-logfile'/>
-  <flag name='secret'/>
  <flag name='pxb'/>
  <flag name='pxb-pcie'/>
  <flag name='nec-usb-xhci-ports'/>
--- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
@ -51,7 +51,6 @@
  <flag name='vserport-change-event'/>
  <flag name='virtio-balloon-pci.deflate-on-oom'/>
  <flag name='chardev-logfile'/>
-  <flag name='secret'/>
  <flag name='virtio-scsi-pci.iothread'/>
  <flag name='drive-detect-zeroes'/>
  <flag name='tls-creds-x509'/>
--- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
@ -104,7 +104,6 @@
  <flag name='spice-gl'/>
  <flag name='qxl.vram64_size_mb'/>
  <flag name='chardev-logfile'/>
-  <flag name='secret'/>
  <flag name='pxb'/>
  <flag name='pxb-pcie'/>
  <flag name='nec-usb-xhci-ports'/>
--- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
@ -103,7 +103,6 @@
  <flag name='spice-gl'/>
  <flag name='qxl.vram64_size_mb'/>
  <flag name='chardev-logfile'/>
-  <flag name='secret'/>
  <flag name='pxb'/>
  <flag name='pxb-pcie'/>
  <flag name='nec-usb-xhci-ports'/>