From f8ea0b00e087380fa0c7309f843f67b7e2d0126a Mon Sep 17 00:00:00 2001 From: Nicholas Bellinger Date: Mon, 17 May 2010 09:45:57 -0700 Subject: [PATCH] block: Make find_image_format() return 'raw' BlockDriver for SG_IO devices 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. The patch then returns the BlockDriver * from bdrv_find_format("raw"), skipping the subsequent bdrv_read() and rest of find_image_format(). Signed-off-by: Nicholas A. Bellinger Signed-off-by: Kevin Wolf --- block.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/block.c b/block.c index 89eece7b7..6a95768e8 100644 --- a/block.c +++ b/block.c @@ -329,6 +329,11 @@ static BlockDriver *find_image_format(const char *filename) ret = bdrv_file_open(&bs, filename, 0); if (ret < 0) return NULL; + + /* Return the raw BlockDriver * to scsi-generic devices */ + if (bs->sg) + return bdrv_find_format("raw"); + ret = bdrv_pread(bs, 0, buf, sizeof(buf)); bdrv_delete(bs); if (ret < 0) { -- 2.39.5