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 --- target/i386/cpu.c | 22 +++++++++++----------- target/i386/kvm.c | 12 ++++++------ 2 files changed, 17 insertions(+), 17 deletions(-) (limited to 'target/i386') diff --git a/target/i386/cpu.c b/target/i386/cpu.c index c57177278b..da942d91c7 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -2060,15 +2060,15 @@ static void x86_cpu_parse_featurestr(const char *typename, char *features, name = featurestr; if (g_list_find_custom(plus_features, name, compare_string)) { - error_report("warning: Ambiguous CPU model string. " - "Don't mix both \"+%s\" and \"%s=%s\"", - name, name, val); + warn_report("Ambiguous CPU model string. " + "Don't mix both \"+%s\" and \"%s=%s\"", + name, name, val); ambiguous = true; } if (g_list_find_custom(minus_features, name, compare_string)) { - error_report("warning: Ambiguous CPU model string. " - "Don't mix both \"-%s\" and \"%s=%s\"", - name, name, val); + warn_report("Ambiguous CPU model string. " + "Don't mix both \"-%s\" and \"%s=%s\"", + name, name, val); ambiguous = true; } @@ -2096,8 +2096,8 @@ static void x86_cpu_parse_featurestr(const char *typename, char *features, } if (ambiguous) { - error_report("warning: Compatibility of ambiguous CPU model " - "strings won't be kept on future QEMU versions"); + warn_report("Compatibility of ambiguous CPU model " + "strings won't be kept on future QEMU versions"); } } @@ -3547,9 +3547,9 @@ static void x86_cpu_realizefn(DeviceState *dev, Error **errp) */ if (cpu->phys_bits != host_phys_bits && cpu->phys_bits != 0 && !warned) { - error_report("Warning: Host physical bits (%u)" - " does not match phys-bits property (%u)", - host_phys_bits, cpu->phys_bits); + warn_report("Host physical bits (%u)" + " does not match phys-bits property (%u)", + host_phys_bits, cpu->phys_bits); warned = true; } diff --git a/target/i386/kvm.c b/target/i386/kvm.c index f84a49d366..a6613e19f2 100644 --- a/target/i386/kvm.c +++ b/target/i386/kvm.c @@ -600,10 +600,10 @@ static int kvm_arch_set_tsc_khz(CPUState *cs) kvm_vcpu_ioctl(cs, KVM_GET_TSC_KHZ) : -ENOTSUP; if (cur_freq <= 0 || cur_freq != env->tsc_khz) { - error_report("warning: TSC frequency mismatch between " - "VM (%" PRId64 " kHz) and host (%d kHz), " - "and TSC scaling unavailable", - env->tsc_khz, cur_freq); + warn_report("TSC frequency mismatch between " + "VM (%" PRId64 " kHz) and host (%d kHz), " + "and TSC scaling unavailable", + env->tsc_khz, cur_freq); return r; } } @@ -919,8 +919,8 @@ int kvm_arch_init_vcpu(CPUState *cs) error_report("kvm: LMCE not supported"); return -ENOTSUP; } - error_report("warning: Unsupported MCG_CAP bits: 0x%" PRIx64, - unsupported_caps); + warn_report("Unsupported MCG_CAP bits: 0x%" PRIx64, + unsupported_caps); } env->mcg_cap &= mcg_cap | MCG_CAP_BANKS_MASK; -- cgit v1.2.3