openkylin
/
libvirt
mirror of https://gitee.com/openkylin/libvirt.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

qemu: deprecate QEMU_CAPS_SDL 

Implied by QEMU >= 1.2.0.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Andrea Bolognani <abologna@redhat.com>
This commit is contained in:
Ján Tomko 2018-03-29 12:51:55 +02:00
parent ee11ba29f5
commit 649a9dd7a4
29 changed files with 6 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/qemu/qemu_capabilities.c
View 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,7 +4688,6 @@ virQEMUCapsFillDomainDeviceGraphicsCaps(virQEMUCapsPtr qemuCaps,
{
dev->supported = true;
if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_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);

2
src/qemu/qemu_capabilities.h
View 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 */

9
src/qemu/qemu_command.c
View 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;
}

1
tests/qemucapabilitiesdata/caps_1.5.3.x86_64.xml
View 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'/>

1
tests/qemucapabilitiesdata/caps_1.6.0.x86_64.xml
View 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'/>

1
tests/qemucapabilitiesdata/caps_1.7.0.x86_64.xml
View 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'/>

1
tests/qemucapabilitiesdata/caps_2.1.1.x86_64.xml
View 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'/>

1
tests/qemucapabilitiesdata/caps_2.10.0.aarch64.xml
View 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'/>

1
tests/qemucapabilitiesdata/caps_2.10.0.ppc64.xml
View 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'/>

1
tests/qemucapabilitiesdata/caps_2.10.0.s390x.xml
View 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'/>

1
tests/qemucapabilitiesdata/caps_2.10.0.x86_64.xml
View 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'/>

1
tests/qemucapabilitiesdata/caps_2.11.0.s390x.xml
View 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'/>

1
tests/qemucapabilitiesdata/caps_2.12.0.aarch64.xml
View 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'/>

1
tests/qemucapabilitiesdata/caps_2.12.0.ppc64.xml
View 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'/>

1
tests/qemucapabilitiesdata/caps_2.12.0.s390x.xml
View 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'/>

1
tests/qemucapabilitiesdata/caps_2.12.0.x86_64.xml
View 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'/>

1
tests/qemucapabilitiesdata/caps_2.4.0.x86_64.xml
View 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'/>

1
tests/qemucapabilitiesdata/caps_2.5.0.x86_64.xml
View 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'/>

1
tests/qemucapabilitiesdata/caps_2.6.0.aarch64.xml
View 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'/>

1
tests/qemucapabilitiesdata/caps_2.6.0.ppc64.xml
View 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'/>

1
tests/qemucapabilitiesdata/caps_2.6.0.x86_64.xml
View 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'/>

1
tests/qemucapabilitiesdata/caps_2.7.0.s390x.xml
View 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'/>

1
tests/qemucapabilitiesdata/caps_2.7.0.x86_64.xml
View 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'/>

1
tests/qemucapabilitiesdata/caps_2.8.0.s390x.xml
View 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'/>

1
tests/qemucapabilitiesdata/caps_2.8.0.x86_64.xml
View 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'/>

1
tests/qemucapabilitiesdata/caps_2.9.0.ppc64.xml
View 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'/>

1
tests/qemucapabilitiesdata/caps_2.9.0.s390x.xml
View 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'/>

1
tests/qemucapabilitiesdata/caps_2.9.0.x86_64.xml
View 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'/>

5
tests/qemuxml2argvtest.c
View 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",