From e9c5d55aa2132484144d231261d128f57e7ec9dd Mon Sep 17 00:00:00 2001

From: Jeffrey Cody <jcody@redhat.com>

Date: Wed, 26 Apr 2017 20:08:48 +0200

Subject: [PATCH 02/11] block: add bdrv_set_read_only() helper function

RH-Author: Jeffrey Cody <jcody@redhat.com>

Message-id: <90cc08632a1a1a4b57830ba63f430506952dd49c.1493236824.git.jcody@redhat.com>

Patchwork-id: 74895

O-Subject: [RHEV-7.4 qemu-kvm-rhev 1/8] block: add bdrv_set_read_only() helper function

Bugzilla: 1189998

RH-Acked-by: John Snow <jsnow@redhat.com>

RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>

RH-Acked-by: Max Reitz <mreitz@redhat.com>

We have a helper wrapper for checking for the BDS read_only flag,

add a helper wrapper to set the read_only flag as well.

Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>

Signed-off-by: Jeff Cody <jcody@redhat.com>

Reviewed-by: John Snow <jsnow@redhat.com>

Message-id: 9b18972d05f5fa2ac16c014f0af98d680553048d.1491597120.git.jcody@redhat.com

(cherry picked from commit fe5241bfe3fb61ec3f589ceacd91c1469bfd400f)

Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>

---

 block.c               | 5 +++++

 block/bochs.c         | 2 +-

 block/cloop.c         | 2 +-

 block/dmg.c           | 2 +-

 block/rbd.c           | 2 +-

 block/vvfat.c         | 4 ++--

 include/block/block.h | 1 +

 7 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/block.c b/block.c

index 1fbbb8d..25a4cfd 100644

--- a/block.c

+++ b/block.c

@@ -192,6 +192,11 @@ void path_combine(char *dest, int dest_size,

     }

 }

+void bdrv_set_read_only(BlockDriverState *bs, bool read_only)

+{

+    bs->read_only = read_only;

+}

+

 void bdrv_get_full_backing_filename_from_filename(const char *backed,

                                                   const char *backing,

                                                   char *dest, size_t sz,

diff --git a/block/bochs.c b/block/bochs.c

index 516da56..bdc2831 100644

--- a/block/bochs.c

+++ b/block/bochs.c

@@ -110,7 +110,7 @@ static int bochs_open(BlockDriverState *bs, QDict *options, int flags,

         return -EINVAL;

     }

-    bs->read_only = true; /* no write support yet */

+    bdrv_set_read_only(bs, true); /* no write support yet */

     ret = bdrv_pread(bs->file, 0, &bochs, sizeof(bochs));

     if (ret < 0) {

diff --git a/block/cloop.c b/block/cloop.c

index a6c7b9d..11f17c8 100644

--- a/block/cloop.c

+++ b/block/cloop.c

@@ -72,7 +72,7 @@ static int cloop_open(BlockDriverState *bs, QDict *options, int flags,

         return -EINVAL;

     }

-    bs->read_only = true;

+    bdrv_set_read_only(bs, true);

     /* read header */

     ret = bdrv_pread(bs->file, 128, &s->block_size, 4);

diff --git a/block/dmg.c b/block/dmg.c

index a7d25fc..27ce4a6 100644

--- a/block/dmg.c

+++ b/block/dmg.c

@@ -420,7 +420,7 @@ static int dmg_open(BlockDriverState *bs, QDict *options, int flags,

     }

     block_module_load_one("dmg-bz2");

-    bs->read_only = true;

+    bdrv_set_read_only(bs, true);

     s->n_chunks = 0;

     s->offsets = s->lengths = s->sectors = s->sectorcounts = NULL;

diff --git a/block/rbd.c b/block/rbd.c

index 1ceeeb5..6ad2904 100644

--- a/block/rbd.c

+++ b/block/rbd.c

@@ -641,7 +641,7 @@ static int qemu_rbd_open(BlockDriverState *bs, QDict *options, int flags,

         goto failed_open;

     }

-    bs->read_only = (s->snap != NULL);

+    bdrv_set_read_only(bs, (s->snap != NULL));

     qemu_opts_del(opts);

     return 0;

diff --git a/block/vvfat.c b/block/vvfat.c

index af5153d..d4ce6d7 100644

--- a/block/vvfat.c

+++ b/block/vvfat.c

@@ -1157,7 +1157,7 @@ static int vvfat_open(BlockDriverState *bs, QDict *options, int flags,

     s->current_cluster=0xffffffff;

     /* read only is the default for safety */

-    bs->read_only = true;

+    bdrv_set_read_only(bs, true);

     s->qcow = NULL;

     s->qcow_filename = NULL;

     s->fat2 = NULL;

@@ -1173,7 +1173,7 @@ static int vvfat_open(BlockDriverState *bs, QDict *options, int flags,

         if (ret < 0) {

             goto fail;

         }

-        bs->read_only = false;

+        bdrv_set_read_only(bs, false);

     }

     bs->total_sectors = cyls * heads * secs;

diff --git a/include/block/block.h b/include/block/block.h

index 5ddc0cf..16eb909 100644

--- a/include/block/block.h

+++ b/include/block/block.h

@@ -434,6 +434,7 @@ int bdrv_is_allocated_above(BlockDriverState *top, BlockDriverState *base,

                             int64_t sector_num, int nb_sectors, int *pnum);

 bool bdrv_is_read_only(BlockDriverState *bs);

+void bdrv_set_read_only(BlockDriverState *bs, bool read_only);

 bool bdrv_is_sg(BlockDriverState *bs);

 bool bdrv_is_inserted(BlockDriverState *bs);

 int bdrv_media_changed(BlockDriverState *bs);

-- 

1.8.3.1