mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qapi: Inline and remove QERR_INVALID_PARAMETER_TYPE 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 changes (escaping the format in qapi/visit.py).

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

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

@ -17,9 +17,6 @@
* add new ones! * add new ones!
*/ */
#define QERR_INVALID_PARAMETER_TYPE \
"Invalid parameter type for '%s', expected: %s"
#define QERR_INVALID_PARAMETER_VALUE \ #define QERR_INVALID_PARAMETER_VALUE \
"Parameter '%s' expects %s" "Parameter '%s' expects %s"

4
qom/object.c
View File

@ -23,7 +23,6 @@
#include "qapi/qobject-input-visitor.h" #include "qapi/qobject-input-visitor.h"
#include "qapi/forward-visitor.h" #include "qapi/forward-visitor.h"
#include "qapi/qapi-builtin-visit.h" #include "qapi/qapi-builtin-visit.h"
#include "qapi/qmp/qerror.h"
#include "qapi/qmp/qjson.h" #include "qapi/qmp/qjson.h"
#include "trace.h" #include "trace.h"
@ -1912,7 +1911,8 @@ static Object *object_resolve_link(Object *obj, const char *name,
} else if (!target) { } else if (!target) {
target = object_resolve_path(path, &ambiguous); target = object_resolve_path(path, &ambiguous);
if (target || ambiguous) { if (target || ambiguous) {
error_setg(errp, QERR_INVALID_PARAMETER_TYPE, name, target_type); error_setg(errp, "Invalid parameter type for '%s', expected: %s",
name, target_type);
} else { } else {
error_set(errp, ERROR_CLASS_DEVICE_NOT_FOUND, error_set(errp, ERROR_CLASS_DEVICE_NOT_FOUND,
"Device '%s' not found", path); "Device '%s' not found", path);

5
scripts/qapi/visit.py
View File

@ -278,8 +278,8 @@ bool visit_type_%(c_name)s(Visitor *v, const char *name,
abort(); abort();
default: default:
assert(visit_is_input(v)); assert(visit_is_input(v));
error_setg(errp, QERR_INVALID_PARAMETER_TYPE, name ? name : "null", error_setg(errp, "Invalid parameter type for '%%s', expected: %(name)s",
"%(name)s"); name ? name : "null");
/* Avoid passing invalid *obj to qapi_free_%(c_name)s() */ /* Avoid passing invalid *obj to qapi_free_%(c_name)s() */
g_free(*obj); g_free(*obj);
*obj = NULL; *obj = NULL;
@ -356,7 +356,6 @@ class QAPISchemaGenVisitVisitor(QAPISchemaModularCVisitor):
self._genc.preamble_add(mcgen(''' self._genc.preamble_add(mcgen('''
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "qapi/error.h" #include "qapi/error.h"
#include "qapi/qmp/qerror.h"
#include "%(visit)s.h" #include "%(visit)s.h"
''', ''',
visit=visit)) visit=visit))