commit 7580f231cf3f1710951416ec85df7b3f79dbaf86
author Markus Armbruster <armbru@redhat.com> Tue Feb 16 15:51:53 2016 +0100
committer Markus Armbruster <armbru@redhat.com> Fri Feb 19 13:46:44 2016 +0100
tree 963411f89678907b7ae3842424b25421e39f3a75
parent bbe2d25c8f89db4f0075a1321b1911b42d97e436

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: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Marcel Apfelbaum <marcel@redhat.com>

vl.c

diff --git a/vl.c b/vl.c
index 8c1a1ff..b87e292 100644
--- a/vl.c
+++ b/vl.c
@@ -2762,8 +2762,9 @@
     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 @@
 
     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 @@
     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 @@
 
     replay_configure(icount_opts);
 
-    set_machine_options(&machine_class);
+    machine_class = select_machine();
 
     set_memory_options(&ram_slots, &maxram_size, machine_class);