Signed-off-by: Markus Armbruster <arm...@redhat.com> --- block/backup.c | 2 +- block/commit.c | 2 +- block/mirror.c | 2 +- block/stream.c | 2 +- blockjob.c | 9 +-------- include/block/blockjob_int.h | 2 +- 6 files changed, 6 insertions(+), 13 deletions(-)
diff --git a/block/backup.c b/block/backup.c index b76143d..359e526 100644 --- a/block/backup.c +++ b/block/backup.c @@ -188,7 +188,7 @@ static int coroutine_fn backup_before_write_notify( return backup_do_cow(job, req->offset, req->bytes, NULL, true); } -static void backup_set_speed(BlockJob *job, uint64_t speed, Error **errp) +static void backup_set_speed(BlockJob *job, uint64_t speed) { BackupBlockJob *s = container_of(job, BackupBlockJob, common); diff --git a/block/commit.c b/block/commit.c index 5dc1c73..ae9191d 100644 --- a/block/commit.c +++ b/block/commit.c @@ -220,7 +220,7 @@ out: block_job_defer_to_main_loop(&s->common, commit_complete, data); } -static void commit_set_speed(BlockJob *job, uint64_t speed, Error **errp) +static void commit_set_speed(BlockJob *job, uint64_t speed) { CommitBlockJob *s = container_of(job, CommitBlockJob, common); diff --git a/block/mirror.c b/block/mirror.c index 7959a7f..6c3b446 100644 --- a/block/mirror.c +++ b/block/mirror.c @@ -928,7 +928,7 @@ immediate_exit: block_job_defer_to_main_loop(&s->common, mirror_exit, data); } -static void mirror_set_speed(BlockJob *job, uint64_t speed, Error **errp) +static void mirror_set_speed(BlockJob *job, uint64_t speed) { MirrorBlockJob *s = container_of(job, MirrorBlockJob, common); diff --git a/block/stream.c b/block/stream.c index 11b6673..9a145f2 100644 --- a/block/stream.c +++ b/block/stream.c @@ -207,7 +207,7 @@ out: block_job_defer_to_main_loop(&s->common, stream_complete, data); } -static void stream_set_speed(BlockJob *job, uint64_t speed, Error **errp) +static void stream_set_speed(BlockJob *job, uint64_t speed) { StreamBlockJob *s = container_of(job, StreamBlockJob, common); diff --git a/blockjob.c b/blockjob.c index 7f77b7e..e653eef 100644 --- a/blockjob.c +++ b/blockjob.c @@ -454,8 +454,6 @@ static void block_job_completed_txn_success(BlockJob *job) void block_job_set_speed(BlockJob *job, int64_t speed, Error **errp) { - Error *local_err = NULL; - if (!job->driver->set_speed) { error_setg(errp, QERR_UNSUPPORTED); return; @@ -467,12 +465,7 @@ void block_job_set_speed(BlockJob *job, int64_t speed, Error **errp) return; } - job->driver->set_speed(job, speed, &local_err); - if (local_err) { - error_propagate(errp, local_err); - return; - } - + job->driver->set_speed(job, speed); job->speed = speed; } diff --git a/include/block/blockjob_int.h b/include/block/blockjob_int.h index 2d10794..dadfd8c 100644 --- a/include/block/blockjob_int.h +++ b/include/block/blockjob_int.h @@ -42,7 +42,7 @@ struct BlockJobDriver { BlockJobType job_type; /** Optional callback for job types that support setting a speed limit */ - void (*set_speed)(BlockJob *job, uint64_t speed, Error **errp); + void (*set_speed)(BlockJob *job, uint64_t speed); /** Mandatory: Entrypoint for the Coroutine. */ CoroutineEntry *start; -- 2.7.5