From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=46718 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OJUkM-0004Ao-GG for qemu-devel@nongnu.org; Tue, 01 Jun 2010 12:55:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OJUkK-0000cp-Rw for qemu-devel@nongnu.org; Tue, 01 Jun 2010 12:55:22 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42619) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OJUkK-0000cj-LA for qemu-devel@nongnu.org; Tue, 01 Jun 2010 12:55:20 -0400 Received: from int-mx05.intmail.prod.int.phx2.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.18]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o51GtHqd004523 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Tue, 1 Jun 2010 12:55:19 -0400 From: Kevin Wolf Date: Tue, 1 Jun 2010 18:50:00 +0200 Message-Id: <1275411000-27324-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH] block: Assume raw for drives without media List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com qemu -cdrom /dev/cdrom with an empty CD-ROM drive doesn't work any more because we try to guess the format and when this fails (because there is no medium) we exit with an error message. This patch should restore the old behaviour by assuming raw format for such drives. Signed-off-by: Kevin Wolf --- block.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/block.c b/block.c index d789d02..7dded4e 100644 --- a/block.c +++ b/block.c @@ -331,8 +331,8 @@ static BlockDriver *find_image_format(const char *filename) if (ret < 0) return NULL; - /* Return the raw BlockDriver * to scsi-generic devices */ - if (bs->sg) { + /* Return the raw BlockDriver * to scsi-generic devices or empty drives */ + if (bs->sg || !bdrv_is_inserted(bs)) { bdrv_delete(bs); return bdrv_find_format("raw"); } -- 1.6.6.1