External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-22 22:13:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: fix parsing of -sdl arg

Browse Source 
The previous commit

  commit 4e8993a250
  Author: Daniel P. Berrange <berrange@redhat.com>
  Date:   Mon Nov 9 16:20:08 2015 +0000

    qemu: assume various QEMU 0.10 features are always available

Added broken handling of -sdl. Instead of duplicating existing
SDL handling code, just ensure it is invoked in the right
scenarios.

Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrange 2015-11-10 12:18:47 +00:00
parent 4e8993a250
commit f8ea21c95d
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/qemu/qemu_command.c
View File

@ -12759,6 +12759,7 @@ qemuParseCommandLine(virCapsPtr qemuCaps,
qemuDomainCmdlineDefPtr cmd = NULL; qemuDomainCmdlineDefPtr cmd = NULL;
virDomainDiskDefPtr disk = NULL; virDomainDiskDefPtr disk = NULL;
const char *ceph_args = qemuFindEnv(progenv, "CEPH_ARGS"); const char *ceph_args = qemuFindEnv(progenv, "CEPH_ARGS");
bool have_sdl = false;
if (pidfile) if (pidfile)
*pidfile = NULL; *pidfile = NULL;
@ -12982,10 +12983,7 @@ qemuParseCommandLine(virCapsPtr qemuCaps,
goto error; goto error;
} }
} else if (STREQ(arg, "-sdl")) { } else if (STREQ(arg, "-sdl")) {
virDomainGraphicsDefPtr sdl; have_sdl = true;
if (VIR_ALLOC(sdl) < 0)
goto error;
sdl->type = VIR_DOMAIN_GRAPHICS_TYPE_SDL;
} else if (STREQ(arg, "-m")) { } else if (STREQ(arg, "-m")) {
int mem; int mem;
WANT_VALUE(); WANT_VALUE();
@ -13672,7 +13670,7 @@ qemuParseCommandLine(virCapsPtr qemuCaps,
VIR_FREE(capsdata); VIR_FREE(capsdata);
} }
if (!nographics && def->ngraphics == 0) { if (!nographics && (def->ngraphics == 0 || have_sdl)) {
virDomainGraphicsDefPtr sdl; virDomainGraphicsDefPtr sdl;
const char *display = qemuFindEnv(progenv, "DISPLAY"); const char *display = qemuFindEnv(progenv, "DISPLAY");
const char *xauth = qemuFindEnv(progenv, "XAUTHORITY"); const char *xauth = qemuFindEnv(progenv, "XAUTHORITY");