From 0b15abfcbcb6d4f658bf92d618386f79a7f7e9e8 Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Fri, 21 Mar 2014 19:42:27 -0400 Subject: [PATCH] qerror.h: Replace QERR_NOT_SUPPORTED with QERR_UNSUPPORTED The former is only used twice, the latter is used over 30 times, and has a nicer error message. Cc: Luiz Capitulino Cc: Markus Armbruster Signed-off-by: Cole Robinson Reviewed-by: Paolo Bonzini Signed-off-by: Luiz Capitulino --- blockjob.c | 2 +- include/qapi/qmp/qerror.h | 3 --- stubs/arch-query-cpu-def.c | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/blockjob.c b/blockjob.c index b3ce14cebd..cd4784f053 100644 --- a/blockjob.c +++ b/blockjob.c @@ -88,7 +88,7 @@ void block_job_set_speed(BlockJob *job, int64_t speed, Error **errp) Error *local_err = NULL; if (!job->driver->set_speed) { - error_set(errp, QERR_NOT_SUPPORTED); + error_set(errp, QERR_UNSUPPORTED); return; } job->driver->set_speed(job, speed, &local_err); diff --git a/include/qapi/qmp/qerror.h b/include/qapi/qmp/qerror.h index 01d1d0661c..f5335e67d6 100644 --- a/include/qapi/qmp/qerror.h +++ b/include/qapi/qmp/qerror.h @@ -122,9 +122,6 @@ void qerror_report_err(Error *err); #define QERR_MISSING_PARAMETER \ ERROR_CLASS_GENERIC_ERROR, "Parameter '%s' is missing" -#define QERR_NOT_SUPPORTED \ - ERROR_CLASS_GENERIC_ERROR, "Not supported" - #define QERR_PERMISSION_DENIED \ ERROR_CLASS_GENERIC_ERROR, "Insufficient permission to perform this operation" diff --git a/stubs/arch-query-cpu-def.c b/stubs/arch-query-cpu-def.c index fa6789598a..22e0b43de9 100644 --- a/stubs/arch-query-cpu-def.c +++ b/stubs/arch-query-cpu-def.c @@ -4,6 +4,6 @@ CpuDefinitionInfoList *arch_query_cpu_definitions(Error **errp) { - error_set(errp, QERR_NOT_SUPPORTED); + error_set(errp, QERR_UNSUPPORTED); return NULL; }