| Message ID | ab8395c8926892311948dcfd3f88c598dd74797b.1542031058.git.berto@igalia.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Don't pass flags to bdrv_reopen_queue() | expand |
Am 12.11.2018 um 15:00 hat Alberto Garcia geschrieben: > This patch replaces the bdrv_reopen() calls that set and remove the > BDRV_O_RDWR flag with the new bdrv_reopen_set_read_only() function. > > Signed-off-by: Alberto Garcia <berto@igalia.com> > Reviewed-by: Max Reitz <mreitz@redhat.com> > --- > block/stream.c | 20 ++++++++++---------- > 1 file changed, 10 insertions(+), 10 deletions(-) > > diff --git a/block/stream.c b/block/stream.c > index 81a7ec8ece..262d280ccd 100644 > --- a/block/stream.c > +++ b/block/stream.c > @@ -34,7 +34,7 @@ typedef struct StreamBlockJob { > BlockDriverState *base; > BlockdevOnError on_error; > char *backing_file_str; > - int bs_flags; > + bool bs_read_only; > } StreamBlockJob; > > static int coroutine_fn stream_populate(BlockBackend *blk, > @@ -89,10 +89,10 @@ static void stream_clean(Job *job) > BlockDriverState *bs = blk_bs(bjob->blk); > > /* Reopen the image back in read-only mode if necessary */ > - if (s->bs_flags != bdrv_get_flags(bs)) { > + if (s->bs_read_only) { > /* Give up write permissions before making it read-only */ > blk_set_perm(bjob->blk, 0, BLK_PERM_ALL, &error_abort); > - bdrv_reopen(bs, s->bs_flags, NULL); > + bdrv_reopen_set_read_only(bs, true, NULL); > } > > g_free(s->backing_file_str); > @@ -226,12 +226,12 @@ void stream_start(const char *job_id, BlockDriverState *bs, > { > StreamBlockJob *s; > BlockDriverState *iter; > - int orig_bs_flags; > + int bs_read_only; bool certainly? Kevin
On Tue 20 Nov 2018 07:00:29 PM CET, Kevin Wolf wrote: >> @@ -226,12 +226,12 @@ void stream_start(const char *job_id, BlockDriverState *bs, >> { >> StreamBlockJob *s; >> BlockDriverState *iter; >> - int orig_bs_flags; >> + int bs_read_only; > > bool certainly? Oops! Berto
diff --git a/block/stream.c b/block/stream.c index 81a7ec8ece..262d280ccd 100644 --- a/block/stream.c +++ b/block/stream.c @@ -34,7 +34,7 @@ typedef struct StreamBlockJob { BlockDriverState *base; BlockdevOnError on_error; char *backing_file_str; - int bs_flags; + bool bs_read_only; } StreamBlockJob; static int coroutine_fn stream_populate(BlockBackend *blk, @@ -89,10 +89,10 @@ static void stream_clean(Job *job) BlockDriverState *bs = blk_bs(bjob->blk); /* Reopen the image back in read-only mode if necessary */ - if (s->bs_flags != bdrv_get_flags(bs)) { + if (s->bs_read_only) { /* Give up write permissions before making it read-only */ blk_set_perm(bjob->blk, 0, BLK_PERM_ALL, &error_abort); - bdrv_reopen(bs, s->bs_flags, NULL); + bdrv_reopen_set_read_only(bs, true, NULL); } g_free(s->backing_file_str); @@ -226,12 +226,12 @@ void stream_start(const char *job_id, BlockDriverState *bs, { StreamBlockJob *s; BlockDriverState *iter; - int orig_bs_flags; + int bs_read_only; /* Make sure that the image is opened in read-write mode */ - orig_bs_flags = bdrv_get_flags(bs); - if (!(orig_bs_flags & BDRV_O_RDWR)) { - if (bdrv_reopen(bs, orig_bs_flags | BDRV_O_RDWR, errp) != 0) { + bs_read_only = bdrv_is_read_only(bs); + if (bs_read_only) { + if (bdrv_reopen_set_read_only(bs, false, errp) != 0) { return; } } @@ -261,7 +261,7 @@ void stream_start(const char *job_id, BlockDriverState *bs, s->base = base; s->backing_file_str = g_strdup(backing_file_str); - s->bs_flags = orig_bs_flags; + s->bs_read_only = bs_read_only; s->on_error = on_error; trace_stream_start(bs, base, s); @@ -269,7 +269,7 @@ void stream_start(const char *job_id, BlockDriverState *bs, return; fail: - if (orig_bs_flags != bdrv_get_flags(bs)) { - bdrv_reopen(bs, orig_bs_flags, NULL); + if (bs_read_only) { + bdrv_reopen_set_read_only(bs, true, NULL); } }