| Message ID | 20231004173158.42591-13-philmd@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | qapi: Kill 'qapi/qmp/qerror.h' for good | expand |
On 10/4/23 13:31, Philippe Mathieu-Daudé wrote: > 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! > */ > > Manually modify the error_report() call in softmmu/tpm.c, > then use sed to mechanically transform the rest. Finally > remove the definition in include/qapi/qmp/qerror.h. > > Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> Reviewed-by: Stefan Berger <stefanb@linux.ibm.com> > --- > include/qapi/qmp/qerror.h | 3 --- > qapi/opts-visitor.c | 4 ++-- > qapi/qapi-visit-core.c | 4 ++-- > softmmu/tpm.c | 3 +-- > 4 files changed, 5 insertions(+), 9 deletions(-) > > diff --git a/include/qapi/qmp/qerror.h b/include/qapi/qmp/qerror.h > index b723830eff..ac727d1c2d 100644 > --- a/include/qapi/qmp/qerror.h > +++ b/include/qapi/qmp/qerror.h > @@ -17,9 +17,6 @@ > * add new ones! > */ > > -#define QERR_INVALID_PARAMETER_VALUE \ > - "Parameter '%s' expects %s" > - > #define QERR_IO_ERROR \ > "An IO error has occurred" > > diff --git a/qapi/opts-visitor.c b/qapi/opts-visitor.c > index 0393704a73..844db583f4 100644 > --- a/qapi/opts-visitor.c > +++ b/qapi/opts-visitor.c > @@ -441,7 +441,7 @@ opts_type_int64(Visitor *v, const char *name, int64_t *obj, Error **errp) > } > } > } > - error_setg(errp, QERR_INVALID_PARAMETER_VALUE, opt->name, > + error_setg(errp, "Parameter '%s' expects %s", opt->name, > (ov->list_mode == LM_NONE) ? "an int64 value" : > "an int64 value or range"); > return false; > @@ -494,7 +494,7 @@ opts_type_uint64(Visitor *v, const char *name, uint64_t *obj, Error **errp) > } > } > } > - error_setg(errp, QERR_INVALID_PARAMETER_VALUE, opt->name, > + error_setg(errp, "Parameter '%s' expects %s", opt->name, > (ov->list_mode == LM_NONE) ? "a uint64 value" : > "a uint64 value or range"); > return false; > diff --git a/qapi/qapi-visit-core.c b/qapi/qapi-visit-core.c > index 6c13510a2b..01793d6e74 100644 > --- a/qapi/qapi-visit-core.c > +++ b/qapi/qapi-visit-core.c > @@ -194,7 +194,7 @@ static bool visit_type_uintN(Visitor *v, uint64_t *obj, const char *name, > } > if (value > max) { > assert(v->type == VISITOR_INPUT); > - error_setg(errp, QERR_INVALID_PARAMETER_VALUE, > + error_setg(errp, "Parameter '%s' expects %s", > name ? name : "null", type); > return false; > } > @@ -262,7 +262,7 @@ static bool visit_type_intN(Visitor *v, int64_t *obj, const char *name, > } > if (value < min || value > max) { > assert(v->type == VISITOR_INPUT); > - error_setg(errp, QERR_INVALID_PARAMETER_VALUE, > + error_setg(errp, "Parameter '%s' expects %s", > name ? name : "null", type); > return false; > } > diff --git a/softmmu/tpm.c b/softmmu/tpm.c > index 578563f05a..8437c4efc3 100644 > --- a/softmmu/tpm.c > +++ b/softmmu/tpm.c > @@ -120,8 +120,7 @@ static int tpm_init_tpmdev(void *dummy, QemuOpts *opts, Error **errp) > i = qapi_enum_parse(&TpmType_lookup, value, -1, NULL); > be = i >= 0 ? tpm_be_find_by_type(i) : NULL; > if (be == NULL) { > - error_report(QERR_INVALID_PARAMETER_VALUE, > - "type", "a TPM backend type"); > + error_report("Parameter 'type' expects a TPM backend type"); > tpm_display_backend_drivers(); > return 1; > }
diff --git a/include/qapi/qmp/qerror.h b/include/qapi/qmp/qerror.h index b723830eff..ac727d1c2d 100644 --- a/include/qapi/qmp/qerror.h +++ b/include/qapi/qmp/qerror.h @@ -17,9 +17,6 @@ * add new ones! */ -#define QERR_INVALID_PARAMETER_VALUE \ - "Parameter '%s' expects %s" - #define QERR_IO_ERROR \ "An IO error has occurred" diff --git a/qapi/opts-visitor.c b/qapi/opts-visitor.c index 0393704a73..844db583f4 100644 --- a/qapi/opts-visitor.c +++ b/qapi/opts-visitor.c @@ -441,7 +441,7 @@ opts_type_int64(Visitor *v, const char *name, int64_t *obj, Error **errp) } } } - error_setg(errp, QERR_INVALID_PARAMETER_VALUE, opt->name, + error_setg(errp, "Parameter '%s' expects %s", opt->name, (ov->list_mode == LM_NONE) ? "an int64 value" : "an int64 value or range"); return false; @@ -494,7 +494,7 @@ opts_type_uint64(Visitor *v, const char *name, uint64_t *obj, Error **errp) } } } - error_setg(errp, QERR_INVALID_PARAMETER_VALUE, opt->name, + error_setg(errp, "Parameter '%s' expects %s", opt->name, (ov->list_mode == LM_NONE) ? "a uint64 value" : "a uint64 value or range"); return false; diff --git a/qapi/qapi-visit-core.c b/qapi/qapi-visit-core.c index 6c13510a2b..01793d6e74 100644 --- a/qapi/qapi-visit-core.c +++ b/qapi/qapi-visit-core.c @@ -194,7 +194,7 @@ static bool visit_type_uintN(Visitor *v, uint64_t *obj, const char *name, } if (value > max) { assert(v->type == VISITOR_INPUT); - error_setg(errp, QERR_INVALID_PARAMETER_VALUE, + error_setg(errp, "Parameter '%s' expects %s", name ? name : "null", type); return false; } @@ -262,7 +262,7 @@ static bool visit_type_intN(Visitor *v, int64_t *obj, const char *name, } if (value < min || value > max) { assert(v->type == VISITOR_INPUT); - error_setg(errp, QERR_INVALID_PARAMETER_VALUE, + error_setg(errp, "Parameter '%s' expects %s", name ? name : "null", type); return false; } diff --git a/softmmu/tpm.c b/softmmu/tpm.c index 578563f05a..8437c4efc3 100644 --- a/softmmu/tpm.c +++ b/softmmu/tpm.c @@ -120,8 +120,7 @@ static int tpm_init_tpmdev(void *dummy, QemuOpts *opts, Error **errp) i = qapi_enum_parse(&TpmType_lookup, value, -1, NULL); be = i >= 0 ? tpm_be_find_by_type(i) : NULL; if (be == NULL) { - error_report(QERR_INVALID_PARAMETER_VALUE, - "type", "a TPM backend type"); + error_report("Parameter 'type' expects a TPM backend type"); tpm_display_backend_drivers(); return 1; }
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! */ Manually modify the error_report() call in softmmu/tpm.c, then use sed to mechanically transform the rest. Finally remove the definition in include/qapi/qmp/qerror.h. Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> --- include/qapi/qmp/qerror.h | 3 --- qapi/opts-visitor.c | 4 ++-- qapi/qapi-visit-core.c | 4 ++-- softmmu/tpm.c | 3 +-- 4 files changed, 5 insertions(+), 9 deletions(-)