Re: [Qemu-devel] [PATCH] Allow to leave type on default in -machine

[Alexander Graf]

On 25.07.2011, at 18:21, Richard W.M. Jones wrote:

> On Mon, Jul 25, 2011 at 06:11:20PM +0200, Jan Kiszka wrote:
>> I was incorrectly pointing the core, the problem is solvable at the
>> level where we parse -machine:
>> 
>> -------8<--------
>> 
>> This allows to specify -machine options without setting an explicit
>> machine type. We will pick the default machine in this case. Requesting
>> the list of available machines is still possible via '-machine ?' e.g.
>> 
>> Signed-off-by: Jan Kiszka <address@hidden>
>> ---
>> vl.c |    5 ++++-
>> 1 files changed, 4 insertions(+), 1 deletions(-)
>> 
>> diff --git a/vl.c b/vl.c
>> index 8256504..5e53ddc 100644
>> --- a/vl.c
>> +++ b/vl.c
>> @@ -2720,7 +2720,10 @@ int main(int argc, char **argv, char **envp)
>>                     fprintf(stderr, "parse error: %s\n", optarg);
>>                     exit(1);
>>                 }
>> -                machine = machine_parse(qemu_opt_get(opts, "type"));
>> +                optarg = qemu_opt_get(opts, "type");
>> +                if (optarg) {
>> +                    machine = machine_parse(optarg);
>> +                }
>>                 break;
>>             case QEMU_OPTION_usb:
>>                 usb_enabled = 1;
>> -- 
>> 1.7.3.4
> 
> I have tested this patch, and it allows libguestfs to work without
> modifications.  ie qemu -machine accel=[...] works as before.

Very nice! It's also a lot more intuitive this way.


Alex