From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:39982) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SCsMy-0005OI-9X for qemu-devel@nongnu.org; Wed, 28 Mar 2012 08:53:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SCsMr-0007sd-O5 for qemu-devel@nongnu.org; Wed, 28 Mar 2012 08:52:55 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Wed, 28 Mar 2012 14:52:26 +0200 Message-Id: <1332939159-16434-24-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 23/36] block: set bs->read_only before .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 block drivers set bs->read_only in .bdrv_open() but block.c:bdrv_open_common() clobbers its value. Additionally, QED uses bdrv_is_read_only() in .bdrv_open() to decide whether to perform consistency checks. The correct ordering is to initialize bs->read_only from the open flags before calling .bdrv_open(). This way block drivers can override it if necessary and can use bdrv_is_read_only() in .bdrv_open(). Signed-off-by: Stefan Hajnoczi Signed-off-by: Kevin Wolf (cherry picked from commit e7c637967e6aad195b5f30cfd995913c9e0b4666) Signed-off-by: Bruce Rogers Signed-off-by: Andreas F=C3=A4rber --- block.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/block.c b/block.c index 4ebb18b..8d77746 100644 --- a/block.c +++ b/block.c @@ -455,6 +455,8 @@ static int bdrv_open_common(BlockDriverState *bs, con= st char *filename, open_flags |=3D BDRV_O_RDWR; } =20 + bs->keep_read_only =3D bs->read_only =3D !(open_flags & BDRV_O_RDWR)= ; + /* Open the image, either directly or using a protocol */ if (drv->bdrv_file_open) { ret =3D drv->bdrv_file_open(bs, filename, open_flags); @@ -469,8 +471,6 @@ static int bdrv_open_common(BlockDriverState *bs, con= st char *filename, goto free_and_fail; } =20 - bs->keep_read_only =3D bs->read_only =3D !(open_flags & BDRV_O_RDWR)= ; - ret =3D refresh_total_sectors(bs, bs->total_sectors); if (ret < 0) { goto free_and_fail; --=20 1.7.7