Implied by QEMU >= 1.2.0.
Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Andrea Bolognani <abologna@redhat.com>
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);
{
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))
/* 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 */
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)
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;
}
<selfvers>0</selfvers>
<usedQMP/>
<flag name='kvm'/>
- <flag name='sdl'/>
<flag name='rtc'/>
<flag name='vhost-net'/>
<flag name='no-hpet'/>
<selfvers>0</selfvers>
<usedQMP/>
<flag name='kvm'/>
- <flag name='sdl'/>
<flag name='rtc'/>
<flag name='vhost-net'/>
<flag name='no-hpet'/>
<selfvers>0</selfvers>
<usedQMP/>
<flag name='kvm'/>
- <flag name='sdl'/>
<flag name='rtc'/>
<flag name='vhost-net'/>
<flag name='no-hpet'/>
<selfvers>0</selfvers>
<usedQMP/>
<flag name='kvm'/>
- <flag name='sdl'/>
<flag name='rtc'/>
<flag name='vhost-net'/>
<flag name='no-hpet'/>
<selfvers>0</selfvers>
<usedQMP/>
<flag name='kvm'/>
- <flag name='sdl'/>
<flag name='rtc'/>
<flag name='vhost-net'/>
<flag name='nodefconfig'/>
<selfvers>0</selfvers>
<usedQMP/>
<flag name='kvm'/>
- <flag name='sdl'/>
<flag name='rtc'/>
<flag name='vhost-net'/>
<flag name='nodefconfig'/>
<selfvers>0</selfvers>
<usedQMP/>
<flag name='kvm'/>
- <flag name='sdl'/>
<flag name='rtc'/>
<flag name='vhost-net'/>
<flag name='nodefconfig'/>
<selfvers>0</selfvers>
<usedQMP/>
<flag name='kvm'/>
- <flag name='sdl'/>
<flag name='rtc'/>
<flag name='vhost-net'/>
<flag name='no-hpet'/>
<selfvers>0</selfvers>
<usedQMP/>
<flag name='kvm'/>
- <flag name='sdl'/>
<flag name='rtc'/>
<flag name='vhost-net'/>
<flag name='nodefconfig'/>
<selfvers>0</selfvers>
<usedQMP/>
<flag name='kvm'/>
- <flag name='sdl'/>
<flag name='rtc'/>
<flag name='vhost-net'/>
<flag name='nodefconfig'/>
<selfvers>0</selfvers>
<usedQMP/>
<flag name='kvm'/>
- <flag name='sdl'/>
<flag name='rtc'/>
<flag name='vhost-net'/>
<flag name='nodefconfig'/>
<selfvers>0</selfvers>
<usedQMP/>
<flag name='enable-kvm'/>
- <flag name='sdl'/>
<flag name='rtc'/>
<flag name='vhost-net'/>
<flag name='nodefconfig'/>
<selfvers>0</selfvers>
<usedQMP/>
<flag name='kvm'/>
- <flag name='sdl'/>
<flag name='rtc'/>
<flag name='vhost-net'/>
<flag name='no-hpet'/>
<selfvers>0</selfvers>
<usedQMP/>
<flag name='kvm'/>
- <flag name='sdl'/>
<flag name='rtc'/>
<flag name='vhost-net'/>
<flag name='no-hpet'/>
<selfvers>0</selfvers>
<usedQMP/>
<flag name='kvm'/>
- <flag name='sdl'/>
<flag name='rtc'/>
<flag name='vhost-net'/>
<flag name='no-hpet'/>
<selfvers>0</selfvers>
<usedQMP/>
<flag name='kvm'/>
- <flag name='sdl'/>
<flag name='rtc'/>
<flag name='vhost-net'/>
<flag name='nodefconfig'/>
<selfvers>0</selfvers>
<usedQMP/>
<flag name='kvm'/>
- <flag name='sdl'/>
<flag name='rtc'/>
<flag name='vhost-net'/>
<flag name='nodefconfig'/>
<selfvers>0</selfvers>
<usedQMP/>
<flag name='kvm'/>
- <flag name='sdl'/>
<flag name='rtc'/>
<flag name='vhost-net'/>
<flag name='no-hpet'/>
<selfvers>0</selfvers>
<usedQMP/>
<flag name='kvm'/>
- <flag name='sdl'/>
<flag name='rtc'/>
<flag name='vhost-net'/>
<flag name='nodefconfig'/>
<selfvers>0</selfvers>
<usedQMP/>
<flag name='kvm'/>
- <flag name='sdl'/>
<flag name='rtc'/>
<flag name='vhost-net'/>
<flag name='no-hpet'/>
<selfvers>0</selfvers>
<usedQMP/>
<flag name='kvm'/>
- <flag name='sdl'/>
<flag name='rtc'/>
<flag name='vhost-net'/>
<flag name='nodefconfig'/>
<selfvers>0</selfvers>
<usedQMP/>
<flag name='kvm'/>
- <flag name='sdl'/>
<flag name='rtc'/>
<flag name='vhost-net'/>
<flag name='no-hpet'/>
<selfvers>0</selfvers>
<usedQMP/>
<flag name='kvm'/>
- <flag name='sdl'/>
<flag name='rtc'/>
<flag name='vhost-net'/>
<flag name='nodefconfig'/>
<selfvers>0</selfvers>
<usedQMP/>
<flag name='kvm'/>
- <flag name='sdl'/>
<flag name='rtc'/>
<flag name='vhost-net'/>
<flag name='nodefconfig'/>
<selfvers>0</selfvers>
<usedQMP/>
<flag name='kvm'/>
- <flag name='sdl'/>
<flag name='rtc'/>
<flag name='vhost-net'/>
<flag name='no-hpet'/>
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",