[Qemu-devel] [4833] Bail out if -append or -initrd is specified without -kernel, by

[Qemu-devel] [4833] Bail out if -append or -initrd is specified without -kernel, by

[Thiemo Seufer]

Revision: 4833
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=4833
Author:   ths
Date:     2008-07-03 10:01:15 +0000 (Thu, 03 Jul 2008)

Log Message:
-----------
Bail out if -append or -initrd is specified without -kernel, by
Sebastian Herbszt.

Modified Paths:
--------------
    trunk/vl.c

Modified: trunk/vl.c
===================================================================
--- trunk/vl.c	2008-07-03 04:13:24 UTC (rev 4832)
+++ trunk/vl.c	2008-07-03 10:01:15 UTC (rev 4833)
@@ -8580,6 +8580,16 @@
         nb_drives_opt == 0)
         help(1);
 
+    if (!linux_boot && *kernel_cmdline != '\0') {
+        fprintf(stderr, "-append only allowed with -kernel option\n");
+        exit(1);
+    }
+
+    if (!linux_boot && initrd_filename != NULL) {
+        fprintf(stderr, "-initrd only allowed with -kernel option\n");
+        exit(1);
+    }
+
     /* boot to floppy or the default cd if no hard disk defined yet */
     if (!boot_devices[0]) {
         boot_devices = "cad";