6ba4785
--- qemu-kvm-0.15.0.old/vl.c	2011-08-09 13:40:29.000000000 +0100
6ba4785
+++ qemu-kvm-0.15.0/vl.c	2011-08-18 16:38:51.487515037 +0100
6ba4785
@@ -2718,7 +2718,10 @@
6ba4785
                     fprintf(stderr, "parse error: %s\n", optarg);
6ba4785
                     exit(1);
6ba4785
                 }
6ba4785
-                machine = machine_parse(qemu_opt_get(opts, "type"));
6ba4785
+                optarg = qemu_opt_get(opts, "type");
6ba4785
+                if (optarg) {
6ba4785
+                    machine = machine_parse(optarg);
6ba4785
+                }
6ba4785
                 break;
6ba4785
 	    case QEMU_OPTION_no_kvm:
6ba4785
                 olist = qemu_find_opts("machine");