Commit 7580f231 authored by Markus Armbruster's avatar Markus Armbruster
Browse files

vl: Clean up machine selection in main(). 



We set machine_class to the default first, and update it to the real
one later.  Any use of machine_class in between is almost certainly
wrong (there are no such uses right now).  Set it once and for all
instead.

Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Reviewed-by: default avatarLaszlo Ersek <lersek@redhat.com>
Reviewed-by: default avatarMarcel Apfelbaum <marcel@redhat.com>
parent bbe2d25c

vl.c

+6 −5
Original line number Diff line number Diff line
@@ -2762,8 +2762,9 @@ static const QEMUOption *lookup_opt(int argc, char **argv, 
    return popt;

}



static void set_machine_options(MachineClass **machine_class)

static MachineClass *select_machine(void)

{

    MachineClass *machine_class = find_default_machine();

    const char *optarg;

    QemuOpts *opts;

    Location loc;
@@ -2775,16 +2776,17 @@ static void set_machine_options(MachineClass **machine_class) 


    optarg = qemu_opt_get(opts, "type");

    if (optarg) {

        *machine_class = machine_parse(optarg);

        machine_class = machine_parse(optarg);

    }



    if (*machine_class == NULL) {

    if (!machine_class) {

        error_report("No machine specified, and there is no default");

        error_printf("Use -machine help to list supported machines\n");

        exit(1);

    }



    loc_pop(&loc);

    return machine_class;

}



static int machine_set_property(void *opaque,
@@ -3031,7 +3033,6 @@ int main(int argc, char **argv, char **envp) 
    os_setup_early_signal_handling();



    module_call_init(MODULE_INIT_MACHINE);

    machine_class = find_default_machine();

    cpu_model = NULL;

    snapshot = 0;

    cyls = heads = secs = 0;
@@ -4022,7 +4023,7 @@ int main(int argc, char **argv, char **envp) 


    replay_configure(icount_opts);



    set_machine_options(&machine_class);

    machine_class = select_machine();



    set_memory_options(&ram_slots, &maxram_size, machine_class);