aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Cody <jcody@redhat.com>2012-09-20 15:13:35 -0400
committerKevin Wolf <kwolf@redhat.com>2012-09-24 15:15:13 +0200
commitdc1c13d96912731d4c7c7e13d31c93b8735f1203 (patch)
treedfa2470427405927c852dc9dc2acf03e0ecd8cd1
parent0bce597d6ec34b2af802799eb53ebc863c704d05 (diff)
downloadqemu-arm-dc1c13d96912731d4c7c7e13d31c93b8735f1203.tar.gz
block: remove keep_read_only flag from BlockDriverState struct
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> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
-rw-r--r--block.c2
-rw-r--r--block_int.h1
2 files changed, 0 insertions, 3 deletions
diff --git a/block.c b/block.c
index 84544d23bb..751ebdc06b 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 22b3d93d19..ac4245cb18 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 */