qemu: always assume QEMU_CAPS_DEVICE_SCSI_GENERIC_BOOTINDEX

Introduced by QEMU commit 28b77657 in v1.0-rc4~21^2~8.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Andrea Bolognani <abologna@redhat.com>

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 5a32a0409ffb2d01b5def68b47bad9d2ad5ea89f..202859abacc3ca033d51a1a4424f367b49737a32 100644 (file)
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -1224,7 +1224,6 @@ static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsUSBHost[] = {
 };
 
 static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsSCSIGeneric[] = {
-    { "bootindex", QEMU_CAPS_DEVICE_SCSI_GENERIC_BOOTINDEX },
 };
 
 static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsI440FXPCIHost[] = {

diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index 0ceb5f3af525a17c949f738ad38ed79f96a7de2d..0f69c691367c8b8bcd2faa1ab70b876e68d1e392 100644 (file)
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -251,7 +251,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
     QEMU_CAPS_DEVICE_SCSI_GENERIC, /* -device scsi-generic */
 
     /* 145 */
-    QEMU_CAPS_DEVICE_SCSI_GENERIC_BOOTINDEX, /* -device scsi-generic.bootindex */
+    X_QEMU_CAPS_DEVICE_SCSI_GENERIC_BOOTINDEX, /* -device scsi-generic.bootindex */
     QEMU_CAPS_MEM_MERGE, /* -machine mem-merge */
     QEMU_CAPS_VNC_WEBSOCKET, /* -vnc x:y,websocket */
     QEMU_CAPS_DRIVE_DISCARD, /* -drive discard=off(ignore)|on(unmap) */

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 3fd9d78daf6a56c1ad33fc805bb196fe18eff4fe..ff9589f593a0e46f20d01dc01116470e799b7701 100644 (file)
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -5324,15 +5324,6 @@ qemuBuildHostdevCommandLine(virCommandPtr cmd,
                                _("booting from assigned devices is only "
                                  "supported for PCI, USB and SCSI devices"));
                 return -1;
-            } else {
-                if (subsys->type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI &&
-                    !virQEMUCapsGet(qemuCaps,
-                                    QEMU_CAPS_DEVICE_SCSI_GENERIC_BOOTINDEX)) {
-                    virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
-                                   _("booting from assigned SCSI devices is not"
-                                     " supported with this version of qemu"));
-                    return -1;
-                }
             }
         }
 

diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
index 338c42f70bcae5f7f01a200819fd9a14cdcbefef..fd8b56045d9142edd4e14b5d2a6af5a59a505f4d 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
@@ -63,7 +63,6 @@
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
   <flag name='scsi-generic'/>
-  <flag name='scsi-generic.bootindex'/>
   <flag name='mem-merge'/>
   <flag name='vnc-websocket'/>
   <flag name='drive-discard'/>

diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
index a433fc12f02f2df49f9a37078f5caf2b45405204..68311493795d4442670dd7b940ddb5fc5ff44840 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
@@ -64,7 +64,6 @@
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
   <flag name='scsi-generic'/>
-  <flag name='scsi-generic.bootindex'/>
   <flag name='mem-merge'/>
   <flag name='vnc-websocket'/>
   <flag name='mlock'/>

diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
index bd5fec9f1a44a9a2f3b2ac749365527eb0662b23..852dcb0226ec033d3c040649e2fb535b8981b547 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
@@ -64,7 +64,6 @@
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
   <flag name='scsi-generic'/>
-  <flag name='scsi-generic.bootindex'/>
   <flag name='mem-merge'/>
   <flag name='vnc-websocket'/>
   <flag name='drive-discard'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
index 17a58a58f3c0e4de324ab419ada877c0d3a6dae2..af35d676cbadfe498e6d5d955d4ff006c05fb985 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
@@ -66,7 +66,6 @@
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
   <flag name='scsi-generic'/>
-  <flag name='scsi-generic.bootindex'/>
   <flag name='mem-merge'/>
   <flag name='vnc-websocket'/>
   <flag name='drive-discard'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
index 2da02c56be9e355cc45b3c755b8770f4edaac557..8d22cd8ca69b0ee01820829435600eb02cdbf77b 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
@@ -52,7 +52,6 @@
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
   <flag name='scsi-generic'/>
-  <flag name='scsi-generic.bootindex'/>
   <flag name='mem-merge'/>
   <flag name='vnc-websocket'/>
   <flag name='drive-discard'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
index 34972d614d528c5cc5e4e0e12b20de3649d5b5e2..ee9faac3cd0fdd64f98244cba0324f90b4bcd8d5 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
@@ -52,7 +52,6 @@
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
   <flag name='scsi-generic'/>
-  <flag name='scsi-generic.bootindex'/>
   <flag name='mem-merge'/>
   <flag name='vnc-websocket'/>
   <flag name='drive-discard'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
index 33d404fdc661eda48dec42f76217c8d0cf64ce0f..c2b41249da937a63c289cd1e7465eb155e639edb 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
@@ -36,7 +36,6 @@
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
   <flag name='scsi-generic'/>
-  <flag name='scsi-generic.bootindex'/>
   <flag name='mem-merge'/>
   <flag name='vnc-websocket'/>
   <flag name='drive-discard'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
index d9b520356924b9d489d7a0e541ea2e52346cf2d7..46f6f6c4925bec89a32a8a083bef98fdb2204f50 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
@@ -66,7 +66,6 @@
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
   <flag name='scsi-generic'/>
-  <flag name='scsi-generic.bootindex'/>
   <flag name='mem-merge'/>
   <flag name='vnc-websocket'/>
   <flag name='drive-discard'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
index fd70b05fb9b5a1c90ae6929f7256ef30d98d3e2c..fa515d455b9995355ea800a344fb74c178cc302d 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
@@ -36,7 +36,6 @@
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
   <flag name='scsi-generic'/>
-  <flag name='scsi-generic.bootindex'/>
   <flag name='mem-merge'/>
   <flag name='vnc-websocket'/>
   <flag name='drive-discard'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
index 334607c9e580d3afa340aae784bfd4e6adc2b814..f3be49a288570e46568efc5b18bf038dd2c264c4 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
@@ -66,7 +66,6 @@
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
   <flag name='scsi-generic'/>
-  <flag name='scsi-generic.bootindex'/>
   <flag name='mem-merge'/>
   <flag name='vnc-websocket'/>
   <flag name='drive-discard'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
index 53cc1d2a0e19ceb4b985f3950572c317b908af92..4f13281e3d8a84ea08ff525c24ea5f36adc52e79 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
@@ -52,7 +52,6 @@
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
   <flag name='scsi-generic'/>
-  <flag name='scsi-generic.bootindex'/>
   <flag name='mem-merge'/>
   <flag name='vnc-websocket'/>
   <flag name='drive-discard'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
index 48a27a0e72989fc2e7ed192f8dbb6bc1d8d211b6..295e6062dfe7189d785ec8d3b907b490f2f8ab8d 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
@@ -52,7 +52,6 @@
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
   <flag name='scsi-generic'/>
-  <flag name='scsi-generic.bootindex'/>
   <flag name='mem-merge'/>
   <flag name='vnc-websocket'/>
   <flag name='drive-discard'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
index 4e34bf6e2126646f75ab7618daaac1590c487df1..d19ad59b31100fbde6ea04f555093096546517ef 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
@@ -36,7 +36,6 @@
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
   <flag name='scsi-generic'/>
-  <flag name='scsi-generic.bootindex'/>
   <flag name='mem-merge'/>
   <flag name='vnc-websocket'/>
   <flag name='drive-discard'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
index 7c994b82b9efc5e3fe28e0ed52415137f54a334c..16861727cfa990d437efb0e86297422abb0c32da 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
@@ -66,7 +66,6 @@
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
   <flag name='scsi-generic'/>
-  <flag name='scsi-generic.bootindex'/>
   <flag name='mem-merge'/>
   <flag name='vnc-websocket'/>
   <flag name='drive-discard'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
index ecf207b384f80095a141cc70f163af8e7c8de7f0..7759fe9f9990e6bc07ccddab57b9e44d11df6541 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
@@ -66,7 +66,6 @@
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
   <flag name='scsi-generic'/>
-  <flag name='scsi-generic.bootindex'/>
   <flag name='mem-merge'/>
   <flag name='vnc-websocket'/>
   <flag name='drive-discard'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
index 142d8452818d9f63248fe7633c6525cf24ea19e8..d9c352ca17eee04363bc32f15e18a1ee669dba48 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
@@ -66,7 +66,6 @@
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
   <flag name='scsi-generic'/>
-  <flag name='scsi-generic.bootindex'/>
   <flag name='mem-merge'/>
   <flag name='vnc-websocket'/>
   <flag name='drive-discard'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
index bd1bb7992d7392acb4e9337b87e3ff72ff61132d..283a290799d1a4bbcf3b342c9329c3f684322f54 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
@@ -54,7 +54,6 @@
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
   <flag name='scsi-generic'/>
-  <flag name='scsi-generic.bootindex'/>
   <flag name='mem-merge'/>
   <flag name='vnc-websocket'/>
   <flag name='drive-discard'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
index 881c002770fb600ed5a49985a395524cad0e901b..c78fa358344705a017839a675297c1274f38796d 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
@@ -52,7 +52,6 @@
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
   <flag name='scsi-generic'/>
-  <flag name='scsi-generic.bootindex'/>
   <flag name='mem-merge'/>
   <flag name='vnc-websocket'/>
   <flag name='drive-discard'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
index 0317c655316eaa49246d370ff8cda7214c081493..9af99e6244f93cd21da364a6f2a54e1844cd7805 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
@@ -66,7 +66,6 @@
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
   <flag name='scsi-generic'/>
-  <flag name='scsi-generic.bootindex'/>
   <flag name='mem-merge'/>
   <flag name='vnc-websocket'/>
   <flag name='drive-discard'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
index b33eea90bc042b590c95da131100d5a7290b4094..ad60b5b6d2c5359fcc4718cf52f3f9e937699e5d 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
@@ -36,7 +36,6 @@
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
   <flag name='scsi-generic'/>
-  <flag name='scsi-generic.bootindex'/>
   <flag name='mem-merge'/>
   <flag name='vnc-websocket'/>
   <flag name='drive-discard'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
index 53a792ea9c045dabfa7c1498d1acb7d395a4e2e9..164639c6e7391ae756a3a84d56a72c120f2a2d6b 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
@@ -66,7 +66,6 @@
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
   <flag name='scsi-generic'/>
-  <flag name='scsi-generic.bootindex'/>
   <flag name='mem-merge'/>
   <flag name='vnc-websocket'/>
   <flag name='drive-discard'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
index 0705501c1df602a2f4faebd9ac89132871470f67..5cd2cd8552946b59493176e18f05f50d99c425a0 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
@@ -36,7 +36,6 @@
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
   <flag name='scsi-generic'/>
-  <flag name='scsi-generic.bootindex'/>
   <flag name='mem-merge'/>
   <flag name='vnc-websocket'/>
   <flag name='drive-discard'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
index 5c87d9484a375274c948ceb458506858989ad9c0..f11af45f5798f7d7872172ea4d9d9646b9002c03 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
@@ -66,7 +66,6 @@
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
   <flag name='scsi-generic'/>
-  <flag name='scsi-generic.bootindex'/>
   <flag name='mem-merge'/>
   <flag name='vnc-websocket'/>
   <flag name='drive-discard'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
index 8c24c0bb029a972ab8d991866760a8b485eaa91a..6089f96f720d41798a640bda9de277227302546f 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
@@ -52,7 +52,6 @@
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
   <flag name='scsi-generic'/>
-  <flag name='scsi-generic.bootindex'/>
   <flag name='mem-merge'/>
   <flag name='vnc-websocket'/>
   <flag name='drive-discard'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
index ee0981da26185d014aa6b629270da01a0ed72a3a..a5a8d2d551e547d88bd5a44bc1ae1693115cd081 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
@@ -36,7 +36,6 @@
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
   <flag name='scsi-generic'/>
-  <flag name='scsi-generic.bootindex'/>
   <flag name='mem-merge'/>
   <flag name='vnc-websocket'/>
   <flag name='drive-discard'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
index 82ccc49784fff8af736e1958d521bc9243dd5f5c..b1bf8c57e2cffa9497a9a28defddaaa0b3d86fa1 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
@@ -66,7 +66,6 @@
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
   <flag name='scsi-generic'/>
-  <flag name='scsi-generic.bootindex'/>
   <flag name='mem-merge'/>
   <flag name='vnc-websocket'/>
   <flag name='drive-discard'/>

diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
index bf347dac646a998295f6f51c2c23b47ee6f48297..9a0281e3c6a955ff14ae049343807f6c8f469c01 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
@@ -52,7 +52,6 @@
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
   <flag name='scsi-generic'/>
-  <flag name='scsi-generic.bootindex'/>
   <flag name='mem-merge'/>
   <flag name='vnc-websocket'/>
   <flag name='drive-discard'/>

diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
index 39cc480dd2c3152717b71b7ab9389d960f2b7a40..fecef3a0cf5e94c62369045009624e4c673cd0ae 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
@@ -26,7 +26,6 @@
   <flag name='rng-egd'/>
   <flag name='tpm-passthrough'/>
   <flag name='scsi-generic'/>
-  <flag name='scsi-generic.bootindex'/>
   <flag name='mem-merge'/>
   <flag name='vnc-websocket'/>
   <flag name='drive-discard'/>

diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
index 344740879e57af4e410ede140e60b7860fc8fad5..4cae4fd058679e05f7d46272539e1920503411fe 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
@@ -26,7 +26,6 @@
   <flag name='rng-egd'/>
   <flag name='tpm-passthrough'/>
   <flag name='scsi-generic'/>
-  <flag name='scsi-generic.bootindex'/>
   <flag name='mem-merge'/>
   <flag name='vnc-websocket'/>
   <flag name='drive-discard'/>

diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
index a049fcea20d42f325a438a78e60400a32d50d180..eeb0941f27b45bd17c27357049513535cb6dd323 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
@@ -66,7 +66,6 @@
   <flag name='pci-bridge'/>
   <flag name='vfio-pci'/>
   <flag name='scsi-generic'/>
-  <flag name='scsi-generic.bootindex'/>
   <flag name='mem-merge'/>
   <flag name='vnc-websocket'/>
   <flag name='drive-discard'/>

diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 42a93f6bddbf1384630b158f661c555a681893fe..04b6c00ebaca4cbf96e4c9d0e21513befb44eb76 100644 (file)
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -2436,8 +2436,7 @@ mymain(void)
             QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_DEVICE_SCSI_GENERIC);
     DO_TEST("hostdev-scsi-virtio-scsi",
             QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_VIRTIO_SCSI,
-            QEMU_CAPS_DEVICE_SCSI_GENERIC,
-            QEMU_CAPS_DEVICE_SCSI_GENERIC_BOOTINDEX);
+            QEMU_CAPS_DEVICE_SCSI_GENERIC);
     DO_TEST("hostdev-scsi-lsi-iscsi",
             QEMU_CAPS_VIRTIO_SCSI, QEMU_CAPS_SCSI_LSI,
             QEMU_CAPS_DEVICE_SCSI_GENERIC);