* [Qemu-devel] [PATCH] Bail out if -append or -initrd is specified without -kernel
@ 2008-06-23 14:49 Sebastian Herbszt
0 siblings, 0 replies; only message in thread
From: Sebastian Herbszt @ 2008-06-23 14:49 UTC (permalink / raw)
To: qemu-devel
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";
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2008-06-23 14:50 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-06-23 14:49 [Qemu-devel] [PATCH] Bail out if -append or -initrd is specified without -kernel Sebastian Herbszt
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).