From db5d39f7866d3b02e06b91b0404061a4da00cd6c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andreas=20F=C3=A4rber?= Date: Mon, 3 Mar 2014 23:47:54 +0100 Subject: [PATCH] target-sparc: Use error_report() for CPU error reporting MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Replace non-debug fprintf() with error_report(). Tested-by: Mark Cave-Ayland Signed-off-by: Andreas Färber --- target-sparc/cpu.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/target-sparc/cpu.c b/target-sparc/cpu.c index 6cf7e371f0..9870991512 100644 --- a/target-sparc/cpu.c +++ b/target-sparc/cpu.c @@ -18,6 +18,7 @@ */ #include "cpu.h" +#include "qemu/error-report.h" //#define DEBUG_FEATURES @@ -506,7 +507,7 @@ static void add_flagname_to_bitmaps(const char *flagname, uint32_t *features) return; } } - fprintf(stderr, "CPU feature %s not found\n", flagname); + error_report("CPU feature %s not found", flagname); } static int cpu_sparc_find_by_name(sparc_def_t *cpu_def, const char *cpu_model) @@ -545,7 +546,7 @@ static int cpu_sparc_find_by_name(sparc_def_t *cpu_def, const char *cpu_model) iu_version = strtoll(val, &err, 0); if (!*val || *err) { - fprintf(stderr, "bad numerical value %s\n", val); + error_report("bad numerical value %s", val); goto error; } cpu_def->iu_version = iu_version; @@ -557,7 +558,7 @@ static int cpu_sparc_find_by_name(sparc_def_t *cpu_def, const char *cpu_model) fpu_version = strtol(val, &err, 0); if (!*val || *err) { - fprintf(stderr, "bad numerical value %s\n", val); + error_report("bad numerical value %s", val); goto error; } cpu_def->fpu_version = fpu_version; @@ -569,7 +570,7 @@ static int cpu_sparc_find_by_name(sparc_def_t *cpu_def, const char *cpu_model) mmu_version = strtol(val, &err, 0); if (!*val || *err) { - fprintf(stderr, "bad numerical value %s\n", val); + error_report("bad numerical value %s", val); goto error; } cpu_def->mmu_version = mmu_version; @@ -582,7 +583,7 @@ static int cpu_sparc_find_by_name(sparc_def_t *cpu_def, const char *cpu_model) nwindows = strtol(val, &err, 0); if (!*val || *err || nwindows > MAX_NWINDOWS || nwindows < MIN_NWINDOWS) { - fprintf(stderr, "bad numerical value %s\n", val); + error_report("bad numerical value %s", val); goto error; } cpu_def->nwindows = nwindows; @@ -590,12 +591,12 @@ static int cpu_sparc_find_by_name(sparc_def_t *cpu_def, const char *cpu_model) fprintf(stderr, "nwindows %d\n", nwindows); #endif } else { - fprintf(stderr, "unrecognized feature %s\n", featurestr); + error_report("unrecognized feature %s", featurestr); goto error; } } else { - fprintf(stderr, "feature string `%s' not in format " - "(+feature|-feature|feature=xyz)\n", featurestr); + error_report("feature string `%s' not in format " + "(+feature|-feature|feature=xyz)", featurestr); goto error; } featurestr = strtok(NULL, ","); -- 2.11.4.GIT