@@ -33,6 +33,7 @@ typedef struct QEMUMachine {
void machine_register(QEMUMachine *m);
QEMUMachine *machine_find_default(void);
+void machine_print_all(void);
extern QEMUMachine *current_machine;
@@ -1198,6 +1198,20 @@ QEMUMachine *machine_find_default(void)
return NULL;
}
+void machine_print_all(void)
+{
+ QEMUMachine *m;
+
+ printf("Supported machines are:\n");
+ for (m = first_machine; m != NULL; m = m->next) {
+ if (m->alias) {
+ printf("%-10s %s (alias of %s)\n", m->alias, m->desc, m->name);
+ }
+ printf("%-10s %s%s\n", m->name, m->desc,
+ m->is_default ? " (default)" : "");
+ }
+}
+
/***********************************************************/
/* main execution loop */
@@ -1987,7 +2001,7 @@ static int debugcon_parse(const char *devname)
static QEMUMachine *machine_parse(const char *name)
{
- QEMUMachine *m, *machine = NULL;
+ QEMUMachine *machine = NULL;
if (name) {
machine = machine_find(name);
@@ -1995,14 +2009,7 @@ static QEMUMachine *machine_parse(const char *name)
if (machine) {
return machine;
}
- printf("Supported machines are:\n");
- for (m = first_machine; m != NULL; m = m->next) {
- if (m->alias) {
- printf("%-10s %s (alias of %s)\n", m->alias, m->desc, m->name);
- }
- printf("%-10s %s%s\n", m->name, m->desc,
- m->is_default ? " (default)" : "");
- }
+ machine_print_all();
exit(!name || *name != '?');
}
Print all registered machine types. Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com> --- hw/boards.h | 1 + vl.c | 25 ++++++++++++++++--------- 2 files changed, 17 insertions(+), 9 deletions(-)