Skip to content

Commit

Permalink
qapi: Inline and remove QERR_INVALID_PARAMETER_TYPE definition
Browse files Browse the repository at this point in the history
Address the comment added in commit 4629ed1
("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>
  • Loading branch information
philmd authored and Markus Armbruster committed Apr 24, 2024
1 parent aaeafa5 commit ef92928
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 8 deletions.
3 changes: 0 additions & 3 deletions include/qapi/qmp/qerror.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,6 @@
* add new ones!
*/

#define QERR_INVALID_PARAMETER_TYPE \
"Invalid parameter type for '%s', expected: %s"

#define QERR_INVALID_PARAMETER_VALUE \
"Parameter '%s' expects %s"

Expand Down
4 changes: 2 additions & 2 deletions qom/object.c
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
#include "qapi/qobject-input-visitor.h"
#include "qapi/forward-visitor.h"
#include "qapi/qapi-builtin-visit.h"
#include "qapi/qmp/qerror.h"
#include "qapi/qmp/qjson.h"
#include "trace.h"

Expand Down Expand Up @@ -1912,7 +1911,8 @@ static Object *object_resolve_link(Object *obj, const char *name,
} else if (!target) {
target = object_resolve_path(path, &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 {
error_set(errp, ERROR_CLASS_DEVICE_NOT_FOUND,
"Device '%s' not found", path);
Expand Down
5 changes: 2 additions & 3 deletions scripts/qapi/visit.py
Original file line number Diff line number Diff line change
Expand Up @@ -278,8 +278,8 @@ def gen_visit_alternate(name: str, variants: QAPISchemaVariants) -> str:
abort();
default:
assert(visit_is_input(v));
error_setg(errp, QERR_INVALID_PARAMETER_TYPE, name ? name : "null",
"%(name)s");
error_setg(errp, "Invalid parameter type for '%%s', expected: %(name)s",
name ? name : "null");
/* Avoid passing invalid *obj to qapi_free_%(c_name)s() */
g_free(*obj);
*obj = NULL;
Expand Down Expand Up @@ -356,7 +356,6 @@ def _begin_user_module(self, name: str) -> None:
self._genc.preamble_add(mcgen('''
#include "qemu/osdep.h"
#include "qapi/error.h"
#include "qapi/qmp/qerror.h"
#include "%(visit)s.h"
''',
visit=visit))
Expand Down

0 comments on commit ef92928

Please sign in to comment.