[libvirt] [PATCH 5/9] qemu: always assume QEMU_CAPS_USB_HOST_BOOTINDEX
Ján Tomko
jtomko at redhat.com
Fri Sep 7 14:08:25 UTC 2018
Added by QEMU commit 65bb3a5 contained in v1.1.
Signed-off-by: Ján Tomko <jtomko at redhat.com>
---
src/qemu/qemu_capabilities.c | 1 -
src/qemu/qemu_capabilities.h | 2 +-
src/qemu/qemu_command.c | 7 -------
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.x86_64.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.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.x86_64.xml | 1 -
tests/qemucapabilitiesdata/caps_2.8.0.x86_64.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.x86_64.xml | 1 -
tests/qemuxml2argvtest.c | 3 +--
25 files changed, 2 insertions(+), 32 deletions(-)
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 288d4461cd..814712fa6c 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -1222,7 +1222,6 @@ static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsUSBRedir[] = {
};
static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsUSBHost[] = {
- { "bootindex", QEMU_CAPS_USB_HOST_BOOTINDEX },
};
static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsSCSIGeneric[] = {
diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index 48549e8e65..9ab8e329f4 100644
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -211,7 +211,7 @@ typedef enum { /* virQEMUCapsFlags grouping marker for syntax-check */
/* 115 */
QEMU_CAPS_DRIVE_MIRROR, /* drive-mirror monitor command */
X_QEMU_CAPS_USB_REDIR_BOOTINDEX, /* usb-redir.bootindex */
- QEMU_CAPS_USB_HOST_BOOTINDEX, /* usb-host.bootindex */
+ X_QEMU_CAPS_USB_HOST_BOOTINDEX, /* usb-host.bootindex */
QEMU_CAPS_DISK_SNAPSHOT, /* blockdev-snapshot-sync command */
QEMU_CAPS_DEVICE_QXL, /* -device qxl */
diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 3381d6a9f7..8577641e87 100644
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -5337,13 +5337,6 @@ qemuBuildHostdevCommandLine(virCommandPtr cmd,
}
}
}
- if (subsys->type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_USB &&
- !virQEMUCapsGet(qemuCaps, QEMU_CAPS_USB_HOST_BOOTINDEX)) {
- virReportError(VIR_ERR_CONFIG_UNSUPPORTED, "%s",
- _("booting from assigned USB devices is not "
- "supported with this version of qemu"));
- return -1;
- }
if (subsys->type == VIR_DOMAIN_HOSTDEV_SUBSYS_TYPE_SCSI &&
!virQEMUCapsGet(qemuCaps,
QEMU_CAPS_DEVICE_SCSI_GENERIC_BOOTINDEX)) {
diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
index 141d2b9484..5563668d75 100644
--- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
@@ -49,7 +49,6 @@
<flag name='block-commit'/>
<flag name='vnc'/>
<flag name='drive-mirror'/>
- <flag name='usb-host.bootindex'/>
<flag name='blockdev-snapshot-sync'/>
<flag name='qxl'/>
<flag name='VGA'/>
diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
index 1091a1b213..710b214628 100644
--- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
@@ -49,7 +49,6 @@
<flag name='block-commit'/>
<flag name='vnc'/>
<flag name='drive-mirror'/>
- <flag name='usb-host.bootindex'/>
<flag name='blockdev-snapshot-sync'/>
<flag name='qxl'/>
<flag name='VGA'/>
diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
index 41979e9dfa..5501d4bb37 100644
--- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
@@ -49,7 +49,6 @@
<flag name='block-commit'/>
<flag name='vnc'/>
<flag name='drive-mirror'/>
- <flag name='usb-host.bootindex'/>
<flag name='blockdev-snapshot-sync'/>
<flag name='qxl'/>
<flag name='VGA'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
index 63cb847e7c..2387cbf04d 100644
--- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
@@ -49,7 +49,6 @@
<flag name='block-commit'/>
<flag name='vnc'/>
<flag name='drive-mirror'/>
- <flag name='usb-host.bootindex'/>
<flag name='blockdev-snapshot-sync'/>
<flag name='qxl'/>
<flag name='VGA'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
index df27f3621c..640fb69143 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
@@ -40,7 +40,6 @@
<flag name='block-commit'/>
<flag name='vnc'/>
<flag name='drive-mirror'/>
- <flag name='usb-host.bootindex'/>
<flag name='blockdev-snapshot-sync'/>
<flag name='VGA'/>
<flag name='device-video-primary'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
index b3e5c36203..7eb72a85db 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
@@ -39,7 +39,6 @@
<flag name='block-commit'/>
<flag name='vnc'/>
<flag name='drive-mirror'/>
- <flag name='usb-host.bootindex'/>
<flag name='blockdev-snapshot-sync'/>
<flag name='VGA'/>
<flag name='device-video-primary'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
index c529b09113..388625156c 100644
--- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
@@ -49,7 +49,6 @@
<flag name='block-commit'/>
<flag name='vnc'/>
<flag name='drive-mirror'/>
- <flag name='usb-host.bootindex'/>
<flag name='blockdev-snapshot-sync'/>
<flag name='qxl'/>
<flag name='VGA'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
index b539bc71d7..b234be563f 100644
--- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
@@ -49,7 +49,6 @@
<flag name='block-commit'/>
<flag name='vnc'/>
<flag name='drive-mirror'/>
- <flag name='usb-host.bootindex'/>
<flag name='blockdev-snapshot-sync'/>
<flag name='qxl'/>
<flag name='VGA'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
index e06b935f95..84429e8f0e 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
@@ -40,7 +40,6 @@
<flag name='block-commit'/>
<flag name='vnc'/>
<flag name='drive-mirror'/>
- <flag name='usb-host.bootindex'/>
<flag name='blockdev-snapshot-sync'/>
<flag name='VGA'/>
<flag name='device-video-primary'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
index 741364d3bc..7cd97dd702 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
@@ -39,7 +39,6 @@
<flag name='block-commit'/>
<flag name='vnc'/>
<flag name='drive-mirror'/>
- <flag name='usb-host.bootindex'/>
<flag name='blockdev-snapshot-sync'/>
<flag name='VGA'/>
<flag name='device-video-primary'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
index 3d41b8f9f9..41ba01ba03 100644
--- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
@@ -49,7 +49,6 @@
<flag name='block-commit'/>
<flag name='vnc'/>
<flag name='drive-mirror'/>
- <flag name='usb-host.bootindex'/>
<flag name='blockdev-snapshot-sync'/>
<flag name='qxl'/>
<flag name='VGA'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
index 26f50588fc..d4ed1d3eff 100644
--- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
@@ -49,7 +49,6 @@
<flag name='block-commit'/>
<flag name='vnc'/>
<flag name='drive-mirror'/>
- <flag name='usb-host.bootindex'/>
<flag name='blockdev-snapshot-sync'/>
<flag name='qxl'/>
<flag name='VGA'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
index 653d238413..8d4a7785c4 100644
--- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
@@ -49,7 +49,6 @@
<flag name='block-commit'/>
<flag name='vnc'/>
<flag name='drive-mirror'/>
- <flag name='usb-host.bootindex'/>
<flag name='blockdev-snapshot-sync'/>
<flag name='qxl'/>
<flag name='VGA'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
index ae94e9eeaa..2ed63c8f38 100644
--- a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
@@ -42,7 +42,6 @@
<flag name='block-commit'/>
<flag name='vnc'/>
<flag name='drive-mirror'/>
- <flag name='usb-host.bootindex'/>
<flag name='blockdev-snapshot-sync'/>
<flag name='VGA'/>
<flag name='device-video-primary'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
index b116d425ad..f66fb172d5 100644
--- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
@@ -39,7 +39,6 @@
<flag name='block-commit'/>
<flag name='vnc'/>
<flag name='drive-mirror'/>
- <flag name='usb-host.bootindex'/>
<flag name='blockdev-snapshot-sync'/>
<flag name='VGA'/>
<flag name='device-video-primary'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
index 5e93a56432..4685a02877 100644
--- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
@@ -49,7 +49,6 @@
<flag name='block-commit'/>
<flag name='vnc'/>
<flag name='drive-mirror'/>
- <flag name='usb-host.bootindex'/>
<flag name='blockdev-snapshot-sync'/>
<flag name='qxl'/>
<flag name='VGA'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
index 21a811c9a8..d8f1888755 100644
--- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
@@ -49,7 +49,6 @@
<flag name='block-commit'/>
<flag name='vnc'/>
<flag name='drive-mirror'/>
- <flag name='usb-host.bootindex'/>
<flag name='blockdev-snapshot-sync'/>
<flag name='qxl'/>
<flag name='VGA'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
index 3ae31609d2..c7a1de6159 100644
--- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
@@ -49,7 +49,6 @@
<flag name='block-commit'/>
<flag name='vnc'/>
<flag name='drive-mirror'/>
- <flag name='usb-host.bootindex'/>
<flag name='blockdev-snapshot-sync'/>
<flag name='qxl'/>
<flag name='VGA'/>
diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
index 20ec3a3311..278bd43420 100644
--- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
@@ -49,7 +49,6 @@
<flag name='block-commit'/>
<flag name='vnc'/>
<flag name='drive-mirror'/>
- <flag name='usb-host.bootindex'/>
<flag name='blockdev-snapshot-sync'/>
<flag name='qxl'/>
<flag name='VGA'/>
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
index 67e0edd13b..db8313277a 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
@@ -39,7 +39,6 @@
<flag name='block-commit'/>
<flag name='vnc'/>
<flag name='drive-mirror'/>
- <flag name='usb-host.bootindex'/>
<flag name='blockdev-snapshot-sync'/>
<flag name='VGA'/>
<flag name='device-video-primary'/>
diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
index ed6114f10c..faf3e527cc 100644
--- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
@@ -49,7 +49,6 @@
<flag name='block-commit'/>
<flag name='vnc'/>
<flag name='drive-mirror'/>
- <flag name='usb-host.bootindex'/>
<flag name='blockdev-snapshot-sync'/>
<flag name='qxl'/>
<flag name='VGA'/>
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 7d280f41d1..71abfefb16 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1635,8 +1635,7 @@ mymain(void)
DO_TEST("hostdev-usb-address", NONE);
DO_TEST("hostdev-usb-address-device", NONE);
- DO_TEST("hostdev-usb-address-device-boot",
- QEMU_CAPS_USB_HOST_BOOTINDEX);
+ DO_TEST("hostdev-usb-address-device-boot", NONE);
DO_TEST("hostdev-pci-address", NONE);
DO_TEST("hostdev-pci-address-device", NONE);
DO_TEST("hostdev-vfio",
--
2.16.4
More information about the libvir-list
mailing list