From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([140.186.70.92]:54241) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RJMfh-0004m3-O2 for qemu-devel@nongnu.org; Thu, 27 Oct 2011 05:54:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1RJMfc-00037I-1u for qemu-devel@nongnu.org; Thu, 27 Oct 2011 05:54:49 -0400 Received: from mtagate1.uk.ibm.com ([194.196.100.161]:54256) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1RJMfb-00036m-Mx for qemu-devel@nongnu.org; Thu, 27 Oct 2011 05:54:43 -0400 Received: from d06nrmr1507.portsmouth.uk.ibm.com (d06nrmr1507.portsmouth.uk.ibm.com [9.149.38.233]) by mtagate1.uk.ibm.com (8.13.1/8.13.1) with ESMTP id p9R9sef1018801 for ; Thu, 27 Oct 2011 09:54:40 GMT Received: from d06av07.portsmouth.uk.ibm.com (d06av07.portsmouth.uk.ibm.com [9.149.37.248]) by d06nrmr1507.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id p9R9sevd2576484 for ; Thu, 27 Oct 2011 10:54:40 +0100 Received: from d06av07.portsmouth.uk.ibm.com (loopback [127.0.0.1]) by d06av07.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id p9R9sdms013571 for ; Thu, 27 Oct 2011 03:54:39 -0600 From: Stefan Hajnoczi Date: Thu, 27 Oct 2011 10:54:27 +0100 Message-Id: <1319709268-7435-2-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 2/3] 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 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 --- block.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/block.c b/block.c index 70aab63..3207e99 100644 --- a/block.c +++ b/block.c @@ -500,6 +500,8 @@ static int bdrv_open_common(BlockDriverState *bs, const char *filename, open_flags |= BDRV_O_RDWR; } + bs->keep_read_only = bs->read_only = !(open_flags & BDRV_O_RDWR); + /* Open the image, either directly or using a protocol */ if (drv->bdrv_file_open) { ret = drv->bdrv_file_open(bs, filename, open_flags); @@ -514,8 +516,6 @@ static int bdrv_open_common(BlockDriverState *bs, const char *filename, goto free_and_fail; } - bs->keep_read_only = bs->read_only = !(open_flags & BDRV_O_RDWR); - ret = refresh_total_sectors(bs, bs->total_sectors); if (ret < 0) { goto free_and_fail; -- 1.7.7