From patchwork Mon Jan 11 18:30:18 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: raw-posix: Detect CDROM via ioctl From: Cole Robinson X-Patchwork-Id: 42651 Message-Id: <1263234619-14522-1-git-send-email-crobinso@redhat.com> To: qemu-devel@nongnu.org Cc: Cole Robinson Date: Mon, 11 Jan 2010 13:30:18 -0500 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 --- 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)