mirror of https://github.com/proxmox/mirror_qemu
block/stream: refactor stream to use job callbacks
Signed-off-by: John Snow <jsnow@redhat.com> Reviewed-by: Max Reitz <mreitz@redhat.com> Message-id: 20180906130225.5118-8-jsnow@redhat.com Reviewed-by: Jeff Cody <jcody@redhat.com> Signed-off-by: Max Reitz <mreitz@redhat.com>master
parent
737efc1eda
commit
1b57488acf
|
@ -54,16 +54,16 @@ static int coroutine_fn stream_populate(BlockBackend *blk,
|
||||||
return blk_co_preadv(blk, offset, qiov.size, &qiov, BDRV_REQ_COPY_ON_READ);
|
return blk_co_preadv(blk, offset, qiov.size, &qiov, BDRV_REQ_COPY_ON_READ);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void stream_exit(Job *job)
|
static int stream_prepare(Job *job)
|
||||||
{
|
{
|
||||||
StreamBlockJob *s = container_of(job, StreamBlockJob, common.job);
|
StreamBlockJob *s = container_of(job, StreamBlockJob, common.job);
|
||||||
BlockJob *bjob = &s->common;
|
BlockJob *bjob = &s->common;
|
||||||
BlockDriverState *bs = blk_bs(bjob->blk);
|
BlockDriverState *bs = blk_bs(bjob->blk);
|
||||||
BlockDriverState *base = s->base;
|
BlockDriverState *base = s->base;
|
||||||
Error *local_err = NULL;
|
Error *local_err = NULL;
|
||||||
int ret = job->ret;
|
int ret = 0;
|
||||||
|
|
||||||
if (!job_is_cancelled(job) && bs->backing && ret == 0) {
|
if (bs->backing) {
|
||||||
const char *base_id = NULL, *base_fmt = NULL;
|
const char *base_id = NULL, *base_fmt = NULL;
|
||||||
if (base) {
|
if (base) {
|
||||||
base_id = s->backing_file_str;
|
base_id = s->backing_file_str;
|
||||||
|
@ -75,12 +75,19 @@ static void stream_exit(Job *job)
|
||||||
bdrv_set_backing_hd(bs, base, &local_err);
|
bdrv_set_backing_hd(bs, base, &local_err);
|
||||||
if (local_err) {
|
if (local_err) {
|
||||||
error_report_err(local_err);
|
error_report_err(local_err);
|
||||||
ret = -EPERM;
|
return -EPERM;
|
||||||
goto out;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
out:
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void stream_clean(Job *job)
|
||||||
|
{
|
||||||
|
StreamBlockJob *s = container_of(job, StreamBlockJob, common.job);
|
||||||
|
BlockJob *bjob = &s->common;
|
||||||
|
BlockDriverState *bs = blk_bs(bjob->blk);
|
||||||
|
|
||||||
/* Reopen the image back in read-only mode if necessary */
|
/* Reopen the image back in read-only mode if necessary */
|
||||||
if (s->bs_flags != bdrv_get_flags(bs)) {
|
if (s->bs_flags != bdrv_get_flags(bs)) {
|
||||||
/* Give up write permissions before making it read-only */
|
/* Give up write permissions before making it read-only */
|
||||||
|
@ -89,7 +96,6 @@ out:
|
||||||
}
|
}
|
||||||
|
|
||||||
g_free(s->backing_file_str);
|
g_free(s->backing_file_str);
|
||||||
job->ret = ret;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static int coroutine_fn stream_run(Job *job, Error **errp)
|
static int coroutine_fn stream_run(Job *job, Error **errp)
|
||||||
|
@ -206,7 +212,8 @@ static const BlockJobDriver stream_job_driver = {
|
||||||
.job_type = JOB_TYPE_STREAM,
|
.job_type = JOB_TYPE_STREAM,
|
||||||
.free = block_job_free,
|
.free = block_job_free,
|
||||||
.run = stream_run,
|
.run = stream_run,
|
||||||
.exit = stream_exit,
|
.prepare = stream_prepare,
|
||||||
|
.clean = stream_clean,
|
||||||
.user_resume = block_job_user_resume,
|
.user_resume = block_job_user_resume,
|
||||||
.drain = block_job_drain,
|
.drain = block_job_drain,
|
||||||
},
|
},
|
||||||
|
|
Loading…
Reference in New Issue