Implied by QEMU >= 1.2.0. Signed-off-by: Ján Tomko <jtomko@xxxxxxxxxx> --- src/qemu/qemu_capabilities.c | 4 +--- src/qemu/qemu_capabilities.h | 2 +- src/qemu/qemu_command.c | 9 +-------- tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml | 1 - tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml | 1 - tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml | 1 - tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml | 1 - tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml | 1 - tests/qemuxml2argvtest.c | 4 ++-- 31 files changed, 5 insertions(+), 41 deletions(-) diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c index 6b16662fe..6bd097181 100644 --- a/src/qemu/qemu_capabilities.c +++ b/src/qemu/qemu_capabilities.c @@ -3633,7 +3633,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); @@ -4686,8 +4685,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)) diff --git a/src/qemu/qemu_capabilities.h b/src/qemu/qemu_capabilities.h index 3073446ee..48bf881a2 100644 --- a/src/qemu/qemu_capabilities.h +++ b/src/qemu/qemu_capabilities.h @@ -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 */ diff --git a/src/qemu/qemu_command.c b/src/qemu/qemu_command.c index 2ab3dcb10..574dc94ce 100644 --- a/src/qemu/qemu_command.c +++ b/src/qemu/qemu_command.c @@ -8139,18 +8139,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) @@ -10114,7 +10107,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; } diff --git a/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml index be0412bd2..2c1077687 100644 --- a/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.3.1.x86_64.xml @@ -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'/> diff --git a/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml index 2dbc1b913..d07a8dbe8 100644 --- a/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.4.2.x86_64.xml @@ -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'/> diff --git a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml index 1b09d4108..4c10ccfa1 100644 --- a/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml @@ -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'/> diff --git a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml index 96f6a3c2e..4c105f6c3 100644 --- a/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml @@ -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'/> diff --git a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml index ff7f5e139..f422ea3e5 100644 --- a/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml @@ -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'/> diff --git a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml index ca98ee14d..e2a329755 100644 --- a/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml @@ -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'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml index 146f0f0b8..ae7f59d6c 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml @@ -4,7 +4,6 @@ <selfvers>0</selfvers> <usedQMP/> <flag name='kvm'/> - <flag name='sdl'/> <flag name='rtc'/> <flag name='vhost-net'/> <flag name='nodefconfig'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml index 5df71879f..246a49865 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml @@ -4,7 +4,6 @@ <selfvers>0</selfvers> <usedQMP/> <flag name='kvm'/> - <flag name='sdl'/> <flag name='rtc'/> <flag name='vhost-net'/> <flag name='nodefconfig'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml index 5bc204e14..90ca3a673 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml @@ -4,7 +4,6 @@ <selfvers>0</selfvers> <usedQMP/> <flag name='kvm'/> - <flag name='sdl'/> <flag name='rtc'/> <flag name='vhost-net'/> <flag name='nodefconfig'/> diff --git a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml index 3d59e0e3b..122807ded 100644 --- a/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml @@ -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'/> diff --git a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml index 2fbd794ec..516466b03 100644 --- a/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml @@ -4,7 +4,6 @@ <selfvers>0</selfvers> <usedQMP/> <flag name='kvm'/> - <flag name='sdl'/> <flag name='rtc'/> <flag name='vhost-net'/> <flag name='nodefconfig'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml index 6aa99fac9..201c437a6 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml @@ -4,7 +4,6 @@ <selfvers>0</selfvers> <usedQMP/> <flag name='kvm'/> - <flag name='sdl'/> <flag name='rtc'/> <flag name='vhost-net'/> <flag name='nodefconfig'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml index 744a95481..b0586596b 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml @@ -4,7 +4,6 @@ <selfvers>0</selfvers> <usedQMP/> <flag name='kvm'/> - <flag name='sdl'/> <flag name='rtc'/> <flag name='vhost-net'/> <flag name='nodefconfig'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml index 5e2ac1d96..14b738301 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml @@ -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'/> diff --git a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml index cc05d2dd9..135d591d5 100644 --- a/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml @@ -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'/> diff --git a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml index a94a47ee5..617b5875f 100644 --- a/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml @@ -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'/> diff --git a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml index 7576e0b1d..62e348bef 100644 --- a/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml @@ -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'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml index 34bc3919e..9a1848cf8 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml @@ -4,7 +4,6 @@ <selfvers>0</selfvers> <usedQMP/> <flag name='kvm'/> - <flag name='sdl'/> <flag name='rtc'/> <flag name='vhost-net'/> <flag name='nodefconfig'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml index 9ae59448b..aa797a4a1 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml @@ -4,7 +4,6 @@ <selfvers>0</selfvers> <usedQMP/> <flag name='kvm'/> - <flag name='sdl'/> <flag name='rtc'/> <flag name='vhost-net'/> <flag name='nodefconfig'/> diff --git a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml index 748b5ebc5..8f5fde40f 100644 --- a/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml @@ -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'/> diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml index c35cade3d..686fdd360 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml @@ -4,7 +4,6 @@ <selfvers>0</selfvers> <usedQMP/> <flag name='kvm'/> - <flag name='sdl'/> <flag name='rtc'/> <flag name='vhost-net'/> <flag name='nodefconfig'/> diff --git a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml index b9e5b3110..891a35233 100644 --- a/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml @@ -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'/> diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml index 82d7dd791..00af20ea1 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml @@ -4,7 +4,6 @@ <selfvers>0</selfvers> <usedQMP/> <flag name='kvm'/> - <flag name='sdl'/> <flag name='rtc'/> <flag name='vhost-net'/> <flag name='nodefconfig'/> diff --git a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml index 2cdd49231..1dc24b9fa 100644 --- a/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml @@ -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'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml index 7c8973ae0..24ae2649b 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml @@ -4,7 +4,6 @@ <selfvers>0</selfvers> <usedQMP/> <flag name='kvm'/> - <flag name='sdl'/> <flag name='rtc'/> <flag name='vhost-net'/> <flag name='nodefconfig'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml index d99924f99..13e96443f 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml @@ -4,7 +4,6 @@ <selfvers>0</selfvers> <usedQMP/> <flag name='kvm'/> - <flag name='sdl'/> <flag name='rtc'/> <flag name='vhost-net'/> <flag name='nodefconfig'/> diff --git a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml index 5bd53f71f..6b4329024 100644 --- a/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml +++ b/tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml @@ -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'/> diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c index 346382c8f..4a0a43a5f 100644 --- a/tests/qemuxml2argvtest.c +++ b/tests/qemuxml2argvtest.c @@ -1100,8 +1100,8 @@ 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", -- 2.16.1 -- libvir-list mailing list libvir-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/libvir-list