qemu: capabilities: Probe caps for 'ide-hd' instead of 'ide-drive'

Since commit a4cda054e7 we are using 'ide-hd' and 'ide-cd' instead of 'ide-drive'. We also should probe capabilities for 'ide-hd' instead of 'ide-drive'. It is safe to do as 'ide-drive' is the common denominator of both 'ide-hd' and 'ide-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>
2019-01-28 14:52:22 +01:00 · 2019-01-28 14:52:22 +01:00 · e67b6dcf36
parent 7d114e1b72
commit e67b6dcf36
37 changed files with 37 additions and 37 deletions
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@ -1302,7 +1302,7 @@ static virQEMUCapsObjectTypeProps virQEMUCapsDeviceProps[] = {
    { "scsi-hd", virQEMUCapsDevicePropsSCSIDisk,
      ARRAY_CARDINALITY(virQEMUCapsDevicePropsSCSIDisk),
      -1 },
-    { "ide-drive", virQEMUCapsDevicePropsIDEDrive,
+    { "ide-hd", virQEMUCapsDevicePropsIDEDrive,
      ARRAY_CARDINALITY(virQEMUCapsDevicePropsIDEDrive),
      -1 },
    { "PIIX4_PM", virQEMUCapsDevicePropsPiix4PM,
--- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.replies
@ -1547,7 +1547,7 @@
 {
  "execute": "device-list-properties",
  "arguments": {
-    "typename": "ide-drive"
+    "typename": "ide-hd"
  },
  "id": "libvirt-17"
 }
--- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.replies
@ -1576,7 +1576,7 @@
 {
  "execute": "device-list-properties",
  "arguments": {
-    "typename": "ide-drive"
+    "typename": "ide-hd"
  },
  "id": "libvirt-17"
 }
--- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.replies
@ -1585,7 +1585,7 @@
 {
  "execute": "device-list-properties",
  "arguments": {
-    "typename": "ide-drive"
+    "typename": "ide-hd"
  },
  "id": "libvirt-17"
 }
--- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.replies
@ -1864,7 +1864,7 @@
 {
  "execute": "device-list-properties",
  "arguments": {
-    "typename": "ide-drive"
+    "typename": "ide-hd"
  },
  "id": "libvirt-17"
 }
--- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.replies
@ -4188,7 +4188,7 @@
 {
  "execute": "device-list-properties",
  "arguments": {
-    "typename": "ide-drive"
+    "typename": "ide-hd"
  },
  "id": "libvirt-16"
 }
--- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.replies
@ -4289,7 +4289,7 @@
 {
  "execute": "device-list-properties",
  "arguments": {
-    "typename": "ide-drive"
+    "typename": "ide-hd"
  },
  "id": "libvirt-16"
 }
--- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies
@ -2935,7 +2935,7 @@
 {
  "execute": "device-list-properties",
  "arguments": {
-    "typename": "ide-drive"
+    "typename": "ide-hd"
  },
  "id": "libvirt-17"
 }
--- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies
@ -3166,7 +3166,7 @@
 {
  "execute": "device-list-properties",
  "arguments": {
-    "typename": "ide-drive"
+    "typename": "ide-hd"
  },
  "id": "libvirt-16"
 }
--- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies
@ -2989,7 +2989,7 @@
 {
  "execute": "device-list-properties",
  "arguments": {
-    "typename": "ide-drive"
+    "typename": "ide-hd"
  },
  "id": "libvirt-17"
 }
--- a/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies
@ -3168,7 +3168,7 @@
 {
  "execute": "device-list-properties",
  "arguments": {
-    "typename": "ide-drive"
+    "typename": "ide-hd"
  },
  "id": "libvirt-16"
 }
--- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies
@ -4510,7 +4510,7 @@
 {
  "execute": "device-list-properties",
  "arguments": {
-    "typename": "ide-drive"
+    "typename": "ide-hd"
  },
  "id": "libvirt-16"
 }
--- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies
@ -4499,7 +4499,7 @@
 {
  "execute": "device-list-properties",
  "arguments": {
-    "typename": "ide-drive"
+    "typename": "ide-hd"
  },
  "id": "libvirt-16"
 }
--- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies
@ -3077,7 +3077,7 @@
 {
  "execute": "device-list-properties",
  "arguments": {
-    "typename": "ide-drive"
+    "typename": "ide-hd"
  },
  "id": "libvirt-17"
 }
--- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies
@ -3357,7 +3357,7 @@
 {
  "execute": "device-list-properties",
  "arguments": {
-    "typename": "ide-drive"
+    "typename": "ide-hd"
  },
  "id": "libvirt-16"
 }
--- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.replies
@ -2175,7 +2175,7 @@
 {
  "execute": "device-list-properties",
  "arguments": {
-    "typename": "ide-drive"
+    "typename": "ide-hd"
  },
  "id": "libvirt-17"
 }
--- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies
@ -2272,7 +2272,7 @@
 {
  "execute": "device-list-properties",
  "arguments": {
-    "typename": "ide-drive"
+    "typename": "ide-hd"
  },
  "id": "libvirt-16"
 }
--- a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.replies
@ -3035,7 +3035,7 @@
 {
  "execute": "device-list-properties",
  "arguments": {
-    "typename": "ide-drive"
+    "typename": "ide-hd"
  },
  "id": "libvirt-16"
 }
--- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.replies
@ -3185,7 +3185,7 @@
 {
  "execute": "device-list-properties",
  "arguments": {
-    "typename": "ide-drive"
+    "typename": "ide-hd"
  },
  "id": "libvirt-16"
 }
--- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies
@ -2354,7 +2354,7 @@
 {
  "execute": "device-list-properties",
  "arguments": {
-    "typename": "ide-drive"
+    "typename": "ide-hd"
  },
  "id": "libvirt-16"
 }
--- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.replies
+++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.replies
@ -2197,7 +2197,7 @@
 {
  "execute": "device-list-properties",
  "arguments": {
-    "typename": "ide-drive"
+    "typename": "ide-hd"
  },
  "id": "libvirt-17"
 }
--- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies
@ -2438,7 +2438,7 @@
 {
  "execute": "device-list-properties",
  "arguments": {
-    "typename": "ide-drive"
+    "typename": "ide-hd"
  },
  "id": "libvirt-16"
 }
--- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies
+++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies
@ -2460,7 +2460,7 @@
 {
  "execute": "device-list-properties",
  "arguments": {
-    "typename": "ide-drive"
+    "typename": "ide-hd"
  },
  "id": "libvirt-17"
 }
--- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies
@ -2553,7 +2553,7 @@
 {
  "execute": "device-list-properties",
  "arguments": {
-    "typename": "ide-drive"
+    "typename": "ide-hd"
  },
  "id": "libvirt-16"
 }
--- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.replies
@ -3548,7 +3548,7 @@
 {
  "execute": "device-list-properties",
  "arguments": {
-    "typename": "ide-drive"
+    "typename": "ide-hd"
  },
  "id": "libvirt-16"
 }
--- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies
@ -2650,7 +2650,7 @@
 {
  "execute": "device-list-properties",
  "arguments": {
-    "typename": "ide-drive"
+    "typename": "ide-hd"
  },
  "id": "libvirt-17"
 }
--- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies
@ -2738,7 +2738,7 @@
 {
  "execute": "device-list-properties",
  "arguments": {
-    "typename": "ide-drive"
+    "typename": "ide-hd"
  },
  "id": "libvirt-16"
 }
--- a/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies
@ -4586,7 +4586,7 @@
 {
  "execute": "device-list-properties",
  "arguments": {
-    "typename": "ide-drive"
+    "typename": "ide-hd"
  },
  "id": "libvirt-16"
 }
--- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.replies
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv32.replies
@ -1425,7 +1425,7 @@
 {
  "execute": "device-list-properties",
  "arguments": {
-    "typename": "ide-drive"
+    "typename": "ide-hd"
  },
  "id": "libvirt-15"
 }
--- a/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.replies
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.riscv64.replies
@ -1425,7 +1425,7 @@
 {
  "execute": "device-list-properties",
  "arguments": {
-    "typename": "ide-drive"
+    "typename": "ide-hd"
  },
  "id": "libvirt-15"
 }
--- a/tests/qemucapabilitiesdata/caps_3.0.0.s390x.replies
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.s390x.replies
@ -3154,7 +3154,7 @@
 {
  "execute": "device-list-properties",
  "arguments": {
-    "typename": "ide-drive"
+    "typename": "ide-hd"
  },
  "id": "libvirt-17"
 }
--- a/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies
@ -3431,7 +3431,7 @@
 {
  "execute": "device-list-properties",
  "arguments": {
-    "typename": "ide-drive"
+    "typename": "ide-hd"
  },
  "id": "libvirt-16"
 }
--- a/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.replies
+++ b/tests/qemucapabilitiesdata/caps_3.1.0.ppc64.replies
@ -4619,7 +4619,7 @@
 {
  "execute": "device-list-properties",
  "arguments": {
-    "typename": "ide-drive"
+    "typename": "ide-hd"
  },
  "id": "libvirt-16"
 }
--- a/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_3.1.0.x86_64.replies
@ -3464,7 +3464,7 @@
 {
  "execute": "device-list-properties",
  "arguments": {
-    "typename": "ide-drive"
+    "typename": "ide-hd"
  },
  "id": "libvirt-16"
 }
--- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.replies
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv32.replies
@ -2919,7 +2919,7 @@
 {
  "execute": "device-list-properties",
  "arguments": {
-    "typename": "ide-drive"
+    "typename": "ide-hd"
  },
  "id": "libvirt-16"
 }
--- a/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.replies
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.riscv64.replies
@ -2919,7 +2919,7 @@
 {
  "execute": "device-list-properties",
  "arguments": {
-    "typename": "ide-drive"
+    "typename": "ide-hd"
  },
  "id": "libvirt-16"
 }
--- a/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_4.0.0.x86_64.replies
@ -3607,7 +3607,7 @@
 {
  "execute": "device-list-properties",
  "arguments": {
-    "typename": "ide-drive"
+    "typename": "ide-hd"
  },
  "id": "libvirt-16"
 }