>From 8f4cbec758867e51839d2f3f270fc06907a97dd5 Mon Sep 17 00:00:00 2001
From: Nicholas Bellinger <nab@linux-iscsi.org>
Date: Sun, 16 May 2010 18:28:35 -0700
Subject: [PATCH 2/2] [block]: Add SG_IO device check in refresh_total_sectors()

This patch adds a special case check for scsi-generic devices in refresh_total_sectors()
to skip the subsequent BlockDriver->bdrv_getlength() that will be returning
-ESPIPE from block/raw-posic.c:raw_getlength() for BlockDriverState->sg=1 devices.

Signed-off-by: Nicholas A. Bellinger <nab@linux-iscsi.org>
---
 block.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/block.c b/block.c
index f419ee6..7917712 100644
--- a/block.c
+++ b/block.c
@@ -364,6 +364,10 @@ static int refresh_total_sectors(BlockDriverState *bs, int64_t hint)
 {
     BlockDriver *drv = bs->drv;
 
+    /* Do not attempt drv->bdrv_getlength() on scsi-generic devices */
+    if (bs->sg)
+        return 0;
+
     /* query actual device if possible, otherwise just trust the hint */
     if (drv->bdrv_getlength) {
         int64_t length = drv->bdrv_getlength(bs);
-- 
1.5.6.5

