[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v4 05/15] block/mirror: don't install backing ch
From: |
Max Reitz |
Subject: |
Re: [Qemu-devel] [PATCH v4 05/15] block/mirror: don't install backing chain on abort |
Date: |
Wed, 5 Sep 2018 12:40:37 +0200 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 |
On 2018-09-04 19:09, John Snow wrote:
> In cases where we abort the block/mirror job, there's no point in
> installing the new backing chain before we finish aborting.
>
> Move this to the "success" portion of mirror_exit.
Sounds a bit weird now that you don't do any moving.
> Signed-off-by: John Snow <address@hidden>
> ---
> block/mirror.c | 7 ++-----
> 1 file changed, 2 insertions(+), 5 deletions(-)
>
> diff --git a/block/mirror.c b/block/mirror.c
> index cba555b4ef..3365bcfdfb 100644
> --- a/block/mirror.c
> +++ b/block/mirror.c
> @@ -642,7 +642,7 @@ static void mirror_exit(Job *job)
> * required before it could become a backing file of target_bs. */
> bdrv_child_try_set_perm(mirror_top_bs->backing, 0, BLK_PERM_ALL,
> &error_abort);
> - if (s->backing_mode == MIRROR_SOURCE_BACKING_CHAIN) {
> + if (ret == 0 && s->backing_mode == MIRROR_SOURCE_BACKING_CHAIN) {
> BlockDriverState *backing = s->is_none_mode ? src : s->base;
> if (backing_bs(target_bs) != backing) {
> bdrv_set_backing_hd(target_bs, backing, &local_err);
> @@ -659,10 +659,7 @@ static void mirror_exit(Job *job)
> }
>
> if (s->should_complete && ret == 0) {
> - BlockDriverState *to_replace = src;
> - if (s->to_replace) {
> - to_replace = s->to_replace;
> - }
> + BlockDriverState *to_replace = s->to_replace ? s->to_replace : src;
>
> if (bdrv_get_flags(target_bs) != bdrv_get_flags(to_replace)) {
> bdrv_reopen(target_bs, bdrv_get_flags(to_replace), NULL);
And this hunk now looks out of place. Sure, it makes sense, but why is
it in this patch now? :-)
(Moving it into the next patch would make more sense, I think.)
I'd like to give an R-b anyway, but I know that I shouldn't, so I won't.
Max
signature.asc
Description: OpenPGP digital signature
- Re: [Qemu-devel] [PATCH v4 04/15] block/commit: refactor commit to use job callbacks, (continued)
- [Qemu-devel] [PATCH v4 01/15] block/commit: add block job creation flags, John Snow, 2018/09/04
- [Qemu-devel] [PATCH v4 02/15] block/mirror: add block job creation flags, John Snow, 2018/09/04
- [Qemu-devel] [PATCH v4 07/15] block/stream: refactor stream to use job callbacks, John Snow, 2018/09/04
- [Qemu-devel] [PATCH v4 12/15] qapi/block-commit: expose new job properties, John Snow, 2018/09/04
- [Qemu-devel] [PATCH v4 13/15] qapi/block-mirror: expose new job properties, John Snow, 2018/09/04
- [Qemu-devel] [PATCH v4 10/15] tests/test-blockjob-txn: move .exit to .clean, John Snow, 2018/09/04
- [Qemu-devel] [PATCH v4 05/15] block/mirror: don't install backing chain on abort, John Snow, 2018/09/04
- Re: [Qemu-devel] [PATCH v4 05/15] block/mirror: don't install backing chain on abort,
Max Reitz <=
- [Qemu-devel] [PATCH v4 06/15] block/mirror: conservative mirror_exit refactor, John Snow, 2018/09/04
[Qemu-devel] [PATCH v4 08/15] tests/blockjob: replace Blockjob with Job, John Snow, 2018/09/04
[Qemu-devel] [PATCH v4 09/15] tests/test-blockjob: remove exit callback, John Snow, 2018/09/04
[Qemu-devel] [PATCH v4 14/15] qapi/block-stream: expose new job properties, John Snow, 2018/09/04
[Qemu-devel] [PATCH v4 15/15] block/backup: qapi documentation fixup, John Snow, 2018/09/04