]> xenbits.xensource.com Git - libvirt.git/commitdiff
qemu: capabilities: Probe caps for 'ide-hd' instead of 'ide-drive'
authorPeter Krempa <pkrempa@redhat.com>
Mon, 28 Jan 2019 13:52:22 +0000 (14:52 +0100)
committerPeter Krempa <pkrempa@redhat.com>
Fri, 8 Feb 2019 07:30:38 +0000 (08:30 +0100)
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>
37 files changed:
src/qemu/qemu_capabilities.c
tests/qemucapabilitiesdata/caps_1.5.3.x86_64.replies
tests/qemucapabilitiesdata/caps_1.6.0.x86_64.replies
tests/qemucapabilitiesdata/caps_1.7.0.x86_64.replies
tests/qemucapabilitiesdata/caps_2.1.1.x86_64.replies
tests/qemucapabilitiesdata/caps_2.10.0.aarch64.replies
tests/qemucapabilitiesdata/caps_2.10.0.ppc64.replies
tests/qemucapabilitiesdata/caps_2.10.0.s390x.replies
tests/qemucapabilitiesdata/caps_2.10.0.x86_64.replies
tests/qemucapabilitiesdata/caps_2.11.0.s390x.replies
tests/qemucapabilitiesdata/caps_2.11.0.x86_64.replies
tests/qemucapabilitiesdata/caps_2.12.0.aarch64.replies
tests/qemucapabilitiesdata/caps_2.12.0.ppc64.replies
tests/qemucapabilitiesdata/caps_2.12.0.s390x.replies
tests/qemucapabilitiesdata/caps_2.12.0.x86_64.replies
tests/qemucapabilitiesdata/caps_2.4.0.x86_64.replies
tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies
tests/qemucapabilitiesdata/caps_2.6.0.aarch64.replies
tests/qemucapabilitiesdata/caps_2.6.0.ppc64.replies
tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies
tests/qemucapabilitiesdata/caps_2.7.0.s390x.replies
tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies
tests/qemucapabilitiesdata/caps_2.8.0.s390x.replies
tests/qemucapabilitiesdata/caps_2.8.0.x86_64.replies
tests/qemucapabilitiesdata/caps_2.9.0.ppc64.replies
tests/qemucapabilitiesdata/caps_2.9.0.s390x.replies
tests/qemucapabilitiesdata/caps_2.9.0.x86_64.replies
tests/qemucapabilitiesdata/caps_3.0.0.ppc64.replies
tests/qemucapabilitiesdata/caps_3.0.0.riscv32.replies
tests/qemucapabilitiesdata/caps_3.0.0.riscv64.replies
tests/qemucapabilitiesdata/caps_3.0.0.s390x.replies
tests/qemucapabilitiesdata/caps_3.0.0.x86_64.replies
tests/qemucapabilitiesdata/caps_3.1.0.ppc64.replies
tests/qemucapabilitiesdata/caps_3.1.0.x86_64.replies
tests/qemucapabilitiesdata/caps_4.0.0.riscv32.replies
tests/qemucapabilitiesdata/caps_4.0.0.riscv64.replies
tests/qemucapabilitiesdata/caps_4.0.0.x86_64.replies

index 6aa6235540b967bcd111ff0fe2b154f4cea1b9bc..f81e8d3d87e1250b8680fe5e1f9c2ca2178ffd0a 100644 (file)
@@ -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,
index 95f3c45f2fcd3a1aeb8c99636aebe06b2e7d6366..a62b4e98f4736eb2d2984946f8d80e5c1fc954e1 100644 (file)
 {
   "execute": "device-list-properties",
   "arguments": {
-    "typename": "ide-drive"
+    "typename": "ide-hd"
   },
   "id": "libvirt-17"
 }
index ef7b3021e74ed4ac8b36109242734cfc25f818a2..3253ba635a7be79f68189fe343ddc434eec67b48 100644 (file)
 {
   "execute": "device-list-properties",
   "arguments": {
-    "typename": "ide-drive"
+    "typename": "ide-hd"
   },
   "id": "libvirt-17"
 }
index dfa1d3e6232f658bccf038b97631d6f23f86f2ce..4789a11f55cdb69f1341719e1cb634c65746ee08 100644 (file)
 {
   "execute": "device-list-properties",
   "arguments": {
-    "typename": "ide-drive"
+    "typename": "ide-hd"
   },
   "id": "libvirt-17"
 }
index adf015bf19408c8882894021bced3e741fd560b5..42b7278fe1239ec2da17d60d772d4a256e8e87e4 100644 (file)
 {
   "execute": "device-list-properties",
   "arguments": {
-    "typename": "ide-drive"
+    "typename": "ide-hd"
   },
   "id": "libvirt-17"
 }
index c0a463b5b1871de8ab71b0e756da49250fe34219..61131cee46605af9e7eee78af6acb8a05f94fa89 100644 (file)
 {
   "execute": "device-list-properties",
   "arguments": {
-    "typename": "ide-drive"
+    "typename": "ide-hd"
   },
   "id": "libvirt-16"
 }
index 0f41060b1d1cb797808109169916066cd36b8860..7e9229983cbf25a8bfeabc1f095d988c5ec9e0e4 100644 (file)
 {
   "execute": "device-list-properties",
   "arguments": {
-    "typename": "ide-drive"
+    "typename": "ide-hd"
   },
   "id": "libvirt-16"
 }
index 30fecf430ef3e27afbfa5476a08cae88647d59cc..d688e2aeef6fccce93178b7240771bdb7e35054a 100644 (file)
 {
   "execute": "device-list-properties",
   "arguments": {
-    "typename": "ide-drive"
+    "typename": "ide-hd"
   },
   "id": "libvirt-17"
 }
index 251363ace758cdff3a585fe7de19bafcb391be66..c182f5fe5ed492553b1592ea5a2fbb9101835914 100644 (file)
 {
   "execute": "device-list-properties",
   "arguments": {
-    "typename": "ide-drive"
+    "typename": "ide-hd"
   },
   "id": "libvirt-16"
 }
index e5914f41126e51d64229222a953fb368815c3723..560c0af0c83df09abfb76ed9ffb56b4e7de2229d 100644 (file)
 {
   "execute": "device-list-properties",
   "arguments": {
-    "typename": "ide-drive"
+    "typename": "ide-hd"
   },
   "id": "libvirt-17"
 }
index f526f0969130549ab866f53b33f6ac070aa800f9..1ed4707a23480d442bc86fddb2e651410f1f8472 100644 (file)
 {
   "execute": "device-list-properties",
   "arguments": {
-    "typename": "ide-drive"
+    "typename": "ide-hd"
   },
   "id": "libvirt-16"
 }
index 809ec1f309e5ea37ded3a3575b46e9e40d7d88f5..565e10047ef6c9e023197d0b091020de15e61e1f 100644 (file)
 {
   "execute": "device-list-properties",
   "arguments": {
-    "typename": "ide-drive"
+    "typename": "ide-hd"
   },
   "id": "libvirt-16"
 }
index 57bf5612f5a500f1f53c22fa95abab4b0f7c6c00..fb9fa444c8778705eca91e418f76b6fe56760966 100644 (file)
 {
   "execute": "device-list-properties",
   "arguments": {
-    "typename": "ide-drive"
+    "typename": "ide-hd"
   },
   "id": "libvirt-16"
 }
index aa3e821f8c40a6244339f1de744402ee170f2038..ddc62a8b82ad5ee9c9eb50ff6b59afb1515cb0e9 100644 (file)
 {
   "execute": "device-list-properties",
   "arguments": {
-    "typename": "ide-drive"
+    "typename": "ide-hd"
   },
   "id": "libvirt-17"
 }
index 16ac6aff5385fc5c3363cb948b711fc2c332e57d..132c9c98937c6e12276e02e813ddc516d1dfa37c 100644 (file)
 {
   "execute": "device-list-properties",
   "arguments": {
-    "typename": "ide-drive"
+    "typename": "ide-hd"
   },
   "id": "libvirt-16"
 }
index c2cdafd39bd022415f8ff8131af0856621f7584a..9ad0d61af674611a4c55ba62a5fc2f5343265a5e 100644 (file)
 {
   "execute": "device-list-properties",
   "arguments": {
-    "typename": "ide-drive"
+    "typename": "ide-hd"
   },
   "id": "libvirt-17"
 }
index caec42eb561935ab9c7ebadc4a22056c7db2586d..dcec7217dbfca9aed9d88a16577c683d0c08e31d 100644 (file)
 {
   "execute": "device-list-properties",
   "arguments": {
-    "typename": "ide-drive"
+    "typename": "ide-hd"
   },
   "id": "libvirt-16"
 }
index 965eb5d5d99b39ed2564c16f9ee2cd94896e385c..9df4439b0501aaeefb9ebb04439227bc194f635a 100644 (file)
 {
   "execute": "device-list-properties",
   "arguments": {
-    "typename": "ide-drive"
+    "typename": "ide-hd"
   },
   "id": "libvirt-16"
 }
index 88bbbb64104262682ecad09f4337da557792d291..09f2f5daa5a992908915e03aeac5d95eaddcdb0b 100644 (file)
 {
   "execute": "device-list-properties",
   "arguments": {
-    "typename": "ide-drive"
+    "typename": "ide-hd"
   },
   "id": "libvirt-16"
 }
index a9b181beb9f6d0d201278d163456548cb244ec55..b3848a67fa3d03c0bdfcdb84641ae9b853f624c2 100644 (file)
 {
   "execute": "device-list-properties",
   "arguments": {
-    "typename": "ide-drive"
+    "typename": "ide-hd"
   },
   "id": "libvirt-16"
 }
index 4d695724104da45b0cbf7d169f23d46998eb9c8d..bea4007f0494152c63556853bdbccd2240998915 100644 (file)
 {
   "execute": "device-list-properties",
   "arguments": {
-    "typename": "ide-drive"
+    "typename": "ide-hd"
   },
   "id": "libvirt-17"
 }
index 160c4424edcb088dcaec1f44c3b568e1e8c9ab44..e2b5751cf7a24baf912bb8caa15fa5792f4eefa5 100644 (file)
 {
   "execute": "device-list-properties",
   "arguments": {
-    "typename": "ide-drive"
+    "typename": "ide-hd"
   },
   "id": "libvirt-16"
 }
index 2730b740d530591429ef3d0335e8161df3a15273..7a874985dda29583f8dd643ef302d83db6a336ac 100644 (file)
 {
   "execute": "device-list-properties",
   "arguments": {
-    "typename": "ide-drive"
+    "typename": "ide-hd"
   },
   "id": "libvirt-17"
 }
index c13bfb4f6966413b18d572e639ad833e50b34335..a4747f746ab6fc92402adffa78348ed9456a39e1 100644 (file)
 {
   "execute": "device-list-properties",
   "arguments": {
-    "typename": "ide-drive"
+    "typename": "ide-hd"
   },
   "id": "libvirt-16"
 }
index d63c4a3484bb21028e625f81d7bdacae85f1594d..d9319e9a597300acd9993163ebf3926ad5e6f3e9 100644 (file)
 {
   "execute": "device-list-properties",
   "arguments": {
-    "typename": "ide-drive"
+    "typename": "ide-hd"
   },
   "id": "libvirt-16"
 }
index bb2f7674e417273861e5c96bbedf34dd856bf54f..fab8534b8efd564215a899789d737e35d55079c2 100644 (file)
 {
   "execute": "device-list-properties",
   "arguments": {
-    "typename": "ide-drive"
+    "typename": "ide-hd"
   },
   "id": "libvirt-17"
 }
index 6ca30f43ebfe6d43b170a1d900e79e7692149142..ec7747b5d787c4154775007269db7473207adc66 100644 (file)
 {
   "execute": "device-list-properties",
   "arguments": {
-    "typename": "ide-drive"
+    "typename": "ide-hd"
   },
   "id": "libvirt-16"
 }
index 18f3047b4c11c736516028590f4a2576da4f74a1..c6e5678144703b29ce4df4156a179d9a3f655d93 100644 (file)
 {
   "execute": "device-list-properties",
   "arguments": {
-    "typename": "ide-drive"
+    "typename": "ide-hd"
   },
   "id": "libvirt-16"
 }
index 726b3843e38a14b824ecbcf98667914f6750074c..cf8953390aec0e7f4b64f736323b95eb5fc69ed4 100644 (file)
 {
   "execute": "device-list-properties",
   "arguments": {
-    "typename": "ide-drive"
+    "typename": "ide-hd"
   },
   "id": "libvirt-15"
 }
index 65acdeb5e6c3635b1dcbafa5028494925e0949cd..b1b578443963ca2fb87a3f5a8c2f0215914a4bf4 100644 (file)
 {
   "execute": "device-list-properties",
   "arguments": {
-    "typename": "ide-drive"
+    "typename": "ide-hd"
   },
   "id": "libvirt-15"
 }
index b7a2108ccc974ac4700413551d7b8d42d10bf4bd..1b398ed4e4c7f774f3298faebdf05f6b894d2993 100644 (file)
 {
   "execute": "device-list-properties",
   "arguments": {
-    "typename": "ide-drive"
+    "typename": "ide-hd"
   },
   "id": "libvirt-17"
 }
index d60559a6ad60ac6988565675a874158abd93266a..558a753e1328933f1b13ca918bdf7dee66ddbc52 100644 (file)
 {
   "execute": "device-list-properties",
   "arguments": {
-    "typename": "ide-drive"
+    "typename": "ide-hd"
   },
   "id": "libvirt-16"
 }
index 88fd2619e247f3d900bc3bc35aafa3740185d594..ca8c176dd3c05ad5468adb40a08a9b5c762d4335 100644 (file)
 {
   "execute": "device-list-properties",
   "arguments": {
-    "typename": "ide-drive"
+    "typename": "ide-hd"
   },
   "id": "libvirt-16"
 }
index 3357ae44e58cbda4afc4e62e3b990ad104fa7c26..358e2a0bdf66c8178633580a1291975e00d1fa03 100644 (file)
 {
   "execute": "device-list-properties",
   "arguments": {
-    "typename": "ide-drive"
+    "typename": "ide-hd"
   },
   "id": "libvirt-16"
 }
index e8e2c8671f404c18259f8ba549279b14f1b6eebf..667159d6aba3b14d34f6e86cd37277e7f01b0c85 100644 (file)
 {
   "execute": "device-list-properties",
   "arguments": {
-    "typename": "ide-drive"
+    "typename": "ide-hd"
   },
   "id": "libvirt-16"
 }
index 5c169379d20aa9c20f6052f43e9da87055285cdc..414707e42a475048ceb26d4b51526d975f2b56b5 100644 (file)
 {
   "execute": "device-list-properties",
   "arguments": {
-    "typename": "ide-drive"
+    "typename": "ide-hd"
   },
   "id": "libvirt-16"
 }
index 75817bf7edbff2d1fca6209248435f7328e88688..f39f047f1f8014f0a33268eeb428e34be410fa87 100644 (file)
 {
   "execute": "device-list-properties",
   "arguments": {
-    "typename": "ide-drive"
+    "typename": "ide-hd"
   },
   "id": "libvirt-16"
 }