hw/qxl: fix condition for exiting guest_bug

[qemu.git] / qemu-config.c

diff --git a/qemu-config.c b/qemu-config.c
index eba977ebca452de316d2d47c8d9d1f450dec0511..cd1ec2165ae1b0100eff7a6de7bd9857e5cd0652 100644 (file)
--- a/qemu-config.c
+++ b/qemu-config.c
@@ -615,6 +615,10 @@ static QemuOptsList qemu_machine_opts = {
             .name = "dump-guest-core",
             .type = QEMU_OPT_BOOL,
             .help = "Include guest memory in  a core dump",
+        }, {
+            .name = "mem-merge",
+            .type = QEMU_OPT_BOOL,
+            .help = "enable/disable memory merge support",
         },
         { /* End of list */ }
     },
@@ -641,6 +645,9 @@ QemuOptsList qemu_boot_opts = {
         }, {
             .name = "splash-time",
             .type = QEMU_OPT_STRING,
+        }, {
+            .name = "reboot-timeout",
+            .type = QEMU_OPT_STRING,
         },
         { /*End of list */ }
     },