|
 |
9ae3a8 |
From 81a1f4a5ffab6a20f5fa90c722791e6956999988 Mon Sep 17 00:00:00 2001
|
|
|
9ae3a8 |
Message-Id: <81a1f4a5ffab6a20f5fa90c722791e6956999988.1389014116.git.minovotn@redhat.com>
|
|
|
9ae3a8 |
In-Reply-To: <c8cc35838d42aa286242772d97e3a9be7bb786ba.1389014116.git.minovotn@redhat.com>
|
|
|
9ae3a8 |
References: <c8cc35838d42aa286242772d97e3a9be7bb786ba.1389014116.git.minovotn@redhat.com>
|
|
|
9ae3a8 |
From: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
9ae3a8 |
Date: Mon, 9 Dec 2013 14:09:20 +0100
|
|
|
9ae3a8 |
Subject: [PATCH 32/50] block/iscsi: remove .bdrv_has_zero_init
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
RH-Author: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
9ae3a8 |
Message-id: <1386598178-11845-35-git-send-email-pbonzini@redhat.com>
|
|
|
9ae3a8 |
Patchwork-id: 56071
|
|
|
9ae3a8 |
O-Subject: [RHEL 7.0 qemu-kvm PATCH 34/52] block/iscsi: remove .bdrv_has_zero_init
|
|
|
9ae3a8 |
Bugzilla: 1007815
|
|
|
9ae3a8 |
RH-Acked-by: Jeffrey Cody <jcody@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Fam Zheng <famz@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
From: Peter Lieven <pl@kamp.de>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
since commit 3ac21627 the default value changed to 0.
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Peter Lieven <pl@kamp.de>
|
|
|
9ae3a8 |
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
9ae3a8 |
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
|
|
|
9ae3a8 |
(cherry picked from commit 4b52498e62d02a30f780875f54431d1bad0bcabd)
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
block/iscsi.c | 7 -------
|
|
|
9ae3a8 |
1 file changed, 7 deletions(-)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Michal Novotny <minovotn@redhat.com>
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
block/iscsi.c | 7 -------
|
|
|
9ae3a8 |
1 file changed, 7 deletions(-)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
diff --git a/block/iscsi.c b/block/iscsi.c
|
|
|
9ae3a8 |
index 3e3ae64..c5cd86d 100644
|
|
|
9ae3a8 |
--- a/block/iscsi.c
|
|
|
9ae3a8 |
+++ b/block/iscsi.c
|
|
|
9ae3a8 |
@@ -1507,11 +1507,6 @@ static int iscsi_truncate(BlockDriverState *bs, int64_t offset)
|
|
|
9ae3a8 |
return 0;
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
-static int iscsi_has_zero_init(BlockDriverState *bs)
|
|
|
9ae3a8 |
-{
|
|
|
9ae3a8 |
- return 0;
|
|
|
9ae3a8 |
-}
|
|
|
9ae3a8 |
-
|
|
|
9ae3a8 |
static int iscsi_create(const char *filename, QEMUOptionParameter *options,
|
|
|
9ae3a8 |
Error **errp)
|
|
|
9ae3a8 |
{
|
|
|
9ae3a8 |
@@ -1607,8 +1602,6 @@ static BlockDriver bdrv_iscsi = {
|
|
|
9ae3a8 |
.bdrv_aio_writev = iscsi_aio_writev,
|
|
|
9ae3a8 |
.bdrv_aio_flush = iscsi_aio_flush,
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
- .bdrv_has_zero_init = iscsi_has_zero_init,
|
|
|
9ae3a8 |
-
|
|
|
9ae3a8 |
#ifdef __linux__
|
|
|
9ae3a8 |
.bdrv_ioctl = iscsi_ioctl,
|
|
|
9ae3a8 |
.bdrv_aio_ioctl = iscsi_aio_ioctl,
|
|
|
9ae3a8 |
--
|
|
|
9ae3a8 |
1.7.11.7
|
|
|
9ae3a8 |
|