qemu: capabilities: Retire QEMU_CAPS_ISCSI_PASSWORD_SECRET

Signed-off-by: Peter Krempa <pkrempa@redhat.com> Reviewed-by: Ján Tomko <jtomko@redhat.com>
2025-02-21 19:02:25 +00:00 · 2021-09-21 18:13:02 +02:00 · 2021-09-21 18:13:02 +02:00 · 09466e1f62
commit 09466e1f62
parent 900270a24f
41 changed files with 2 additions and 42 deletions
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@ -453,7 +453,7 @@ VIR_ENUM_IMPL(virQEMUCaps,

              /* 275 */
              "disk-share-rw", /* QEMU_CAPS_DISK_SHARE_RW */
-              "iscsi.password-secret", /* QEMU_CAPS_ISCSI_PASSWORD_SECRET */
+              "iscsi.password-secret", /* X_QEMU_CAPS_ISCSI_PASSWORD_SECRET */
              "isa-serial", /* QEMU_CAPS_DEVICE_ISA_SERIAL */
              "pl011", /* QEMU_CAPS_DEVICE_PL011 */
              "machine.pseries.max-cpu-compat", /* QEMU_CAPS_MACHINE_PSERIES_MAX_CPU_COMPAT */
@ -1554,7 +1554,6 @@ static struct virQEMUCapsStringFlags virQEMUCapsQMPSchemaQueries[] = {
    { "blockdev-add/arg-type/options/+gluster/debug-level", QEMU_CAPS_GLUSTER_DEBUG_LEVEL},
    { "blockdev-add/arg-type/+gluster/debug", QEMU_CAPS_GLUSTER_DEBUG_LEVEL},
    { "blockdev-add/arg-type/+vxhs", QEMU_CAPS_VXHS},
-    { "blockdev-add/arg-type/+iscsi/password-secret", QEMU_CAPS_ISCSI_PASSWORD_SECRET },
    { "blockdev-add/arg-type/+qcow2/encrypt/+luks/key-secret", QEMU_CAPS_QCOW2_LUKS },
    { "blockdev-add/arg-type/+file/drop-cache", QEMU_CAPS_MIGRATION_FILE_DROP_CACHE },
    { "blockdev-add/arg-type/+file/$dynamic-auto-read-only", QEMU_CAPS_BLOCK_FILE_AUTO_READONLY_DYNAMIC },
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@ -433,7 +433,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */

    /* 275 */
    QEMU_CAPS_DISK_SHARE_RW, /* share-rw=on for concurrent disk access */
-    QEMU_CAPS_ISCSI_PASSWORD_SECRET, /* -drive file.driver=iscsi,...,password-secret= */
+    X_QEMU_CAPS_ISCSI_PASSWORD_SECRET, /* -drive file.driver=iscsi,...,password-secret= */
    QEMU_CAPS_DEVICE_ISA_SERIAL, /* -device isa-serial */
    QEMU_CAPS_DEVICE_PL011, /* -device pl011 (not user-instantiable) */
    QEMU_CAPS_MACHINE_PSERIES_MAX_CPU_COMPAT, /* -machine pseries,max-cpu-compat= */
--- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
@ -75,7 +75,6 @@
  <flag name='virtio-blk.num-queues'/>
  <flag name='sclplmconsole'/>
  <flag name='disk-share-rw'/>
-  <flag name='iscsi.password-secret'/>
  <flag name='dump-completed'/>
  <flag name='virtio-gpu-ccw'/>
  <flag name='virtio-keyboard-ccw'/>
--- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
@ -148,7 +148,6 @@
  <flag name='virtio-blk.num-queues'/>
  <flag name='vmcoreinfo'/>
  <flag name='disk-share-rw'/>
-  <flag name='iscsi.password-secret'/>
  <flag name='isa-serial'/>
  <flag name='dump-completed'/>
  <flag name='qcow2-luks'/>
--- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
@ -109,7 +109,6 @@
  <flag name='virtio-blk.num-queues'/>
  <flag name='vmcoreinfo'/>
  <flag name='disk-share-rw'/>
-  <flag name='iscsi.password-secret'/>
  <flag name='isa-serial'/>
  <flag name='pl011'/>
  <flag name='dump-completed'/>
--- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
@ -106,7 +106,6 @@
  <flag name='machine.pseries.resize-hpt'/>
  <flag name='spapr-vty'/>
  <flag name='disk-share-rw'/>
-  <flag name='iscsi.password-secret'/>
  <flag name='isa-serial'/>
  <flag name='machine.pseries.max-cpu-compat'/>
  <flag name='dump-completed'/>
--- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
@ -75,7 +75,6 @@
  <flag name='virtio-blk.num-queues'/>
  <flag name='sclplmconsole'/>
  <flag name='disk-share-rw'/>
-  <flag name='iscsi.password-secret'/>
  <flag name='dump-completed'/>
  <flag name='virtio-gpu-ccw'/>
  <flag name='virtio-keyboard-ccw'/>
--- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
@ -145,7 +145,6 @@
  <flag name='virtio-blk.num-queues'/>
  <flag name='vmcoreinfo'/>
  <flag name='disk-share-rw'/>
-  <flag name='iscsi.password-secret'/>
  <flag name='isa-serial'/>
  <flag name='dump-completed'/>
  <flag name='qcow2-luks'/>
--- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
@ -105,7 +105,6 @@
  <flag name='machine.pseries.resize-hpt'/>
  <flag name='spapr-vty'/>
  <flag name='disk-share-rw'/>
-  <flag name='iscsi.password-secret'/>
  <flag name='isa-serial'/>
  <flag name='machine.pseries.max-cpu-compat'/>
  <flag name='dump-completed'/>
--- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
@ -52,7 +52,6 @@
  <flag name='virtio-gpu.max_outputs'/>
  <flag name='vxhs'/>
  <flag name='disk-share-rw'/>
-  <flag name='iscsi.password-secret'/>
  <flag name='dump-completed'/>
  <flag name='qcow2-luks'/>
  <flag name='seccomp-blacklist'/>
--- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
@ -52,7 +52,6 @@
  <flag name='virtio-gpu.max_outputs'/>
  <flag name='vxhs'/>
  <flag name='disk-share-rw'/>
-  <flag name='iscsi.password-secret'/>
  <flag name='dump-completed'/>
  <flag name='qcow2-luks'/>
  <flag name='seccomp-blacklist'/>
--- a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml
@ -77,7 +77,6 @@
  <flag name='virtio-blk.num-queues'/>
  <flag name='sclplmconsole'/>
  <flag name='disk-share-rw'/>
-  <flag name='iscsi.password-secret'/>
  <flag name='dump-completed'/>
  <flag name='virtio-gpu-ccw'/>
  <flag name='virtio-keyboard-ccw'/>
--- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
@ -147,7 +147,6 @@
  <flag name='virtio-blk.num-queues'/>
  <flag name='vmcoreinfo'/>
  <flag name='disk-share-rw'/>
-  <flag name='iscsi.password-secret'/>
  <flag name='isa-serial'/>
  <flag name='dump-completed'/>
  <flag name='qcow2-luks'/>
--- a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml
@ -106,7 +106,6 @@
  <flag name='machine.pseries.resize-hpt'/>
  <flag name='spapr-vty'/>
  <flag name='disk-share-rw'/>
-  <flag name='iscsi.password-secret'/>
  <flag name='isa-serial'/>
  <flag name='machine.pseries.max-cpu-compat'/>
  <flag name='dump-completed'/>
--- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml
@ -147,7 +147,6 @@
  <flag name='virtio-blk.num-queues'/>
  <flag name='vmcoreinfo'/>
  <flag name='disk-share-rw'/>
-  <flag name='iscsi.password-secret'/>
  <flag name='isa-serial'/>
  <flag name='dump-completed'/>
  <flag name='qcow2-luks'/>
--- a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml
@ -111,7 +111,6 @@
  <flag name='virtio-blk.num-queues'/>
  <flag name='vmcoreinfo'/>
  <flag name='disk-share-rw'/>
-  <flag name='iscsi.password-secret'/>
  <flag name='pl011'/>
  <flag name='dump-completed'/>
  <flag name='qcow2-luks'/>
--- a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml
@ -112,7 +112,6 @@
  <flag name='machine.pseries.resize-hpt'/>
  <flag name='spapr-vty'/>
  <flag name='disk-share-rw'/>
-  <flag name='iscsi.password-secret'/>
  <flag name='isa-serial'/>
  <flag name='machine.pseries.max-cpu-compat'/>
  <flag name='dump-completed'/>
--- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml
@ -115,7 +115,6 @@
  <flag name='vxhs'/>
  <flag name='virtio-blk.num-queues'/>
  <flag name='disk-share-rw'/>
-  <flag name='iscsi.password-secret'/>
  <flag name='dump-completed'/>
  <flag name='qcow2-luks'/>
  <flag name='pcie-pci-bridge'/>
--- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml
@ -115,7 +115,6 @@
  <flag name='vxhs'/>
  <flag name='virtio-blk.num-queues'/>
  <flag name='disk-share-rw'/>
-  <flag name='iscsi.password-secret'/>
  <flag name='dump-completed'/>
  <flag name='qcow2-luks'/>
  <flag name='pcie-pci-bridge'/>
--- a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml
@ -77,7 +77,6 @@
  <flag name='virtio-blk.num-queues'/>
  <flag name='sclplmconsole'/>
  <flag name='disk-share-rw'/>
-  <flag name='iscsi.password-secret'/>
  <flag name='dump-completed'/>
  <flag name='virtio-gpu-ccw'/>
  <flag name='virtio-keyboard-ccw'/>
--- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml
@ -146,7 +146,6 @@
  <flag name='virtio-blk.num-queues'/>
  <flag name='vmcoreinfo'/>
  <flag name='disk-share-rw'/>
-  <flag name='iscsi.password-secret'/>
  <flag name='isa-serial'/>
  <flag name='dump-completed'/>
  <flag name='qcow2-luks'/>
--- a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml
@ -146,7 +146,6 @@
  <flag name='virtio-blk.num-queues'/>
  <flag name='vmcoreinfo'/>
  <flag name='disk-share-rw'/>
-  <flag name='iscsi.password-secret'/>
  <flag name='isa-serial'/>
  <flag name='dump-completed'/>
  <flag name='qcow2-luks'/>
--- a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml
@ -113,7 +113,6 @@
  <flag name='virtio-blk.num-queues'/>
  <flag name='vmcoreinfo'/>
  <flag name='disk-share-rw'/>
-  <flag name='iscsi.password-secret'/>
  <flag name='pl011'/>
  <flag name='dump-completed'/>
  <flag name='qcow2-luks'/>
--- a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml
@ -112,7 +112,6 @@
  <flag name='machine.pseries.resize-hpt'/>
  <flag name='spapr-vty'/>
  <flag name='disk-share-rw'/>
-  <flag name='iscsi.password-secret'/>
  <flag name='isa-serial'/>
  <flag name='machine.pseries.max-cpu-compat'/>
  <flag name='dump-completed'/>
--- a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml
@ -77,7 +77,6 @@
  <flag name='virtio-blk.num-queues'/>
  <flag name='sclplmconsole'/>
  <flag name='disk-share-rw'/>
-  <flag name='iscsi.password-secret'/>
  <flag name='dump-completed'/>
  <flag name='virtio-gpu-ccw'/>
  <flag name='virtio-keyboard-ccw'/>
--- a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml
@ -147,7 +147,6 @@
  <flag name='virtio-blk.num-queues'/>
  <flag name='vmcoreinfo'/>
  <flag name='disk-share-rw'/>
-  <flag name='iscsi.password-secret'/>
  <flag name='isa-serial'/>
  <flag name='dump-completed'/>
  <flag name='qcow2-luks'/>
--- a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml
@ -115,7 +115,6 @@
  <flag name='virtio-blk.num-queues'/>
  <flag name='vmcoreinfo'/>
  <flag name='disk-share-rw'/>
-  <flag name='iscsi.password-secret'/>
  <flag name='pl011'/>
  <flag name='dump-completed'/>
  <flag name='qcow2-luks'/>
--- a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml
@ -114,7 +114,6 @@
  <flag name='machine.pseries.resize-hpt'/>
  <flag name='spapr-vty'/>
  <flag name='disk-share-rw'/>
-  <flag name='iscsi.password-secret'/>
  <flag name='isa-serial'/>
  <flag name='machine.pseries.max-cpu-compat'/>
  <flag name='dump-completed'/>
--- a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml
@ -115,7 +115,6 @@
  <flag name='vxhs'/>
  <flag name='virtio-blk.num-queues'/>
  <flag name='disk-share-rw'/>
-  <flag name='iscsi.password-secret'/>
  <flag name='dump-completed'/>
  <flag name='qcow2-luks'/>
  <flag name='pcie-pci-bridge'/>
--- a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml
@ -147,7 +147,6 @@
  <flag name='virtio-blk.num-queues'/>
  <flag name='vmcoreinfo'/>
  <flag name='disk-share-rw'/>
-  <flag name='iscsi.password-secret'/>
  <flag name='isa-serial'/>
  <flag name='dump-completed'/>
  <flag name='qcow2-luks'/>
--- a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml
@ -44,7 +44,6 @@
  <flag name='vnc-multi-servers'/>
  <flag name='chardev-reconnect'/>
  <flag name='disk-share-rw'/>
-  <flag name='iscsi.password-secret'/>
  <flag name='isa-serial'/>
  <flag name='dump-completed'/>
  <flag name='qcow2-luks'/>
--- a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml
@ -146,7 +146,6 @@
  <flag name='virtio-blk.num-queues'/>
  <flag name='vmcoreinfo'/>
  <flag name='disk-share-rw'/>
-  <flag name='iscsi.password-secret'/>
  <flag name='isa-serial'/>
  <flag name='dump-completed'/>
  <flag name='qcow2-luks'/>
--- a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml
@ -114,7 +114,6 @@
  <flag name='virtio-blk.num-queues'/>
  <flag name='vmcoreinfo'/>
  <flag name='disk-share-rw'/>
-  <flag name='iscsi.password-secret'/>
  <flag name='pl011'/>
  <flag name='dump-completed'/>
  <flag name='qcow2-luks'/>
--- a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml
@ -112,7 +112,6 @@
  <flag name='machine.pseries.resize-hpt'/>
  <flag name='spapr-vty'/>
  <flag name='disk-share-rw'/>
-  <flag name='iscsi.password-secret'/>
  <flag name='isa-serial'/>
  <flag name='machine.pseries.max-cpu-compat'/>
  <flag name='dump-completed'/>
--- a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml
@ -113,7 +113,6 @@
  <flag name='virtio-gpu.max_outputs'/>
  <flag name='virtio-blk.num-queues'/>
  <flag name='disk-share-rw'/>
-  <flag name='iscsi.password-secret'/>
  <flag name='dump-completed'/>
  <flag name='qcow2-luks'/>
  <flag name='pcie-pci-bridge'/>
--- a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml
@ -75,7 +75,6 @@
  <flag name='virtio-blk.num-queues'/>
  <flag name='sclplmconsole'/>
  <flag name='disk-share-rw'/>
-  <flag name='iscsi.password-secret'/>
  <flag name='dump-completed'/>
  <flag name='virtio-gpu-ccw'/>
  <flag name='virtio-keyboard-ccw'/>
--- a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml
@ -146,7 +146,6 @@
  <flag name='virtio-blk.num-queues'/>
  <flag name='vmcoreinfo'/>
  <flag name='disk-share-rw'/>
-  <flag name='iscsi.password-secret'/>
  <flag name='isa-serial'/>
  <flag name='dump-completed'/>
  <flag name='qcow2-luks'/>
--- a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml
@ -115,7 +115,6 @@
  <flag name='virtio-blk.num-queues'/>
  <flag name='vmcoreinfo'/>
  <flag name='disk-share-rw'/>
-  <flag name='iscsi.password-secret'/>
  <flag name='pl011'/>
  <flag name='dump-completed'/>
  <flag name='qcow2-luks'/>
--- a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml
@ -75,7 +75,6 @@
  <flag name='virtio-blk.num-queues'/>
  <flag name='sclplmconsole'/>
  <flag name='disk-share-rw'/>
-  <flag name='iscsi.password-secret'/>
  <flag name='dump-completed'/>
  <flag name='virtio-gpu-ccw'/>
  <flag name='virtio-keyboard-ccw'/>
--- a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml
@ -145,7 +145,6 @@
  <flag name='virtio-blk.num-queues'/>
  <flag name='vmcoreinfo'/>
  <flag name='disk-share-rw'/>
-  <flag name='iscsi.password-secret'/>
  <flag name='isa-serial'/>
  <flag name='dump-completed'/>
  <flag name='qcow2-luks'/>
--- a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml
@ -144,7 +144,6 @@
  <flag name='virtio-blk.num-queues'/>
  <flag name='vmcoreinfo'/>
  <flag name='disk-share-rw'/>
-  <flag name='iscsi.password-secret'/>
  <flag name='isa-serial'/>
  <flag name='dump-completed'/>
  <flag name='qcow2-luks'/>