qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Sebastian Herbszt" <herbszt@gmx.de>
To: qemu-devel@nongnu.org
Subject: [Qemu-devel] [PATCH] Bail out if -append or -initrd is specified without -kernel
Date: Mon, 23 Jun 2008 16:49:38 +0200	[thread overview]
Message-ID: <009c01c8d540$8804fa70$0201a8c0@zeug> (raw)

The append and initrd options are only allowed with the kernel option.
Make both depend on the kernel option. This should take care of
the confusion seen recently [1].

[1] http://permalink.gmane.org/gmane.comp.emulators.qemu/26684

- Sebastian

--- vl.c.orig Mon Jun 23 14:15:30 2008
+++ vl.c Mon Jun 23 14:32:16 2008
@@ -8386,6 +8386,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";

                 reply	other threads:[~2008-06-23 14:50 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='009c01c8d540$8804fa70$0201a8c0@zeug' \
    --to=herbszt@gmx.de \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).