From: Peter Lieven Date: Thu, 16 Apr 2015 14:08:33 +0000 (+0200) Subject: block/iscsi: use the allocationmap also if cache.direct=on X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=9eac3622a2b1159ab50b10540e822f3e58fdc383;p=qemu.git block/iscsi: use the allocationmap also if cache.direct=on 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 Message-id: 1429193313-4263-10-git-send-email-pl@kamp.de Signed-off-by: Stefan Hajnoczi Signed-off-by: Kevin Wolf --- diff --git a/block/iscsi.c b/block/iscsi.c index 8364f975ba..8fca1d32cb 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;