From: Peter Lieven <pl@dlhnet.de>
Date: Sat, 17 Nov 2012 15:20:28 +0000 (+0100)
Subject: iscsi: do not assume device is zero initialized
X-Git-Tag: qemu-xen-4.3.0-rc1~17^2~17^2~2
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=f807ecd5741325fe0d281199ff22cdda0acb6a7a;p=qemu-upstream-4.3-testing.git

iscsi: do not assume device is zero initialized

Without any complex checks we can't assume that an
iscsi target is initialized to zero.

Signed-off-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 01340e116..c0b70b3d3 100644
--- a/block/iscsi.c
+++ b/block/iscsi.c
@@ -951,6 +951,11 @@ static void iscsi_close(BlockDriverState *bs)
     memset(iscsilun, 0, sizeof(IscsiLun));
 }
 
+static int iscsi_has_zero_init(BlockDriverState *bs)
+{
+    return 0;
+}
+
 static BlockDriver bdrv_iscsi = {
     .format_name     = "iscsi",
     .protocol_name   = "iscsi",
@@ -966,6 +971,7 @@ static BlockDriver bdrv_iscsi = {
     .bdrv_aio_flush  = iscsi_aio_flush,
 
     .bdrv_aio_discard = iscsi_aio_discard,
+    .bdrv_has_zero_init = iscsi_has_zero_init,
 
 #ifdef __linux__
     .bdrv_ioctl       = iscsi_ioctl,