X-Git-Url: https://repo.jachan.dev/qemu.git/blobdiff_plain/69fc255350af9e8e39e29b4d6a84d44f0a55ebf2..d96aafca057845a4d58cd7b36771f2c97c78cd56:/qemu-config.c

diff --git a/qemu-config.c b/qemu-config.c
index eba977ebca..cd1ec2165a 100644
--- 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 */ }
     },