]> xenbits.xensource.com Git - libvirt.git/commitdiff
qemu: deprecate QEMU_CAPS_SDL
authorJán Tomko <jtomko@redhat.com>
Thu, 29 Mar 2018 10:51:55 +0000 (12:51 +0200)
committerJán Tomko <jtomko@redhat.com>
Mon, 16 Apr 2018 12:54:58 +0000 (14:54 +0200)
Implied by QEMU >= 1.2.0.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Andrea Bolognani <abologna@redhat.com>
29 files changed:
src/qemu/qemu_capabilities.c
src/qemu/qemu_capabilities.h
src/qemu/qemu_command.c
tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
tests/qemuxml2argvtest.c

index c8488f875d67ccf033421838551ab641255cc505..748ca7c4ae0dfce7685a3fafa2aeda23cf6363e9 100644 (file)
@@ -3631,7 +3631,6 @@ static qemuMonitorCallbacks callbacks = {
 static void
 virQEMUCapsInitQMPBasic(virQEMUCapsPtr qemuCaps)
 {
-    virQEMUCapsSet(qemuCaps, QEMU_CAPS_SDL);
     virQEMUCapsSet(qemuCaps, QEMU_CAPS_RTC);
     virQEMUCapsSet(qemuCaps, QEMU_CAPS_VHOST_NET);
     virQEMUCapsSet(qemuCaps, QEMU_CAPS_NODEFCONFIG);
@@ -4689,8 +4688,7 @@ virQEMUCapsFillDomainDeviceGraphicsCaps(virQEMUCapsPtr qemuCaps,
 {
     dev->supported = true;
 
-    if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_SDL))
-        VIR_DOMAIN_CAPS_ENUM_SET(dev->type, VIR_DOMAIN_GRAPHICS_TYPE_SDL);
+    VIR_DOMAIN_CAPS_ENUM_SET(dev->type, VIR_DOMAIN_GRAPHICS_TYPE_SDL);
     if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_VNC))
         VIR_DOMAIN_CAPS_ENUM_SET(dev->type, VIR_DOMAIN_GRAPHICS_TYPE_VNC);
     if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_SPICE))
index 3a8ffcd0e722725ee35c69e6bd1629a1df0ce280..83e760ab1d5a502692d3d5b38c5089ab8307d3ab 100644 (file)
@@ -85,7 +85,7 @@ typedef enum {
     /* 25 */
     X_QEMU_CAPS_BALLOON, /* -balloon available */
     X_QEMU_CAPS_DEVICE, /* Is the -device arg available */
-    QEMU_CAPS_SDL, /* Is the new -sdl arg available */
+    X_QEMU_CAPS_SDL, /* Is the new -sdl arg available */
     X_QEMU_CAPS_SMP_TOPOLOGY, /* -smp has sockets/cores/threads */
     X_QEMU_CAPS_NETDEV, /* -netdev flag & netdev_add/remove */
 
index f864350bd5f624a530e4a717a28abc4d602fff8f..298de334b959f4d0642211a4a6c8b7cc14d2cd84 100644 (file)
@@ -8153,18 +8153,11 @@ qemuBuildGraphicsSPICECommandLine(virQEMUDriverConfigPtr cfg,
 static int
 qemuBuildGraphicsCommandLine(virQEMUDriverConfigPtr cfg,
                              virCommandPtr cmd,
-                             virDomainDefPtr def,
                              virQEMUCapsPtr qemuCaps,
                              virDomainGraphicsDefPtr graphics)
 {
     switch (graphics->type) {
     case VIR_DOMAIN_GRAPHICS_TYPE_SDL:
-        if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_SDL)) {
-            virReportError(VIR_ERR_CONFIG_UNSUPPORTED,
-                           _("sdl not supported by '%s'"), def->emulator);
-            return -1;
-        }
-
         if (graphics->data.sdl.xauth)
             virCommandAddEnvPair(cmd, "XAUTHORITY", graphics->data.sdl.xauth);
         if (graphics->data.sdl.display)
@@ -10136,7 +10129,7 @@ qemuBuildCommandLine(virQEMUDriverPtr driver,
         goto error;
 
     for (i = 0; i < def->ngraphics; ++i) {
-        if (qemuBuildGraphicsCommandLine(cfg, cmd, def, qemuCaps,
+        if (qemuBuildGraphicsCommandLine(cfg, cmd, qemuCaps,
                                          def->graphics[i]) < 0)
             goto error;
     }
index 1b09d41083ee8c211936ebdbce0ef78448446b8a..4c10ccfa101a987a8d36279a4d8fd15cbd993324 100644 (file)
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='sdl'/>
   <flag name='rtc'/>
   <flag name='vhost-net'/>
   <flag name='no-hpet'/>
index 96f6a3c2ef13c10ef60189e75bc362c12b2ce07f..4c105f6c3b2e46d38356cc88d7e93e435edc4550 100644 (file)
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='sdl'/>
   <flag name='rtc'/>
   <flag name='vhost-net'/>
   <flag name='no-hpet'/>
index ff7f5e139b8e3ec75281e10a4b8fd05ca2e9f1f1..f422ea3e5bcce75482cebcf7b3f62f415a576786 100644 (file)
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='sdl'/>
   <flag name='rtc'/>
   <flag name='vhost-net'/>
   <flag name='no-hpet'/>
index ca98ee14dbd6a71eb33011e7204dac94e53a5777..e2a3297556834d3ad96089fc1a17437243366885 100644 (file)
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='sdl'/>
   <flag name='rtc'/>
   <flag name='vhost-net'/>
   <flag name='no-hpet'/>
index 1b3080a7880d01cbc9ae078173e7f731a66220df..e22c206ff81eca585bbd57a0b35ddd903a70d1da 100644 (file)
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='sdl'/>
   <flag name='rtc'/>
   <flag name='vhost-net'/>
   <flag name='nodefconfig'/>
index 3f518f9207aeaea742643b26fbe55a5d4b7e977c..c90421c3037ab7c3d9ed9751212cbee297ee1ef1 100644 (file)
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='sdl'/>
   <flag name='rtc'/>
   <flag name='vhost-net'/>
   <flag name='nodefconfig'/>
index b1b6d66c679998bfdc0f0744a8496055b1fbdee7..99d7c63db22e190d761699072095979b7a8145c1 100644 (file)
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='sdl'/>
   <flag name='rtc'/>
   <flag name='vhost-net'/>
   <flag name='nodefconfig'/>
index cad21498e1eec6df1423b6ab72a51539637c9578..9a6bb0323cefd008f001e6211e5b0002501fce29 100644 (file)
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='sdl'/>
   <flag name='rtc'/>
   <flag name='vhost-net'/>
   <flag name='no-hpet'/>
index 3a77b04d4f22a9aa53c3e973b13f15c7a982a4a7..e041f122185396b54f50cca28be06c89c024b33f 100644 (file)
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='sdl'/>
   <flag name='rtc'/>
   <flag name='vhost-net'/>
   <flag name='nodefconfig'/>
index b9c589e09285dfaeefe040c3d25e6f3bfb4275d2..13e1071a797b202179a5cd4aee0a828651a7d3bf 100644 (file)
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='sdl'/>
   <flag name='rtc'/>
   <flag name='vhost-net'/>
   <flag name='nodefconfig'/>
index 8094139624346cf83d78308d05a84238ce9d2c8a..387a7646f10b72988845c63dc79e3d0111e6821b 100644 (file)
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='sdl'/>
   <flag name='rtc'/>
   <flag name='vhost-net'/>
   <flag name='nodefconfig'/>
index 210ebb1a13fd4909fac85e9f99d4bea8996d55fa..5f7971df719fe1edcb29d49a7e10373d3cc9e362 100644 (file)
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='enable-kvm'/>
-  <flag name='sdl'/>
   <flag name='rtc'/>
   <flag name='vhost-net'/>
   <flag name='nodefconfig'/>
index 9d477f7fec41f42f9d81457af28a75007b1c5db2..7729b57031526e9e789f75bb802530da23ec1d9d 100644 (file)
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='sdl'/>
   <flag name='rtc'/>
   <flag name='vhost-net'/>
   <flag name='no-hpet'/>
index a94a47ee5dfa07084feb1cef6287d290a29ed8f0..617b5875f163b04a8f71d3688b14d98c685c1fba 100644 (file)
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='sdl'/>
   <flag name='rtc'/>
   <flag name='vhost-net'/>
   <flag name='no-hpet'/>
index 7576e0b1dde709110ab166b0368d2f50784a4353..62e348bef944776cb62bdb2fef291d8bb4c298cb 100644 (file)
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='sdl'/>
   <flag name='rtc'/>
   <flag name='vhost-net'/>
   <flag name='no-hpet'/>
index 34bc3919ea6444f5cd8f2b6dbc3793e60d2cd295..9a1848cf87b9ea77b1a935056f323f8d0089547b 100644 (file)
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='sdl'/>
   <flag name='rtc'/>
   <flag name='vhost-net'/>
   <flag name='nodefconfig'/>
index 9ae59448ba304b5d537d3bf0a1e8e5698c22e0de..aa797a4a161dd8565886a62f9c826acad7da52a1 100644 (file)
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='sdl'/>
   <flag name='rtc'/>
   <flag name='vhost-net'/>
   <flag name='nodefconfig'/>
index 748b5ebc56e7af3b4269161c3cbe5c6beba1cec6..8f5fde40fcb42dd3e225c36dcdcec0cae8715e6f 100644 (file)
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='sdl'/>
   <flag name='rtc'/>
   <flag name='vhost-net'/>
   <flag name='no-hpet'/>
index c35cade3df2d646590bb485e31ff3d82a940ad9c..686fdd360d53a0890fe4ba2f1d2bcd835597416f 100644 (file)
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='sdl'/>
   <flag name='rtc'/>
   <flag name='vhost-net'/>
   <flag name='nodefconfig'/>
index b9e5b31108f25e572a2c0bd714a76d75256b9645..891a352338c4eac47d122766fc5b894de3b40111 100644 (file)
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='sdl'/>
   <flag name='rtc'/>
   <flag name='vhost-net'/>
   <flag name='no-hpet'/>
index 82d7dd79169cd780ce0cefe27f659525768dc40a..00af20ea10d6e302c443e6e9a9ee16b1e610c45b 100644 (file)
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='sdl'/>
   <flag name='rtc'/>
   <flag name='vhost-net'/>
   <flag name='nodefconfig'/>
index 2cdd4923163e8f332ae4135893ada9ee24ed36f6..1dc24b9faa48bbc54f4665f980598898ff2a5ff0 100644 (file)
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='sdl'/>
   <flag name='rtc'/>
   <flag name='vhost-net'/>
   <flag name='no-hpet'/>
index 7c8973ae05805079c482be87c8670d4542b635ed..24ae2649b8e5bc09975a4ef03b2869565e8f3c5a 100644 (file)
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='sdl'/>
   <flag name='rtc'/>
   <flag name='vhost-net'/>
   <flag name='nodefconfig'/>
index d99924f996d4a1390c1b966fb509a65671929444..13e96443f375e06b235350ab03b1cdb6742ef91e 100644 (file)
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='sdl'/>
   <flag name='rtc'/>
   <flag name='vhost-net'/>
   <flag name='nodefconfig'/>
index 5bd53f71f58637fdb153f97800a43c8124121aee..6b432902402b841335b97cf01e56d1b10226876a 100644 (file)
@@ -4,7 +4,6 @@
   <selfvers>0</selfvers>
   <usedQMP/>
   <flag name='kvm'/>
-  <flag name='sdl'/>
   <flag name='rtc'/>
   <flag name='vhost-net'/>
   <flag name='no-hpet'/>
index 8e5d79834d8a7b2ff360b94098f8b93291a7f537..85ffc86d0a0de3381d856b24221212c957001931 100644 (file)
@@ -1138,8 +1138,9 @@ mymain(void)
     VIR_FREE(driver.config->vncSASLdir);
     VIR_FREE(driver.config->vncTLSx509certdir);
 
-    DO_TEST("graphics-sdl", QEMU_CAPS_SDL, QEMU_CAPS_DEVICE_VGA);
-    DO_TEST("graphics-sdl-fullscreen", QEMU_CAPS_SDL,
+    DO_TEST("graphics-sdl",
+            QEMU_CAPS_DEVICE_VGA);
+    DO_TEST("graphics-sdl-fullscreen",
             QEMU_CAPS_DEVICE_CIRRUS_VGA);
     DO_TEST("nographics", NONE);
     DO_TEST("nographics-display",