From: Paolo Bonzini <pbonzini@redhat.com>
Date: Wed, 2 Apr 2014 13:04:41 +0000 (+0200)
Subject: iscsi: ignore flushes on scsi-generic devices
X-Git-Tag: v2.0.0-rc1~4^2~1
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=b2f9c08a4f11f16ec101e95feab8e71d7cfcfee9;p=users%2Fdwmw2%2Fqemu.git

iscsi: ignore flushes on scsi-generic devices

Non-block SCSI devices do not support flushing, but we may still send
them requests via bdrv_flush_all.  Just ignore them.

Reviewed-by: Peter Lieven <pl@kamp.de>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---

diff --git a/block/iscsi.c b/block/iscsi.c
index 2f96a8e037..e68aa0ffde 100644
--- a/block/iscsi.c
+++ b/block/iscsi.c
@@ -417,6 +417,10 @@ static int coroutine_fn iscsi_co_flush(BlockDriverState *bs)
     IscsiLun *iscsilun = bs->opaque;
     struct IscsiTask iTask;
 
+    if (bs->sg) {
+        return 0;
+    }
+
     iscsi_co_init_iscsitask(iscsilun, &iTask);
 
 retry: