提交 7d114e1b 编写于 作者: P Peter Krempa

qemu: capabilities: Probe caps for 'scsi-hd' instead of 'scsi-disk'

Since commit 02e8d0cf we are using 'scsi-hd' and 'scsi-cd' instead of
'scsi-disk'. We also should probe capabilities for 'scsi-hd' instead of
'scsi-disk'. It is safe to do as 'scsi-disk' is the common denominator
of both 'scsi-hd' and 'scsi-cd' so all the properties were common.

For now the test data are modified by just changing the appropriate type
when probing for caps.
Signed-off-by: NPeter Krempa <pkrempa@redhat.com>
上级 aedd2038
......@@ -1299,7 +1299,7 @@ static virQEMUCapsObjectTypeProps virQEMUCapsDeviceProps[] = {
{ "vfio-pci", virQEMUCapsDevicePropsVfioPCI,
ARRAY_CARDINALITY(virQEMUCapsDevicePropsVfioPCI),
QEMU_CAPS_DEVICE_VFIO_PCI },
{ "scsi-disk", virQEMUCapsDevicePropsSCSIDisk,
{ "scsi-hd", virQEMUCapsDevicePropsSCSIDisk,
ARRAY_CARDINALITY(virQEMUCapsDevicePropsSCSIDisk),
-1 },
{ "ide-drive", virQEMUCapsDevicePropsIDEDrive,
......
......@@ -1465,7 +1465,7 @@
{
"execute": "device-list-properties",
"arguments": {
"typename": "scsi-disk"
"typename": "scsi-hd"
},
"id": "libvirt-16"
}
......
......@@ -1494,7 +1494,7 @@
{
"execute": "device-list-properties",
"arguments": {
"typename": "scsi-disk"
"typename": "scsi-hd"
},
"id": "libvirt-16"
}
......
......@@ -1503,7 +1503,7 @@
{
"execute": "device-list-properties",
"arguments": {
"typename": "scsi-disk"
"typename": "scsi-hd"
},
"id": "libvirt-16"
}
......
......@@ -1770,7 +1770,7 @@
{
"execute": "device-list-properties",
"arguments": {
"typename": "scsi-disk"
"typename": "scsi-hd"
},
"id": "libvirt-16"
}
......
......@@ -4066,7 +4066,7 @@
{
"execute": "device-list-properties",
"arguments": {
"typename": "scsi-disk"
"typename": "scsi-hd"
},
"id": "libvirt-15"
}
......
......@@ -4167,7 +4167,7 @@
{
"execute": "device-list-properties",
"arguments": {
"typename": "scsi-disk"
"typename": "scsi-hd"
},
"id": "libvirt-15"
}
......
......@@ -2813,7 +2813,7 @@
{
"execute": "device-list-properties",
"arguments": {
"typename": "scsi-disk"
"typename": "scsi-hd"
},
"id": "libvirt-16"
}
......
......@@ -3044,7 +3044,7 @@
{
"execute": "device-list-properties",
"arguments": {
"typename": "scsi-disk"
"typename": "scsi-hd"
},
"id": "libvirt-15"
}
......
......@@ -2867,7 +2867,7 @@
{
"execute": "device-list-properties",
"arguments": {
"typename": "scsi-disk"
"typename": "scsi-hd"
},
"id": "libvirt-16"
}
......
......@@ -3046,7 +3046,7 @@
{
"execute": "device-list-properties",
"arguments": {
"typename": "scsi-disk"
"typename": "scsi-hd"
},
"id": "libvirt-15"
}
......
......@@ -4388,7 +4388,7 @@
{
"execute": "device-list-properties",
"arguments": {
"typename": "scsi-disk"
"typename": "scsi-hd"
},
"id": "libvirt-15"
}
......
......@@ -4377,7 +4377,7 @@
{
"execute": "device-list-properties",
"arguments": {
"typename": "scsi-disk"
"typename": "scsi-hd"
},
"id": "libvirt-15"
}
......
......@@ -2951,7 +2951,7 @@
{
"execute": "device-list-properties",
"arguments": {
"typename": "scsi-disk"
"typename": "scsi-hd"
},
"id": "libvirt-16"
}
......
......@@ -3235,7 +3235,7 @@
{
"execute": "device-list-properties",
"arguments": {
"typename": "scsi-disk"
"typename": "scsi-hd"
},
"id": "libvirt-15"
}
......
......@@ -2072,7 +2072,7 @@
{
"execute": "device-list-properties",
"arguments": {
"typename": "scsi-disk"
"typename": "scsi-hd"
},
"id": "libvirt-16"
}
......
......@@ -2169,7 +2169,7 @@
{
"execute": "device-list-properties",
"arguments": {
"typename": "scsi-disk"
"typename": "scsi-hd"
},
"id": "libvirt-15"
}
......
......@@ -2932,7 +2932,7 @@
{
"execute": "device-list-properties",
"arguments": {
"typename": "scsi-disk"
"typename": "scsi-hd"
},
"id": "libvirt-15"
}
......
......@@ -3082,7 +3082,7 @@
{
"execute": "device-list-properties",
"arguments": {
"typename": "scsi-disk"
"typename": "scsi-hd"
},
"id": "libvirt-15"
}
......
......@@ -2251,7 +2251,7 @@
{
"execute": "device-list-properties",
"arguments": {
"typename": "scsi-disk"
"typename": "scsi-hd"
},
"id": "libvirt-15"
}
......
......@@ -2079,7 +2079,7 @@
{
"execute": "device-list-properties",
"arguments": {
"typename": "scsi-disk"
"typename": "scsi-hd"
},
"id": "libvirt-16"
}
......
......@@ -2320,7 +2320,7 @@
{
"execute": "device-list-properties",
"arguments": {
"typename": "scsi-disk"
"typename": "scsi-hd"
},
"id": "libvirt-15"
}
......
......@@ -2342,7 +2342,7 @@
{
"execute": "device-list-properties",
"arguments": {
"typename": "scsi-disk"
"typename": "scsi-hd"
},
"id": "libvirt-16"
}
......
......@@ -2435,7 +2435,7 @@
{
"execute": "device-list-properties",
"arguments": {
"typename": "scsi-disk"
"typename": "scsi-hd"
},
"id": "libvirt-15"
}
......
......@@ -3426,7 +3426,7 @@
{
"execute": "device-list-properties",
"arguments": {
"typename": "scsi-disk"
"typename": "scsi-hd"
},
"id": "libvirt-15"
}
......
......@@ -2528,7 +2528,7 @@
{
"execute": "device-list-properties",
"arguments": {
"typename": "scsi-disk"
"typename": "scsi-hd"
},
"id": "libvirt-16"
}
......
......@@ -2616,7 +2616,7 @@
{
"execute": "device-list-properties",
"arguments": {
"typename": "scsi-disk"
"typename": "scsi-hd"
},
"id": "libvirt-15"
}
......
......@@ -4460,7 +4460,7 @@
{
"execute": "device-list-properties",
"arguments": {
"typename": "scsi-disk"
"typename": "scsi-hd"
},
"id": "libvirt-15"
}
......
......@@ -1299,7 +1299,7 @@
{
"execute": "device-list-properties",
"arguments": {
"typename": "scsi-disk"
"typename": "scsi-hd"
},
"id": "libvirt-14"
}
......
......@@ -1299,7 +1299,7 @@
{
"execute": "device-list-properties",
"arguments": {
"typename": "scsi-disk"
"typename": "scsi-hd"
},
"id": "libvirt-14"
}
......
......@@ -3028,7 +3028,7 @@
{
"execute": "device-list-properties",
"arguments": {
"typename": "scsi-disk"
"typename": "scsi-hd"
},
"id": "libvirt-16"
}
......
......@@ -3305,7 +3305,7 @@
{
"execute": "device-list-properties",
"arguments": {
"typename": "scsi-disk"
"typename": "scsi-hd"
},
"id": "libvirt-15"
}
......
......@@ -4493,7 +4493,7 @@
{
"execute": "device-list-properties",
"arguments": {
"typename": "scsi-disk"
"typename": "scsi-hd"
},
"id": "libvirt-15"
}
......
......@@ -3338,7 +3338,7 @@
{
"execute": "device-list-properties",
"arguments": {
"typename": "scsi-disk"
"typename": "scsi-hd"
},
"id": "libvirt-15"
}
......
......@@ -2793,7 +2793,7 @@
{
"execute": "device-list-properties",
"arguments": {
"typename": "scsi-disk"
"typename": "scsi-hd"
},
"id": "libvirt-15"
}
......
......@@ -2793,7 +2793,7 @@
{
"execute": "device-list-properties",
"arguments": {
"typename": "scsi-disk"
"typename": "scsi-hd"
},
"id": "libvirt-15"
}
......
......@@ -3481,7 +3481,7 @@
{
"execute": "device-list-properties",
"arguments": {
"typename": "scsi-disk"
"typename": "scsi-hd"
},
"id": "libvirt-15"
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册