SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

qapi: Inline and remove QERR_PROPERTY_VALUE_BAD definition

Browse Source 
Address the comment added in commit 4629ed1e98
("qerror: Finally unused, clean up"), from 2015:

  /*
   * These macros will go away, please don't use
   * in new code, and do not add new ones!
   */

Manual change. Remove the definition in
include/qapi/qmp/qerror.h.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-ID: <20240312141343.3168265-11-armbru@redhat.com>
Reviewed-by: Zhao Liu <zhao1.liu@intel.com>
This commit is contained in:
Philippe Mathieu-Daudé 2024-03-12 15:13:43 +01:00 committed by Markus Armbruster
parent 005807860d
commit be842efbe3
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hw/core/qdev-properties.c
View File

@ -2,7 +2,6 @@
#include "hw/qdev-properties.h" #include "hw/qdev-properties.h"
#include "qapi/error.h" #include "qapi/error.h"
#include "qapi/qapi-types-misc.h" #include "qapi/qapi-types-misc.h"
#include "qapi/qmp/qerror.h"
#include "qapi/qmp/qlist.h" #include "qapi/qmp/qlist.h"
#include "qemu/ctype.h" #include "qemu/ctype.h"
#include "qemu/error-report.h" #include "qemu/error-report.h"
@ -792,7 +791,7 @@ void error_set_from_qdev_prop_error(Error **errp, int ret, Object *obj,
break; break;
default: default:
case -EINVAL: case -EINVAL:
error_setg(errp, QERR_PROPERTY_VALUE_BAD, error_setg(errp, "Property '%s.%s' doesn't take value '%s'",
object_get_typename(obj), name, value); object_get_typename(obj), name, value);
break; break;
case -ENOENT: case -ENOENT:

3
include/qapi/qmp/qerror.h
View File

@ -26,9 +26,6 @@
#define QERR_MISSING_PARAMETER \ #define QERR_MISSING_PARAMETER \
"Parameter '%s' is missing" "Parameter '%s' is missing"
#define QERR_PROPERTY_VALUE_BAD \
"Property '%s.%s' doesn't take value '%s'"
#define QERR_PROPERTY_VALUE_OUT_OF_RANGE \ #define QERR_PROPERTY_VALUE_OUT_OF_RANGE \
"Property %s.%s doesn't take value %" PRId64 " (minimum: %" PRId64 ", maximum: %" PRId64 ")" "Property %s.%s doesn't take value %" PRId64 " (minimum: %" PRId64 ", maximum: %" PRId64 ")"