Commit 2e3a0266 authored by Markus Armbruster's avatar Markus Armbruster Committed by Max Reitz
Browse files

blockdev: Eliminate silly QERR_BLOCK_JOB_NOT_ACTIVE macro 



The QERR_ macros are leftovers from the days of "rich" error objects.
They're used with error_set() and qerror_report(), and expand into the
first *two* arguments.  This trickiness has become pointless.  Clean
this one up.

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

blockdev.c

+2 −1
Original line number Diff line number Diff line
@@ -2674,7 +2674,8 @@ static BlockJob *find_block_job(const char *device, AioContext **aio_context, 
    return bs->job;



notfound:

    error_set(errp, QERR_BLOCK_JOB_NOT_ACTIVE, device);

    error_set(errp, ERROR_CLASS_DEVICE_NOT_ACTIVE,

              "No active block job on device '%s'", device);

    *aio_context = NULL;

    return NULL;

}

include/qapi/qmp/qerror.h

+0 −3
Original line number Diff line number Diff line
@@ -37,9 +37,6 @@ void qerror_report_err(Error *err); 
#define QERR_BASE_NOT_FOUND \

    ERROR_CLASS_GENERIC_ERROR, "Base '%s' not found"



#define QERR_BLOCK_JOB_NOT_ACTIVE \

    ERROR_CLASS_DEVICE_NOT_ACTIVE, "No active block job on device '%s'"



#define QERR_BLOCK_JOB_NOT_READY \

    ERROR_CLASS_GENERIC_ERROR, "The active block job for device '%s' cannot be completed"