From 3dc6f8693694a649a9c83f1e2746565b47683923 Mon Sep 17 00:00:00 2001 From: Alistair Francis Date: Wed, 12 Jul 2017 06:57:41 -0700 Subject: 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: Alistair Francis Suggested-by: Thomas Huth Cc: Jeff Cody Cc: Kevin Wolf Cc: Max Reitz Cc: Ronnie Sahlberg Cc: Paolo Bonzini Cc: Peter Lieven Cc: Josh Durgin Cc: "Richard W.M. Jones" Cc: Markus Armbruster Cc: Peter Crosthwaite Cc: Richard Henderson Cc: "Aneesh Kumar K.V" Cc: Greg Kurz Cc: Rob Herring Cc: Peter Maydell Cc: Peter Chubb Cc: Eduardo Habkost Cc: Marcel Apfelbaum Cc: "Michael S. Tsirkin" Cc: Igor Mammedov Cc: David Gibson Cc: Alexander Graf Cc: Gerd Hoffmann Cc: Jason Wang Cc: Marcelo Tosatti Cc: Christian Borntraeger Cc: Cornelia Huck Cc: Stefan Hajnoczi Acked-by: David Gibson Acked-by: Greg Kurz Acked-by: Cornelia Huck Reviewed-by: Stefan Hajnoczi Reviewed by: Peter Chubb Acked-by: Max Reitz Acked-by: Marcel Apfelbaum Message-Id: Reviewed-by: Markus Armbruster Signed-off-by: Markus Armbruster --- block/backup.c | 12 ++++++------ block/gluster.c | 3 +-- block/iscsi.c | 6 +++--- block/nfs.c | 12 ++++++------ block/rbd.c | 6 +++--- block/ssh.c | 4 ++-- 6 files changed, 21 insertions(+), 22 deletions(-) (limited to 'block') diff --git a/block/backup.c b/block/backup.c index b69184eac5..504a089150 100644 --- a/block/backup.c +++ b/block/backup.c @@ -639,12 +639,12 @@ 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 " - "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 " - "this default, the backup may be unusable", - BACKUP_CLUSTER_SIZE_DEFAULT); + 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 " + "this default, the backup may be unusable", + BACKUP_CLUSTER_SIZE_DEFAULT); job->cluster_size = BACKUP_CLUSTER_SIZE_DEFAULT; } else if (ret < 0 && !target->backing) { error_setg_errno(errp, -ret, diff --git a/block/gluster.c b/block/gluster.c index addceed6eb..c2a524140d 100644 --- a/block/gluster.c +++ b/block/gluster.c @@ -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; diff --git a/block/iscsi.c b/block/iscsi.c index 54067e2620..3aa438a0b7 100644 --- a/block/iscsi.c +++ b/block/iscsi.c @@ -1761,9 +1761,9 @@ 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. " - "This is an unsupported option, and may be deprecated " - "in the future"); + warn_report("'filename' option specified. " + "This is an unsupported option, and may be deprecated " + "in the future"); iscsi_parse_filename(filename, options, &local_err); if (local_err) { ret = -EINVAL; diff --git a/block/nfs.c b/block/nfs.c index c3c5de0113..5e985282f4 100644 --- a/block/nfs.c +++ b/block/nfs.c @@ -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); diff --git a/block/rbd.c b/block/rbd.c index 9da02cdceb..d461f7dc87 100644 --- a/block/rbd.c +++ b/block/rbd.c @@ -555,9 +555,9 @@ 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. " - "This is an unsupported option, and may be deprecated " - "in the future"); + 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); if (local_err) { r = -EINVAL; diff --git a/block/ssh.c b/block/ssh.c index 52964416da..07a57eb466 100644 --- a/block/ssh.c +++ b/block/ssh.c @@ -1114,8 +1114,8 @@ static coroutine_fn int ssh_co_writev(BlockDriverState *bs, static void unsafe_flush_warning(BDRVSSHState *s, const char *what) { if (!s->unsafe_flush_warning) { - error_report("warning: ssh server %s does not support fsync", - s->inet->host); + warn_report("ssh server %s does not support fsync", + s->inet->host); if (what) { error_report("to support fsync, you need %s", what); } -- cgit v1.2.3