diff options
author | Nicholas Bellinger <nab@linux-iscsi.org> | 2010-05-17 09:45:57 -0700 |
---|---|---|
committer | Kevin Wolf <kwolf@redhat.com> | 2010-05-21 11:49:19 +0200 |
commit | f8ea0b00e087380fa0c7309f843f67b7e2d0126a (patch) | |
tree | c8fe12eb7ae342a85a3e4a718af0e3665f68a70c | |
parent | 77be4366baface6613cfc312ba281f8e5860997c (diff) |
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 <nab@linux-iscsi.org>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-rw-r--r-- | block.c | 5 |
1 files changed, 5 insertions, 0 deletions
@@ -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) { |