SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tcg: Replace fprintf(stderr, "*\n" with error_report()

Browse Source 
Replace a large number of the fprintf(stderr, "*\n" calls with
error_report(). The functions were renamed with these commands and then
compiler issues where manually fixed.

find ./* -type f -exec sed -i \
    'N;N;N;N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
    {} +
find ./* -type f -exec sed -i \
    'N;N;N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
    {} +
find ./* -type f -exec sed -i \
    'N;N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
    {} +
find ./* -type f -exec sed -i \
    'N;N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
    {} +
find ./* -type f -exec sed -i \
    'N;N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
    {} +
find ./* -type f -exec sed -i \
    'N;N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
    {} +
find ./* -type f -exec sed -i \
    'N;N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
    {} +
find ./* -type f -exec sed -i \
    'N;N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
    {} +
find ./* -type f -exec sed -i \
    'N;N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
    {} +
find ./* -type f -exec sed -i \
    'N;N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
    {} +
find ./* -type f -exec sed -i \
    'N; {s|fprintf(stderr, "\(.*\)\\n"\(.*\));|error_report("\1"\2);|Ig}' \
    {} +

Signed-off-by: Alistair Francis <alistair.francis@xilinx.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Peter Crosthwaite <crosthwaite.peter@gmail.com>
Cc: Richard Henderson <rth@twiddle.net>
Cc: Stefan Weil <sw@weilnetz.de>

Conversions that aren't followed by exit() dropped, because they might
be inappropriate.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20180203084315.20497-14-armbru@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
Alistair Francis 2018-02-03 09:43:14 +01:00 committed by Markus Armbruster
parent 47d17c0ac3
commit 493d89bf74
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cpus.c
View File

@ -259,7 +259,7 @@ int64_t cpu_get_icount_raw(void)
if (cpu && cpu->running) { if (cpu && cpu->running) {
if (!cpu->can_do_io) { if (!cpu->can_do_io) {
fprintf(stderr, "Bad icount read\n"); error_report("Bad icount read");
exit(1); exit(1);
} }
/* Take into account what has run */ /* Take into account what has run */
@ -1181,7 +1181,7 @@ static void *qemu_kvm_cpu_thread_fn(void *arg)
r = kvm_init_vcpu(cpu); r = kvm_init_vcpu(cpu);
if (r < 0) { if (r < 0) {
fprintf(stderr, "kvm_init_vcpu failed: %s\n", strerror(-r)); error_report("kvm_init_vcpu failed: %s", strerror(-r));
exit(1); exit(1);
} }
@ -1211,7 +1211,7 @@ static void *qemu_kvm_cpu_thread_fn(void *arg)
static void *qemu_dummy_cpu_thread_fn(void *arg) static void *qemu_dummy_cpu_thread_fn(void *arg)
{ {
#ifdef _WIN32 #ifdef _WIN32
fprintf(stderr, "qtest is not supported under Windows\n"); error_report("qtest is not supported under Windows");
exit(1); exit(1);
#else #else
CPUState *cpu = arg; CPUState *cpu = arg;
@ -1631,8 +1631,8 @@ static void qemu_cpu_kick_thread(CPUState *cpu)
#else /* _WIN32 */ #else /* _WIN32 */
if (!qemu_cpu_is_self(cpu)) { if (!qemu_cpu_is_self(cpu)) {
if (!QueueUserAPC(dummy_apc_func, cpu->hThread, 0)) { if (!QueueUserAPC(dummy_apc_func, cpu->hThread, 0)) {
fprintf(stderr, "%s: QueueUserAPC failed with error %lu\n", error_report("%s: QueueUserAPC failed with error %lu", __func__,
__func__, GetLastError()); GetLastError());
exit(1); exit(1);
} }
} }

6
exec.c
View File

@ -2216,9 +2216,9 @@ void qemu_ram_remap(ram_addr_t addr, ram_addr_t length)
flags, -1, 0); flags, -1, 0);
} }
if (area != vaddr) { if (area != vaddr) {
fprintf(stderr, "Could not remap addr: " error_report("Could not remap addr: "
RAM_ADDR_FMT "@" RAM_ADDR_FMT "\n", RAM_ADDR_FMT "@" RAM_ADDR_FMT "",
length, addr); length, addr);
exit(1); exit(1);
} }
memory_try_enable_merging(vaddr, length); memory_try_enable_merging(vaddr, length);

2
vl.c
View File

@ -2172,7 +2172,7 @@ static DisplayType select_display(const char *p)
display_opengl = 1; display_opengl = 1;
display = DT_EGL; display = DT_EGL;
#else #else
fprintf(stderr, "egl support is disabled\n"); error_report("egl support is disabled");
exit(1); exit(1);
#endif #endif
} else if (strstart(p, "curses", &opts)) { } else if (strstart(p, "curses", &opts)) {