From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60147) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1duHfa-0004Mr-TI for qemu-devel@nongnu.org; Tue, 19 Sep 2017 08:30:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1duHfS-0005aw-HY for qemu-devel@nongnu.org; Tue, 19 Sep 2017 08:30:26 -0400 Received: from mail-wm0-x242.google.com ([2a00:1450:400c:c09::242]:33580) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1duHfS-0005aW-Ai for qemu-devel@nongnu.org; Tue, 19 Sep 2017 08:30:22 -0400 Received: by mail-wm0-x242.google.com with SMTP id m127so3757436wmm.0 for ; Tue, 19 Sep 2017 05:30:22 -0700 (PDT) Sender: Paolo Bonzini From: Paolo Bonzini Date: Tue, 19 Sep 2017 14:29:23 +0200 Message-Id: <1505824179-21541-35-git-send-email-pbonzini@redhat.com> In-Reply-To: <1505824179-21541-1-git-send-email-pbonzini@redhat.com> References: <1505824179-21541-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PULL 34/50] Convert remaining error_report() to warn_report() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Alistair Francis , Kevin Wolf , Max Reitz , Christian Borntraeger , Cornelia Huck , Alexander Graf , Richard Henderson , Stefan Hajnoczi From: Alistair Francis In a previous patch (3dc6f8693694a649a9c83f1e2746565b47683923) we converted uses of error_report("warning:"... to use warn_report() instead. This was to help standardise on a single method of printing warnings to the user. There appears to have been some cases that slipped through in patch sets applied around the same time, this patch catches the few remaining cases. All of the warnings were changed using this command: find ./* -type f -exec sed -i \ 's|error_report(".*warning[,:] |warn_report("|Ig' {} + Indentation fixed up manually afterwards. Two messages were manually fixed up as well. Signed-off-by: Alistair Francis Cc: Kevin Wolf Cc: Max Reitz Cc: Christian Borntraeger Cc: Cornelia Huck Cc: Alexander Graf Cc: Richard Henderson Cc: Stefan Hajnoczi Acked-by: Cornelia Huck Reviewed-by: Markus Armbruster Message-Id: Signed-off-by: Paolo Bonzini --- block/qcow2.c | 9 +++++---- target/s390x/kvm.c | 4 ++-- trace/control.c | 4 ++-- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/block/qcow2.c b/block/qcow2.c index bae5893..d33fb3e 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -301,10 +301,11 @@ static int qcow2_read_extensions(BlockDriverState *bs, uint64_t start_offset, } if (!(s->autoclear_features & QCOW2_AUTOCLEAR_BITMAPS)) { - error_report("WARNING: a program lacking bitmap support " - "modified this file, so all bitmaps are now " - "considered inconsistent. Some clusters may be " - "leaked, run 'qemu-img check -r' on the image " + warn_report("a program lacking bitmap support " + "modified this file, so all bitmaps are now " + "considered inconsistent"); + error_printf("Some clusters may be leaked, " + "run 'qemu-img check -r' on the image " "file to fix."); if (need_update_header != NULL) { /* Updating is needed to drop invalid bitmap extension. */ diff --git a/target/s390x/kvm.c b/target/s390x/kvm.c index d07763f..ad7ce9f 100644 --- a/target/s390x/kvm.c +++ b/target/s390x/kvm.c @@ -224,8 +224,8 @@ static void kvm_s390_enable_cmma(void) }; if (mem_path) { - error_report("Warning: CMM will not be enabled because it is not " - "compatible to hugetlbfs."); + warn_report("CMM will not be enabled because it is not " + "compatible with hugetlbfs."); return; } rc = kvm_vm_ioctl(kvm_state, KVM_SET_DEVICE_ATTR, &attr); diff --git a/trace/control.c b/trace/control.c index 82d8989..2769934 100644 --- a/trace/control.c +++ b/trace/control.c @@ -72,8 +72,8 @@ void trace_event_register_group(TraceEvent **events) if (likely(next_vcpu_id < CPU_TRACE_DSTATE_MAX_EVENTS)) { events[i]->vcpu_id = next_vcpu_id++; } else { - error_report("WARNING: too many vcpu trace events; dropping '%s'", - events[i]->name); + warn_report("too many vcpu trace events; dropping '%s'", + events[i]->name); } } event_groups = g_renew(TraceEventGroup, event_groups, nevent_groups + 1); -- 1.8.3.1