From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53042) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XLrfF-00056R-Db for qemu-devel@nongnu.org; Mon, 25 Aug 2014 06:38:22 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XLrf9-0000S0-B7 for qemu-devel@nongnu.org; Mon, 25 Aug 2014 06:38:17 -0400 Received: from mx1.redhat.com ([209.132.183.28]:30753) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XLrf9-0000Rw-27 for qemu-devel@nongnu.org; Mon, 25 Aug 2014 06:38:11 -0400 Message-ID: <53FB11FB.7090703@redhat.com> Date: Mon, 25 Aug 2014 12:37:47 +0200 From: Paolo Bonzini MIME-Version: 1.0 References: <1408699567-6940-1-git-send-email-pl@kamp.de> <1408699567-6940-3-git-send-email-pl@kamp.de> In-Reply-To: <1408699567-6940-3-git-send-email-pl@kamp.de> Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: 7bit Subject: Re: [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: Peter Lieven , qemu-devel@nongnu.org Cc: kwolf@redhat.com, stefanha@redhat.com Il 22/08/2014 11:26, Peter Lieven ha scritto: > 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); > } > } iscsi_open has an Error ** argument. Please pass it to iscsi_allocationmap_init and use error_setg instead of error_report. > @@ -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); Here you may have to use qerror_report_err, though I guess the failure need not be fatal and you can leave the allocationmap set to NULL. Paolo > } > > return 0; >