[PATCH 06/12] qemu: capabilities: Retire QEMU_CAPS_ISCSI_PASSWORD_SECRET

Signed-off-by: Peter Krempa <pkrempa(a)redhat.com&gt; --- src/qemu/qemu_capabilities.c | 3 +-- src/qemu/qemu_capabilities.h | 2 +- tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml | 1 - tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml | 1 - tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml | 1 - tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml | 1 - 41 files changed, 2 insertions(+), 42 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 7f39a7d595..2842666d2e 100644 --- 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 }, diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index b415b82a82..ea2b3b0ccd 100644 --- 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= */ diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml index e4b7cc9581..bfc68aa9a7 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml index 71fd465304..702ee5160c 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml index aea66d22fa..1a5284fc4c 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml index 54e0d83356..d3d4ee00fa 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml index cce82f0863..1c3eaf63e5 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml index 08da606409..de5e0de181 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml index 623f56a9c1..9a638e7527 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml index b91af5dedd..765027cba2 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml index 039c8c0b07..57ded29ba7 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.xml index 78fbb7fcbb..2148c46bc2 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml index 6cd80ac9db..386607dc41 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.xml index c8098e1b1b..95c309f3d0 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.xml index 311aeb2345..71cfd86a69 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.aarch64.xml index 7be3e93766..aa9cf21d21 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.ppc64.xml index 625eb66e05..a198fd261d 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.xml index 22def85d8a..4c8c9bdd82 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.xml index 7ca2e8a6ca..3f4bf4dfe8 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.0.0.s390x.xml index c635c38504..74eb8d89fe 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.xml index 9c71800987..3b5dcfc8d2 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.1.0.x86_64.xml index 4797f838fe..d5463952f2 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.aarch64.xml index c5831ed7a0..562d082681 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.ppc64.xml index 88a931167c..c9ee56014c 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_4.2.0.s390x.xml index 4cc73436d0..1fa1ceb827 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_4.2.0.x86_64.xml index cb7c27b8f4..f96027feb5 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.aarch64.xml index d67956f2d0..e1d3b1c831 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.ppc64.xml index 0358971510..28d494a7fd 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.riscv64.xml index 95ab677abc..23ada9ac91 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.0.0.x86_64.xml index c894cba8d2..43e0d4b661 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml b/tests/qemucapabilitiesdata/caps_5.1.0.sparc.xml index 4d1eeea008..7d4d2edd7c 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.1.0.x86_64.xml index 05da126589..aae3346e5d 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.aarch64.xml index d77ba09bec..e4eb9c2316 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.ppc64.xml index 0d67439b8e..253188797c 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.riscv64.xml index b7889c8b49..fcfbbb6cb5 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml b/tests/qemucapabilitiesdata/caps_5.2.0.s390x.xml index 9e34ee78d9..1720c9f885 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_5.2.0.x86_64.xml index d79bb8f747..f07e21ada9 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.aarch64.xml index 3e6347c546..4348f54516 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml b/tests/qemucapabilitiesdata/caps_6.0.0.s390x.xml index bfc5c6c5f1..7334b17b22 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.0.0.x86_64.xml index 5558d14b15..4ed12cf316 100644 --- 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'/> diff --git a/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_6.1.0.x86_64.xml index 047920e424..f727efcff1 100644 --- 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'/> -- 2.31.1