qemu: Take full advantage of conditional device property probing

Commit 4ae59411fa introduced the ability to make probing for
device properties conditional on a capability being set, but
didn't extend the use of this feature to existing devices.

This commit does the last bit of work, which results in a lot
of pointless QMP chatter no longer happening and our test suite
shrinking a fair bit.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>

tests/qemucapabilitiesdata/caps_2.1.1.x86_64.replies

@@ -1629,7 +1629,7 @@
   "id": "libvirt-13",
   "error": {
     "class": "DeviceNotFound",
-    "desc": "Device 'virtio-blk-ccw' not found"
+    "desc": "Device 'virtio-net-ccw' not found"
   }
 }
 
@@ -1637,28 +1637,12 @@
   "id": "libvirt-14",
   "error": {
     "class": "DeviceNotFound",
-    "desc": "Device 'virtio-net-ccw' not found"
+    "desc": "Device 'virtio-scsi-ccw' not found"
   }
 }
 
 {
   "id": "libvirt-15",
-  "error": {
-    "class": "DeviceNotFound",
-    "desc": "Device 'virtio-scsi-ccw' not found"
-  }
-}
-
-{
-  "id": "libvirt-16",
-  "error": {
-    "class": "DeviceNotFound",
-    "desc": "Device 'virtio-blk-s390' not found"
-  }
-}
-
-{
-  "id": "libvirt-17",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-net-s390' not found"
@@ -1666,7 +1650,7 @@
 }
 
 {
-  "id": "libvirt-18",
+  "id": "libvirt-16",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'pci-assign' not found"
@@ -1716,7 +1700,7 @@
       "type": "pci-host-devaddr"
     }
   ],
-  "id": "libvirt-19"
+  "id": "libvirt-17"
 }
 
 {
@@ -1758,7 +1742,7 @@
       "type": "pci-host-devaddr"
     }
   ],
-  "id": "libvirt-20"
+  "id": "libvirt-18"
 }
 
 {
@@ -1844,7 +1828,7 @@
       "type": "drive"
     }
   ],
-  "id": "libvirt-21"
+  "id": "libvirt-19"
 }
 
 {
@@ -1898,7 +1882,7 @@
       "type": "drive"
     }
   ],
-  "id": "libvirt-22"
+  "id": "libvirt-20"
 }
 
 {
@@ -1948,7 +1932,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-23"
+  "id": "libvirt-21"
 }
 
 {
@@ -1986,7 +1970,7 @@
       "type": "chr"
     }
   ],
-  "id": "libvirt-24"
+  "id": "libvirt-22"
 }
 
 {
@@ -2048,7 +2032,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-25"
+  "id": "libvirt-23"
 }
 
 {
@@ -2074,7 +2058,7 @@
       "type": "drive"
     }
   ],
-  "id": "libvirt-26"
+  "id": "libvirt-24"
 }
 
 {
@@ -2112,7 +2096,7 @@
       "type": "size"
     }
   ],
-  "id": "libvirt-27"
+  "id": "libvirt-25"
 }
 
 {
@@ -2162,7 +2146,7 @@
       "type": "uint64"
     }
   ],
-  "id": "libvirt-28"
+  "id": "libvirt-26"
 }
 
 {
@@ -2216,7 +2200,7 @@
       "type": "drive"
     }
   ],
-  "id": "libvirt-29"
+  "id": "libvirt-27"
 }
 
 {
@@ -2230,7 +2214,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-30"
+  "id": "libvirt-28"
 }
 
 {
@@ -2264,7 +2248,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-31"
+  "id": "libvirt-29"
 }
 
 {
@@ -2294,7 +2278,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-32"
+  "id": "libvirt-30"
 }
 
 {
@@ -2364,23 +2348,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-33"
-}
-
-{
-  "id": "libvirt-34",
-  "error": {
-    "class": "DeviceNotFound",
-    "desc": "Device 'virtio-gpu-pci' not found"
-  }
-}
-
-{
-  "id": "libvirt-35",
-  "error": {
-    "class": "DeviceNotFound",
-    "desc": "Device 'virtio-gpu-device' not found"
-  }
+  "id": "libvirt-31"
 }
 
 {
@@ -2434,7 +2402,7 @@
       "type": "pci-devfn"
     }
   ],
-  "id": "libvirt-36"
+  "id": "libvirt-32"
 }
 
 {
@@ -2484,11 +2452,11 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-37"
+  "id": "libvirt-33"
 }
 
 {
-  "id": "libvirt-38",
+  "id": "libvirt-34",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-balloon-ccw' not found"
@@ -2498,7 +2466,7 @@
 {
   "return": [
   ],
-  "id": "libvirt-39"
+  "id": "libvirt-35"
 }
 
 {
@@ -2552,7 +2520,7 @@
       "type": "on/off"
     }
   ],
-  "id": "libvirt-40"
+  "id": "libvirt-36"
 }
 
 {
@@ -2657,7 +2625,7 @@
       "cpu-max": 255
     }
   ],
-  "id": "libvirt-41"
+  "id": "libvirt-37"
 }
 
 {
@@ -2738,21 +2706,21 @@
       "name": "qemu64"
     }
   ],
-  "id": "libvirt-42"
+  "id": "libvirt-38"
 }
 
 {
   "return": [
     "tpm-tis"
   ],
-  "id": "libvirt-43"
+  "id": "libvirt-39"
 }
 
 {
   "return": [
     "passthrough"
   ],
-  "id": "libvirt-44"
+  "id": "libvirt-40"
 }
 
 {
@@ -3612,7 +3580,7 @@
       "option": "drive"
     }
   ],
-  "id": "libvirt-45"
+  "id": "libvirt-41"
 }
 
 {
@@ -3634,7 +3602,7 @@
       "capability": "zero-blocks"
     }
   ],
-  "id": "libvirt-46"
+  "id": "libvirt-42"
 }
 
 {