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>

diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index da8f3d1ed1515ad2c1a87a83655f722b67cb85d1..4dfbd81bc11c458bfc284dd17f3943f4e1e5d3c3 100644 (file)
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -1528,7 +1528,6 @@ struct virQEMUCapsStringFlags virQEMUCapsObjectTypes[] = {
     { "virtio-scsi-device", QEMU_CAPS_VIRTIO_SCSI },
     { "megasas", QEMU_CAPS_SCSI_MEGASAS },
     { "spicevmc", QEMU_CAPS_DEVICE_SPICEVMC },
-    { "qxl-vga", QEMU_CAPS_DEVICE_QXL_VGA },
     { "qxl", QEMU_CAPS_DEVICE_QXL },
     { "sga", QEMU_CAPS_SGA },
     { "scsi-block", QEMU_CAPS_SCSI_BLOCK },
@@ -1679,12 +1678,6 @@ static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsQxl[] = {
     { "max_outputs", QEMU_CAPS_QXL_MAX_OUTPUTS },
 };
 
-static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsQxlVga[] = {
-    { "vgamem_mb", QEMU_CAPS_QXL_VGA_VGAMEM },
-    { "vram64_size_mb", QEMU_CAPS_QXL_VGA_VRAM64 },
-    { "max_outputs", QEMU_CAPS_QXL_VGA_MAX_OUTPUTS },
-};
-
 static struct virQEMUCapsStringFlags virQEMUCapsObjectPropsVirtioGpu[] = {
     { "virgl", QEMU_CAPS_DEVICE_VIRTIO_GPU_VIRGL },
 };
@@ -1753,8 +1746,6 @@ static struct virQEMUCapsObjectTypeProps virQEMUCapsObjectProps[] = {
       ARRAY_CARDINALITY(virQEMUCapsObjectPropsVmwareSvga) },
     { "qxl", virQEMUCapsObjectPropsQxl,
       ARRAY_CARDINALITY(virQEMUCapsObjectPropsQxl) },
-    { "qxl-vga", virQEMUCapsObjectPropsQxlVga,
-      ARRAY_CARDINALITY(virQEMUCapsObjectPropsQxlVga) },
     { "virtio-gpu-pci", virQEMUCapsObjectPropsVirtioGpu,
       ARRAY_CARDINALITY(virQEMUCapsObjectPropsVirtioGpu) },
     { "ICH9-LPC", virQEMUCapsObjectPropsICH9,
@@ -3638,7 +3629,6 @@ virQEMUCapsInitQMPBasic(virQEMUCapsPtr qemuCaps)
     virQEMUCapsSet(qemuCaps, QEMU_CAPS_VGA_NONE);
     virQEMUCapsSet(qemuCaps, QEMU_CAPS_DRIVE_AIO);
     virQEMUCapsSet(qemuCaps, QEMU_CAPS_CHARDEV_SPICEVMC);
-    virQEMUCapsSet(qemuCaps, QEMU_CAPS_DEVICE_QXL_VGA);
     virQEMUCapsSet(qemuCaps, QEMU_CAPS_DRIVE_CACHE_DIRECTSYNC);
     virQEMUCapsSet(qemuCaps, QEMU_CAPS_NO_SHUTDOWN);
     virQEMUCapsSet(qemuCaps, QEMU_CAPS_DRIVE_CACHE_UNSAFE);
@@ -4501,7 +4491,7 @@ virQEMUCapsFillDomainDeviceVideoCaps(virQEMUCapsPtr qemuCaps,
         VIR_DOMAIN_CAPS_ENUM_SET(dev->modelType, VIR_DOMAIN_VIDEO_TYPE_CIRRUS);
     if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VMWARE_SVGA))
         VIR_DOMAIN_CAPS_ENUM_SET(dev->modelType, VIR_DOMAIN_VIDEO_TYPE_VMVGA);
-    if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_QXL_VGA))
+    if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_QXL))
         VIR_DOMAIN_CAPS_ENUM_SET(dev->modelType, VIR_DOMAIN_VIDEO_TYPE_QXL);
     if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VIRTIO_GPU))
         VIR_DOMAIN_CAPS_ENUM_SET(dev->modelType, VIR_DOMAIN_VIDEO_TYPE_VIRTIO);

diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h
index 51c2372b8a58bbd553147080bf7f85ad241b252b..fa43dc6cb68fdcb50358055f8a00721d864bd458 100644 (file)
--- a/src/qemu/qemu_capabilities.h
+++ b/src/qemu/qemu_capabilities.h
@@ -128,7 +128,7 @@ typedef enum {
     QEMU_CAPS_CHARDEV_SPICEVMC, /* newer -chardev spicevmc */
     QEMU_CAPS_DEVICE_SPICEVMC, /* older -device spicevmc*/
     QEMU_CAPS_VIRTIO_TX_ALG, /* -device virtio-net-pci,tx=string */
-    QEMU_CAPS_DEVICE_QXL_VGA, /* primary qxl device named qxl-vga? */
+    X_QEMU_CAPS_DEVICE_QXL_VGA, /* primary qxl device named qxl-vga? */
 
     /* 60 */
     QEMU_CAPS_PCI_MULTIFUNCTION, /* -device multifunction=on|off */
@@ -302,7 +302,7 @@ typedef enum {
     QEMU_CAPS_VGA_VGAMEM, /* -device VGA.vgamem_mb */
     QEMU_CAPS_VMWARE_SVGA_VGAMEM, /* -device vmware-svga.vgamem_mb */
     QEMU_CAPS_QXL_VGAMEM, /* -device qxl.vgamem_mb */
-    QEMU_CAPS_QXL_VGA_VGAMEM, /* -device qxl-vga.vgamem_mb */
+    X_QEMU_CAPS_QXL_VGA_VGAMEM, /* -device qxl-vga.vgamem_mb */
     QEMU_CAPS_DEVICE_PC_DIMM, /* pc-dimm device */
 
     /* 185 */
@@ -349,7 +349,7 @@ typedef enum {
     QEMU_CAPS_QXL_VRAM64, /* -device qxl.vram64_size_mb */
 
     /* 215 */
-    QEMU_CAPS_QXL_VGA_VRAM64, /* -device qxl-vga.vram64_size_mb */
+    X_QEMU_CAPS_QXL_VGA_VRAM64, /* -device qxl-vga.vram64_size_mb */
     QEMU_CAPS_CHARDEV_LOGFILE, /* -chardev logfile=xxxx */
     QEMU_CAPS_NAME_DEBUG_THREADS, /* Is -name debug-threads= available */
     QEMU_CAPS_OBJECT_SECRET, /* -object secret */
@@ -364,7 +364,7 @@ typedef enum {
 
     /* 225 */
     QEMU_CAPS_QXL_MAX_OUTPUTS, /* -device qxl,max-outputs= */
-    QEMU_CAPS_QXL_VGA_MAX_OUTPUTS, /* -device qxl-vga,max-outputs= */
+    X_QEMU_CAPS_QXL_VGA_MAX_OUTPUTS, /* -device qxl-vga,max-outputs= */
     QEMU_CAPS_SPICE_UNIX, /* -spice unix */
     QEMU_CAPS_DRIVE_DETECT_ZEROES, /* -drive detect-zeroes= */
     QEMU_CAPS_OBJECT_TLS_CREDS_X509, /* -object tls-creds-x509 */

diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c
index 5640a5b79d2f71b4787cb9a2400a32fd0a18770c..65d67fef3f031c886472e6c7b597348dc3114853 100644 (file)
--- a/src/qemu/qemu_command.c
+++ b/src/qemu/qemu_command.c
@@ -4331,26 +4331,17 @@ qemuBuildDeviceVideoStr(const virDomainDef *def,
             virBufferAsprintf(&buf, ",vram_size=%u", video->vram * 1024);
         }
 
-        if ((video->primary &&
-             virQEMUCapsGet(qemuCaps, QEMU_CAPS_QXL_VGA_VRAM64)) ||
-            (!video->primary &&
-             virQEMUCapsGet(qemuCaps, QEMU_CAPS_QXL_VRAM64))) {
+        if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_QXL_VRAM64)) {
             /* QEMU accepts mebibytes for vram64_size_mb. */
             virBufferAsprintf(&buf, ",vram64_size_mb=%u", video->vram64 / 1024);
         }
 
-        if ((video->primary &&
-             virQEMUCapsGet(qemuCaps, QEMU_CAPS_QXL_VGA_VGAMEM)) ||
-            (!video->primary &&
-             virQEMUCapsGet(qemuCaps, QEMU_CAPS_QXL_VGAMEM))) {
+        if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_QXL_VGAMEM)) {
             /* QEMU accepts mebibytes for vgamem_mb. */
             virBufferAsprintf(&buf, ",vgamem_mb=%u", video->vgamem / 1024);
         }
 
-        if ((video->primary &&
-             virQEMUCapsGet(qemuCaps, QEMU_CAPS_QXL_VGA_MAX_OUTPUTS)) ||
-            (!video->primary &&
-             virQEMUCapsGet(qemuCaps, QEMU_CAPS_QXL_MAX_OUTPUTS))) {
+        if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_QXL_MAX_OUTPUTS)) {
             if (video->heads)
                 virBufferAsprintf(&buf, ",max_outputs=%u", video->heads);
         }
@@ -4405,7 +4396,7 @@ qemuBuildVideoCommandLine(virCommandPtr cmd,
          (primaryVideoType == VIR_DOMAIN_VIDEO_TYPE_VMVGA &&
              virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VMWARE_SVGA)) ||
          (primaryVideoType == VIR_DOMAIN_VIDEO_TYPE_QXL &&
-             virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_QXL_VGA)) ||
+             virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_QXL)) ||
          (primaryVideoType == VIR_DOMAIN_VIDEO_TYPE_VIRTIO &&
              virQEMUCapsGet(qemuCaps, QEMU_CAPS_DEVICE_VIRTIO_GPU)))) {
         for (i = 0; i < def->nvideos; i++) {
@@ -4480,13 +4471,13 @@ qemuBuildVideoCommandLine(virCommandPtr cmd,
                                        dev, vram * 1024);
             }
             if (vram64 &&
-                virQEMUCapsGet(qemuCaps, QEMU_CAPS_QXL_VGA_VRAM64)) {
+                virQEMUCapsGet(qemuCaps, QEMU_CAPS_QXL_VRAM64)) {
                 virCommandAddArg(cmd, "-global");
                 virCommandAddArgFormat(cmd, "%s.vram64_size_mb=%u",
                                        dev, vram64 / 1024);
             }
             if (vgamem &&
-                virQEMUCapsGet(qemuCaps, QEMU_CAPS_QXL_VGA_VGAMEM)) {
+                virQEMUCapsGet(qemuCaps, QEMU_CAPS_QXL_VGAMEM)) {
                 virCommandAddArg(cmd, "-global");
                 virCommandAddArgFormat(cmd, "%s.vgamem_mb=%u",
                                        dev, vgamem / 1024);

diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index ea609417d180b8e3a0857addf1f589a21a7f9c07..ab69811f13a78a2dd0feb5e285d708993fa654d6 100644 (file)
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -2567,12 +2567,12 @@ qemuProcessUpdateVideoRamSize(virQEMUDriverPtr driver,
             break;
         case VIR_DOMAIN_VIDEO_TYPE_QXL:
             if (i == 0) {
-                if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_QXL_VGA_VGAMEM) &&
+                if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_QXL_VGAMEM) &&
                     qemuMonitorUpdateVideoMemorySize(priv->mon, video,
                                                      "qxl-vga") < 0)
                         goto error;
 
-                if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_QXL_VGA_VRAM64) &&
+                if (virQEMUCapsGet(priv->qemuCaps, QEMU_CAPS_QXL_VRAM64) &&
                     qemuMonitorUpdateVideoVram64Size(priv->mon, video,
                                                      "qxl-vga") < 0)
                     goto error;

diff --git a/tests/domaincapsschemadata/qemu_2.6.0-gicv2-virt.aarch64.xml b/tests/domaincapsschemadata/qemu_2.6.0-gicv2-virt.aarch64.xml
index 796c3afee811a8dafb891c152dc3f3d948c01e98..76aee83ba175a07c364b41fed63d8529124ea50a 100644 (file)
--- a/tests/domaincapsschemadata/qemu_2.6.0-gicv2-virt.aarch64.xml
+++ b/tests/domaincapsschemadata/qemu_2.6.0-gicv2-virt.aarch64.xml
@@ -79,7 +79,6 @@
     <video supported='yes'>
       <enum name='modelType'>
         <value>vga</value>
-        <value>qxl</value>
         <value>virtio</value>
       </enum>
     </video>

diff --git a/tests/domaincapsschemadata/qemu_2.6.0-gicv3-virt.aarch64.xml b/tests/domaincapsschemadata/qemu_2.6.0-gicv3-virt.aarch64.xml
index 5a5f82c5d469dbd1c064ed143f27adc837974121..104c29fabb22515a9b912ace5296d895e59fb27e 100644 (file)
--- a/tests/domaincapsschemadata/qemu_2.6.0-gicv3-virt.aarch64.xml
+++ b/tests/domaincapsschemadata/qemu_2.6.0-gicv3-virt.aarch64.xml
@@ -79,7 +79,6 @@
     <video supported='yes'>
       <enum name='modelType'>
         <value>vga</value>
-        <value>qxl</value>
         <value>virtio</value>
       </enum>
     </video>

diff --git a/tests/domaincapsschemadata/qemu_2.6.0.aarch64.xml b/tests/domaincapsschemadata/qemu_2.6.0.aarch64.xml
index 90b57ffa2abbbc859a196b53975d45d04b93dfb7..ca511f48d8aff796771d31164daa93f4fc2834c4 100644 (file)
--- a/tests/domaincapsschemadata/qemu_2.6.0.aarch64.xml
+++ b/tests/domaincapsschemadata/qemu_2.6.0.aarch64.xml
@@ -79,7 +79,6 @@
     <video supported='yes'>
       <enum name='modelType'>
         <value>vga</value>
-        <value>qxl</value>
         <value>virtio</value>
       </enum>
     </video>

diff --git a/tests/domaincapsschemadata/qemu_2.6.0.ppc64le.xml b/tests/domaincapsschemadata/qemu_2.6.0.ppc64le.xml
index 962be6f33fc119fd209f6b309148050b62b8f258..a75764c07193af2a5ec4d922fe30c4d5afd27d8b 100644 (file)
--- a/tests/domaincapsschemadata/qemu_2.6.0.ppc64le.xml
+++ b/tests/domaincapsschemadata/qemu_2.6.0.ppc64le.xml
@@ -51,7 +51,6 @@
     <video supported='yes'>
       <enum name='modelType'>
         <value>vga</value>
-        <value>qxl</value>
         <value>virtio</value>
       </enum>
     </video>

diff --git a/tests/qemucapabilitiesdata/caps_1.2.2.x86_64.replies b/tests/qemucapabilitiesdata/caps_1.2.2.x86_64.replies
index 521578e593fdef83e3604138dfb18548f8558d39..6d356dbb861de59163ede6e6df5df96da7d439ce 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.2.2.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_1.2.2.x86_64.replies
@@ -1593,73 +1593,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": "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-32"
-}
-
-{
-  "id": "libvirt-33",
+  "id": "libvirt-32",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-gpu-pci' not found"
@@ -1667,7 +1601,7 @@
 }
 
 {
-  "id": "libvirt-34",
+  "id": "libvirt-33",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'ICH9-LPC' not found"
@@ -1709,11 +1643,11 @@
       "type": "on/off"
     }
   ],
-  "id": "libvirt-35"
+  "id": "libvirt-34"
 }
 
 {
-  "id": "libvirt-36",
+  "id": "libvirt-35",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-balloon-ccw' not found"
@@ -1721,7 +1655,7 @@
 }
 
 {
-  "id": "libvirt-37",
+  "id": "libvirt-36",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-balloon-device' not found"
@@ -1755,7 +1689,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-38"
+  "id": "libvirt-37"
 }
 
 {
@@ -1796,7 +1730,7 @@
       "name": "none"
     }
   ],
-  "id": "libvirt-39"
+  "id": "libvirt-38"
 }
 
 {
@@ -1868,7 +1802,7 @@
       "name": "Opteron_G4"
     }
   ],
-  "id": "libvirt-40"
+  "id": "libvirt-39"
 }
 
 {
@@ -1876,11 +1810,11 @@
     "enabled": false,
     "present": true
   },
-  "id": "libvirt-41"
+  "id": "libvirt-40"
 }
 
 {
-  "id": "libvirt-42",
+  "id": "libvirt-41",
   "error": {
     "class": "CommandNotFound",
     "desc": "The command query-tpm-models has not been found"
@@ -1888,7 +1822,7 @@
 }
 
 {
-  "id": "libvirt-43",
+  "id": "libvirt-42",
   "error": {
     "class": "CommandNotFound",
     "desc": "The command query-tpm-types has not been found"
@@ -1896,7 +1830,7 @@
 }
 
 {
-  "id": "libvirt-44",
+  "id": "libvirt-43",
   "error": {
     "class": "CommandNotFound",
     "desc": "The command query-command-line-options has not been found"
@@ -1910,5 +1844,5 @@
       "capability": "xbzrle"
     }
   ],
-  "id": "libvirt-45"
+  "id": "libvirt-44"
 }

diff --git a/tests/qemucapabilitiesdata/caps_1.2.2.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.2.2.x86_64.xml
index 565151fc55338d6d7f7044187011aedc5ed20368..e4609750b9c29f44b12127e0142a8fe0b9b08ca9 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.2.2.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.2.2.x86_64.xml
@@ -30,7 +30,6 @@
   <flag name='ccid-passthru'/>
   <flag name='chardev-spicevmc'/>
   <flag name='virtio-tx-alg'/>
-  <flag name='device-qxl-vga'/>
   <flag name='pci-multifunction'/>
   <flag name='virtio-blk-pci.ioeventfd'/>
   <flag name='sga'/>
@@ -103,7 +102,6 @@
   <flag name='VGA.vgamem_mb'/>
   <flag name='vmware-svga.vgamem_mb'/>
   <flag name='qxl.vgamem_mb'/>
-  <flag name='qxl-vga.vgamem_mb'/>
   <flag name='ioh3420'/>
   <flag name='x3130-upstream'/>
   <flag name='xio3130-downstream'/>
@@ -111,7 +109,6 @@
   <flag name='e1000'/>
   <flag name='virtio-net'/>
   <flag name='qxl.vram64_size_mb'/>
-  <flag name='qxl-vga.vram64_size_mb'/>
   <flag name='device-tray-moved-event'/>
   <flag name='display'/>
   <version>1002002</version>

diff --git a/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.replies b/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.replies
index 110858bd06d01d27befc71cb5ef0433ce0c74799..69bf0c26b6d87b7b13fa560e5116bb360cd4cbbf 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.replies
@@ -1793,77 +1793,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"
@@ -1871,7 +1801,7 @@
 }
 
 {
-  "id": "libvirt-35",
+  "id": "libvirt-34",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'ICH9-LPC' not found"
@@ -1913,11 +1843,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"
@@ -1925,7 +1855,7 @@
 }
 
 {
-  "id": "libvirt-38",
+  "id": "libvirt-37",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-balloon-device' not found"
@@ -1979,7 +1909,7 @@
       "type": "on/off"
     }
   ],
-  "id": "libvirt-39"
+  "id": "libvirt-38"
 }
 
 {
@@ -2027,7 +1957,7 @@
       "name": "none"
     }
   ],
-  "id": "libvirt-40"
+  "id": "libvirt-39"
 }
 
 {
@@ -2105,7 +2035,7 @@
       "name": "Opteron_G5"
     }
   ],
-  "id": "libvirt-41"
+  "id": "libvirt-40"
 }
 
 {
@@ -2113,11 +2043,11 @@
     "enabled": false,
     "present": true
   },
-  "id": "libvirt-42"
+  "id": "libvirt-41"
 }
 
 {
-  "id": "libvirt-43",
+  "id": "libvirt-42",
   "error": {
     "class": "CommandNotFound",
     "desc": "The command query-tpm-models has not been found"
@@ -2125,7 +2055,7 @@
 }
 
 {
-  "id": "libvirt-44",
+  "id": "libvirt-43",
   "error": {
     "class": "CommandNotFound",
     "desc": "The command query-tpm-types has not been found"
@@ -2133,7 +2063,7 @@
 }
 
 {
-  "id": "libvirt-45",
+  "id": "libvirt-44",
   "error": {
     "class": "CommandNotFound",
     "desc": "The command query-command-line-options has not been found"
@@ -2147,5 +2077,5 @@
       "capability": "xbzrle"
     }
   ],
-  "id": "libvirt-46"
+  "id": "libvirt-45"
 }

diff --git a/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml
index 2d4be6141af696fe1df8bf63b2745049db15d0b5..4f7cbff37e93d1036794f3a5fac173f0b9d668ea 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml
@@ -32,7 +32,6 @@
   <flag name='ccid-passthru'/>
   <flag name='chardev-spicevmc'/>
   <flag name='virtio-tx-alg'/>
-  <flag name='device-qxl-vga'/>
   <flag name='pci-multifunction'/>
   <flag name='virtio-blk-pci.ioeventfd'/>
   <flag name='sga'/>
@@ -119,7 +118,6 @@
   <flag name='VGA.vgamem_mb'/>
   <flag name='vmware-svga.vgamem_mb'/>
   <flag name='qxl.vgamem_mb'/>
-  <flag name='qxl-vga.vgamem_mb'/>
   <flag name='pci-serial'/>
   <flag name='ioh3420'/>
   <flag name='x3130-upstream'/>
@@ -128,7 +126,6 @@
   <flag name='e1000'/>
   <flag name='virtio-net'/>
   <flag name='qxl.vram64_size_mb'/>
-  <flag name='qxl-vga.vram64_size_mb'/>
   <flag name='device-tray-moved-event'/>
   <flag name='nec-usb-xhci-ports'/>
   <flag name='display'/>

diff --git a/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.replies b/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.replies
index d910b5c6e6f98633de043563dee5b19fa6fa704c..a69846aaee71268329446f12b77a5254ef9e2b76 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.replies
@@ -1840,77 +1840,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"
@@ -1918,7 +1848,7 @@
 }
 
 {
-  "id": "libvirt-35",
+  "id": "libvirt-34",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'ICH9-LPC' not found"
@@ -1960,11 +1890,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"
@@ -1972,7 +1902,7 @@
 }
 
 {
-  "id": "libvirt-38",
+  "id": "libvirt-37",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-balloon-device' not found"
@@ -2026,7 +1956,7 @@
       "type": "on/off"
     }
   ],
-  "id": "libvirt-39"
+  "id": "libvirt-38"
 }
 
 {
@@ -2077,7 +2007,7 @@
       "name": "none"
     }
   ],
-  "id": "libvirt-40"
+  "id": "libvirt-39"
 }
 
 {
@@ -2155,7 +2085,7 @@
       "name": "qemu64"
     }
   ],
-  "id": "libvirt-41"
+  "id": "libvirt-40"
 }
 
 {
@@ -2163,11 +2093,11 @@
     "enabled": false,
     "present": true
   },
-  "id": "libvirt-42"
+  "id": "libvirt-41"
 }
 
 {
-  "id": "libvirt-43",
+  "id": "libvirt-42",
   "error": {
     "class": "CommandNotFound",
     "desc": "The command query-tpm-models has not been found"
@@ -2175,7 +2105,7 @@
 }
 
 {
-  "id": "libvirt-44",
+  "id": "libvirt-43",
   "error": {
     "class": "CommandNotFound",
     "desc": "The command query-tpm-types has not been found"
@@ -2183,7 +2113,7 @@
 }
 
 {
-  "id": "libvirt-45",
+  "id": "libvirt-44",
   "error": {
     "class": "CommandNotFound",
     "desc": "The command query-command-line-options has not been found"
@@ -2197,5 +2127,5 @@
       "capability": "xbzrle"
     }
   ],
-  "id": "libvirt-46"
+  "id": "libvirt-45"
 }

diff --git a/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml
index 18076a5fc7a7efae4a8c3ffd2887b1f4a9c9fcca..ca611822d2f1f3c4b143d15478908d56b222111f 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml
@@ -32,7 +32,6 @@
   <flag name='ccid-passthru'/>
   <flag name='chardev-spicevmc'/>
   <flag name='virtio-tx-alg'/>
-  <flag name='device-qxl-vga'/>
   <flag name='pci-multifunction'/>
   <flag name='virtio-blk-pci.ioeventfd'/>
   <flag name='sga'/>
@@ -120,7 +119,6 @@
   <flag name='VGA.vgamem_mb'/>
   <flag name='vmware-svga.vgamem_mb'/>
   <flag name='qxl.vgamem_mb'/>
-  <flag name='qxl-vga.vgamem_mb'/>
   <flag name='pci-serial'/>
   <flag name='ioh3420'/>
   <flag name='x3130-upstream'/>
@@ -129,7 +127,6 @@
   <flag name='e1000'/>
   <flag name='virtio-net'/>
   <flag name='qxl.vram64_size_mb'/>
-  <flag name='qxl-vga.vram64_size_mb'/>
   <flag name='device-tray-moved-event'/>
   <flag name='nec-usb-xhci-ports'/>
   <flag name='display'/>

diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.replies b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.replies
index d6314f0b6937346ed301363a5474bcf0f5b550c2..2c835ad7865b2e1c6b1d85e58b3511855b15904d 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.replies
@@ -1943,77 +1943,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"
@@ -2021,7 +1951,7 @@
 }
 
 {
-  "id": "libvirt-35",
+  "id": "libvirt-34",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'ICH9-LPC' not found"
@@ -2063,11 +1993,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"
@@ -2077,7 +2007,7 @@
 {
   "return": [
   ],
-  "id": "libvirt-38"
+  "id": "libvirt-37"
 }
 
 {
@@ -2127,7 +2057,7 @@
       "type": "on/off"
     }
   ],
-  "id": "libvirt-39"
+  "id": "libvirt-38"
 }
 
 {
@@ -2200,7 +2130,7 @@
       "cpu-max": 1
     }
   ],
-  "id": "libvirt-40"
+  "id": "libvirt-39"
 }
 
 {
@@ -2278,7 +2208,7 @@
       "name": "qemu64"
     }
   ],
-  "id": "libvirt-41"
+  "id": "libvirt-40"
 }
 
 {
@@ -2286,19 +2216,19 @@
     "enabled": false,
     "present": true
   },
-  "id": "libvirt-42"
+  "id": "libvirt-41"
 }
 
 {
   "return": [
   ],
-  "id": "libvirt-43"
+  "id": "libvirt-42"
 }
 
 {
   "return": [
   ],
-  "id": "libvirt-44"
+  "id": "libvirt-43"
 }
 
 {
@@ -2999,7 +2929,7 @@
       "option": "drive"
     }
   ],
-  "id": "libvirt-45"
+  "id": "libvirt-44"
 }
 
 {
@@ -3009,5 +2939,5 @@
       "capability": "xbzrle"
     }
   ],
-  "id": "libvirt-46"
+  "id": "libvirt-45"
 }

diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
index 0d048da3feb69e16a13bb5bde9c74e9b0bd97fcd..471244d03b8333ddef29b1ad300e27f1205bd7cf 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
@@ -32,7 +32,6 @@
   <flag name='ccid-passthru'/>
   <flag name='chardev-spicevmc'/>
   <flag name='virtio-tx-alg'/>
-  <flag name='device-qxl-vga'/>
   <flag name='pci-multifunction'/>
   <flag name='virtio-blk-pci.ioeventfd'/>
   <flag name='sga'/>
@@ -130,7 +129,6 @@
   <flag name='VGA.vgamem_mb'/>
   <flag name='vmware-svga.vgamem_mb'/>
   <flag name='qxl.vgamem_mb'/>
-  <flag name='qxl-vga.vgamem_mb'/>
   <flag name='pci-serial'/>
   <flag name='ioh3420'/>
   <flag name='x3130-upstream'/>
@@ -139,7 +137,6 @@
   <flag name='e1000'/>
   <flag name='virtio-net'/>
   <flag name='qxl.vram64_size_mb'/>
-  <flag name='qxl-vga.vram64_size_mb'/>
   <flag name='device-tray-moved-event'/>
   <flag name='nec-usb-xhci-ports'/>
   <flag name='display'/>

diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.replies
index 7412ba53dc1c81415cb6ebb814323e5f4abd31d4..91481bbbfb77f30936c1c291a245aa9e4ab29f1a 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.replies
@@ -1988,77 +1988,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"
@@ -2066,7 +1996,7 @@
 }
 
 {
-  "id": "libvirt-35",
+  "id": "libvirt-34",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'ICH9-LPC' not found"
@@ -2108,11 +2038,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"
@@ -2122,7 +2052,7 @@
 {
   "return": [
   ],
-  "id": "libvirt-38"
+  "id": "libvirt-37"
 }
 
 {
@@ -2172,7 +2102,7 @@
       "type": "on/off"
     }
   ],
-  "id": "libvirt-39"
+  "id": "libvirt-38"
 }
 
 {
@@ -2253,7 +2183,7 @@
       "cpu-max": 1
     }
   ],
-  "id": "libvirt-40"
+  "id": "libvirt-39"
 }
 
 {
@@ -2331,7 +2261,7 @@
       "name": "qemu64"
     }
   ],
-  "id": "libvirt-41"
+  "id": "libvirt-40"
 }
 
 {
@@ -2339,19 +2269,19 @@
     "enabled": false,
     "present": true
   },
-  "id": "libvirt-42"
+  "id": "libvirt-41"
 }
 
 {
   "return": [
   ],
-  "id": "libvirt-43"
+  "id": "libvirt-42"
 }
 
 {
   "return": [
   ],
-  "id": "libvirt-44"
+  "id": "libvirt-43"
 }
 
 {
@@ -2954,7 +2884,7 @@
       "option": "drive"
     }
   ],
-  "id": "libvirt-45"
+  "id": "libvirt-44"
 }
 
 {
@@ -2976,5 +2906,5 @@
       "capability": "zero-blocks"
     }
   ],
-  "id": "libvirt-46"
+  "id": "libvirt-45"
 }

diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
index a6d45617ff8a615e81d755fbcbc381aefb2a1262..db0d0a0793d94f84d07ec3d531b300d0803be24a 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
@@ -32,7 +32,6 @@
   <flag name='ccid-passthru'/>
   <flag name='chardev-spicevmc'/>
   <flag name='virtio-tx-alg'/>
-  <flag name='device-qxl-vga'/>
   <flag name='pci-multifunction'/>
   <flag name='virtio-blk-pci.ioeventfd'/>
   <flag name='sga'/>
@@ -135,7 +134,6 @@
   <flag name='VGA.vgamem_mb'/>
   <flag name='vmware-svga.vgamem_mb'/>
   <flag name='qxl.vgamem_mb'/>
-  <flag name='qxl-vga.vgamem_mb'/>
   <flag name='pci-serial'/>
   <flag name='ioh3420'/>
   <flag name='x3130-upstream'/>
@@ -144,7 +142,6 @@
   <flag name='e1000'/>
   <flag name='virtio-net'/>
   <flag name='qxl.vram64_size_mb'/>
-  <flag name='qxl-vga.vram64_size_mb'/>
   <flag name='device-tray-moved-event'/>
   <flag name='nec-usb-xhci-ports'/>
   <flag name='display'/>

diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.replies
index 50e4042b0d54fde916ec470de5e709f82194dae3..bde8c202b4f15ced5578a4559639ea3563098935 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.replies
+++ b/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,19 +2294,19 @@
     "enabled": false,
     "present": true
   },
-  "id": "libvirt-42"
+  "id": "libvirt-41"
 }
 
 {
   "return": [
   ],
-  "id": "libvirt-43"
+  "id": "libvirt-42"
 }
 
 {
   "return": [
   ],
-  "id": "libvirt-44"
+  "id": "libvirt-43"
 }
 
 {
@@ -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"
 }

diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
index f756a4116d5a21052f7ce3c2537d9adf564a6389..55005e2fd4db477ef80f865c776dfad83cd25756 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
@@ -32,7 +32,6 @@
   <flag name='ccid-passthru'/>
   <flag name='chardev-spicevmc'/>
   <flag name='virtio-tx-alg'/>
-  <flag name='device-qxl-vga'/>
   <flag name='pci-multifunction'/>
   <flag name='virtio-blk-pci.ioeventfd'/>
   <flag name='sga'/>
@@ -137,7 +136,6 @@
   <flag name='VGA.vgamem_mb'/>
   <flag name='vmware-svga.vgamem_mb'/>
   <flag name='qxl.vgamem_mb'/>
-  <flag name='qxl-vga.vgamem_mb'/>
   <flag name='pci-serial'/>
   <flag name='ioh3420'/>
   <flag name='x3130-upstream'/>
@@ -146,7 +144,6 @@
   <flag name='e1000'/>
   <flag name='virtio-net'/>
   <flag name='qxl.vram64_size_mb'/>
-  <flag name='qxl-vga.vram64_size_mb'/>
   <flag name='device-tray-moved-event'/>
   <flag name='nec-usb-xhci-ports'/>
   <flag name='display'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.replies
index 1c853ca26d3ec89c47b7b53ab17bfea289985553..344497cb58185ff63a792a212c7220679250a316 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.replies
@@ -2360,77 +2360,7 @@
 }
 
 {
-  "return": [
-    {
-      "name": "command_serr_enable",
-      "type": "on/off"
-    },
-    {
-      "name": "multifunction",
-      "type": "on/off"
-    },
-    {
-      "name": "rombar",
-      "type": "uint32"
-    },
-    {
-      "name": "romfile",
-      "type": "str"
-    },
-    {
-      "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"
@@ -2488,7 +2418,7 @@
       "type": "pci-devfn"
     }
   ],
-  "id": "libvirt-35"
+  "id": "libvirt-34"
 }
 
 {
@@ -2538,11 +2468,11 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-36"
+  "id": "libvirt-35"
 }
 
 {
-  "id": "libvirt-37",
+  "id": "libvirt-36",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-balloon-ccw' not found"
@@ -2552,7 +2482,7 @@
 {
   "return": [
   ],
-  "id": "libvirt-38"
+  "id": "libvirt-37"
 }
 
 {
@@ -2606,7 +2536,7 @@
       "type": "on/off"
     }
   ],
-  "id": "libvirt-39"
+  "id": "libvirt-38"
 }
 
 {
@@ -2711,7 +2641,7 @@
       "cpu-max": 255
     }
   ],
-  "id": "libvirt-40"
+  "id": "libvirt-39"
 }
 
 {
@@ -2792,7 +2722,7 @@
       "name": "qemu64"
     }
   ],
-  "id": "libvirt-41"
+  "id": "libvirt-40"
 }
 
 {
@@ -2800,21 +2730,21 @@
     "enabled": false,
     "present": true
   },
-  "id": "libvirt-42"
+  "id": "libvirt-41"
 }
 
 {
   "return": [
     "tpm-tis"
   ],
-  "id": "libvirt-43"
+  "id": "libvirt-42"
 }
 
 {
   "return": [
     "passthrough"
   ],
-  "id": "libvirt-44"
+  "id": "libvirt-43"
 }
 
 {
@@ -3674,7 +3604,7 @@
       "option": "drive"
     }
   ],
-  "id": "libvirt-45"
+  "id": "libvirt-44"
 }
 
 {
@@ -3696,5 +3626,5 @@
       "capability": "zero-blocks"
     }
   ],
-  "id": "libvirt-46"
+  "id": "libvirt-45"
 }

diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
index a77ad9ed0ceaef20dc438b6b54347f1fd20b6957..3e80717d725ef4796510c4e139002a527a39e8a0 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
@@ -32,7 +32,6 @@
   <flag name='ccid-passthru'/>
   <flag name='chardev-spicevmc'/>
   <flag name='virtio-tx-alg'/>
-  <flag name='device-qxl-vga'/>
   <flag name='pci-multifunction'/>
   <flag name='virtio-blk-pci.ioeventfd'/>
   <flag name='sga'/>
@@ -147,7 +146,6 @@
   <flag name='VGA.vgamem_mb'/>
   <flag name='vmware-svga.vgamem_mb'/>
   <flag name='qxl.vgamem_mb'/>
-  <flag name='qxl-vga.vgamem_mb'/>
   <flag name='pc-dimm'/>
   <flag name='pci-serial'/>
   <flag name='ioh3420'/>
@@ -158,7 +156,6 @@
   <flag name='virtio-net'/>
   <flag name='vserport-change-event'/>
   <flag name='qxl.vram64_size_mb'/>
-  <flag name='qxl-vga.vram64_size_mb'/>
   <flag name='debug-threads'/>
   <flag name='device-tray-moved-event'/>
   <flag name='nec-usb-xhci-ports'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.replies
index 16588e8346ff0fefd687552aaf89bf70ac59b6ea..95a3fc830b17c42f34553be4baca114892f77909 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.replies
@@ -2722,83 +2722,6 @@
   "id": "libvirt-32"
 }
 
-{
-  "return": [
-    {
-      "name": "command_serr_enable",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "multifunction",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "rombar",
-      "type": "uint32"
-    },
-    {
-      "name": "romfile",
-      "type": "str"
-    },
-    {
-      "name": "addr",
-      "description": "Slot and optional function number, example: 06.0 or 06",
-      "type": "int32"
-    },
-    {
-      "name": "max_outputs",
-      "type": "uint16"
-    },
-    {
-      "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"
-}
-
 {
   "return": [
     {
@@ -2877,7 +2800,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-34"
+  "id": "libvirt-33"
 }
 
 {
@@ -2954,7 +2877,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-35"
+  "id": "libvirt-34"
 }
 
 {
@@ -3039,11 +2962,11 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-36"
+  "id": "libvirt-35"
 }
 
 {
-  "id": "libvirt-37",
+  "id": "libvirt-36",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-balloon-ccw' not found"
@@ -3086,7 +3009,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-38"
+  "id": "libvirt-37"
 }
 
 {
@@ -3156,7 +3079,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-39"
+  "id": "libvirt-38"
 }
 
 {
@@ -3285,7 +3208,7 @@
       "cpu-max": 255
     }
   ],
-  "id": "libvirt-40"
+  "id": "libvirt-39"
 }
 
 {
@@ -3375,7 +3298,7 @@
       "name": "qemu64"
     }
   ],
-  "id": "libvirt-41"
+  "id": "libvirt-40"
 }
 
 {
@@ -3383,21 +3306,21 @@
     "enabled": false,
     "present": true
   },
-  "id": "libvirt-42"
+  "id": "libvirt-41"
 }
 
 {
   "return": [
     "tpm-tis"
   ],
-  "id": "libvirt-43"
+  "id": "libvirt-42"
 }
 
 {
   "return": [
     "passthrough"
   ],
-  "id": "libvirt-44"
+  "id": "libvirt-43"
 }
 
 {
@@ -4405,7 +4328,7 @@
       "option": "drive"
     }
   ],
-  "id": "libvirt-45"
+  "id": "libvirt-44"
 }
 
 {
@@ -4435,5 +4358,5 @@
       "capability": "events"
     }
   ],
-  "id": "libvirt-46"
+  "id": "libvirt-45"
 }

diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
index abb9c66ad8af68e1c724f84d41db2eb7a161a212..3526869cde8c66904c38b99c5c2981c6ca64c53b 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
@@ -32,7 +32,6 @@
   <flag name='ccid-passthru'/>
   <flag name='chardev-spicevmc'/>
   <flag name='virtio-tx-alg'/>
-  <flag name='device-qxl-vga'/>
   <flag name='pci-multifunction'/>
   <flag name='virtio-blk-pci.ioeventfd'/>
   <flag name='sga'/>
@@ -147,7 +146,6 @@
   <flag name='VGA.vgamem_mb'/>
   <flag name='vmware-svga.vgamem_mb'/>
   <flag name='qxl.vgamem_mb'/>
-  <flag name='qxl-vga.vgamem_mb'/>
   <flag name='pc-dimm'/>
   <flag name='machine-vmport-opt'/>
   <flag name='pci-serial'/>
@@ -170,7 +168,6 @@
   <flag name='vserport-change-event'/>
   <flag name='virtio-balloon-pci.deflate-on-oom'/>
   <flag name='qxl.vram64_size_mb'/>
-  <flag name='qxl-vga.vram64_size_mb'/>
   <flag name='debug-threads'/>
   <flag name='pxb'/>
   <flag name='device-tray-moved-event'/>
@@ -178,7 +175,6 @@
   <flag name='virtio-scsi-pci.iothread'/>
   <flag name='name-guest'/>
   <flag name='qxl.max_outputs'/>
-  <flag name='qxl-vga.max_outputs'/>
   <flag name='spice-unix'/>
   <flag name='drive-detect-zeroes'/>
   <flag name='display'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies
index d25b82b8651a1d3ff9f1bec2c7765423ab8ff884..2deb044e63d015f0264ece223466bfa906450ac0 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.replies
@@ -2835,83 +2835,6 @@
   "id": "libvirt-32"
 }
 
-{
-  "return": [
-    {
-      "name": "rombar",
-      "type": "uint32"
-    },
-    {
-      "name": "ram_size_mb",
-      "type": "uint32"
-    },
-    {
-      "name": "command_serr_enable",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "multifunction",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "vgamem_mb",
-      "type": "uint32"
-    },
-    {
-      "name": "romfile",
-      "type": "str"
-    },
-    {
-      "name": "addr",
-      "description": "Slot and optional function number, example: 06.0 or 06",
-      "type": "int32"
-    },
-    {
-      "name": "debug",
-      "type": "uint32"
-    },
-    {
-      "name": "vram_size_mb",
-      "type": "uint32"
-    },
-    {
-      "name": "revision",
-      "type": "uint32"
-    },
-    {
-      "name": "ram_size",
-      "type": "uint32"
-    },
-    {
-      "name": "vram64_size_mb",
-      "type": "uint32"
-    },
-    {
-      "name": "guestdebug",
-      "type": "uint32"
-    },
-    {
-      "name": "vram_size",
-      "type": "uint32"
-    },
-    {
-      "name": "surfaces",
-      "type": "int32"
-    },
-    {
-      "name": "max_outputs",
-      "type": "uint16"
-    },
-    {
-      "name": "cmdlog",
-      "type": "uint32"
-    }
-  ],
-  "id": "libvirt-33"
-}
-
 {
   "return": [
     {
@@ -3015,7 +2938,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-34"
+  "id": "libvirt-33"
 }
 
 {
@@ -3092,7 +3015,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-35"
+  "id": "libvirt-34"
 }
 
 {
@@ -3192,11 +3115,11 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-36"
+  "id": "libvirt-35"
 }
 
 {
-  "id": "libvirt-37",
+  "id": "libvirt-36",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-balloon-ccw' not found"
@@ -3239,7 +3162,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-38"
+  "id": "libvirt-37"
 }
 
 {
@@ -3309,7 +3232,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-39"
+  "id": "libvirt-38"
 }
 
 {
@@ -3446,7 +3369,7 @@
       "cpu-max": 255
     }
   ],
-  "id": "libvirt-40"
+  "id": "libvirt-39"
 }
 
 {
@@ -3536,7 +3459,7 @@
       "name": "qemu64"
     }
   ],
-  "id": "libvirt-41"
+  "id": "libvirt-40"
 }
 
 {
@@ -3544,21 +3467,21 @@
     "enabled": false,
     "present": true
   },
-  "id": "libvirt-42"
+  "id": "libvirt-41"
 }
 
 {
   "return": [
     "tpm-tis"
   ],
-  "id": "libvirt-43"
+  "id": "libvirt-42"
 }
 
 {
   "return": [
     "passthrough"
   ],
-  "id": "libvirt-44"
+  "id": "libvirt-43"
 }
 
 {
@@ -4603,7 +4526,7 @@
       "option": "drive"
     }
   ],
-  "id": "libvirt-45"
+  "id": "libvirt-44"
 }
 
 {
@@ -4637,5 +4560,5 @@
       "capability": "x-postcopy-ram"
     }
   ],
-  "id": "libvirt-46"
+  "id": "libvirt-45"
 }

diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
index cbf2e1ebc23835654fe844b66a5fbf1644374a84..01ac2c71a6fc66a00a87bc405418e590f4374116 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
@@ -32,7 +32,6 @@
   <flag name='ccid-passthru'/>
   <flag name='chardev-spicevmc'/>
   <flag name='virtio-tx-alg'/>
-  <flag name='device-qxl-vga'/>
   <flag name='pci-multifunction'/>
   <flag name='virtio-blk-pci.ioeventfd'/>
   <flag name='sga'/>
@@ -147,7 +146,6 @@
   <flag name='VGA.vgamem_mb'/>
   <flag name='vmware-svga.vgamem_mb'/>
   <flag name='qxl.vgamem_mb'/>
-  <flag name='qxl-vga.vgamem_mb'/>
   <flag name='pc-dimm'/>
   <flag name='machine-vmport-opt'/>
   <flag name='aes-key-wrap'/>
@@ -174,7 +172,6 @@
   <flag name='vserport-change-event'/>
   <flag name='virtio-balloon-pci.deflate-on-oom'/>
   <flag name='qxl.vram64_size_mb'/>
-  <flag name='qxl-vga.vram64_size_mb'/>
   <flag name='debug-threads'/>
   <flag name='pxb'/>
   <flag name='device-tray-moved-event'/>
@@ -182,7 +179,6 @@
   <flag name='virtio-scsi-pci.iothread'/>
   <flag name='name-guest'/>
   <flag name='qxl.max_outputs'/>
-  <flag name='qxl-vga.max_outputs'/>
   <flag name='spice-unix'/>
   <flag name='drive-detect-zeroes'/>
   <flag name='tls-creds-x509'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.replies b/tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.replies
index 9e221771ebc63be34c1975e3c4f55a526a8124cb..f6107a0f2ef6de81f6fccb10372647852d61536f 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.replies
@@ -3297,14 +3297,6 @@
   }
 }
 
-{
-  "id": "libvirt-33",
-  "error": {
-    "class": "DeviceNotFound",
-    "desc": "Device 'qxl-vga' not found"
-  }
-}
-
 {
   "return": [
     {

diff --git a/tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.xml
index fd14665d53974791942dd687ebffbbe64a1ec918..fe8c0fda2408e2179366f753085dab41236bb265 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0-gicv2.aarch64.xml
@@ -25,7 +25,6 @@
   <flag name='ccid-passthru'/>
   <flag name='chardev-spicevmc'/>
   <flag name='virtio-tx-alg'/>
-  <flag name='device-qxl-vga'/>
   <flag name='pci-multifunction'/>
   <flag name='virtio-blk-pci.ioeventfd'/>
   <flag name='virtio-blk-pci.event_idx'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.replies b/tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.replies
index c92815a522b3f5183e5d56a9084454750708c43f..609e38bcb5bd22becc131d22bd9dc67c7498398b 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.replies
@@ -3297,14 +3297,6 @@
   }
 }
 
-{
-  "id": "libvirt-33",
-  "error": {
-    "class": "DeviceNotFound",
-    "desc": "Device 'qxl-vga' not found"
-  }
-}
-
 {
   "return": [
     {

diff --git a/tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.xml
index eb708f8a983ac820d65259931e79a22d9d890e4c..0abe0d31c9947a2c632e35baac0bed8b26b31df5 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0-gicv3.aarch64.xml
@@ -25,7 +25,6 @@
   <flag name='ccid-passthru'/>
   <flag name='chardev-spicevmc'/>
   <flag name='virtio-tx-alg'/>
-  <flag name='device-qxl-vga'/>
   <flag name='pci-multifunction'/>
   <flag name='virtio-blk-pci.ioeventfd'/>
   <flag name='virtio-blk-pci.event_idx'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.replies b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.replies
index 372dfd5d22cbd797c367a30e998dc1438c4eb371..7051e31c8534f9a752ce08c2f6f2a41b42a7de79 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.replies
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.replies
@@ -3444,14 +3444,6 @@
   }
 }
 
-{
-  "id": "libvirt-33",
-  "error": {
-    "class": "DeviceNotFound",
-    "desc": "Device 'qxl-vga' not found"
-  }
-}
-
 {
   "return": [
     {

diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml
index 482b3849b50f1917b480e7735542bb20a545669d..60f5392f587d8c4f7a41a6fc5d2b81665fa1b49d 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64le.xml
@@ -23,7 +23,6 @@
   <flag name='drive-aio'/>
   <flag name='chardev-spicevmc'/>
   <flag name='virtio-tx-alg'/>
-  <flag name='device-qxl-vga'/>
   <flag name='pci-multifunction'/>
   <flag name='virtio-blk-pci.ioeventfd'/>
   <flag name='virtio-blk-pci.event_idx'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies
index 68e64d896c4bbbc38b9e98fbccfd56b1630478b0..74e48b0c5480dac3c40fca992ac93a9eaca6f52a 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.replies
@@ -2917,83 +2917,6 @@
   "id": "libvirt-32"
 }
 
-{
-  "return": [
-    {
-      "name": "rombar",
-      "type": "uint32"
-    },
-    {
-      "name": "ram_size_mb",
-      "type": "uint32"
-    },
-    {
-      "name": "command_serr_enable",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "multifunction",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "vgamem_mb",
-      "type": "uint32"
-    },
-    {
-      "name": "romfile",
-      "type": "str"
-    },
-    {
-      "name": "addr",
-      "description": "Slot and optional function number, example: 06.0 or 06",
-      "type": "int32"
-    },
-    {
-      "name": "debug",
-      "type": "uint32"
-    },
-    {
-      "name": "vram_size_mb",
-      "type": "uint32"
-    },
-    {
-      "name": "revision",
-      "type": "uint32"
-    },
-    {
-      "name": "ram_size",
-      "type": "uint32"
-    },
-    {
-      "name": "vram64_size_mb",
-      "type": "uint32"
-    },
-    {
-      "name": "guestdebug",
-      "type": "uint32"
-    },
-    {
-      "name": "vram_size",
-      "type": "uint32"
-    },
-    {
-      "name": "surfaces",
-      "type": "int32"
-    },
-    {
-      "name": "max_outputs",
-      "type": "uint16"
-    },
-    {
-      "name": "cmdlog",
-      "type": "uint32"
-    }
-  ],
-  "id": "libvirt-33"
-}
-
 {
   "return": [
     {
@@ -3097,7 +3020,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-34"
+  "id": "libvirt-33"
 }
 
 {
@@ -3174,7 +3097,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-35"
+  "id": "libvirt-34"
 }
 
 {
@@ -3274,11 +3197,11 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-36"
+  "id": "libvirt-35"
 }
 
 {
-  "id": "libvirt-37",
+  "id": "libvirt-36",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-balloon-ccw' not found"
@@ -3321,7 +3244,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-38"
+  "id": "libvirt-37"
 }
 
 {
@@ -3391,7 +3314,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-39"
+  "id": "libvirt-38"
 }
 
 {
@@ -3504,7 +3427,7 @@
       "cpu-max": 255
     }
   ],
-  "id": "libvirt-40"
+  "id": "libvirt-39"
 }
 
 {
@@ -3594,7 +3517,7 @@
       "name": "qemu64"
     }
   ],
-  "id": "libvirt-41"
+  "id": "libvirt-40"
 }
 
 {
@@ -3602,21 +3525,21 @@
     "enabled": false,
     "present": true
   },
-  "id": "libvirt-42"
+  "id": "libvirt-41"
 }
 
 {
   "return": [
     "tpm-tis"
   ],
-  "id": "libvirt-43"
+  "id": "libvirt-42"
 }
 
 {
   "return": [
     "passthrough"
   ],
-  "id": "libvirt-44"
+  "id": "libvirt-43"
 }
 
 {
@@ -4710,7 +4633,7 @@
       "option": "drive"
     }
   ],
-  "id": "libvirt-45"
+  "id": "libvirt-44"
 }
 
 {
@@ -4744,5 +4667,5 @@
       "capability": "postcopy-ram"
     }
   ],
-  "id": "libvirt-46"
+  "id": "libvirt-45"
 }

diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
index 116c5062c58c5d67b090ce4b57c468265e42235c..cb2b76ddc34527c2bd4996a6ad48a02ba9dc9f67 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
@@ -32,7 +32,6 @@
   <flag name='ccid-passthru'/>
   <flag name='chardev-spicevmc'/>
   <flag name='virtio-tx-alg'/>
-  <flag name='device-qxl-vga'/>
   <flag name='pci-multifunction'/>
   <flag name='virtio-blk-pci.ioeventfd'/>
   <flag name='sga'/>
@@ -147,7 +146,6 @@
   <flag name='VGA.vgamem_mb'/>
   <flag name='vmware-svga.vgamem_mb'/>
   <flag name='qxl.vgamem_mb'/>
-  <flag name='qxl-vga.vgamem_mb'/>
   <flag name='pc-dimm'/>
   <flag name='machine-vmport-opt'/>
   <flag name='aes-key-wrap'/>
@@ -177,7 +175,6 @@
   <flag name='mptsas1068'/>
   <flag name='spice-gl'/>
   <flag name='qxl.vram64_size_mb'/>
-  <flag name='qxl-vga.vram64_size_mb'/>
   <flag name='chardev-logfile'/>
   <flag name='debug-threads'/>
   <flag name='secret'/>
@@ -188,7 +185,6 @@
   <flag name='virtio-scsi-pci.iothread'/>
   <flag name='name-guest'/>
   <flag name='qxl.max_outputs'/>
-  <flag name='qxl-vga.max_outputs'/>
   <flag name='spice-unix'/>
   <flag name='drive-detect-zeroes'/>
   <flag name='tls-creds-x509'/>

diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies
index ce8dee99cf8c8ff13ccb6ebf80ed3ea9e6fabfb1..6514dd19a948dfb52a4efe986c59d634ebdd4fd5 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies
+++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.replies
@@ -3086,88 +3086,6 @@
   "id": "libvirt-32"
 }
 
-{
-  "return": [
-    {
-      "name": "rombar",
-      "type": "uint32"
-    },
-    {
-      "name": "x-pcie-lnksta-dllla",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "ram_size_mb",
-      "type": "uint32"
-    },
-    {
-      "name": "command_serr_enable",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "multifunction",
-      "description": "on/off",
-      "type": "bool"
-    },
-    {
-      "name": "vgamem_mb",
-      "type": "uint32"
-    },
-    {
-      "name": "romfile",
-      "type": "str"
-    },
-    {
-      "name": "addr",
-      "description": "Slot and optional function number, example: 06.0 or 06",
-      "type": "int32"
-    },
-    {
-      "name": "debug",
-      "type": "uint32"
-    },
-    {
-      "name": "vram_size_mb",
-      "type": "uint32"
-    },
-    {
-      "name": "revision",
-      "type": "uint32"
-    },
-    {
-      "name": "ram_size",
-      "type": "uint32"
-    },
-    {
-      "name": "vram64_size_mb",
-      "type": "uint32"
-    },
-    {
-      "name": "guestdebug",
-      "type": "uint32"
-    },
-    {
-      "name": "vram_size",
-      "type": "uint64"
-    },
-    {
-      "name": "surfaces",
-      "type": "int32"
-    },
-    {
-      "name": "max_outputs",
-      "type": "uint16"
-    },
-    {
-      "name": "cmdlog",
-      "type": "uint32"
-    }
-  ],
-  "id": "libvirt-33"
-}
-
 {
   "return": [
     {
@@ -3275,7 +3193,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-34"
+  "id": "libvirt-33"
 }
 
 {
@@ -3361,7 +3279,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-35"
+  "id": "libvirt-34"
 }
 
 {
@@ -3465,11 +3383,11 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-36"
+  "id": "libvirt-35"
 }
 
 {
-  "id": "libvirt-37",
+  "id": "libvirt-36",
   "error": {
     "class": "DeviceNotFound",
     "desc": "Device 'virtio-balloon-ccw' not found"
@@ -3512,7 +3430,7 @@
       "type": "bool"
     }
   ],
-  "id": "libvirt-38"
+  "id": "libvirt-37"
 }
 
 {
@@ -3587,7 +3505,7 @@
       "type": "uint32"
     }
   ],
-  "id": "libvirt-39"
+  "id": "libvirt-38"
 }
 
 {
@@ -3736,7 +3654,7 @@
       "cpu-max": 255
     }
   ],
-  "id": "libvirt-40"
+  "id": "libvirt-39"
 }
 
 {
@@ -3829,7 +3747,7 @@
       "name": "qemu64"
     }
   ],
-  "id": "libvirt-41"
+  "id": "libvirt-40"
 }
 
 {
@@ -3837,21 +3755,21 @@
     "enabled": false,
     "present": true
   },
-  "id": "libvirt-42"
+  "id": "libvirt-41"
 }
 
 {
   "return": [
     "tpm-tis"
   ],
-  "id": "libvirt-43"
+  "id": "libvirt-42"
 }
 
 {
   "return": [
     "passthrough"
   ],
-  "id": "libvirt-44"
+  "id": "libvirt-43"
 }
 
 {
@@ -4949,7 +4867,7 @@
       "option": "drive"
     }
   ],
-  "id": "libvirt-45"
+  "id": "libvirt-44"
 }
 
 {
@@ -4983,5 +4901,5 @@
       "capability": "postcopy-ram"
     }
   ],
-  "id": "libvirt-46"
+  "id": "libvirt-45"
 }

diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
index 98f37622bff0a298e875c6e2bfd867369a98a212..1b8d9c8707c80162987815b662642220e1ed6243 100644 (file)
--- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
+++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
@@ -32,7 +32,6 @@
   <flag name='ccid-passthru'/>
   <flag name='chardev-spicevmc'/>
   <flag name='virtio-tx-alg'/>
-  <flag name='device-qxl-vga'/>
   <flag name='pci-multifunction'/>
   <flag name='virtio-blk-pci.ioeventfd'/>
   <flag name='sga'/>
@@ -147,7 +146,6 @@
   <flag name='VGA.vgamem_mb'/>
   <flag name='vmware-svga.vgamem_mb'/>
   <flag name='qxl.vgamem_mb'/>
-  <flag name='qxl-vga.vgamem_mb'/>
   <flag name='pc-dimm'/>
   <flag name='machine-vmport-opt'/>
   <flag name='aes-key-wrap'/>
@@ -177,7 +175,6 @@
   <flag name='mptsas1068'/>
   <flag name='spice-gl'/>
   <flag name='qxl.vram64_size_mb'/>
-  <flag name='qxl-vga.vram64_size_mb'/>
   <flag name='chardev-logfile'/>
   <flag name='debug-threads'/>
   <flag name='secret'/>
@@ -188,7 +185,6 @@
   <flag name='virtio-scsi-pci.iothread'/>
   <flag name='name-guest'/>
   <flag name='qxl.max_outputs'/>
-  <flag name='qxl-vga.max_outputs'/>
   <flag name='spice-unix'/>
   <flag name='drive-detect-zeroes'/>
   <flag name='tls-creds-x509'/>

diff --git a/tests/qemuhelptest.c b/tests/qemuhelptest.c
index 2fc030e17d13a550d92fe26711c8ee2971293f67..bba30bb5faf4cdf0044c34ab7d2d95c4cc898b8a 100644 (file)
--- a/tests/qemuhelptest.c
+++ b/tests/qemuhelptest.c
@@ -295,7 +295,6 @@ mymain(void)
             QEMU_CAPS_CCID_PASSTHRU,
             QEMU_CAPS_CHARDEV_SPICEVMC,
             QEMU_CAPS_VIRTIO_TX_ALG,
-            QEMU_CAPS_DEVICE_QXL_VGA,
             QEMU_CAPS_PCI_MULTIFUNCTION,
             QEMU_CAPS_VIRTIO_IOEVENTFD,
             QEMU_CAPS_SGA,
@@ -368,7 +367,6 @@ mymain(void)
             QEMU_CAPS_CCID_PASSTHRU,
             QEMU_CAPS_CHARDEV_SPICEVMC,
             QEMU_CAPS_VIRTIO_TX_ALG,
-            QEMU_CAPS_DEVICE_QXL_VGA,
             QEMU_CAPS_PCI_MULTIFUNCTION,
             QEMU_CAPS_VIRTIO_IOEVENTFD,
             QEMU_CAPS_SGA,

diff --git a/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-sec-nodevice.xml b/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-sec-nodevice.xml
deleted file mode 100644 (file)
index 0868f39..0000000
--- a/tests/qemuxml2argvdata/qemuxml2argv-video-qxl-sec-nodevice.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<domain type='qemu'>
-  <name>QEMUGuest1</name>
-  <uuid>c7a5fdbd-edaf-9455-926a-d65c16db1809</uuid>
-  <memory unit='KiB'>1048576</memory>
-  <currentMemory unit='KiB'>1048576</currentMemory>
-  <vcpu>1</vcpu>
-  <os>
-    <type arch='i686' machine='pc'>hvm</type>
-    <boot dev='hd'/>
-  </os>
-  <clock offset='utc'/>
-  <on_poweroff>destroy</on_poweroff>
-  <on_reboot>restart</on_reboot>
-  <on_crash>destroy</on_crash>
-  <devices>
-    <emulator>/usr/bin/qemu</emulator>
-    <disk type='file' device='disk'>
-      <driver name='qemu' type='qcow2' cache='none'/>
-      <source file='/var/lib/libvirt/images/QEMUGuest1'/>
-      <target dev='hda' bus='ide'/>
-      <address type='drive' controller='0' bus='0' target='0' unit='0'/>
-    </disk>
-    <controller type='ide' index='0'/>
-    <video>
-      <model type='qxl' heads='1'/>
-    </video>
-    <video>
-      <model type='qxl' heads='1'/>
-    </video>
-    <memballoon model='virtio'/>
-  </devices>
-</domain>

diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index e7a8bea94aea4f129006aed62d6ffad31c3213a4..f7be95eb69ef52ce1d15534891f8a4b94f33a97d 100644 (file)
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -997,7 +997,6 @@ mymain(void)
     DO_TEST("graphics-spice",
             QEMU_CAPS_VGA_QXL,
             QEMU_CAPS_SPICE,
-            QEMU_CAPS_DEVICE_QXL_VGA,
             QEMU_CAPS_DEVICE_QXL,
             QEMU_CAPS_SPICE_FILE_XFER_DISABLE);
     DO_TEST("graphics-spice-no-args",
@@ -1007,7 +1006,6 @@ mymain(void)
     DO_TEST("graphics-spice-sasl",
             QEMU_CAPS_VGA_QXL,
             QEMU_CAPS_SPICE,
-            QEMU_CAPS_DEVICE_QXL_VGA,
             QEMU_CAPS_DEVICE_QXL);
     VIR_FREE(driver.config->spiceSASLdir);
     driver.config->spiceSASL = 0;
@@ -1019,18 +1017,15 @@ mymain(void)
     DO_TEST("graphics-spice-compression",
             QEMU_CAPS_VGA_QXL,
             QEMU_CAPS_SPICE,
-            QEMU_CAPS_DEVICE_QXL_VGA,
             QEMU_CAPS_DEVICE_QXL);
     DO_TEST("graphics-spice-timeout",
             QEMU_CAPS_KVM,
             QEMU_CAPS_VGA_QXL,
             QEMU_CAPS_SPICE,
-            QEMU_CAPS_DEVICE_QXL_VGA,
             QEMU_CAPS_DEVICE_QXL);
     DO_TEST("graphics-spice-qxl-vga",
             QEMU_CAPS_VGA_QXL,
             QEMU_CAPS_SPICE,
-            QEMU_CAPS_DEVICE_QXL_VGA,
             QEMU_CAPS_DEVICE_QXL);
     DO_TEST("graphics-spice-usb-redir",
             QEMU_CAPS_SPICE,
@@ -1041,7 +1036,6 @@ mymain(void)
     DO_TEST("graphics-spice-agent-file-xfer",
             QEMU_CAPS_VGA_QXL,
             QEMU_CAPS_SPICE,
-            QEMU_CAPS_DEVICE_QXL_VGA,
             QEMU_CAPS_DEVICE_QXL,
             QEMU_CAPS_SPICE_FILE_XFER_DISABLE);
     DO_TEST("graphics-spice-socket",
@@ -1123,7 +1117,7 @@ mymain(void)
     DO_TEST("serial-spiceport",
             QEMU_CAPS_CHARDEV,
             QEMU_CAPS_NODEFCONFIG, QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
-            QEMU_CAPS_DEVICE_QXL, QEMU_CAPS_DEVICE_QXL_VGA,
+            QEMU_CAPS_DEVICE_QXL,
             QEMU_CAPS_SPICE, QEMU_CAPS_CHARDEV_SPICEPORT);
     DO_TEST("serial-spiceport-nospice", NONE);
 
@@ -1571,7 +1565,7 @@ mymain(void)
     DO_TEST("video-device-pciaddr-default",
             QEMU_CAPS_KVM, QEMU_CAPS_VNC,
             QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
-            QEMU_CAPS_DEVICE_QXL, QEMU_CAPS_DEVICE_QXL_VGA,
+            QEMU_CAPS_DEVICE_QXL,
             QEMU_CAPS_DEVICE_PCI_BRIDGE);
     DO_TEST("video-vga-nodevice", NONE);
     DO_TEST("video-vga-device", QEMU_CAPS_DEVICE_VGA,
@@ -1579,34 +1573,29 @@ mymain(void)
     DO_TEST("video-vga-device-vgamem", QEMU_CAPS_DEVICE_VGA,
             QEMU_CAPS_DEVICE_VIDEO_PRIMARY, QEMU_CAPS_VGA_VGAMEM);
     DO_TEST("video-qxl-nodevice", QEMU_CAPS_VGA_QXL);
-    DO_TEST("video-qxl-device", QEMU_CAPS_DEVICE_QXL_VGA,
+    DO_TEST("video-qxl-device",
             QEMU_CAPS_DEVICE_QXL,
             QEMU_CAPS_DEVICE_VIDEO_PRIMARY);
     DO_TEST("video-qxl-device-vgamem",
-            QEMU_CAPS_DEVICE_QXL_VGA, QEMU_CAPS_DEVICE_QXL,
+            QEMU_CAPS_DEVICE_QXL,
             QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
-            QEMU_CAPS_QXL_VGA_VGAMEM, QEMU_CAPS_QXL_VGAMEM);
-    DO_TEST_FAILURE("video-qxl-sec-nodevice", QEMU_CAPS_VGA_QXL);
-    DO_TEST("video-qxl-sec-device", QEMU_CAPS_DEVICE_QXL_VGA,
+            QEMU_CAPS_QXL_VGAMEM);
+    DO_TEST("video-qxl-sec-device",
             QEMU_CAPS_DEVICE_QXL, QEMU_CAPS_DEVICE_VIDEO_PRIMARY);
     DO_TEST("video-qxl-sec-device-vgamem",
-            QEMU_CAPS_DEVICE_QXL_VGA, QEMU_CAPS_DEVICE_QXL,
-            QEMU_CAPS_DEVICE_VIDEO_PRIMARY, QEMU_CAPS_QXL_VGA_VGAMEM,
+            QEMU_CAPS_DEVICE_QXL,
+            QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
             QEMU_CAPS_QXL_VGAMEM);
     DO_TEST("video-qxl-heads",
             QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
             QEMU_CAPS_VGA_QXL,
-            QEMU_CAPS_DEVICE_QXL_VGA,
             QEMU_CAPS_DEVICE_QXL,
-            QEMU_CAPS_QXL_MAX_OUTPUTS,
-            QEMU_CAPS_QXL_VGA_MAX_OUTPUTS);
+            QEMU_CAPS_QXL_MAX_OUTPUTS);
     DO_TEST("video-qxl-noheads",
             QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
             QEMU_CAPS_VGA_QXL,
-            QEMU_CAPS_DEVICE_QXL_VGA,
             QEMU_CAPS_DEVICE_QXL,
-            QEMU_CAPS_QXL_MAX_OUTPUTS,
-            QEMU_CAPS_QXL_VGA_MAX_OUTPUTS);
+            QEMU_CAPS_QXL_MAX_OUTPUTS);
     DO_TEST("video-virtio-gpu-device",
             QEMU_CAPS_DEVICE_VIRTIO_GPU,
             QEMU_CAPS_DEVICE_VIDEO_PRIMARY);
@@ -1689,7 +1678,7 @@ mymain(void)
             QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_ICH9_USB_EHCI1,
             QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
             QEMU_CAPS_VGA_QXL,
-            QEMU_CAPS_DEVICE_QXL_VGA, QEMU_CAPS_DEVICE_QXL);
+            QEMU_CAPS_DEVICE_QXL);
     DO_TEST_PARSE_ERROR("q35-dmi-bad-address1",
                         QEMU_CAPS_DEVICE_PCI_BRIDGE,
                         QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
@@ -1714,7 +1703,7 @@ mymain(void)
             QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_ICH9_USB_EHCI1,
             QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
             QEMU_CAPS_VGA_QXL,
-            QEMU_CAPS_DEVICE_QXL_VGA, QEMU_CAPS_DEVICE_QXL);
+            QEMU_CAPS_DEVICE_QXL);
     DO_TEST("q35-usb2-multi",
             QEMU_CAPS_DEVICE_PCI_BRIDGE,
             QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
@@ -1722,7 +1711,7 @@ mymain(void)
             QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_ICH9_USB_EHCI1,
             QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
             QEMU_CAPS_VGA_QXL,
-            QEMU_CAPS_DEVICE_QXL_VGA, QEMU_CAPS_DEVICE_QXL);
+            QEMU_CAPS_DEVICE_QXL);
     DO_TEST("q35-usb2-reorder",
             QEMU_CAPS_DEVICE_PCI_BRIDGE,
             QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
@@ -1730,7 +1719,7 @@ mymain(void)
             QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_ICH9_USB_EHCI1,
             QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
             QEMU_CAPS_VGA_QXL,
-            QEMU_CAPS_DEVICE_QXL_VGA, QEMU_CAPS_DEVICE_QXL);
+            QEMU_CAPS_DEVICE_QXL);
     DO_TEST("pcie-root-port",
             QEMU_CAPS_DEVICE_PCI_BRIDGE,
             QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
@@ -1738,7 +1727,7 @@ mymain(void)
             QEMU_CAPS_ICH9_AHCI,
             QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
             QEMU_CAPS_VGA_QXL,
-            QEMU_CAPS_DEVICE_QXL_VGA, QEMU_CAPS_DEVICE_QXL);
+            QEMU_CAPS_DEVICE_QXL);
     DO_TEST("autoindex",
             QEMU_CAPS_DEVICE_PCI_BRIDGE,
             QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
@@ -1756,7 +1745,7 @@ mymain(void)
             QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_ICH9_USB_EHCI1,
             QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
             QEMU_CAPS_VGA_QXL,
-            QEMU_CAPS_DEVICE_QXL_VGA, QEMU_CAPS_DEVICE_QXL);
+            QEMU_CAPS_DEVICE_QXL);
     DO_TEST_PARSE_ERROR("440fx-wrong-root", NONE);
 
     DO_TEST_PARSE_ERROR("pcie-root-port-too-many",
@@ -1766,7 +1755,7 @@ mymain(void)
             QEMU_CAPS_ICH9_AHCI,
             QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
             QEMU_CAPS_VGA_QXL,
-            QEMU_CAPS_DEVICE_QXL_VGA, QEMU_CAPS_DEVICE_QXL);
+            QEMU_CAPS_DEVICE_QXL);
 
     DO_TEST("pcie-switch-upstream-port",
             QEMU_CAPS_DEVICE_PCI_BRIDGE,
@@ -1776,7 +1765,7 @@ mymain(void)
             QEMU_CAPS_ICH9_AHCI,
             QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
             QEMU_CAPS_VGA_QXL,
-            QEMU_CAPS_DEVICE_QXL_VGA, QEMU_CAPS_DEVICE_QXL);
+            QEMU_CAPS_DEVICE_QXL);
     DO_TEST("pcie-switch-downstream-port",
             QEMU_CAPS_DEVICE_PCI_BRIDGE,
             QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
@@ -1786,7 +1775,7 @@ mymain(void)
             QEMU_CAPS_ICH9_AHCI,
             QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
             QEMU_CAPS_VGA_QXL,
-            QEMU_CAPS_DEVICE_QXL_VGA, QEMU_CAPS_DEVICE_QXL);
+            QEMU_CAPS_DEVICE_QXL);
 
     DO_TEST("pci-expander-bus",
             QEMU_CAPS_DEVICE_PCI_BRIDGE,
@@ -1872,7 +1861,7 @@ mymain(void)
             QEMU_CAPS_ICH9_AHCI,
             QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
             QEMU_CAPS_VGA_QXL,
-            QEMU_CAPS_DEVICE_QXL_VGA, QEMU_CAPS_DEVICE_QXL,
+            QEMU_CAPS_DEVICE_QXL,
             QEMU_CAPS_Q35_PCI_HOLE64_SIZE);
 
     DO_TEST("arm-vexpressa9-nodevs",

diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index 6a15309d9ff818e6617da67dcb8ace9de2de977a..80d7ad4516ea65edf25149f7cb4099c864e7fedf 100644 (file)
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -677,7 +677,7 @@ mymain(void)
             QEMU_CAPS_ICH9_AHCI, QEMU_CAPS_PCI_MULTIFUNCTION,
             QEMU_CAPS_ICH9_USB_EHCI1, QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
             QEMU_CAPS_VGA_QXL,
-            QEMU_CAPS_DEVICE_QXL_VGA, QEMU_CAPS_DEVICE_QXL);
+            QEMU_CAPS_DEVICE_QXL);
     DO_TEST("q35-usb2",
             QEMU_CAPS_DEVICE_PCI_BRIDGE,
             QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
@@ -685,40 +685,40 @@ mymain(void)
             QEMU_CAPS_PCI_MULTIFUNCTION, QEMU_CAPS_ICH9_USB_EHCI1,
             QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
             QEMU_CAPS_VGA_QXL,
-            QEMU_CAPS_DEVICE_QXL_VGA, QEMU_CAPS_DEVICE_QXL);
+            QEMU_CAPS_DEVICE_QXL);
     DO_TEST("q35-usb2-multi",
             QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
             QEMU_CAPS_ICH9_AHCI, QEMU_CAPS_PCI_MULTIFUNCTION,
             QEMU_CAPS_ICH9_USB_EHCI1, QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
             QEMU_CAPS_VGA_QXL,
-            QEMU_CAPS_DEVICE_QXL_VGA, QEMU_CAPS_DEVICE_QXL);
+            QEMU_CAPS_DEVICE_QXL);
     DO_TEST("q35-usb2-reorder",
             QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
             QEMU_CAPS_ICH9_AHCI, QEMU_CAPS_PCI_MULTIFUNCTION,
             QEMU_CAPS_ICH9_USB_EHCI1, QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
             QEMU_CAPS_VGA_QXL,
-            QEMU_CAPS_DEVICE_QXL_VGA, QEMU_CAPS_DEVICE_QXL);
+            QEMU_CAPS_DEVICE_QXL);
 
     DO_TEST("pcie-root",
             QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
             QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_ICH9_AHCI,
             QEMU_CAPS_DEVICE_VIDEO_PRIMARY, QEMU_CAPS_VGA_QXL,
-            QEMU_CAPS_DEVICE_QXL_VGA, QEMU_CAPS_DEVICE_QXL);
+            QEMU_CAPS_DEVICE_QXL);
     DO_TEST("pcie-root-port",
             QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
             QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_ICH9_AHCI,
             QEMU_CAPS_DEVICE_VIDEO_PRIMARY, QEMU_CAPS_VGA_QXL,
-            QEMU_CAPS_DEVICE_QXL_VGA, QEMU_CAPS_DEVICE_QXL);
+            QEMU_CAPS_DEVICE_QXL);
     DO_TEST("pcie-switch-upstream-port",
             QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
             QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_ICH9_AHCI,
             QEMU_CAPS_DEVICE_VIDEO_PRIMARY, QEMU_CAPS_VGA_QXL,
-            QEMU_CAPS_DEVICE_QXL_VGA, QEMU_CAPS_DEVICE_QXL);
+            QEMU_CAPS_DEVICE_QXL);
     DO_TEST("pcie-switch-downstream-port",
             QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
             QEMU_CAPS_DEVICE_IOH3420, QEMU_CAPS_ICH9_AHCI,
             QEMU_CAPS_DEVICE_VIDEO_PRIMARY, QEMU_CAPS_VGA_QXL,
-            QEMU_CAPS_DEVICE_QXL_VGA, QEMU_CAPS_DEVICE_QXL);
+            QEMU_CAPS_DEVICE_QXL);
     DO_TEST("pci-expander-bus",
             QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_DEVICE_PXB);
     DO_TEST("pcie-expander-bus",
@@ -788,7 +788,7 @@ mymain(void)
             QEMU_CAPS_DEVICE_PCI_BRIDGE, QEMU_CAPS_DEVICE_DMI_TO_PCI_BRIDGE,
             QEMU_CAPS_ICH9_AHCI, QEMU_CAPS_DEVICE_VIDEO_PRIMARY,
             QEMU_CAPS_VGA_QXL,
-            QEMU_CAPS_DEVICE_QXL_VGA, QEMU_CAPS_DEVICE_QXL,
+            QEMU_CAPS_DEVICE_QXL,
             QEMU_CAPS_Q35_PCI_HOLE64_SIZE);
 
     DO_TEST("panic", NONE);