diff options
| author | Markus Armbruster <armbru@pond.sub.org> | 2015-01-29 10:36:59 +0100 |
|---|---|---|
| committer | Max Reitz <mreitz@redhat.com> | 2015-02-06 11:46:32 -0500 |
| commit | 2e3a0266bd84a9be9f5e23c1568db6eb7f3e9e94 (patch) | |
| tree | 28930c8e1e9f8ebfa9f8987ef62c0ca4bb027b42 | |
| parent | 24d6bffe8ab523b1dcd8b8a2be678775f3e26b1c (diff) | |
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: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-id: 1422524221-8566-3-git-send-email-armbru@redhat.com
Reviewed-by: Max Reitz <mreitz@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
| -rw-r--r-- | blockdev.c | 3 | ||||
| -rw-r--r-- | include/qapi/qmp/qerror.h | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/blockdev.c b/blockdev.c index 8d6ca35ac8..287d7af901 100644 --- a/blockdev.c +++ b/blockdev.c @@ -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; } diff --git a/include/qapi/qmp/qerror.h b/include/qapi/qmp/qerror.h index eeaf0cb981..85f1699df7 100644 --- a/include/qapi/qmp/qerror.h +++ b/include/qapi/qmp/qerror.h @@ -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" |