qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Cole Robinson <crobinso@redhat.com>
To: qemu-devel@nongnu.org
Cc: Cole Robinson <crobinso@redhat.com>
Subject: [Qemu-devel] [PATCH] raw-posix: Detect CDROM via ioctl
Date: Mon, 11 Jan 2010 13:30:18 -0500	[thread overview]
Message-ID: <1263234619-14522-1-git-send-email-crobinso@redhat.com> (raw)

Current CDROM detection is hardcoded based on source file name.
Make this smarter by attempting a CDROM specific ioctl.

This makes '-cdrom /dev/sr0' succeed with no media present.

Signed-off-by: Cole Robinson <crobinso@redhat.com>
---
 block/raw-posix.c |   18 +++++++++++++++++-
 1 files changed, 17 insertions(+), 1 deletions(-)

diff --git a/block/raw-posix.c b/block/raw-posix.c
index 5a6a22b..3ec58d0 100644
--- a/block/raw-posix.c
+++ b/block/raw-posix.c
@@ -1140,9 +1140,25 @@ static int cdrom_open(BlockDriverState *bs, const char *filename, int flags)
 
 static int cdrom_probe_device(const char *filename)
 {
+    int fd, ret;
+
     if (strstart(filename, "/dev/cd", NULL))
         return 100;
-    return 0;
+
+    fd = open(filename, O_RDONLY | O_NONBLOCK);
+    if (fd < 0) {
+        return 0;
+    }
+
+    /* Attempt to detect via a CDROM specific ioctl */
+    if (ioctl(fd, CDROM_DRIVE_STATUS, CDSL_CURRENT) < 0 && errno == EINVAL) {
+        ret = 0;
+    } else {
+        ret = 100;
+    }
+
+    close(fd);
+    return ret;
 }
 
 static int cdrom_is_inserted(BlockDriverState *bs)
-- 
1.6.6

             reply	other threads:[~2010-01-11 18:30 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-01-11 18:30 Cole Robinson [this message]
2010-01-11 23:13 ` [Qemu-devel] [PATCH] raw-posix: Detect CDROM via ioctl Simon Horman
2010-01-12  0:01   ` 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=1263234619-14522-1-git-send-email-crobinso@redhat.com \
    --to=crobinso@redhat.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).