From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:40017) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SCsMz-0005SO-Nh for qemu-devel@nongnu.org; Wed, 28 Mar 2012 08:53:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SCsMs-0007w1-Am for qemu-devel@nongnu.org; Wed, 28 Mar 2012 08:52:57 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Wed, 28 Mar 2012 14:52:30 +0200 Message-Id: <1332939159-16434-28-git-send-email-afaerber@suse.de> In-Reply-To: <1332939159-16434-1-git-send-email-afaerber@suse.de> References: <1332939159-16434-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH stable-0.15 27/36] 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 , kvm@suse.de, qemu-stable@nongnu.org, Bruce Rogers , =?UTF-8?q?Andreas=20F=C3=A4rber?= From: 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 Signed-off-by: Kevin Wolf (cherry picked from commit 03f541bd6eacdc6c2893f72b975257c89cab2b74) Signed-off-by: Bruce Rogers [AF: backported] Signed-off-by: Andreas F=C3=A4rber --- block.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/block.c b/block.c index 8d77746..1d6d26b 100644 --- a/block.c +++ b/block.c @@ -426,11 +426,14 @@ static int bdrv_open_common(BlockDriverState *bs, c= onst char *filename, bs->total_sectors =3D 0; bs->encrypted =3D 0; bs->valid_key =3D 0; + bs->sg =3D 0; bs->open_flags =3D flags; + bs->growable =3D 0; /* buffer_alignment defaulted to 512, drivers can change this value = */ bs->buffer_alignment =3D 512; =20 pstrcpy(bs->filename, sizeof(bs->filename), filename); + bs->backing_file[0] =3D '\0'; =20 if (use_bdrv_whitelist && !bdrv_is_whitelisted(drv)) { return -ENOTSUP; @@ -439,8 +442,7 @@ static int bdrv_open_common(BlockDriverState *bs, con= st char *filename, bs->drv =3D drv; bs->opaque =3D qemu_mallocz(drv->instance_size); =20 - if (flags & BDRV_O_CACHE_WB) - bs->enable_write_cache =3D 1; + bs->enable_write_cache =3D !!(flags & BDRV_O_CACHE_WB); =20 /* * Clear flags that are internal to the block layer before opening t= he --=20 1.7.7