summary refs log tree commit diff stats
path: root/qemu-config.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2012-02-08 05:41:39 +0000
committerAnthony Liguori <aliguori@us.ibm.com>2012-02-22 09:02:52 -0600
commita0abe474d587499a1553372c1692811f81fd3eda (patch)
tree61171ac07ea5337eafe42fcef1d8b7e824ec1af8 /qemu-config.c
parent78207d80a3d4ed80bca57a67a195a18cc70153bb (diff)
downloadfocaccia-qemu-a0abe474d587499a1553372c1692811f81fd3eda.tar.gz
focaccia-qemu-a0abe474d587499a1553372c1692811f81fd3eda.zip
Make kernel, initrd and append be machine_opts
Make kernel, initrd, append be machine opts (ie -machine kernel=foo)
with the old plain command line arguments as legacy/convenience
equivalents.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Diffstat (limited to 'qemu-config.c')
-rw-r--r--qemu-config.c12
1 files changed, 12 insertions, 0 deletions
diff --git a/qemu-config.c b/qemu-config.c
index c9763e0b93..7d9da787c7 100644
--- a/qemu-config.c
+++ b/qemu-config.c
@@ -566,6 +566,18 @@ static QemuOptsList qemu_machine_opts = {
             .name = "kvm_shadow_mem",
             .type = QEMU_OPT_SIZE,
             .help = "KVM shadow MMU size",
+        }, {
+            .name = "kernel",
+            .type = QEMU_OPT_STRING,
+            .help = "Linux kernel image file",
+        }, {
+            .name = "initrd",
+            .type = QEMU_OPT_STRING,
+            .help = "Linux initial ramdisk file",
+        }, {
+            .name = "append",
+            .type = QEMU_OPT_STRING,
+            .help = "Linux kernel command line",
         },
         { /* End of list */ }
     },