[libvirt] [PATCH v2 17/17] qemu: assume various QEMU 0.10 features are always available

John Ferlan jferlan at redhat.com
Tue Nov 10 11:22:32 UTC 2015



On 11/10/2015 05:31 AM, Daniel P. Berrange wrote:
> 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;
> 

This seems to duplicate an allocation later :

	    if (!nographics && def->ngraphics == 0) {

It's also not FREE'd or appended to def->graphics

John




More information about the libvir-list mailing list