On 2017-07-08 01:21, Alistair Francis wrote:
> Convert all uses of error_report("[Ww]arning:"... 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|error_report.*[Ww]arning: |warn_report("|g' {} +
>
> Then the white space changes where manually fixed afterwards.
>
> The test-qdev-global-props test case was manually updated to ensure that
> this patch passes make check (as the test cases are case sensitive).
>
> Signed-off-by: Alistair Francis <alistair.fran...@xilinx.com>
> Suggested-by: Thomas Huth <th...@redhat.com>
> Cc: Jeff Cody <jc...@redhat.com>
> Cc: Kevin Wolf <kw...@redhat.com>
> Cc: Max Reitz <mre...@redhat.com>
> Cc: Ronnie Sahlberg <ronniesahlb...@gmail.com>
> Cc: Paolo Bonzini <pbonz...@redhat.com>
> Cc: Peter Lieven <p...@kamp.de>
> Cc: Josh Durgin <jdur...@redhat.com>
> Cc: "Richard W.M. Jones" <rjo...@redhat.com>
> Cc: Markus Armbruster <arm...@redhat.com>
> Cc: Peter Crosthwaite <crosthwaite.pe...@gmail.com>
> Cc: Richard Henderson <r...@twiddle.net>
> Cc: "Aneesh Kumar K.V" <aneesh.ku...@linux.vnet.ibm.com>
> Cc: Greg Kurz <gr...@kaod.org>
> Cc: Rob Herring <r...@kernel.org>
> Cc: Peter Maydell <peter.mayd...@linaro.org>
> Cc: Peter Chubb <peter.ch...@nicta.com.au>
> Cc: Eduardo Habkost <ehabk...@redhat.com>
> Cc: Marcel Apfelbaum <mar...@redhat.com>
> Cc: "Michael S. Tsirkin" <m...@redhat.com>
> Cc: Igor Mammedov <imamm...@redhat.com>
> Cc: David Gibson <da...@gibson.dropbear.id.au>
> Cc: Alexander Graf <ag...@suse.de>
> Cc: Gerd Hoffmann <kra...@redhat.com>
> Cc: Jason Wang <jasow...@redhat.com>
> Cc: Marcelo Tosatti <mtosa...@redhat.com>
> Cc: Christian Borntraeger <borntrae...@de.ibm.com>
> Cc: Cornelia Huck <coh...@redhat.com>
> Cc: Stefan Hajnoczi <stefa...@redhat.com>
> Acked-by: David Gibson <da...@gibson.dropbear.id.au>
> Acked-by: Greg Kurz <gr...@kaod.org>
> Acked-by: Cornelia Huck <coh...@redhat.com>
> Reviewed-by: Stefan Hajnoczi <stefa...@redhat.com>
> ---
> V2:
> - Fix quotation issues
> - Update commit message
> - Include full command
>
> block/backup.c | 10 +++++-----
> block/gluster.c | 2 +-
> block/iscsi.c | 6 +++---
> block/nfs.c | 12 ++++++------
> block/rbd.c | 6 +++---
> block/ssh.c | 4 ++--
> blockdev.c | 2 +-
> cpus.c | 2 +-
> hw/9pfs/9p.c | 2 +-
> hw/arm/highbank.c | 6 +++---
> hw/arm/imx25_pdk.c | 6 +++---
> hw/arm/kzm.c | 6 +++---
> hw/core/machine.c | 10 +++++-----
> hw/core/qdev-properties.c | 8 ++++----
> hw/i386/acpi-build.c | 10 +++++-----
> hw/i386/kvm/pci-assign.c | 6 +++---
> hw/i386/pc.c | 12 ++++++------
> hw/i386/pc_piix.c | 8 ++++----
> hw/i386/pc_q35.c | 6 +++---
> hw/misc/aspeed_sdmc.c | 8 ++++----
> hw/nvram/fw_cfg.c | 2 +-
> hw/pci-host/piix.c | 2 +-
> hw/ppc/pnv.c | 6 +++---
> hw/ppc/spapr.c | 4 ++--
> hw/ppc/spapr_iommu.c | 2 +-
> hw/scsi/scsi-bus.c | 6 +++---
> hw/usb/dev-smartcard-reader.c | 6 +++---
> hw/usb/redirect.c | 2 +-
> net/tap-linux.c | 2 +-
> target/i386/cpu.c | 22 +++++++++++-----------
> target/i386/kvm.c | 12 ++++++------
> target/s390x/cpu_models.c | 6 +++---
> target/s390x/kvm.c | 4 ++--
> tests/test-qdev-global-props.c | 6 +++---
> trace/control.c | 8 ++++----
> vl.c | 20 ++++++++++----------
> 36 files changed, 121 insertions(+), 121 deletions(-)
[...]
> diff --git a/block/gluster.c b/block/gluster.c
> index addceed6eb..531e72df56 100644
> --- a/block/gluster.c
> +++ b/block/gluster.c
> @@ -345,7 +345,7 @@ static int qemu_gluster_parse_uri(BlockdevOptionsGluster
> *gconf,
> is_unix = true;
> } else if (!strcmp(uri->scheme, "gluster+rdma")) {
> gsconf->type = SOCKET_ADDRESS_TYPE_INET;
> - error_report("Warning: rdma feature is not supported, falling "
> + warn_report("rdma feature is not supported, falling "
> "back to tcp");
You reindented consecutive lines everywhere else, so you may want to do
that here, too.
With that fixed (or even without, as evidently the alignment for
error_report() wasn't quite right all the time either), for block*:
Acked-by: Max Reitz <mre...@redhat.com>
> } else {
> ret = -EINVAL;
signature.asc
Description: OpenPGP digital signature
