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

Since commit 02e8d0cfdf 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@redhat.com>
2024-12-23 21:34:54 +03:00 · 2019-01-28 10:03:25 +01:00 · 2019-01-28 10:03:25 +01:00 · 7d114e1b72
commit 7d114e1b72
parent aedd20386d
37 changed files with 37 additions and 37 deletions
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@ -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,
--- 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"
 }
--- 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"
 }
--- 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"
 }
--- 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"
 }
--- 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"
 }
--- 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"
 }
--- 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"
 }
--- 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"
 }
--- 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"
 }
--- 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"
 }
--- 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"
 }
--- 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"
 }
--- 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"
 }
--- 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"
 }
--- 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"
 }
--- 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"
 }
--- 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"
 }
--- 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"
 }
--- 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"
 }
--- 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"
 }
--- 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"
 }
--- 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"
 }
--- 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"
 }
--- 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"
 }
--- 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"
 }
--- 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"
 }
--- 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"
 }
--- 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"
 }
--- 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"
 }
--- 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"
 }
--- 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"
 }
--- 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"
 }
--- 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"
 }
--- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.replies
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.replies
@ -2793,7 +2793,7 @@
 {
  "execute": "device-list-properties",
  "arguments": {
-    "typename": "scsi-disk"
+    "typename": "scsi-hd"
  },
  "id": "libvirt-15"
 }
--- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.replies
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.replies
@ -2793,7 +2793,7 @@
 {
  "execute": "device-list-properties",
  "arguments": {
-    "typename": "scsi-disk"
+    "typename": "scsi-hd"
  },
  "id": "libvirt-15"
 }
--- 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"
 }