qemu_capabilities: join capabilities for qxl and qxl-vga devices

This patch simplifies QEMU capabilities for QXL video device.  QEMU
exposes this device as *qxl-vga* and *qxl* and they are both the same
device with the same set of parameters, the only difference is that
*qxl-vga* includes VGA compatibility.

Based on QEMU code they are tied together so it's safe to check only for
presence of only one of them.

This patch also removes an invalid test case "video-qxl-sec-nodevice"
where there is only *qxl-vga* device and *qxl* device is not present.

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>

tests/qemucapabilitiesdata/caps_1.7.0.x86_64.replies

@@ -2005,77 +2005,7 @@
 }
 
 {
-  "return": [
-    {
-      "name": "command_serr_enable",
-      "type": "on/off"
-    },
-    {
-      "name": "multifunction",
-      "type": "on/off"
-    },
-    {
-      "name": "rombar",
-      "type": "uint32"
-    },
-    {
-      "name": "romfile",
-      "type": "string"
-    },
-    {
-      "name": "addr",
-      "type": "pci-devfn"
-    },
-    {
-      "name": "surfaces",
-      "type": "int32"
-    },
-    {
-      "name": "vgamem_mb",
-      "type": "uint32"
-    },
-    {
-      "name": "vram64_size_mb",
-      "type": "uint32"
-    },
-    {
-      "name": "vram_size_mb",
-      "type": "uint32"
-    },
-    {
-      "name": "ram_size_mb",
-      "type": "uint32"
-    },
-    {
-      "name": "cmdlog",
-      "type": "uint32"
-    },
-    {
-      "name": "guestdebug",
-      "type": "uint32"
-    },
-    {
-      "name": "debug",
-      "type": "uint32"
-    },
-    {
-      "name": "revision",
-      "type": "uint32"
-    },
-    {
-      "name": "vram_size",
-      "type": "uint32"
-    },
-    {
-      "name": "ram_size",
-      "type": "uint32"
-    }
-  ],
-  "id": "libvirt-33"
-}
-
-{
-  "id": "libvirt-34",
+  "id": "libvirt-33",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-gpu-pci' not found"
@@ -2083,7 +2013,7 @@
 }
 
 {
-  "id": "libvirt-35",
+  "id": "libvirt-34",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'ICH9-LPC' not found"
@@ -2125,11 +2055,11 @@
       "type": "on/off"
     }
   ],
-  "id": "libvirt-36"
+  "id": "libvirt-35"
 }
 
 {
-  "id": "libvirt-37",
+  "id": "libvirt-36",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-balloon-ccw' not found"
@@ -2139,7 +2069,7 @@
 {
   "return": [
   ],
-  "id": "libvirt-38"
+  "id": "libvirt-37"
 }
 
 {
@@ -2189,7 +2119,7 @@
       "type": "on/off"
     }
   ],
-  "id": "libvirt-39"
+  "id": "libvirt-38"
 }
 
 {
@@ -2278,7 +2208,7 @@
       "cpu-max": 1
     }
   ],
-  "id": "libvirt-40"
+  "id": "libvirt-39"
 }
 
 {
@@ -2356,7 +2286,7 @@
       "name": "qemu64"
     }
   ],
-  "id": "libvirt-41"
+  "id": "libvirt-40"
 }
 
 {
@@ -2364,6 +2294,12 @@
     "enabled": false,
     "present": true
   },
+  "id": "libvirt-41"
+}
+
+{
+  "return": [
+  ],
   "id": "libvirt-42"
 }
 
@@ -2373,12 +2309,6 @@
   "id": "libvirt-43"
 }
 
-{
-  "return": [
-  ],
-  "id": "libvirt-44"
-}
-
 {
   "return": [
     {
@@ -3169,7 +3099,7 @@
       "option": "drive"
     }
   ],
-  "id": "libvirt-45"
+  "id": "libvirt-44"
 }
 
 {
@@ -3191,5 +3121,5 @@
       "capability": "zero-blocks"
     }
   ],
-  "id": "libvirt-46"
+  "id": "libvirt-45"
 }