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@redhat.com>

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 81ef0357e7bf6cda420d766a670e00811dad436a..6aa6235540b967bcd111ff0fe2b154f4cea1b9bc 100644 (file)
--- 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,

diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.replies b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.replies
index 88bc93be3adb3b0dc417a8178ffa5136438379f2..95f3c45f2fcd3a1aeb8c99636aebe06b2e7d6366 100644 (file)
--- 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 ea04d55f2aa95d454b786fb1c87df651d517a882..ef7b3021e74ed4ac8b36109242734cfc25f818a2 100644 (file)
--- 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 1261a2bdc135dbbcfddd2395d274a353176ced6f..dfa1d3e6232f658bccf038b97631d6f23f86f2ce 100644 (file)
--- 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 b6efe1d3a19b76cf0e1b6d813fdd550f567004e4..adf015bf19408c8882894021bced3e741fd560b5 100644 (file)
--- 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 c8b73cd7e27d66e1afdb1373769a3ca99d954090..c0a463b5b1871de8ab71b0e756da49250fe34219 100644 (file)
--- 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 20e5b475415c305320d1a9cdcee6b80835ca05cb..0f41060b1d1cb797808109169916066cd36b8860 100644 (file)
--- 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 a79fad62df0fda959353ac077bc84c2e93ed5cd9..30fecf430ef3e27afbfa5476a08cae88647d59cc 100644 (file)
--- 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 783a40c9a6b2044e8e2338d74cdbec2e8d252672..251363ace758cdff3a585fe7de19bafcb391be66 100644 (file)
--- 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 3a03f390b208895a3fa9d4719ae6f60a916b6b66..e5914f41126e51d64229222a953fb368815c3723 100644 (file)
--- 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 18a2628b1f9dd067cb4c0e057ee6f77fa6fdef67..f526f0969130549ab866f53b33f6ac070aa800f9 100644 (file)
--- 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 2cd6705d7807e3ca90c1a9ff768b1acd03711f11..809ec1f309e5ea37ded3a3575b46e9e40d7d88f5 100644 (file)
--- 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 d8aef1e9d1654e4c7f260035cbf3a587fb30e74e..57bf5612f5a500f1f53c22fa95abab4b0f7c6c00 100644 (file)
--- 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 b5a14b5916b5e2b828660fe6d2b71124ab129bee..aa3e821f8c40a6244339f1de744402ee170f2038 100644 (file)
--- 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 7ba3efaf4f1a9c74dfd041c1e01894c439454a78..16ac6aff5385fc5c3363cb948b711fc2c332e57d 100644 (file)
--- 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 ee248e38aacaeb041f241caf04f750038d073827..c2cdafd39bd022415f8ff8131af0856621f7584a 100644 (file)
--- 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 6065200d39e24f6d6fd15795d38c7262a1abce4f..caec42eb561935ab9c7ebadc4a22056c7db2586d 100644 (file)
--- 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 2bf4b91e4711206d8df550f756261585f5f68fd1..965eb5d5d99b39ed2564c16f9ee2cd94896e385c 100644 (file)
--- 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 99af9c8a46552a585df8920d8f75ea478d609dfc..88bbbb64104262682ecad09f4337da557792d291 100644 (file)
--- 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 3ae433df2c6db067103791fa1f644288fdd605a5..a9b181beb9f6d0d201278d163456548cb244ec55 100644 (file)
--- 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 38d1fa6e52aca1b80e31be389e495992647c325c..4d695724104da45b0cbf7d169f23d46998eb9c8d 100644 (file)
--- 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 8eda09db394ae3bbbb8dc41940ecb1f69c16cfdd..160c4424edcb088dcaec1f44c3b568e1e8c9ab44 100644 (file)
--- 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 1836b6bfc9af5b6cec27ed95b045254ca2075485..2730b740d530591429ef3d0335e8161df3a15273 100644 (file)
--- 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 ab48387adbdfb78251360f8c0a233bfd043d919f..c13bfb4f6966413b18d572e639ad833e50b34335 100644 (file)
--- 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 c92663e299d8a62dc4dec5e37637b24ee54052b4..d63c4a3484bb21028e625f81d7bdacae85f1594d 100644 (file)
--- 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 891cd0180b2940552c338409ea7efedf4dee491b..bb2f7674e417273861e5c96bbedf34dd856bf54f 100644 (file)
--- 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 3b5bcdbc664354a4267888446e1d93e0cc6977ed..6ca30f43ebfe6d43b170a1d900e79e7692149142 100644 (file)
--- 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 aff01371a34c4bd4fd1c029d82c6bbe4ab49501d..18f3047b4c11c736516028590f4a2576da4f74a1 100644 (file)
--- 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 663b4a49c087aa0ace4a715c963d3bedd1dfbfe9..726b3843e38a14b824ecbcf98667914f6750074c 100644 (file)
--- 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 cc66c232aba45c2d0afbb2b21fdbc9d483427a4d..65acdeb5e6c3635b1dcbafa5028494925e0949cd 100644 (file)
--- 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 3bcdfce2931be8db42c42026f4afb28a44c173f5..b7a2108ccc974ac4700413551d7b8d42d10bf4bd 100644 (file)
--- 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 16f021c8798a66630fd831d94d7a308feed87ccc..d60559a6ad60ac6988565675a874158abd93266a 100644 (file)
--- 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 5f57a3bb18a6da04571f77efb60f985f55d0d04c..88fd2619e247f3d900bc3bc35aafa3740185d594 100644 (file)
--- 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 8c537cc7639c03349d0426863430af12df4ef9c3..3357ae44e58cbda4afc4e62e3b990ad104fa7c26 100644 (file)
--- 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.riscv32.replies b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.replies
index 2d3f2fbcc6c35bae0bf816052f86b89af85bbafc..e8e2c8671f404c18259f8ba549279b14f1b6eebf 100644 (file)
--- 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"
 }

diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.replies b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.replies
index 97d92290f646a47af7006d176f97c4a9dfa16d8d..5c169379d20aa9c20f6052f43e9da87055285cdc 100644 (file)
--- 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"
 }

diff --git a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.replies
index 35cf567a34e5675285b644c009709eea239481d2..75817bf7edbff2d1fca6209248435f7328e88688 100644 (file)
--- 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"
 }