qemu: capabilities: Retire QEMU_CAPS_(IDE|SCSI)_DRIVE_WWN

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 8322b0f6e0846a61e46bbfffe94165446878c8e5..5da49e48ac2c3b6b9b41ea8885c7a61f0644ea75 100644 (file)
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -213,8 +213,8 @@ VIR_ENUM_IMPL(virQEMUCaps,
               "usb-redir.filter", /* QEMU_CAPS_USB_REDIR_FILTER */
 
               /* 105 */
-              "ide-drive.wwn", /* QEMU_CAPS_IDE_DRIVE_WWN */
-              "scsi-disk.wwn", /* QEMU_CAPS_SCSI_DISK_WWN */
+              "ide-drive.wwn", /* X_QEMU_CAPS_IDE_DRIVE_WWN */
+              "scsi-disk.wwn", /* X_QEMU_CAPS_SCSI_DISK_WWN */
               "seccomp-sandbox", /* QEMU_CAPS_SECCOMP_SANDBOX */
               "reboot-timeout", /* X_QEMU_CAPS_REBOOT_TIMEOUT */
               "dump-guest-core", /* X_QEMU_CAPS_DUMP_GUEST_CORE */
@@ -1452,12 +1452,10 @@ static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsVfioPCI[] = {
 
 static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsSCSIDisk[] = {
     { "channel", QEMU_CAPS_SCSI_DISK_CHANNEL, NULL },
-    { "wwn", QEMU_CAPS_SCSI_DISK_WWN, NULL },
     { "rotation_rate", QEMU_CAPS_ROTATION_RATE, NULL },
 };
 
 static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsIDEDrive[] = {
-    { "wwn", QEMU_CAPS_IDE_DRIVE_WWN, NULL },
 };
 
 static struct virQEMUCapsDevicePropsFlags virQEMUCapsDevicePropsPiix4PM[] = {

diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index 24014f03c2147262a8217900848cf04d31a050dc..c72f73a161acac932c4a77269b3f10152403583b 100644 (file)
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -191,8 +191,8 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
     QEMU_CAPS_USB_REDIR_FILTER, /* usb-redir.filter */
 
     /* 105 */
-    QEMU_CAPS_IDE_DRIVE_WWN, /* Is ide-drive.wwn available? */
-    QEMU_CAPS_SCSI_DISK_WWN, /* Is scsi-disk.wwn available? */
+    X_QEMU_CAPS_IDE_DRIVE_WWN, /* Is ide-drive.wwn available? */
+    X_QEMU_CAPS_SCSI_DISK_WWN, /* Is scsi-disk.wwn available? */
     QEMU_CAPS_SECCOMP_SANDBOX, /* -sandbox */
     X_QEMU_CAPS_REBOOT_TIMEOUT, /* -boot reboot-timeout */
     X_QEMU_CAPS_DUMP_GUEST_CORE, /* dump-guest-core-parameter */

diff --git a/tests/qemucapabilitiesdata/caps_4.2.0_aarch64.xml b/tests/qemucapabilitiesdata/caps_4.2.0_aarch64.xml
index 0c5e9176586728207eb6bbc54c74b83e2aa5c868..0763809bd16729cd8ca00035628bdfbcb52f51ee 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.2.0_aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0_aarch64.xml
@@ -21,8 +21,6 @@
   <flag name='nec-usb-xhci'/>
   <flag name='lsi'/>
   <flag name='virtio-scsi-pci'/>
-  <flag name='ide-drive.wwn'/>
-  <flag name='scsi-disk.wwn'/>
   <flag name='seccomp-sandbox'/>
   <flag name='vnc'/>
   <flag name='VGA'/>

diff --git a/tests/qemucapabilitiesdata/caps_4.2.0_ppc64.xml b/tests/qemucapabilitiesdata/caps_4.2.0_ppc64.xml
index c7b35dd1d62d3e2074ca2f51b99632fcca658e8f..d596bae8d11a211a0dea157194341b3171bc439c 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.2.0_ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0_ppc64.xml
@@ -21,8 +21,6 @@
   <flag name='nec-usb-xhci'/>
   <flag name='lsi'/>
   <flag name='virtio-scsi-pci'/>
-  <flag name='ide-drive.wwn'/>
-  <flag name='scsi-disk.wwn'/>
   <flag name='seccomp-sandbox'/>
   <flag name='vnc'/>
   <flag name='VGA'/>

diff --git a/tests/qemucapabilitiesdata/caps_4.2.0_s390x.xml b/tests/qemucapabilitiesdata/caps_4.2.0_s390x.xml
index b440d9d5389f13cc6fce7a1048fca4c12ea9bd8b..8ee177f860d285bd29c766019156fed12bb92e57 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.2.0_s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0_s390x.xml
@@ -11,7 +11,6 @@
   <flag name='scsi-block'/>
   <flag name='virtio-scsi-pci'/>
   <flag name='usb-redir.filter'/>
-  <flag name='scsi-disk.wwn'/>
   <flag name='seccomp-sandbox'/>
   <flag name='vnc'/>
   <flag name='s390-sclp'/>

diff --git a/tests/qemucapabilitiesdata/caps_4.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_4.2.0_x86_64.xml
index c2f9dd8add935797a0278198591650c80e00f2b8..6a78466b0f0f79790f46ef14f5211b820d49bc2d 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_4.2.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_4.2.0_x86_64.xml
@@ -28,8 +28,6 @@
   <flag name='disable-s3'/>
   <flag name='disable-s4'/>
   <flag name='usb-redir.filter'/>
-  <flag name='ide-drive.wwn'/>
-  <flag name='scsi-disk.wwn'/>
   <flag name='seccomp-sandbox'/>
   <flag name='vnc'/>
   <flag name='qxl'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.0.0_aarch64.xml b/tests/qemucapabilitiesdata/caps_5.0.0_aarch64.xml
index 8e26b07d2375dba9855c6331462508ba3a3f84e7..a981036763fa80c666fa8712a3bc0b550b903340 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.0.0_aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0_aarch64.xml
@@ -21,8 +21,6 @@
   <flag name='nec-usb-xhci'/>
   <flag name='lsi'/>
   <flag name='virtio-scsi-pci'/>
-  <flag name='ide-drive.wwn'/>
-  <flag name='scsi-disk.wwn'/>
   <flag name='seccomp-sandbox'/>
   <flag name='vnc'/>
   <flag name='VGA'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.0.0_ppc64.xml b/tests/qemucapabilitiesdata/caps_5.0.0_ppc64.xml
index 03a47bf713819fabea08904bd4c5c73e5290569d..c61ab63bdc2737769fb2010721c8154096553ec9 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.0.0_ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0_ppc64.xml
@@ -21,8 +21,6 @@
   <flag name='nec-usb-xhci'/>
   <flag name='lsi'/>
   <flag name='virtio-scsi-pci'/>
-  <flag name='ide-drive.wwn'/>
-  <flag name='scsi-disk.wwn'/>
   <flag name='seccomp-sandbox'/>
   <flag name='vnc'/>
   <flag name='VGA'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.0.0_riscv64.xml b/tests/qemucapabilitiesdata/caps_5.0.0_riscv64.xml
index a9f81c0180a234d49eb443ddd89618f3b73518ee..4a30e8e815796d7b9db73c9a3a02ea399499f3cc 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.0.0_riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0_riscv64.xml
@@ -25,8 +25,6 @@
   <flag name='lsi'/>
   <flag name='virtio-scsi-pci'/>
   <flag name='usb-redir.filter'/>
-  <flag name='ide-drive.wwn'/>
-  <flag name='scsi-disk.wwn'/>
   <flag name='seccomp-sandbox'/>
   <flag name='vnc'/>
   <flag name='VGA'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_5.0.0_x86_64.xml
index c84821dd4b36e020fcfcb9432a76bed554be8519..44e40d5431ff5fcff4c13011aa61d2aa26d2eb01 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.0.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.0.0_x86_64.xml
@@ -28,8 +28,6 @@
   <flag name='disable-s3'/>
   <flag name='disable-s4'/>
   <flag name='usb-redir.filter'/>
-  <flag name='ide-drive.wwn'/>
-  <flag name='scsi-disk.wwn'/>
   <flag name='seccomp-sandbox'/>
   <flag name='vnc'/>
   <flag name='qxl'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.1.0_sparc.xml b/tests/qemucapabilitiesdata/caps_5.1.0_sparc.xml
index bc5b3e6fac208a90163b866740a8c341b20314ea..1d51c2856a0c5bbc02c36855806f1e51c8965df5 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.1.0_sparc.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0_sparc.xml
@@ -9,7 +9,6 @@
   <flag name='scsi-disk.channel'/>
   <flag name='scsi-block'/>
   <flag name='usb-redir.filter'/>
-  <flag name='scsi-disk.wwn'/>
   <flag name='seccomp-sandbox'/>
   <flag name='vnc'/>
   <flag name='rng-random'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.1.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_5.1.0_x86_64.xml
index c8ee59313137a3154d74827e80b4e3bf44e112ec..a96df3c7580cfa09a289f863598ca55c202210ad 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.1.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.1.0_x86_64.xml
@@ -28,8 +28,6 @@
   <flag name='disable-s3'/>
   <flag name='disable-s4'/>
   <flag name='usb-redir.filter'/>
-  <flag name='ide-drive.wwn'/>
-  <flag name='scsi-disk.wwn'/>
   <flag name='seccomp-sandbox'/>
   <flag name='vnc'/>
   <flag name='qxl'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.2.0_aarch64.xml b/tests/qemucapabilitiesdata/caps_5.2.0_aarch64.xml
index 131f31b597eb33317622995e0d5333bc1bc7a3a1..dd1b20a15416169038ca02ba370d028d297bda1f 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.2.0_aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0_aarch64.xml
@@ -21,8 +21,6 @@
   <flag name='nec-usb-xhci'/>
   <flag name='lsi'/>
   <flag name='virtio-scsi-pci'/>
-  <flag name='ide-drive.wwn'/>
-  <flag name='scsi-disk.wwn'/>
   <flag name='seccomp-sandbox'/>
   <flag name='vnc'/>
   <flag name='VGA'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.2.0_ppc64.xml b/tests/qemucapabilitiesdata/caps_5.2.0_ppc64.xml
index c719334258f14087003ff4764c6e8615818e1ff3..d8e2243069dabd4c6233af612476878f93b6f3d2 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.2.0_ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0_ppc64.xml
@@ -21,8 +21,6 @@
   <flag name='nec-usb-xhci'/>
   <flag name='lsi'/>
   <flag name='virtio-scsi-pci'/>
-  <flag name='ide-drive.wwn'/>
-  <flag name='scsi-disk.wwn'/>
   <flag name='seccomp-sandbox'/>
   <flag name='vnc'/>
   <flag name='VGA'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.2.0_riscv64.xml b/tests/qemucapabilitiesdata/caps_5.2.0_riscv64.xml
index fecbf3ef691adc558437e39a74160ad199b2e9d9..864307485e5501895193f2e54ec8f2f37badb634 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.2.0_riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0_riscv64.xml
@@ -25,8 +25,6 @@
   <flag name='lsi'/>
   <flag name='virtio-scsi-pci'/>
   <flag name='usb-redir.filter'/>
-  <flag name='ide-drive.wwn'/>
-  <flag name='scsi-disk.wwn'/>
   <flag name='seccomp-sandbox'/>
   <flag name='vnc'/>
   <flag name='VGA'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.2.0_s390x.xml b/tests/qemucapabilitiesdata/caps_5.2.0_s390x.xml
index 38a3f70a5e24dd43dde83ad7cd897c5ca9456933..1ae0e4cefeddd196fd8bdf52202f176908be429b 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.2.0_s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0_s390x.xml
@@ -11,7 +11,6 @@
   <flag name='scsi-block'/>
   <flag name='virtio-scsi-pci'/>
   <flag name='usb-redir.filter'/>
-  <flag name='scsi-disk.wwn'/>
   <flag name='seccomp-sandbox'/>
   <flag name='vnc'/>
   <flag name='s390-sclp'/>

diff --git a/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml
index 86123439c46f1fdcf2ac2e73aefa9a66eb8b5938..eb825fbd401ec1af26a73dd882019fcc75d474f8 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_5.2.0_x86_64.xml
@@ -28,8 +28,6 @@
   <flag name='disable-s3'/>
   <flag name='disable-s4'/>
   <flag name='usb-redir.filter'/>
-  <flag name='ide-drive.wwn'/>
-  <flag name='scsi-disk.wwn'/>
   <flag name='seccomp-sandbox'/>
   <flag name='vnc'/>
   <flag name='qxl'/>

diff --git a/tests/qemucapabilitiesdata/caps_6.0.0_aarch64.xml b/tests/qemucapabilitiesdata/caps_6.0.0_aarch64.xml
index ca69f1b45e49162cb54e696f40b876cc3e082421..9928d6a07b1e18330c01bbf057126e7808cd2c39 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_6.0.0_aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0_aarch64.xml
@@ -20,8 +20,6 @@
   <flag name='nec-usb-xhci'/>
   <flag name='lsi'/>
   <flag name='virtio-scsi-pci'/>
-  <flag name='ide-drive.wwn'/>
-  <flag name='scsi-disk.wwn'/>
   <flag name='seccomp-sandbox'/>
   <flag name='vnc'/>
   <flag name='VGA'/>

diff --git a/tests/qemucapabilitiesdata/caps_6.0.0_s390x.xml b/tests/qemucapabilitiesdata/caps_6.0.0_s390x.xml
index a63263e7e5a224affe64c81fe58c21f467048fe6..a97519f2ffbd5f2c2205a9db4c92c4c2a9a8ba02 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_6.0.0_s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0_s390x.xml
@@ -11,7 +11,6 @@
   <flag name='scsi-block'/>
   <flag name='virtio-scsi-pci'/>
   <flag name='usb-redir.filter'/>
-  <flag name='scsi-disk.wwn'/>
   <flag name='seccomp-sandbox'/>
   <flag name='vnc'/>
   <flag name='s390-sclp'/>

diff --git a/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml
index 53876effa8b521360029ba3290e00dcaed48f2b3..f72665067480b80a0790c6670fc2cb2bacb9fb52 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.0.0_x86_64.xml
@@ -27,8 +27,6 @@
   <flag name='disable-s3'/>
   <flag name='disable-s4'/>
   <flag name='usb-redir.filter'/>
-  <flag name='ide-drive.wwn'/>
-  <flag name='scsi-disk.wwn'/>
   <flag name='seccomp-sandbox'/>
   <flag name='vnc'/>
   <flag name='qxl'/>

diff --git a/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml
index 667e60b08798fa2a65af2c37fdc2cf6f5dc87b04..f65034ae9c1e4a1372d3ad6ce07c765a86e1beff 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.1.0_x86_64.xml
@@ -27,8 +27,6 @@
   <flag name='disable-s3'/>
   <flag name='disable-s4'/>
   <flag name='usb-redir.filter'/>
-  <flag name='ide-drive.wwn'/>
-  <flag name='scsi-disk.wwn'/>
   <flag name='seccomp-sandbox'/>
   <flag name='vnc'/>
   <flag name='qxl'/>

diff --git a/tests/qemucapabilitiesdata/caps_6.2.0_aarch64.xml b/tests/qemucapabilitiesdata/caps_6.2.0_aarch64.xml
index 16d8a2108132c9bf6a05d99cd2701aee97d41aa0..182d2b9f4e7a6f280bfce803b608f84ddb32a50e 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_6.2.0_aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0_aarch64.xml
@@ -25,8 +25,6 @@
   <flag name='lsi'/>
   <flag name='virtio-scsi-pci'/>
   <flag name='usb-redir.filter'/>
-  <flag name='ide-drive.wwn'/>
-  <flag name='scsi-disk.wwn'/>
   <flag name='seccomp-sandbox'/>
   <flag name='vnc'/>
   <flag name='VGA'/>

diff --git a/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml b/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml
index f25eacd8fb1dbdf1f6e5c41b41bf27128d37d19c..0c2ee9e513d2061318da835984326c43223fa39e 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0_ppc64.xml
@@ -22,8 +22,6 @@
   <flag name='virtio-scsi-pci'/>
   <flag name='disable-s3'/>
   <flag name='disable-s4'/>
-  <flag name='ide-drive.wwn'/>
-  <flag name='scsi-disk.wwn'/>
   <flag name='vnc'/>
   <flag name='VGA'/>
   <flag name='cirrus-vga'/>

diff --git a/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml
index 8a3c0192b54bb2c09c99a1ca7f5e86a2bc0a18ca..c25bb0e469b4cbf063ee291165bbea84bc50aeef 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_6.2.0_x86_64.xml
@@ -27,8 +27,6 @@
   <flag name='disable-s3'/>
   <flag name='disable-s4'/>
   <flag name='usb-redir.filter'/>
-  <flag name='ide-drive.wwn'/>
-  <flag name='scsi-disk.wwn'/>
   <flag name='seccomp-sandbox'/>
   <flag name='vnc'/>
   <flag name='qxl'/>

diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_aarch64+hvf.xml b/tests/qemucapabilitiesdata/caps_7.0.0_aarch64+hvf.xml
index 13259cce7992d5d96022518068ba757f7b66bdf3..fbd08eac810073d091934c47ff4524e7122b3243 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_7.0.0_aarch64+hvf.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0_aarch64+hvf.xml
@@ -24,8 +24,6 @@
   <flag name='lsi'/>
   <flag name='virtio-scsi-pci'/>
   <flag name='usb-redir.filter'/>
-  <flag name='ide-drive.wwn'/>
-  <flag name='scsi-disk.wwn'/>
   <flag name='seccomp-sandbox'/>
   <flag name='vnc'/>
   <flag name='VGA'/>

diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_aarch64.xml b/tests/qemucapabilitiesdata/caps_7.0.0_aarch64.xml
index 1f08d3d696f64994d4340a960fd6651954c1c25d..6d487247cc57ce8425b03dc5b9db44041b5bb705 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_7.0.0_aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0_aarch64.xml
@@ -25,8 +25,6 @@
   <flag name='lsi'/>
   <flag name='virtio-scsi-pci'/>
   <flag name='usb-redir.filter'/>
-  <flag name='ide-drive.wwn'/>
-  <flag name='scsi-disk.wwn'/>
   <flag name='seccomp-sandbox'/>
   <flag name='vnc'/>
   <flag name='VGA'/>

diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml b/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml
index 49efb980401af0a81bdc51ddb6f2e31251210689..7d7df4ed134b74887dca970a500b44801595813f 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0_ppc64.xml
@@ -27,8 +27,6 @@
   <flag name='disable-s3'/>
   <flag name='disable-s4'/>
   <flag name='usb-redir.filter'/>
-  <flag name='ide-drive.wwn'/>
-  <flag name='scsi-disk.wwn'/>
   <flag name='seccomp-sandbox'/>
   <flag name='vnc'/>
   <flag name='VGA'/>

diff --git a/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml
index 00bf47f46a80159d74dfd133c7e540123ac538d8..6616e43b003a48e1d67eda57162f329794eba120 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.0.0_x86_64.xml
@@ -27,8 +27,6 @@
   <flag name='disable-s3'/>
   <flag name='disable-s4'/>
   <flag name='usb-redir.filter'/>
-  <flag name='ide-drive.wwn'/>
-  <flag name='scsi-disk.wwn'/>
   <flag name='seccomp-sandbox'/>
   <flag name='vnc'/>
   <flag name='qxl'/>

diff --git a/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml b/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml
index 23067034021dc3f0ef2cd52845a822f1a7979de9..3ff7a88cd2de2d24d1e9d8ac4f11f14289fb0226 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.1.0_ppc64.xml
@@ -26,8 +26,6 @@
   <flag name='disable-s3'/>
   <flag name='disable-s4'/>
   <flag name='usb-redir.filter'/>
-  <flag name='ide-drive.wwn'/>
-  <flag name='scsi-disk.wwn'/>
   <flag name='seccomp-sandbox'/>
   <flag name='vnc'/>
   <flag name='VGA'/>

diff --git a/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml
index 9edf6a9733c13d3c6fb21d15553e8246586ef6f5..4e2addd76beb239bceed8dca7ad25bbfce9d97d6 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.1.0_x86_64.xml
@@ -27,8 +27,6 @@
   <flag name='disable-s3'/>
   <flag name='disable-s4'/>
   <flag name='usb-redir.filter'/>
-  <flag name='ide-drive.wwn'/>
-  <flag name='scsi-disk.wwn'/>
   <flag name='seccomp-sandbox'/>
   <flag name='vnc'/>
   <flag name='qxl'/>

diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml b/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml
index e80fd7cc25700e1f56394d468ba333242709cd7d..06f8c5801f0714675045b7a46a62b33892eab861 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml
+++ b/tests/qemucapabilitiesdata/caps_7.2.0_ppc.xml
@@ -27,8 +27,6 @@
   <flag name='disable-s3'/>
   <flag name='disable-s4'/>
   <flag name='usb-redir.filter'/>
-  <flag name='ide-drive.wwn'/>
-  <flag name='scsi-disk.wwn'/>
   <flag name='seccomp-sandbox'/>
   <flag name='vnc'/>
   <flag name='VGA'/>

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 06ba71e1dd5c6e21f987ca539b55653551309481..0007a33dca6a6f902eba80a0fd4a7f4687c66f5e 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml
+++ b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64+hvf.xml
@@ -26,8 +26,6 @@
   <flag name='disable-s3'/>
   <flag name='disable-s4'/>
   <flag name='usb-redir.filter'/>
-  <flag name='ide-drive.wwn'/>
-  <flag name='scsi-disk.wwn'/>
   <flag name='seccomp-sandbox'/>
   <flag name='vnc'/>
   <flag name='qxl'/>

diff --git a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml
index e726c5ca9772e7d673af39a56f6110fe40740775..e298cbd9b18ae9f13fe812fb5699e3be29ae04c0 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_7.2.0_x86_64.xml
@@ -27,8 +27,6 @@
   <flag name='disable-s3'/>
   <flag name='disable-s4'/>
   <flag name='usb-redir.filter'/>
-  <flag name='ide-drive.wwn'/>
-  <flag name='scsi-disk.wwn'/>
   <flag name='seccomp-sandbox'/>
   <flag name='vnc'/>
   <flag name='qxl'/>

diff --git a/tests/qemucapabilitiesdata/caps_8.0.0_riscv64.xml b/tests/qemucapabilitiesdata/caps_8.0.0_riscv64.xml
index 8286806239273096a9d6788ee15a642913058e40..987962ca41ce591d40f554b6016fef47cb45e84d 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_8.0.0_riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_8.0.0_riscv64.xml
@@ -19,8 +19,6 @@
   <flag name='nec-usb-xhci'/>
   <flag name='lsi'/>
   <flag name='virtio-scsi-pci'/>
-  <flag name='ide-drive.wwn'/>
-  <flag name='scsi-disk.wwn'/>
   <flag name='seccomp-sandbox'/>
   <flag name='vnc'/>
   <flag name='VGA'/>

diff --git a/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml
index e6174532aaac5dc7a8d0e31b3d8bb44806f29122..c43c2093281426a78833ea88b7c8ef01bbe54008 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_8.0.0_x86_64.xml
@@ -27,8 +27,6 @@
   <flag name='disable-s3'/>
   <flag name='disable-s4'/>
   <flag name='usb-redir.filter'/>
-  <flag name='ide-drive.wwn'/>
-  <flag name='scsi-disk.wwn'/>
   <flag name='seccomp-sandbox'/>
   <flag name='vnc'/>
   <flag name='qxl'/>

diff --git a/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml b/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml
index 88c7ac89db630d3ef879b3722ed884ddb3ae3e44..35751ed44197c0539911bae5775d76052a55f1c1 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_8.1.0_s390x.xml
@@ -9,7 +9,6 @@
   <flag name='scsi-disk.channel'/>
   <flag name='scsi-block'/>
   <flag name='virtio-scsi-pci'/>
-  <flag name='scsi-disk.wwn'/>
   <flag name='seccomp-sandbox'/>
   <flag name='vnc'/>
   <flag name='s390-sclp'/>

diff --git a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml b/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml
index 3585f27e460172345e03ddae5fce08f61f7ee488..e656a2024a5ca080e304a434604c43416ba6b6d6 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_8.1.0_x86_64.xml
@@ -27,8 +27,6 @@
   <flag name='disable-s3'/>
   <flag name='disable-s4'/>
   <flag name='usb-redir.filter'/>
-  <flag name='ide-drive.wwn'/>
-  <flag name='scsi-disk.wwn'/>
   <flag name='seccomp-sandbox'/>
   <flag name='vnc'/>
   <flag name='qxl'/>