mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

block: add bdrv_set_read_only() helper function

Browse Source 
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
This commit is contained in:
Jeff Cody 2017-04-07 16:55:25 -04:00
parent a98f49f46a
commit fe5241bfe3
7 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
block.c
View File

@ -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, void bdrv_get_full_backing_filename_from_filename(const char *backed,
const char *backing, const char *backing,
char *dest, size_t sz, char *dest, size_t sz,

2
block/bochs.c
View File

@ -110,7 +110,7 @@ static int bochs_open(BlockDriverState *bs, QDict *options, int flags,
return -EINVAL; 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)); ret = bdrv_pread(bs->file, 0, &bochs, sizeof(bochs));
if (ret < 0) { if (ret < 0) {

2
block/cloop.c
View File

@ -72,7 +72,7 @@ static int cloop_open(BlockDriverState *bs, QDict *options, int flags,
return -EINVAL; return -EINVAL;
} }
bs->read_only = true; bdrv_set_read_only(bs, true);
/* read header */ /* read header */
ret = bdrv_pread(bs->file, 128, &s->block_size, 4); ret = bdrv_pread(bs->file, 128, &s->block_size, 4);

2
block/dmg.c
View File

@ -420,7 +420,7 @@ static int dmg_open(BlockDriverState *bs, QDict *options, int flags,
} }
block_module_load_one("dmg-bz2"); block_module_load_one("dmg-bz2");
bs->read_only = true; bdrv_set_read_only(bs, true);
s->n_chunks = 0; s->n_chunks = 0;
s->offsets = s->lengths = s->sectors = s->sectorcounts = NULL; s->offsets = s->lengths = s->sectors = s->sectorcounts = NULL;

2
block/rbd.c
View File

@ -641,7 +641,7 @@ static int qemu_rbd_open(BlockDriverState *bs, QDict *options, int flags,
goto failed_open; goto failed_open;
} }
bs->read_only = (s->snap != NULL); bdrv_set_read_only(bs, (s->snap != NULL));
qemu_opts_del(opts); qemu_opts_del(opts);
return 0; return 0;

4
block/vvfat.c
View File

@ -1157,7 +1157,7 @@ static int vvfat_open(BlockDriverState *bs, QDict *options, int flags,
s->current_cluster=0xffffffff; s->current_cluster=0xffffffff;
/* read only is the default for safety */ /* read only is the default for safety */
bs->read_only = true; bdrv_set_read_only(bs, true);
s->qcow = NULL; s->qcow = NULL;
s->qcow_filename = NULL; s->qcow_filename = NULL;
s->fat2 = NULL; s->fat2 = NULL;
@ -1173,7 +1173,7 @@ static int vvfat_open(BlockDriverState *bs, QDict *options, int flags,
if (ret < 0) { if (ret < 0) {
goto fail; goto fail;
} }
bs->read_only = false; bdrv_set_read_only(bs, false);
} }
bs->total_sectors = cyls * heads * secs; bs->total_sectors = cyls * heads * secs;

1
include/block/block.h
View File

@ -434,6 +434,7 @@ int bdrv_is_allocated_above(BlockDriverState *top, BlockDriverState *base,
int64_t sector_num, int nb_sectors, int *pnum); int64_t sector_num, int nb_sectors, int *pnum);
bool bdrv_is_read_only(BlockDriverState *bs); 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_sg(BlockDriverState *bs);
bool bdrv_is_inserted(BlockDriverState *bs); bool bdrv_is_inserted(BlockDriverState *bs);
int bdrv_media_changed(BlockDriverState *bs); int bdrv_media_changed(BlockDriverState *bs);