From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40308) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VCfy3-0000IW-Q3 for qemu-devel@nongnu.org; Thu, 22 Aug 2013 21:15:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VCfxx-00018u-0e for qemu-devel@nongnu.org; Thu, 22 Aug 2013 21:15:11 -0400 Received: from mx1.redhat.com ([209.132.183.28]:36384) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VCfxw-00016r-P7 for qemu-devel@nongnu.org; Thu, 22 Aug 2013 21:15:04 -0400 From: Fam Zheng Date: Fri, 23 Aug 2013 09:14:45 +0800 Message-Id: <1377220491-19954-3-git-send-email-famz@redhat.com> In-Reply-To: <1377220491-19954-1-git-send-email-famz@redhat.com> References: <1377220491-19954-1-git-send-email-famz@redhat.com> Subject: [Qemu-devel] [PATCH v6 2/8] iscsi: use bdrv_new() instead of stack structure List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, famz@redhat.com, jcody@redhat.com, stefanha@redhat.com, pbonzini@redhat.com, xiawenc@linux.vnet.ibm.com BlockDriverState structure needs bdrv_new() to initialize refcnt, don't allocate a local structure variable and memset to 0, becasue with coming refcnt implementation, bdrv_unref will crash if bs->refcnt not initialized to 1. Signed-off-by: Fam Zheng --- block/iscsi.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/block/iscsi.c b/block/iscsi.c index e7c1c2b..123f058 100644 --- a/block/iscsi.c +++ b/block/iscsi.c @@ -1249,11 +1249,11 @@ static int iscsi_create(const char *filename, QEMUOptionParameter *options) { int ret = 0; int64_t total_size = 0; - BlockDriverState bs; + BlockDriverState *bs; IscsiLun *iscsilun = NULL; QDict *bs_options; - memset(&bs, 0, sizeof(BlockDriverState)); + bs = bdrv_new(""); /* Read out options */ while (options && options->name) { @@ -1263,12 +1263,12 @@ static int iscsi_create(const char *filename, QEMUOptionParameter *options) options++; } - bs.opaque = g_malloc0(sizeof(struct IscsiLun)); - iscsilun = bs.opaque; + bs->opaque = g_malloc0(sizeof(struct IscsiLun)); + iscsilun = bs->opaque; bs_options = qdict_new(); qdict_put(bs_options, "filename", qstring_from_str(filename)); - ret = iscsi_open(&bs, bs_options, 0); + ret = iscsi_open(bs, bs_options, 0); QDECREF(bs_options); if (ret != 0) { @@ -1282,7 +1282,7 @@ static int iscsi_create(const char *filename, QEMUOptionParameter *options) ret = -ENODEV; goto out; } - if (bs.total_sectors < total_size) { + if (bs->total_sectors < total_size) { ret = -ENOSPC; goto out; } @@ -1292,7 +1292,9 @@ out: if (iscsilun->iscsi != NULL) { iscsi_destroy_context(iscsilun->iscsi); } - g_free(bs.opaque); + g_free(bs->opaque); + bs->opaque = NULL; + bdrv_delete(bs); return ret; } -- 1.8.3.1