Alistair Francis <alistair.fran...@xilinx.com> writes:
> Convert any remaining uses of fprintf(stderr, "warning:"...
> to use warn_report() instead. This helps standardise on a single
> method of printing warnings to the user.
>
> All of the warnings were changed using this command:
> find ./* -type f -exec sed -i 's|fprintf(.*".*warning[,:]
> |warn_report("|Ig' {} +
>
> The #include line and the chagne to the test Makefile were manually
s/chagne/change/
> updated to allow the code to compile.
>
> Signed-off-by: Alistair Francis <alistair.fran...@xilinx.com>
> Reviewed-by: Philippe Mathieu-Daudé <f4...@amsat.org>
> ---
>
> This pattern matches any case of fprintf(stderr, "warning:"... and is
> the most open pattern match in the series.
>
>
> tests/Makefile.include | 2 +-
> util/cutils.c | 3 ++-
> 2 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/tests/Makefile.include b/tests/Makefile.include
> index 80527a8763..91d5a4544f 100644
> --- a/tests/Makefile.include
> +++ b/tests/Makefile.include
> @@ -584,7 +584,7 @@ tests/test-iov$(EXESUF): tests/test-iov.o
> $(test-util-obj-y)
> tests/test-hbitmap$(EXESUF): tests/test-hbitmap.o $(test-util-obj-y)
> $(test-crypto-obj-y)
> tests/test-x86-cpuid$(EXESUF): tests/test-x86-cpuid.o
> tests/test-xbzrle$(EXESUF): tests/test-xbzrle.o migration/xbzrle.o
> migration/page_cache.o $(test-util-obj-y)
> -tests/test-cutils$(EXESUF): tests/test-cutils.o util/cutils.o
> +tests/test-cutils$(EXESUF): tests/test-cutils.o util/cutils.o
> $(test-util-obj-y)
> tests/test-int128$(EXESUF): tests/test-int128.o
> tests/rcutorture$(EXESUF): tests/rcutorture.o $(test-util-obj-y)
> tests/test-rcu-list$(EXESUF): tests/test-rcu-list.o $(test-util-obj-y)
> diff --git a/util/cutils.c b/util/cutils.c
> index 1534682083..b33ede83d1 100644
> --- a/util/cutils.c
> +++ b/util/cutils.c
> @@ -30,6 +30,7 @@
> #include "qemu/iov.h"
> #include "net/net.h"
> #include "qemu/cutils.h"
> +#include "qemu/error-report.h"
>
> void strpadcpy(char *buf, int buf_size, const char *str, char pad)
> {
> @@ -601,7 +602,7 @@ int parse_debug_env(const char *name, int max, int
> initial)
> return initial;
> }
> if (debug < 0 || debug > max || errno != 0) {
> - fprintf(stderr, "warning: %s not in [0, %d]", name, max);
> + warn_report("%s not in [0, %d]", name, max);
> return initial;
> }
> return debug;
Just one? That's a bit of an anti-climax after the commit message :)
I don't understand why this can't be in PATCH 3 (of course PATCH 6 has
to go before 3 then). Not important.
With the commit message typo fixed:
Reviewed-by: Markus Armbruster <arm...@redhat.com>
