[Qemu-stable] [QEMU-1.6 & QEMU-Upstream PATCH] vl.c: Output error on invalid machine type provided

[Michal Novotny]

Output error message using qemu's error_report() function when user
provides the invalid machine type on the command line. This also saves
time to find what issue is when you downgrade from one version of qemu
to another that doesn't support required machine type yet (the version
user downgraded to have to have this patch applied too, of course).

(This has been posted a while ago and reviewed however not applied yet
 so this is basically just a reminder e-mail to ask for pushing it.
 It also applies cleanly to QEMU-1.6 so I'm sending to qemu-stable as
 well.)

Signed-off-by: Michal Novotny <address@hidden>
---
 vl.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/vl.c b/vl.c
index f422a1c..9b4a3f9 100644
--- a/vl.c
+++ b/vl.c
@@ -2671,6 +2671,11 @@ static QEMUMachine *machine_parse(const char *name)
     if (machine) {
         return machine;
     }
+
+    if (name && !is_help_option(name)) {
+        error_report("Unsupported machine type");
+    }
+
     printf("Supported machines are:\n");
     for (m = first_machine; m != NULL; m = m->next) {
         if (m->alias) {
-- 
1.7.11.7