From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:41652) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TG9d6-00085s-22 for qemu-devel@nongnu.org; Mon, 24 Sep 2012 10:27:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TG9cw-0007Bu-I7 for qemu-devel@nongnu.org; Mon, 24 Sep 2012 10:27:23 -0400 Received: from mx1.redhat.com ([209.132.183.28]:5079) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TG9cw-0007Bq-AL for qemu-devel@nongnu.org; Mon, 24 Sep 2012 10:27:14 -0400 From: Kevin Wolf Date: Mon, 24 Sep 2012 16:26:48 +0200 Message-Id: <1348496808-8159-20-git-send-email-kwolf@redhat.com> In-Reply-To: <1348496808-8159-1-git-send-email-kwolf@redhat.com> References: <1348496808-8159-1-git-send-email-kwolf@redhat.com> Subject: [Qemu-devel] [PATCH 19/19] block: remove keep_read_only flag from BlockDriverState struct List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: anthony@codemonkey.ws Cc: kwolf@redhat.com, qemu-devel@nongnu.org From: Jeff Cody The keep_read_only flag is no longer used, in favor of the bdrv flag BDRV_O_ALLOW_RDWR. Signed-off-by: Jeff Cody Signed-off-by: Kevin Wolf --- block.c | 2 -- block_int.h | 1 - 2 files changed, 0 insertions(+), 3 deletions(-) diff --git a/block.c b/block.c index 84544d2..751ebdc 100644 --- a/block.c +++ b/block.c @@ -812,8 +812,6 @@ int bdrv_open(BlockDriverState *bs, const char *filename, int flags, flags |= BDRV_O_ALLOW_RDWR; } - bs->keep_read_only = !(flags & BDRV_O_ALLOW_RDWR); - /* Open the image */ ret = bdrv_open_common(bs, filename, flags, drv); if (ret < 0) { diff --git a/block_int.h b/block_int.h index 22b3d93..ac4245c 100644 --- a/block_int.h +++ b/block_int.h @@ -275,7 +275,6 @@ struct BlockDriverState { int64_t total_sectors; /* if we are reading a disk image, give its size in sectors */ int read_only; /* if true, the media is read only */ - int keep_read_only; /* if true, the media was requested to stay read only */ int open_flags; /* flags used to open the file, re-used for re-open */ int encrypted; /* if true, the media is encrypted */ int valid_key; /* if true, a valid encryption key has been set */ -- 1.7.6.5