Skip to content

L
libvirt

openeuler / libvirt

通知 3
Star 0
Fork 0
L
libvirt
提交 9b17c939 编写于 作者: J Ján Tomko
浏览文件
操作

qemu: always assume QEMU_CAPS_DEVICE_SCSI_GENERIC_BOOTINDEX 

Introduced by QEMU commit 28b77657 in v1.0-rc4~21^2~8.
Signed-off-by: NJán Tomko <jtomko@redhat.com>
Reviewed-by: NAndrea Bolognani <abologna@redhat.com>
上级 b5acaaae
隐藏空白更改
内联 并排
Showing with 2 addition and 43 deletion
src/qemu/qemu_capabilities.c
浏览文件 @ 9b17c939
......@@ -1224,7 +1224,6 @@ static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsUSBHost[] = {
};
static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsSCSIGeneric[] = {
{ "bootindex", QEMU_CAPS_DEVICE_SCSI_GENERIC_BOOTINDEX },
};
static struct virQEMUCapsStringFlags virQEMUCapsDevicePropsI440FXPCIHost[] = {
......
src/qemu/qemu_capabilities.h
浏览文件 @ 9b17c939
......@@ -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) */
......
src/qemu/qemu_command.c
浏览文件 @ 9b17c939
......@@ -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;
}
}
}
......
tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
浏览文件 @ 9b17c939
......@@ -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'/>
......
tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
浏览文件 @ 9b17c939
......@@ -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'/>
......
tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
浏览文件 @ 9b17c939
......@@ -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'/>
......
tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
浏览文件 @ 9b17c939
......@@ -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'/>
......
tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
浏览文件 @ 9b17c939
......@@ -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'/>
......
tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
浏览文件 @ 9b17c939
......@@ -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'/>
......
tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
浏览文件 @ 9b17c939
......@@ -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'/>
......
tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
浏览文件 @ 9b17c939
......@@ -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'/>
......
tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
浏览文件 @ 9b17c939
......@@ -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'/>
......
tests/qemucapabilitiesdata/caps_2.11.0.x86_64.xml
浏览文件 @ 9b17c939
......@@ -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'/>
......
tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
浏览文件 @ 9b17c939
......@@ -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'/>
......
tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
浏览文件 @ 9b17c939
......@@ -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'/>
......
tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
浏览文件 @ 9b17c939
......@@ -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'/>
......
tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
浏览文件 @ 9b17c939
......@@ -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'/>
......
tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
浏览文件 @ 9b17c939
......@@ -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'/>
......
tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
浏览文件 @ 9b17c939
......@@ -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'/>
......
tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
浏览文件 @ 9b17c939
......@@ -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'/>
......
tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
浏览文件 @ 9b17c939
......@@ -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'/>
......
tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
浏览文件 @ 9b17c939
......@@ -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'/>
......
tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
浏览文件 @ 9b17c939
......@@ -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'/>
......
tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
浏览文件 @ 9b17c939
......@@ -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'/>
......
tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
浏览文件 @ 9b17c939
......@@ -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'/>
......
tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
浏览文件 @ 9b17c939
......@@ -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'/>
......
tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
浏览文件 @ 9b17c939
......@@ -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'/>
......
tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
浏览文件 @ 9b17c939
......@@ -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'/>
......
tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
浏览文件 @ 9b17c939
......@@ -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'/>
......
tests/qemucapabilitiesdata/caps_3.0.0.ppc64.xml
浏览文件 @ 9b17c939
......@@ -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'/>
......
tests/qemucapabilitiesdata/caps_3.0.0.riscv32.xml
浏览文件 @ 9b17c939
......@@ -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'/>
......
tests/qemucapabilitiesdata/caps_3.0.0.riscv64.xml
浏览文件 @ 9b17c939
......@@ -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'/>
......
tests/qemucapabilitiesdata/caps_3.0.0.x86_64.xml
浏览文件 @ 9b17c939
......@@ -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'/>
......
tests/qemuxml2argvtest.c
浏览文件 @ 9b17c939
......@@ -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);
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或