From: Nicholas Bellinger <nab@xxxxxxxxxxxxxxx>
This patch adds a BlockDriverState->sg check in block.c:bdrv_common_open()
to skip the new refresh_total_sectors() call once we know we are working with
a scsi-generic device.
We go ahead and skip this call for scsi-generic devices because
block/raw-posix.c:raw_getlength() -> lseek() will return -ESPIPE.
Signed-off-by: Nicholas A. Bellinger <nab@xxxxxxxxxxxxxxx>
---
block.c | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/block.c b/block.c
index 02a22f6..1053161 100644
--- a/block.c
+++ b/block.c
@@ -444,10 +444,15 @@ static int bdrv_open_common(BlockDriverState *bs, const char *filename,
}
bs->keep_read_only = bs->read_only = !(open_flags & BDRV_O_RDWR);
-
- ret = refresh_total_sectors(bs, bs->total_sectors);
- if (ret < 0) {
- goto free_and_fail;
+ /*
+ * For scsi-generic devices, do not call refresh_total_sectors() -> raw_getlength()
+ * because lseek() will return -ESPIPE.
+ */
+ if (!(bs->sg)) {
+ ret = refresh_total_sectors(bs, bs->total_sectors);
+ if (ret < 0) {
+ goto free_and_fail;
+ }
}
#ifndef _WIN32
--
1.5.6.5
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
