qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: David Ahern <dsahern@gmail.com>
To: qemu-devel@nongnu.org
Subject: [Qemu-devel] [PATCH] don't exit if cdrom media fails to open
Date: Tue, 09 Jun 2009 07:41:44 -0600	[thread overview]
Message-ID: <4A2E6698.30208@gmail.com> (raw)

This patch allows a VM to continue even if the cdrom image is not
accessible at VM boot time. It allows a boot progression similar to real
hardware (e.g., try cd, then disk).

For example,

qemu-system-x86_64 -cdrom /dev/dvd -hda disk.img -boot dc

If there is no media in the tray, qemu currently exits with the message:
qemu: could not open disk image /dev/dvd

With this patch, the message is still displayed, but qemu continues. It
first tries to boot from the cdrom and then falls back to the disk.

Signed-off-by: David Ahern <dsahern@gmail.com>

---

diff --git a/vl.c b/vl.c
index fcf8532..bd3709c 100644
--- a/vl.c
+++ b/vl.c
@@ -152,6 +152,7 @@ int main(int argc, char **argv)
 #include "qemu-char.h"
 #include "cache-utils.h"
 #include "block.h"
+#include "block_int.h"
 #include "dma.h"
 #include "audio/audio.h"
 #include "migration.h"
@@ -2551,7 +2552,8 @@ int drive_init(struct drive_opt *arg, int
snapshot, void *opaque)
     if (bdrv_open2(bdrv, file, bdrv_flags, drv) < 0) {
         fprintf(stderr, "qemu: could not open disk image %s\n",
                         file);
-        return -1;
+        if (bdrv->type != BDRV_TYPE_CDROM)
+            return -1;
     }
     if (bdrv_key_required(bdrv))
         autostart = 0;

             reply	other threads:[~2009-06-09 13:42 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-06-09 13:41 David Ahern [this message]
2009-06-09 22:22 ` [Qemu-devel] [PATCH] don't exit if cdrom media fails to open Mark McLoughlin
2009-06-09 23:34   ` David Ahern
2009-06-10 13:47     ` Cole Robinson

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=4A2E6698.30208@gmail.com \
    --to=dsahern@gmail.com \
    --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).