From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60900) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dhDoG-0002UA-Cr for qemu-devel@nongnu.org; Mon, 14 Aug 2017 07:45:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dhDoC-0000OY-7N for qemu-devel@nongnu.org; Mon, 14 Aug 2017 07:45:28 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44464) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dhDoB-0000NS-U3 for qemu-devel@nongnu.org; Mon, 14 Aug 2017 07:45:24 -0400 From: Markus Armbruster References: <08f16288223244deeccbdc6e4d2fced5d379504d.1501084908.git.alistair.francis@xilinx.com> Date: Mon, 14 Aug 2017 13:45:20 +0200 In-Reply-To: <08f16288223244deeccbdc6e4d2fced5d379504d.1501084908.git.alistair.francis@xilinx.com> (Alistair Francis's message of "Wed, 26 Jul 2017 09:07:52 -0700") Message-ID: <87a832cqzz.fsf@dusky.pond.sub.org> MIME-Version: 1.0 Content-Type: text/plain Subject: Re: [Qemu-devel] [PATCH v1 2/5] Convert remaining error_report() to warn_report() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Alistair Francis Cc: qemu-devel@nongnu.org, alistair23@gmail.com Alistair Francis writes: > 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. > > 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 > --- > > block/qcow2.c | 10 +++++----- > target/s390x/kvm.c | 4 ++-- > trace/control.c | 4 ++-- > 3 files changed, 9 insertions(+), 9 deletions(-) > > diff --git a/block/qcow2.c b/block/qcow2.c > index 90efa4477b..e6c6be0822 100644 > --- a/block/qcow2.c > +++ b/block/qcow2.c > @@ -302,11 +302,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 " > - "file to fix."); > + warn_report("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 " > + "file to fix."); This message is awfully long. What about splitting it while we're there: 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. */ > *need_update_header = true; > diff --git a/target/s390x/kvm.c b/target/s390x/kvm.c > index c4c5791d27..1084923adb 100644 > --- a/target/s390x/kvm.c > +++ b/target/s390x/kvm.c > @@ -222,8 +222,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 to hugetlbfs."); Not a native speaker, but here goes anyway: "compatible with". > return; > } > rc = kvm_vm_ioctl(kvm_state, KVM_SET_DEVICE_ATTR, &attr); > diff --git a/trace/control.c b/trace/control.c > index 82d8989c4d..2769934bec 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); The nits I picked predate your patch, so: Reviewed-by: Markus Armbruster