From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40478) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XKl7S-00057A-Rh for qemu-devel@nongnu.org; Fri, 22 Aug 2014 05:26:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XKl7N-00031S-6d for qemu-devel@nongnu.org; Fri, 22 Aug 2014 05:26:50 -0400 Received: from mx-v6.kamp.de ([2a02:248:0:51::16]:52300 helo=mx01.kamp.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XKl7M-00031H-S2 for qemu-devel@nongnu.org; Fri, 22 Aug 2014 05:26:45 -0400 From: Peter Lieven Date: Fri, 22 Aug 2014 11:26:07 +0200 Message-Id: <1408699567-6940-3-git-send-email-pl@kamp.de> In-Reply-To: <1408699567-6940-1-git-send-email-pl@kamp.de> References: <1408699567-6940-1-git-send-email-pl@kamp.de> Subject: [Qemu-devel] [PATCH 2/2] block/iscsi: handle failure on malloc of the allocationmap List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, pbonzini@redhat.com, Peter Lieven , stefanha@redhat.com Signed-off-by: Peter Lieven --- block/iscsi.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/block/iscsi.c b/block/iscsi.c index ed883c3..131357c 100644 --- a/block/iscsi.c +++ b/block/iscsi.c @@ -325,6 +325,19 @@ static bool is_request_lun_aligned(int64_t sector_num, int nb_sectors, return 1; } +static unsigned long *iscsi_allocationmap_init(IscsiLun *iscsilun) +{ + unsigned long *ptr; + ptr = bitmap_try_new(DIV_ROUND_UP(sector_lun2qemu(iscsilun->num_blocks, + iscsilun), + iscsilun->cluster_sectors)); + if (ptr == NULL) { + error_report("iSCSI: could not initialize allocationmap. " + "Out of memory."); + } + return ptr; +} + static void iscsi_allocationmap_set(IscsiLun *iscsilun, int64_t sector_num, int nb_sectors) { @@ -1413,9 +1426,7 @@ static int iscsi_open(BlockDriverState *bs, QDict *options, int flags, iscsilun->cluster_sectors = (iscsilun->bl.opt_unmap_gran * iscsilun->block_size) >> BDRV_SECTOR_BITS; if (iscsilun->lbprz && !(bs->open_flags & BDRV_O_NOCACHE)) { - iscsilun->allocationmap = - bitmap_new(DIV_ROUND_UP(bs->total_sectors, - iscsilun->cluster_sectors)); + iscsilun->allocationmap = iscsi_allocationmap_init(iscsilun); } } @@ -1508,10 +1519,7 @@ static int iscsi_truncate(BlockDriverState *bs, int64_t offset) if (iscsilun->allocationmap != NULL) { g_free(iscsilun->allocationmap); - iscsilun->allocationmap = - bitmap_new(DIV_ROUND_UP(sector_lun2qemu(iscsilun->num_blocks, - iscsilun), - iscsilun->cluster_sectors)); + iscsilun->allocationmap = iscsi_allocationmap_init(iscsilun); } return 0; -- 1.7.9.5