From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49484) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YikWP-0004F7-1f for qemu-devel@nongnu.org; Thu, 16 Apr 2015 10:12:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YikWK-0006lr-6k for qemu-devel@nongnu.org; Thu, 16 Apr 2015 10:12:00 -0400 Received: from mx-v6.kamp.de ([2a02:248:0:51::16]:36232 helo=mx01.kamp.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YikWJ-0006lD-MT for qemu-devel@nongnu.org; Thu, 16 Apr 2015 10:11:56 -0400 From: Peter Lieven Date: Thu, 16 Apr 2015 16:08:33 +0200 Message-Id: <1429193313-4263-10-git-send-email-pl@kamp.de> In-Reply-To: <1429193313-4263-1-git-send-email-pl@kamp.de> References: <1429193313-4263-1-git-send-email-pl@kamp.de> Subject: [Qemu-devel] [PATCH for-2.4 V2 9/9] block/iscsi: use the allocationmap also if cache.direct=on List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, Peter Lieven , ronniesahlberg@gmail.com, qemu-block@nongnu.org the allocationmap has only a hint character. The driver always double checks that blocks marked unallocated in the cache are still unallocated before taking the fast path and return zeroes. So using the allocationmap is migration safe and can also be enabled with cache.direct=on. Signed-off-by: Peter Lieven --- block/iscsi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/block/iscsi.c b/block/iscsi.c index 8364f97..8fca1d3 100644 --- a/block/iscsi.c +++ b/block/iscsi.c @@ -1499,7 +1499,7 @@ static int iscsi_open(BlockDriverState *bs, QDict *options, int flags, iscsilun->bl.opt_unmap_gran * iscsilun->block_size <= 16 * 1024 * 1024) { iscsilun->cluster_sectors = (iscsilun->bl.opt_unmap_gran * iscsilun->block_size) >> BDRV_SECTOR_BITS; - if (iscsilun->lbprz && !(bs->open_flags & BDRV_O_NOCACHE)) { + if (iscsilun->lbprz) { iscsilun->allocationmap = iscsi_allocationmap_init(iscsilun); if (iscsilun->allocationmap == NULL) { ret = -ENOMEM; -- 1.9.1