From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=42418 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OD9b7-0007rX-CH for qemu-devel@nongnu.org; Sat, 15 May 2010 01:07:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OD9b5-0008GM-Vw for qemu-devel@nongnu.org; Sat, 15 May 2010 01:07:37 -0400 Received: from smtp110.sbc.mail.gq1.yahoo.com ([67.195.14.95]:41441) by eggs.gnu.org with smtp (Exim 4.69) (envelope-from ) id 1OD9b5-0008GI-M4 for qemu-devel@nongnu.org; Sat, 15 May 2010 01:07:35 -0400 From: "Nicholas A. Bellinger" Date: Sat, 15 May 2010 06:30:52 -0700 Message-Id: <1273930252-12673-1-git-send-email-nab@linux-iscsi.org> Subject: [Qemu-devel] [PATCH 1/2] [block]: Fix scsi-generic breakage in find_image_format() List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Kevin Wolf , Christoph Hellwig , Gerd Hoffmann , Hannes Reinecke , kvm-devel , qemu-devel Cc: Nicholas Bellinger From: Nicholas Bellinger This patch adds a special BlockDriverState->sg check in block.c:find_image_format() after bdrv_file_open() -> block/raw-posix.c:hdev_open() has been called to determine if we are dealing with a Linux host scsi-generic device or not. The patch then returns the BlockDriver * from find_protocol(), skipping the subsequent bdrv_read() and rest of find_image_format(). Signed-off-by: Nicholas A. Bellinger --- block.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/block.c b/block.c index 48305b7..02a22f6 100644 --- a/block.c +++ b/block.c @@ -332,6 +332,13 @@ static BlockDriver *find_image_format(const char *filename) ret = bdrv_file_open(&bs, filename, 0); if (ret < 0) return NULL; + /* + * For scsi-generic we skip the read and return *drv from + * find_protocol(). + */ + if (bs->sg) + return drv; + ret = bdrv_pread(bs, 0, buf, sizeof(buf)); bdrv_delete(bs); if (ret < 0) { -- 1.5.6.5