[libvirt] [PATCH 02/32] qemu: capabilities: Probe caps for 'scsi-hd' instead of 'scsi-disk'

Since commit 02e8d0cfdf8 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: Peter Krempa <pkrempa(a)redhat.com&gt; --- src/qemu/qemu_capabilities.c | 2 +- tests/qemucapabilitiesdata/caps_1.5.3.x86_64.replies | 2 +- tests/qemucapabilitiesdata/caps_1.6.0.x86_64.replies | 2 +- tests/qemucapabilitiesdata/caps_1.7.0.x86_64.replies | 2 +- tests/qemucapabilitiesdata/caps_2.1.1.x86_64.replies | 2 +- tests/qemucapabilitiesdata/caps_2.10.0.aarch64.replies | 2 +- tests/qemucapabilitiesdata/caps_2.10.0.ppc64.replies | 2 +- tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies | 2 +- tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies | 2 +- tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies | 2 +- tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies | 2 +- tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies | 2 +- tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies | 2 +- tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies | 2 +- tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies | 2 +- tests/qemucapabilitiesdata/caps_2.4.0.x86_64.replies | 2 +- tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies | 2 +- tests/qemucapabilitiesdata/caps_2.6.0.aarch64.replies | 2 +- tests/qemucapabilitiesdata/caps_2.6.0.ppc64.replies | 2 +- tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies | 2 +- tests/qemucapabilitiesdata/caps_2.7.0.s390x.replies | 2 +- tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies | 2 +- tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies | 2 +- tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies | 2 +- tests/qemucapabilitiesdata/caps_2.9.0.ppc64.replies | 2 +- tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies | 2 +- tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies | 2 +- tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies | 2 +- tests/qemucapabilitiesdata/caps_3.0.0.riscv32.replies | 2 +- tests/qemucapabilitiesdata/caps_3.0.0.riscv64.replies | 2 +- tests/qemucapabilitiesdata/caps_3.0.0.s390x.replies | 2 +- tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies | 2 +- tests/qemucapabilitiesdata/caps_3.1.0.ppc64.replies | 2 +- tests/qemucapabilitiesdata/caps_3.1.0.x86_64.replies | 2 +- tests/qemucapabilitiesdata/caps_4.0.0.x86_64.replies | 2 +- 35 files changed, 35 insertions(+), 35 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index f504db7d05..639591cb22 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -1301,7 +1301,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, diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.replies b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.replies index 88bc93be3a..95f3c45f2f 100644 --- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.replies @@ -1465,7 +1465,7 @@ { "execute": "device-list-properties", "arguments": { - "typename": "scsi-disk" + "typename": "scsi-hd" }, "id": "libvirt-16" } diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.replies index ea04d55f2a..ef7b3021e7 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.replies @@ -1494,7 +1494,7 @@ { "execute": "device-list-properties", "arguments": { - "typename": "scsi-disk" + "typename": "scsi-hd" }, "id": "libvirt-16" } diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.replies index 1261a2bdc1..dfa1d3e623 100644 --- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.replies @@ -1503,7 +1503,7 @@ { "execute": "device-list-properties", "arguments": { - "typename": "scsi-disk" + "typename": "scsi-hd" }, "id": "libvirt-16" } diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.replies index b6efe1d3a1..adf015bf19 100644 --- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.replies @@ -1770,7 +1770,7 @@ { "execute": "device-list-properties", "arguments": { - "typename": "scsi-disk" + "typename": "scsi-hd" }, "id": "libvirt-16" } diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.replies b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.replies index c8b73cd7e2..c0a463b5b1 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.replies +++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.replies @@ -4066,7 +4066,7 @@ { "execute": "device-list-properties", "arguments": { - "typename": "scsi-disk" + "typename": "scsi-hd" }, "id": "libvirt-15" } diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.replies index 20e5b47541..0f41060b1d 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.replies @@ -4167,7 +4167,7 @@ { "execute": "device-list-properties", "arguments": { - "typename": "scsi-disk" + "typename": "scsi-hd" }, "id": "libvirt-15" } diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies index a79fad62df..30fecf430e 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies @@ -2813,7 +2813,7 @@ { "execute": "device-list-properties", "arguments": { - "typename": "scsi-disk" + "typename": "scsi-hd" }, "id": "libvirt-16" } diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies index 783a40c9a6..251363ace7 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies @@ -3044,7 +3044,7 @@ { "execute": "device-list-properties", "arguments": { - "typename": "scsi-disk" + "typename": "scsi-hd" }, "id": "libvirt-15" } diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies index 3a03f390b2..e5914f4112 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies @@ -2867,7 +2867,7 @@ { "execute": "device-list-properties", "arguments": { - "typename": "scsi-disk" + "typename": "scsi-hd" }, "id": "libvirt-16" } diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies index 18a2628b1f..f526f09691 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies @@ -3046,7 +3046,7 @@ { "execute": "device-list-properties", "arguments": { - "typename": "scsi-disk" + "typename": "scsi-hd" }, "id": "libvirt-15" } diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies index 2cd6705d78..809ec1f309 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies +++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies @@ -4388,7 +4388,7 @@ { "execute": "device-list-properties", "arguments": { - "typename": "scsi-disk" + "typename": "scsi-hd" }, "id": "libvirt-15" } diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies index d8aef1e9d1..57bf5612f5 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies @@ -4377,7 +4377,7 @@ { "execute": "device-list-properties", "arguments": { - "typename": "scsi-disk" + "typename": "scsi-hd" }, "id": "libvirt-15" } diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies index b5a14b5916..aa3e821f8c 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies @@ -2951,7 +2951,7 @@ { "execute": "device-list-properties", "arguments": { - "typename": "scsi-disk" + "typename": "scsi-hd" }, "id": "libvirt-16" } diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies index 7ba3efaf4f..16ac6aff53 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies @@ -3235,7 +3235,7 @@ { "execute": "device-list-properties", "arguments": { - "typename": "scsi-disk" + "typename": "scsi-hd" }, "id": "libvirt-15" } diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.replies index ee248e38aa..c2cdafd39b 100644 --- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.replies @@ -2072,7 +2072,7 @@ { "execute": "device-list-properties", "arguments": { - "typename": "scsi-disk" + "typename": "scsi-hd" }, "id": "libvirt-16" } diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies index 6065200d39..caec42eb56 100644 --- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies @@ -2169,7 +2169,7 @@ { "execute": "device-list-properties", "arguments": { - "typename": "scsi-disk" + "typename": "scsi-hd" }, "id": "libvirt-15" } diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.replies b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.replies index 2bf4b91e47..965eb5d5d9 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.replies +++ b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.replies @@ -2932,7 +2932,7 @@ { "execute": "device-list-properties", "arguments": { - "typename": "scsi-disk" + "typename": "scsi-hd" }, "id": "libvirt-15" } diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.replies index 99af9c8a46..88bbbb6410 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.replies @@ -3082,7 +3082,7 @@ { "execute": "device-list-properties", "arguments": { - "typename": "scsi-disk" + "typename": "scsi-hd" }, "id": "libvirt-15" } diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies index 3ae433df2c..a9b181beb9 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies @@ -2251,7 +2251,7 @@ { "execute": "device-list-properties", "arguments": { - "typename": "scsi-disk" + "typename": "scsi-hd" }, "id": "libvirt-15" } diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.replies index 38d1fa6e52..4d69572410 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.replies @@ -2079,7 +2079,7 @@ { "execute": "device-list-properties", "arguments": { - "typename": "scsi-disk" + "typename": "scsi-hd" }, "id": "libvirt-16" } diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies index 8eda09db39..160c4424ed 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies @@ -2320,7 +2320,7 @@ { "execute": "device-list-properties", "arguments": { - "typename": "scsi-disk" + "typename": "scsi-hd" }, "id": "libvirt-15" } diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies index 1836b6bfc9..2730b740d5 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies @@ -2342,7 +2342,7 @@ { "execute": "device-list-properties", "arguments": { - "typename": "scsi-disk" + "typename": "scsi-hd" }, "id": "libvirt-16" } diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies index ab48387adb..c13bfb4f69 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies @@ -2435,7 +2435,7 @@ { "execute": "device-list-properties", "arguments": { - "typename": "scsi-disk" + "typename": "scsi-hd" }, "id": "libvirt-15" } diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.replies index c92663e299..d63c4a3484 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.replies @@ -3426,7 +3426,7 @@ { "execute": "device-list-properties", "arguments": { - "typename": "scsi-disk" + "typename": "scsi-hd" }, "id": "libvirt-15" } diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies index 891cd0180b..bb2f7674e4 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies @@ -2528,7 +2528,7 @@ { "execute": "device-list-properties", "arguments": { - "typename": "scsi-disk" + "typename": "scsi-hd" }, "id": "libvirt-16" } diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies index 3b5bcdbc66..6ca30f43eb 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies @@ -2616,7 +2616,7 @@ { "execute": "device-list-properties", "arguments": { - "typename": "scsi-disk" + "typename": "scsi-hd" }, "id": "libvirt-15" } diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies index aff01371a3..18f3047b4c 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies @@ -4460,7 +4460,7 @@ { "execute": "device-list-properties", "arguments": { - "typename": "scsi-disk" + "typename": "scsi-hd" }, "id": "libvirt-15" } diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.replies b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.replies index 663b4a49c0..726b3843e3 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.replies +++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.replies @@ -1299,7 +1299,7 @@ { "execute": "device-list-properties", "arguments": { - "typename": "scsi-disk" + "typename": "scsi-hd" }, "id": "libvirt-14" } diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.replies b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.replies index cc66c232ab..65acdeb5e6 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.replies +++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.replies @@ -1299,7 +1299,7 @@ { "execute": "device-list-properties", "arguments": { - "typename": "scsi-disk" + "typename": "scsi-hd" }, "id": "libvirt-14" } diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.replies b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.replies index 3bcdfce293..b7a2108ccc 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.replies +++ b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.replies @@ -3028,7 +3028,7 @@ { "execute": "device-list-properties", "arguments": { - "typename": "scsi-disk" + "typename": "scsi-hd" }, "id": "libvirt-16" } diff --git a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies index 16f021c879..d60559a6ad 100644 --- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies @@ -3305,7 +3305,7 @@ { "execute": "device-list-properties", "arguments": { - "typename": "scsi-disk" + "typename": "scsi-hd" }, "id": "libvirt-15" } diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.replies b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.replies index 5f57a3bb18..88fd2619e2 100644 --- a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.replies +++ b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.replies @@ -4493,7 +4493,7 @@ { "execute": "device-list-properties", "arguments": { - "typename": "scsi-disk" + "typename": "scsi-hd" }, "id": "libvirt-15" } diff --git a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.replies index 8c537cc763..3357ae44e5 100644 --- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.replies @@ -3338,7 +3338,7 @@ { "execute": "device-list-properties", "arguments": { - "typename": "scsi-disk" + "typename": "scsi-hd" }, "id": "libvirt-15" } diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.replies index 35cf567a34..75817bf7ed 100644 --- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.replies +++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.replies @@ -3481,7 +3481,7 @@ { "execute": "device-list-properties", "arguments": { - "typename": "scsi-disk" + "typename": "scsi-hd" }, "id": "libvirt-15" } -- 2.20.1