diff options
| author | Vladimir Sementsov-Ogievskiy | 2021-06-08 19:18:52 +0200 |
|---|---|---|
| committer | Kevin Wolf | 2021-07-09 12:26:05 +0200 |
| commit | 2842ff2d81ddd86b1d0dd3b98c46b72bfa5cb4cb (patch) | |
| tree | 96979ef48cf920729690e2fa98f038d3ce04de7a /blockdev.c | |
| parent | vhost-user: Fix backends without multiqueue support (diff) | |
| download | qemu-2842ff2d81ddd86b1d0dd3b98c46b72bfa5cb4cb.tar.gz qemu-2842ff2d81ddd86b1d0dd3b98c46b72bfa5cb4cb.tar.xz qemu-2842ff2d81ddd86b1d0dd3b98c46b72bfa5cb4cb.zip | |
blockdev: fix drive-backup transaction endless drained section
drive_backup_prepare() does bdrv_drained_begin() in hope that
bdrv_drained_end() will be called in drive_backup_clean(). Still we
need to set state->bs for this to work. That's done too late: a lot of
failure paths in drive_backup_prepare() miss setting state->bs. Fix
that.
Fixes: 2288ccfac96281c316db942d10e3f921c1373064
Fixes: https://gitlab.com/qemu-project/qemu/-/issues/399
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Message-Id: <20210608171852.250775-1-vsementsov@virtuozzo.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'blockdev.c')
| -rw-r--r-- | blockdev.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/blockdev.c b/blockdev.c index f08192deda..094c085962 100644 --- a/blockdev.c +++ b/blockdev.c @@ -1714,6 +1714,7 @@ static void drive_backup_prepare(BlkActionState *common, Error **errp) aio_context = bdrv_get_aio_context(bs); aio_context_acquire(aio_context); + state->bs = bs; /* Paired with .clean() */ bdrv_drained_begin(bs); @@ -1813,8 +1814,6 @@ static void drive_backup_prepare(BlkActionState *common, Error **errp) } } - state->bs = bs; - state->job = do_backup_common(qapi_DriveBackup_base(backup), bs, target_bs, aio_context, common->block_job_txn, errp); |