[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 2/7] Convert remaining error_report() to warn_rep
From: |
Alistair Francis |
Subject: |
[Qemu-devel] [PATCH v3 2/7] Convert remaining error_report() to warn_report() |
Date: |
Fri, 1 Sep 2017 09:51:09 -0700 |
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 <address@hidden>
Cc: Kevin Wolf <address@hidden>
Cc: Max Reitz <address@hidden>
Cc: Christian Borntraeger <address@hidden>
Cc: Cornelia Huck <address@hidden>
Cc: Alexander Graf <address@hidden>
Cc: Richard Henderson <address@hidden>
Cc: Stefan Hajnoczi <address@hidden>
Acked-by: Cornelia Huck <address@hidden>
Reviewed-by: Markus Armbruster <address@hidden>
---
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 40ba26c111..27ce159b10 100644
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -302,10 +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 "
+ 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 c4c5791d27..dca53f544b 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 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 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);
--
2.11.0
- [Qemu-devel] [PATCH v3 0/7] More warning reporting fixed, Alistair Francis, 2017/09/01
- [Qemu-devel] [PATCH v3 1/7] hw/i386: Improve some of the warning messages, Alistair Francis, 2017/09/01
- [Qemu-devel] [PATCH v3 2/7] Convert remaining error_report() to warn_report(),
Alistair Francis <=
- [Qemu-devel] [PATCH v3 3/7] Convert single line fprintf(.../n) to warn_report(), Alistair Francis, 2017/09/01
- [Qemu-devel] [PATCH v3 5/7] General warn report fixups, Alistair Francis, 2017/09/01
- [Qemu-devel] [PATCH v3 6/7] Makefile: Remove libqemustub.a, Alistair Francis, 2017/09/01
- [Qemu-devel] [PATCH v3 7/7] Convert remaining single line fprintf() to warn_report(), Alistair Francis, 2017/09/01
- [Qemu-devel] [PATCH v3 4/7] Convert multi-line fprintf() to warn_report(), Alistair Francis, 2017/09/01