[libvirt] [PATCH 7/9] qemu: always assume QEMU_CAPS_DEVICE_SCSI_GENERIC_BOOTINDEX

Introduced by QEMU commit 28b77657 in 2011. Signed-off-by: Ján Tomko <jtomko(a)redhat.com&gt; --- src/qemu/qemu_capabilities.c | 1 - src/qemu/qemu_capabilities.h | 2 +- src/qemu/qemu_command.c | 9 --------- tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 1 - 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_2.4.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.9.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.x86_64.xml | 1 - tests/qemuxml2argvtest.c | 3 +-- 34 files changed, 2 insertions(+), 43 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 5a32a0409f..202859abac 100644 --- 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 0ceb5f3af5..0f69c69136 100644 --- 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 3fd9d78daf..ff9589f593 100644 --- 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 338c42f70b..fd8b56045d 100644 --- 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 a433fc12f0..6831149379 100644 --- 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 bd5fec9f1a..852dcb0226 100644 --- 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 17a58a58f3..af35d676cb 100644 --- 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 2da02c56be..8d22cd8ca6 100644 --- 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 34972d614d..ee9faac3cd 100644 --- 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 33d404fdc6..c2b41249da 100644 --- 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 d9b5203569..46f6f6c492 100644 --- 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 fd70b05fb9..fa515d455b 100644 --- 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 334607c9e5..f3be49a288 100644 --- 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 53cc1d2a0e..4f13281e3d 100644 --- 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 48a27a0e72..295e6062df 100644 --- 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 4e34bf6e21..d19ad59b31 100644 --- 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 7c994b82b9..16861727cf 100644 --- 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 ecf207b384..7759fe9f99 100644 --- 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 142d845281..d9c352ca17 100644 --- 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 bd1bb7992d..283a290799 100644 --- 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 881c002770..c78fa35834 100644 --- 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 0317c65531..9af99e6244 100644 --- 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 b33eea90bc..ad60b5b6d2 100644 --- 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 53a792ea9c..164639c6e7 100644 --- 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 0705501c1d..5cd2cd8552 100644 --- 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 5c87d9484a..f11af45f57 100644 --- 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 8c24c0bb02..6089f96f72 100644 --- 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 ee0981da26..a5a8d2d551 100644 --- 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 82ccc49784..b1bf8c57e2 100644 --- 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 bf347dac64..9a0281e3c6 100644 --- 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 39cc480dd2..fecef3a0cf 100644 --- 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 344740879e..4cae4fd058 100644 --- 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 a049fcea20..eeb0941f27 100644 --- 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 71abfefb16..3f48c79fb1 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -2435,8 +2435,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); -- 2.16.4