Commit 24d6bffe authored by Markus Armbruster's avatar Markus Armbruster Committed by Max Reitz
Browse files

blockdev: Give find_block_job() an Error ** parameter 



When find_block_job() fails, all its callers build the same Error
object.  Build it in find_block_job() instead.

Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
Reviewed-by: default avatarEric Blake <eblake@redhat.com>
Message-id: 1422524221-8566-2-git-send-email-armbru@redhat.com
Reviewed-by: default avatarMax Reitz <mreitz@redhat.com>
Signed-off-by: default avatarMax Reitz <mreitz@redhat.com>
parent 8c44dfbc

blockdev.c

+8 −11
Original line number Diff line number Diff line
@@ -2653,7 +2653,8 @@ out: 
}



/* Get the block job for a given device name and acquire its AioContext */

static BlockJob *find_block_job(const char *device, AioContext **aio_context)

static BlockJob *find_block_job(const char *device, AioContext **aio_context,

                                Error **errp)

{

    BlockDriverState *bs;
@@ -2673,6 +2674,7 @@ static BlockJob *find_block_job(const char *device, AioContext **aio_context) 
    return bs->job;



notfound:

    error_set(errp, QERR_BLOCK_JOB_NOT_ACTIVE, device);

    *aio_context = NULL;

    return NULL;

}
@@ -2680,10 +2682,9 @@ notfound: 
void qmp_block_job_set_speed(const char *device, int64_t speed, Error **errp)

{

    AioContext *aio_context;

    BlockJob *job = find_block_job(device, &aio_context);

    BlockJob *job = find_block_job(device, &aio_context, errp);



    if (!job) {

        error_set(errp, QERR_BLOCK_JOB_NOT_ACTIVE, device);

        return;

    }
@@ -2695,10 +2696,9 @@ void qmp_block_job_cancel(const char *device, 
                          bool has_force, bool force, Error **errp)

{

    AioContext *aio_context;

    BlockJob *job = find_block_job(device, &aio_context);

    BlockJob *job = find_block_job(device, &aio_context, errp);



    if (!job) {

        error_set(errp, QERR_BLOCK_JOB_NOT_ACTIVE, device);

        return;

    }
@@ -2721,10 +2721,9 @@ out: 
void qmp_block_job_pause(const char *device, Error **errp)

{

    AioContext *aio_context;

    BlockJob *job = find_block_job(device, &aio_context);

    BlockJob *job = find_block_job(device, &aio_context, errp);



    if (!job) {

        error_set(errp, QERR_BLOCK_JOB_NOT_ACTIVE, device);

        return;

    }
@@ -2736,10 +2735,9 @@ void qmp_block_job_pause(const char *device, Error **errp) 
void qmp_block_job_resume(const char *device, Error **errp)

{

    AioContext *aio_context;

    BlockJob *job = find_block_job(device, &aio_context);

    BlockJob *job = find_block_job(device, &aio_context, errp);



    if (!job) {

        error_set(errp, QERR_BLOCK_JOB_NOT_ACTIVE, device);

        return;

    }
@@ -2751,10 +2749,9 @@ void qmp_block_job_resume(const char *device, Error **errp) 
void qmp_block_job_complete(const char *device, Error **errp)

{

    AioContext *aio_context;

    BlockJob *job = find_block_job(device, &aio_context);

    BlockJob *job = find_block_job(device, &aio_context, errp);



    if (!job) {

        error_set(errp, QERR_BLOCK_JOB_NOT_ACTIVE, device);

        return;

    }