On Mon, Nov 09, 2015 at 06:28:03PM -0500, John Ferlan wrote:
On 11/09/2015 11:24 AM, Daniel P. Berrange wrote:
The -sdl and -net ...name=XXX arguments were both introduced in QEMU 0.10, so the QEMU driver can assume they are always available.
The -sdl wasn't really removed it seems - although it did me peeking into the rabbit hole for a make check failure...
After a bit of debugging - qemuParseCommandLine has the following:
} else if (STRPREFIX(arg, "-hd") || STRPREFIX(arg, "-sd") || STRPREFIX(arg, "-fd") || STREQ(arg, "-cdrom")) { WANT_VALUE();
If I add:
} else if (STREQ(arg, "-sdl")) { /* Ignore */
Just before that, then things are happy again.
Rather than ignoring it, I added this: virDomainGraphicsDefPtr sdl; if (VIR_ALLOC(sdl) < 0) goto error; sdl->type = VIR_DOMAIN_GRAPHICS_TYPE_SDL;
@@ -8514,8 +8511,7 @@ qemuBuildGraphicsCommandLine(virQEMUDriverConfigPtr cfg, { switch ((virDomainGraphicsType) graphics->type) { case VIR_DOMAIN_GRAPHICS_TYPE_SDL: - if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_0_10) && - !virQEMUCapsGet(qemuCaps, QEMU_CAPS_SDL)) { + if (!virQEMUCapsGet(qemuCaps, QEMU_CAPS_SDL)) { virReportError(VIR_ERR_CONFIG_UNSUPPORTED, _("sdl not supported by '%s'"), def->emulator); return -1;
later in this code there's a:
if (virQEMUCapsGet(qemuCaps, QEMU_CAPS_SDL)) virCommandAddArg(cmd, "-sdl");
The second caps check is probably unnecessary now.
Yep, you're right. Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://autobuild.org -o- http://search.cpan.org/~danberr/ :| |: http://entangle-photo.org -o- http://live.gnome.org/gtk-vnc :|