Commit 3dc6f869 authored by Alistair Francis's avatar Alistair Francis Committed by Markus Armbruster
Browse files

Convert error_report() to warn_report() 



Convert all uses of error_report("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 these two commands:
    find ./* -type f -exec sed -i \
      's|error_report(".*warning[,:] |warn_report("|Ig' {} +

Indentation fixed up manually 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: default avatarAlistair Francis <alistair.francis@xilinx.com>
Suggested-by: default avatarThomas Huth <thuth@redhat.com>
Cc: Jeff Cody <jcody@redhat.com>
Cc: Kevin Wolf <kwolf@redhat.com>
Cc: Max Reitz <mreitz@redhat.com>
Cc: Ronnie Sahlberg <ronniesahlberg@gmail.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Peter Lieven <pl@kamp.de>
Cc: Josh Durgin <jdurgin@redhat.com>
Cc: "Richard W.M. Jones" <rjones@redhat.com>
Cc: Markus Armbruster <armbru@redhat.com>
Cc: Peter Crosthwaite <crosthwaite.peter@gmail.com>
Cc: Richard Henderson <rth@twiddle.net>
Cc: "Aneesh Kumar K.V" <aneesh.kumar@linux.vnet.ibm.com>
Cc: Greg Kurz <groug@kaod.org>
Cc: Rob Herring <robh@kernel.org>
Cc: Peter Maydell <peter.maydell@linaro.org>
Cc: Peter Chubb <peter.chubb@nicta.com.au>
Cc: Eduardo Habkost <ehabkost@redhat.com>
Cc: Marcel Apfelbaum <marcel@redhat.com>
Cc: "Michael S. Tsirkin" <mst@redhat.com>
Cc: Igor Mammedov <imammedo@redhat.com>
Cc: David Gibson <david@gibson.dropbear.id.au>
Cc: Alexander Graf <agraf@suse.de>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: Jason Wang <jasowang@redhat.com>
Cc: Marcelo Tosatti <mtosatti@redhat.com>
Cc: Christian Borntraeger <borntraeger@de.ibm.com>
Cc: Cornelia Huck <cohuck@redhat.com>
Cc: Stefan Hajnoczi <stefanha@redhat.com>
Acked-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
Acked-by: default avatarGreg Kurz <groug@kaod.org>
Acked-by: default avatarCornelia Huck <cohuck@redhat.com>
Reviewed-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Reviewed by: Peter Chubb <peter.chubb@data61.csiro.au>
Acked-by: default avatarMax Reitz <mreitz@redhat.com>
Acked-by: default avatarMarcel Apfelbaum <marcel@redhat.com>
Message-Id: <e1cfa2cd47087c248dd24caca9c33d9af0c499b0.1499866456.git.alistair.francis@xilinx.com>
Reviewed-by: default avatarMarkus Armbruster <armbru@redhat.com>
Signed-off-by: default avatarMarkus Armbruster <armbru@redhat.com>
parent 97f40301

block/backup.c

+6 −6
Original line number Diff line number Diff line
@@ -639,7 +639,7 @@ BlockJob *backup_job_create(const char *job_id, BlockDriverState *bs, 
    ret = bdrv_get_info(target, &bdi);

    if (ret == -ENOTSUP && !target->backing) {

        /* Cluster size is not defined */

        error_report("WARNING: The target block device doesn't provide "

        warn_report("The target block device doesn't provide "

                    "information about the block size and it doesn't have a "

                    "backing file. The default block size of %u bytes is "

                    "used. If the actual block size of the target exceeds "

block/gluster.c

+1 −2
Original line number Diff line number Diff line
@@ -345,8 +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 "

                     "back to tcp");

        warn_report("rdma feature is not supported, falling back to tcp");

    } else {

        ret = -EINVAL;

        goto out;

block/iscsi.c

+3 −3
Original line number Diff line number Diff line
@@ -1761,7 +1761,7 @@ static int iscsi_open(BlockDriverState *bs, QDict *options, int flags, 
     * filename encoded options */

    filename = qdict_get_try_str(options, "filename");

    if (filename) {

        error_report("Warning: 'filename' option specified. "

        warn_report("'filename' option specified. "

                    "This is an unsupported option, and may be deprecated "

                    "in the future");

        iscsi_parse_filename(filename, options, &local_err);

block/nfs.c

+6 −6
Original line number Diff line number Diff line
@@ -558,8 +558,8 @@ static int64_t nfs_client_open(NFSClient *client, QDict *options, 
        }

        client->readahead = qemu_opt_get_number(opts, "readahead-size", 0);

        if (client->readahead > QEMU_NFS_MAX_READAHEAD_SIZE) {

            error_report("NFS Warning: Truncating NFS readahead "

                         "size to %d", QEMU_NFS_MAX_READAHEAD_SIZE);

            warn_report("Truncating NFS readahead size to %d",

                        QEMU_NFS_MAX_READAHEAD_SIZE);

            client->readahead = QEMU_NFS_MAX_READAHEAD_SIZE;

        }

        nfs_set_readahead(client->context, client->readahead);
@@ -579,8 +579,8 @@ static int64_t nfs_client_open(NFSClient *client, QDict *options, 
        }

        client->pagecache = qemu_opt_get_number(opts, "page-cache-size", 0);

        if (client->pagecache > QEMU_NFS_MAX_PAGECACHE_SIZE) {

            error_report("NFS Warning: Truncating NFS pagecache "

                         "size to %d pages", QEMU_NFS_MAX_PAGECACHE_SIZE);

            warn_report("Truncating NFS pagecache size to %d pages",

                        QEMU_NFS_MAX_PAGECACHE_SIZE);

            client->pagecache = QEMU_NFS_MAX_PAGECACHE_SIZE;

        }

        nfs_set_pagecache(client->context, client->pagecache);
@@ -595,8 +595,8 @@ static int64_t nfs_client_open(NFSClient *client, QDict *options, 
        /* limit the maximum debug level to avoid potential flooding

         * of our log files. */

        if (client->debug > QEMU_NFS_MAX_DEBUG_LEVEL) {

            error_report("NFS Warning: Limiting NFS debug level "

                         "to %d", QEMU_NFS_MAX_DEBUG_LEVEL);

            warn_report("Limiting NFS debug level to %d",

                        QEMU_NFS_MAX_DEBUG_LEVEL);

            client->debug = QEMU_NFS_MAX_DEBUG_LEVEL;

        }

        nfs_set_debug(client->context, client->debug);

block/rbd.c

+3 −3
Original line number Diff line number Diff line
@@ -555,7 +555,7 @@ static int qemu_rbd_open(BlockDriverState *bs, QDict *options, int flags, 
     * filename encoded options */

    filename = qdict_get_try_str(options, "filename");

    if (filename) {

        error_report("Warning: 'filename' option specified. "

        warn_report("'filename' option specified. "

                    "This is an unsupported option, and may be deprecated "

                    "in the future");

        qemu_rbd_parse_filename(filename, options, &local_err);