commit 0c257437b25731d4f44985e4b30b7317f2845b4a
author Anthony Liguori <aliguori@us.ibm.com> Thu May 21 20:41:01 2009 -0500
committer Anthony Liguori <aliguori@us.ibm.com> Thu May 21 20:54:40 2009 -0500
tree 36ab639f617589370e583bd774c16a14d5eb73b4
parent 993fbfdb1b1a8d9b3d32ed57afc70a7be1a5e9dc

Introduce is_default field for QEMUMachine

f80f9ec changed the order that machines are registered which had the effect of
changing the default machine.  This changeset introduces a new is_default field
so that machine types can declare that they are the default for an architecture.

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

vl.c

diff --git a/vl.c b/vl.c
index a0ce977..a24692c 100644
--- a/vl.c
+++ b/vl.c
@@ -3497,6 +3497,18 @@
     return NULL;
 }
 
+static QEMUMachine *find_default_machine(void)
+{
+    QEMUMachine *m;
+
+    for(m = first_machine; m != NULL; m = m->next) {
+        if (m->is_default) {
+            return m;
+        }
+    }
+    return NULL;
+}
+
 /***********************************************************/
 /* main execution loop */
 
@@ -4876,7 +4888,7 @@
 #endif
 
     module_call_init(MODULE_INIT_MACHINE);
-    machine = first_machine;
+    machine = find_default_machine();
     cpu_model = NULL;
     initrd_filename = NULL;
     ram_size = 0;
@@ -4967,7 +4979,7 @@
                     for(m = first_machine; m != NULL; m = m->next) {
                         printf("%-10s %s%s\n",
                                m->name, m->desc,
-                               m == first_machine ? " (default)" : "");
+                               m->is_default ? " (default)" : "");
                     }
                     exit(*optarg != '?');
                 }