Skip to content

Commit

Permalink
qapi: Inline and remove QERR_INVALID_PARAMETER 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!
   */

Mechanical transformation using:

  $ sed -i -e "s/QERR_INVALID_PARAMETER,/\"Invalid parameter '%s'\",/" \
    $(git grep -lw QERR_INVALID_PARAMETER)

Manually simplify qemu_opts_create(), and remove the macro 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-6-armbru@redhat.com>
  • Loading branch information
philmd authored and Markus Armbruster committed Apr 24, 2024
1 parent f95b25c commit c6f5d40
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 9 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 \
"Invalid parameter '%s'"

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

Expand Down
2 changes: 1 addition & 1 deletion qapi/opts-visitor.c
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ opts_check_struct(Visitor *v, Error **errp)
const QemuOpt *first;

first = g_queue_peek_head(any);
error_setg(errp, QERR_INVALID_PARAMETER, first->name);
error_setg(errp, "Invalid parameter '%s'", first->name);
return false;
}
return true;
Expand Down
10 changes: 5 additions & 5 deletions util/qemu-option.c
Original file line number Diff line number Diff line change
Expand Up @@ -498,7 +498,7 @@ static bool opt_validate(QemuOpt *opt, Error **errp)

desc = find_desc_by_name(list->desc, opt->name);
if (!desc && !opts_accepts_any(list)) {
error_setg(errp, QERR_INVALID_PARAMETER, opt->name);
error_setg(errp, "Invalid parameter '%s'", opt->name);
return false;
}

Expand Down Expand Up @@ -531,7 +531,7 @@ bool qemu_opt_set_bool(QemuOpts *opts, const char *name, bool val,

desc = find_desc_by_name(list->desc, name);
if (!desc && !opts_accepts_any(list)) {
error_setg(errp, QERR_INVALID_PARAMETER, name);
error_setg(errp, "Invalid parameter '%s'", name);
return false;
}

Expand All @@ -554,7 +554,7 @@ bool qemu_opt_set_number(QemuOpts *opts, const char *name, int64_t val,

desc = find_desc_by_name(list->desc, name);
if (!desc && !opts_accepts_any(list)) {
error_setg(errp, QERR_INVALID_PARAMETER, name);
error_setg(errp, "Invalid parameter '%s'", name);
return false;
}

Expand Down Expand Up @@ -612,7 +612,7 @@ QemuOpts *qemu_opts_create(QemuOptsList *list, const char *id,

if (list->merge_lists) {
if (id) {
error_setg(errp, QERR_INVALID_PARAMETER, "id");
error_setg(errp, "Invalid parameter 'id'");
return NULL;
}
opts = qemu_opts_find(list, NULL);
Expand Down Expand Up @@ -1103,7 +1103,7 @@ bool qemu_opts_validate(QemuOpts *opts, const QemuOptDesc *desc, Error **errp)
QTAILQ_FOREACH(opt, &opts->head, next) {
opt->desc = find_desc_by_name(desc, opt->name);
if (!opt->desc) {
error_setg(errp, QERR_INVALID_PARAMETER, opt->name);
error_setg(errp, "Invalid parameter '%s'", opt->name);
return false;
}

Expand Down

0 comments on commit c6f5d40

Please sign in to comment.