From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:54292) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RJMfw-0005Kz-SH for qemu-devel@nongnu.org; Thu, 27 Oct 2011 05:55:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RJMfv-00039j-H0 for qemu-devel@nongnu.org; Thu, 27 Oct 2011 05:55:04 -0400 Received: from mtagate1.uk.ibm.com ([194.196.100.161]:54463) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RJMfv-00039Y-95 for qemu-devel@nongnu.org; Thu, 27 Oct 2011 05:55:03 -0400 Received: from d06nrmr1307.portsmouth.uk.ibm.com (d06nrmr1307.portsmouth.uk.ibm.com [9.149.38.129]) by mtagate1.uk.ibm.com (8.13.1/8.13.1) with ESMTP id p9R9t2lJ019073 for ; Thu, 27 Oct 2011 09:55:02 GMT Received: from d06av08.portsmouth.uk.ibm.com (d06av08.portsmouth.uk.ibm.com [9.149.37.249]) by d06nrmr1307.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p9R9t1Sf2048160 for ; Thu, 27 Oct 2011 10:55:01 +0100 Received: from d06av08.portsmouth.uk.ibm.com (loopback [127.0.0.1]) by d06av08.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p9R9sdbH024523 for ; Thu, 27 Oct 2011 10:54:39 +0100 From: Stefan Hajnoczi Date: Thu, 27 Oct 2011 10:54:28 +0100 Message-Id: <1319709268-7435-3-git-send-email-stefanha@linux.vnet.ibm.com> In-Reply-To: <1319709268-7435-1-git-send-email-stefanha@linux.vnet.ibm.com> References: <1319709268-7435-1-git-send-email-stefanha@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH 3/3] block: reinitialize across bdrv_close()/bdrv_open() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Kevin Wolf , Stefan Hajnoczi Several BlockDriverState fields are not being reinitialized across bdrv_close()/bdrv_open(). Make sure they are reset to their default values. Signed-off-by: Stefan Hajnoczi --- block.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/block.c b/block.c index 3207e99..b5e2aff 100644 --- a/block.c +++ b/block.c @@ -472,10 +472,13 @@ static int bdrv_open_common(BlockDriverState *bs, const char *filename, bs->total_sectors = 0; bs->encrypted = 0; bs->valid_key = 0; + bs->sg = 0; bs->open_flags = flags; + bs->growable = 0; bs->buffer_alignment = 512; pstrcpy(bs->filename, sizeof(bs->filename), filename); + bs->backing_file[0] = '\0'; if (use_bdrv_whitelist && !bdrv_is_whitelisted(drv)) { return -ENOTSUP; @@ -484,8 +487,7 @@ static int bdrv_open_common(BlockDriverState *bs, const char *filename, bs->drv = drv; bs->opaque = g_malloc0(drv->instance_size); - if (flags & BDRV_O_CACHE_WB) - bs->enable_write_cache = 1; + bs->enable_write_cache = !!(flags & BDRV_O_CACHE_WB); /* * Clear flags that are internal to the block layer before opening the -- 1.7.7