External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-07-31 14:07:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: always assume QEMU_CAPS_USB_HOST_BOOTINDEX

Browse Source 
Added by QEMU commit 65bb3a5 contained in v1.1.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Andrea Bolognani <abologna@redhat.com>
This commit is contained in:
Ján Tomko 2018-09-07 14:37:34 +02:00
parent 40f3c23c0f
commit 8a741a8e31
25 changed files with 2 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/qemu/qemu_capabilities.c
View File

@ -1222,7 +1222,6 @@ static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsUSBRedir[] = {
};
static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsUSBHost[] = {
{ "bootindex", QEMU_CAPS_USB_HOST_BOOTINDEX },
};
static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsSCSIGeneric[] = {

2
src/qemu/qemu_capabilities.h
View File

@ -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 */

7
src/qemu/qemu_command.c
View File

@ -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)) {

1
tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
View File

@ -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'/>

1
tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
View File

@ -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'/>

3
tests/qemuxml2argvtest.c
View File

@ -1636,8 +1636,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",