On Wed, 26 Jul 2017 09:07:57 -0700
Alistair Francis <[email protected]> wrote:
> Convert all the multi-line uses of fprintf(stderr, "warning:"..."\n"...
> 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 these commands:
> find ./* -type f -exec sed -i \
> 'N; {s|fprintf(.*".*warning[,:]
> \(.*\)\\n"\(.*\));|warn_report("\1"\2);|Ig}' \
> {} +
> find ./* -type f -exec sed -i \
> 'N;N; {s|fprintf(.*".*warning[,:]
> \(.*\)\\n"\(.*\));|warn_report("\1"\2);|Ig}' \
> {} +
> find ./* -type f -exec sed -i \
> 'N;N;N; {s|fprintf(.*".*warning[,:]
> \(.*\)\\n"\(.*\));|warn_report("\1"\2);|Ig}' \
> {} +
> find ./* -type f -exec sed -i \
> 'N;N;N;N {s|fprintf(.*".*warning[,:]
> \(.*\)\\n"\(.*\));|warn_report("\1"\2);|Ig}' \
> {} +
> find ./* -type f -exec sed -i \
> 'N;N;N;N;N {s|fprintf(.*".*warning[,:]
> \(.*\)\\n"\(.*\));|warn_report("\1"\2);|Ig}' \
> {} +
> find ./* -type f -exec sed -i \
> 'N;N;N;N;N;N {s|fprintf(.*".*warning[,:]
> \(.*\)\\n"\(.*\));|warn_report("\1"\2);|Ig}' \
> {} +
> find ./* -type f -exec sed -i \
> 'N;N;N;N;N;N;N; {s|fprintf(.*".*warning[,:]
> \(.*\)\\n"\(.*\));|warn_report("\1"\2);|Ig}' \
> {} +
>
> Indentation fixed up manually afterwards.
>
> Some of the lines were manually edited to reduce the line length to below
> 80 charecters. Some of the lines with newlines in the middle of the
> string were also manually edit to avoid checkpatch errrors.
>
> The #include lines were manually updated to allow the code to compile.
>
> Signed-off-by: Alistair Francis <[email protected]>
> Cc: Paolo Bonzini <[email protected]>
> Cc: Kevin Wolf <[email protected]>
> Cc: Max Reitz <[email protected]>
> Cc: "Michael S. Tsirkin" <[email protected]>
> Cc: Igor Mammedov <[email protected]>
> Cc: Peter Maydell <[email protected]>
> Cc: Stefano Stabellini <[email protected]>
> Cc: Anthony Perard <[email protected]>
> Cc: Richard Henderson <[email protected]>
> Cc: Eduardo Habkost <[email protected]>
> Cc: Aurelien Jarno <[email protected]>
> Cc: Yongbok Kim <[email protected]>
> Cc: Cornelia Huck <[email protected]>
> Cc: Christian Borntraeger <[email protected]>
> Cc: Alexander Graf <[email protected]>
> Cc: Jason Wang <[email protected]>
> Cc: David Gibson <[email protected]>
> Cc: Gerd Hoffmann <[email protected]>
> ---
> I couldn't figure out any nice way (it is possible with some more logic
> inside the sed apparently) to do this is one command, so I had to use
> all of the commands above.
>
> accel/kvm/kvm-all.c | 7 +++----
> block/vvfat.c | 4 ++--
> hw/acpi/core.c | 7 +++----
> hw/arm/vexpress.c | 4 ++--
> hw/i386/xen/xen-mapcache.c | 4 ++--
> hw/mips/mips_malta.c | 4 ++--
> hw/mips/mips_r4k.c | 7 ++++---
> hw/s390x/s390-virtio.c | 16 ++++++++--------
> net/hub.c | 9 ++++-----
> net/net.c | 14 +++++++-------
> target/i386/cpu.c | 12 ++++++------
> target/i386/hax-mem.c | 6 +++---
> target/ppc/translate_init.c | 18 +++++++++---------
> ui/keymaps.c | 9 +++++----
> util/main-loop.c | 6 +++---
> 15 files changed, 63 insertions(+), 64 deletions(-)
>
> diff --git a/block/vvfat.c b/block/vvfat.c
> index d682f0a9dc..04801f3136 100644
> --- a/block/vvfat.c
> +++ b/block/vvfat.c
> @@ -1227,8 +1227,8 @@ static int vvfat_open(BlockDriverState *bs, QDict
> *options, int flags,
>
> switch (s->fat_type) {
> case 32:
> - fprintf(stderr, "Big fat greek warning: FAT32 has not been
> tested. "
> - "You are welcome to do so!\n");
Kind of sad to see this one go...
> + warn_report("FAT32 has not been tested. "
> + "You are welcome to do so!");
> break;
> case 16:
> case 12:
> diff --git a/hw/s390x/s390-virtio.c b/hw/s390x/s390-virtio.c
> index afa4148e6b..964df517b4 100644
> --- a/hw/s390x/s390-virtio.c
> +++ b/hw/s390x/s390-virtio.c
> @@ -146,9 +146,9 @@ void gtod_save(QEMUFile *f, void *opaque)
>
> r = s390_get_clock(&tod_high, &tod_low);
> if (r) {
> - fprintf(stderr, "WARNING: Unable to get guest clock for migration. "
> - "Error code %d. Guest clock will not be migrated "
> - "which could cause the guest to hang.\n", r);
> + warn_report("Unable to get guest clock for migration. "
> + "Error code %d. Guest clock will not be migrated "
> + "which could cause the guest to hang.", r);
> qemu_put_byte(f, S390_TOD_CLOCK_VALUE_MISSING);
> return;
> }
> @@ -165,8 +165,8 @@ int gtod_load(QEMUFile *f, void *opaque, int version_id)
> int r;
>
> if (qemu_get_byte(f) == S390_TOD_CLOCK_VALUE_MISSING) {
> - fprintf(stderr, "WARNING: Guest clock was not migrated. This could "
> - "cause the guest to hang.\n");
> + warn_report("Guest clock was not migrated. This could "
> + "cause the guest to hang.");
> return 0;
> }
>
> @@ -175,9 +175,9 @@ int gtod_load(QEMUFile *f, void *opaque, int version_id)
>
> r = s390_set_clock(&tod_high, &tod_low);
> if (r) {
> - fprintf(stderr, "WARNING: Unable to set guest clock value. "
> - "s390_get_clock returned error %d. This could cause "
> - "the guest to hang.\n", r);
> + warn_report("Unable to set guest clock value. "
> + "s390_get_clock returned error %d. This could cause "
> + "the guest to hang.", r);
> }
>
> return 0;
s390x part:
Acked-by: Cornelia Huck <[email protected]>
