Patchwork [v4,19/19] block: remove keep_read_only flag from BlockDriverState struct

login
register
mail settings
Submitter Jeff Cody
Date Sept. 20, 2012, 7:13 p.m.
Message ID <da3eb3b30b29f3cefc258bcdbba58bb75b22408b.1348157913.git.jcody@redhat.com>
Download mbox | patch
Permalink /patch/185479/
State New
Headers show

Comments

Jeff Cody - Sept. 20, 2012, 7:13 p.m.
The keep_read_only flag is no longer used, in favor of the bdrv
flag BDRV_O_ALLOW_RDWR.

Signed-off-by: Jeff Cody <jcody@redhat.com>
---
 block.c     | 2 --
 block_int.h | 1 -
 2 files changed, 3 deletions(-)

Patch

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 */