mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "bsd-user: replace fprintf(stderr, ...) with error_report()"

Browse Source 
This reverts commit 1fba509527.

That commit converted various fprintf(stderr, ...) calls to
use error_report(); however none of these bsd-user files include
a header which gives a prototype for error_report, so this
causes compiler warnings. Since these are just straightforward
reporting of command line errors, we should handle these in the
obvious way by printing to stderr, as we do for linux-user.
There's no need to drag in the error-handling framework for this,
especially since user-mode doesn't have the "maybe we need to
send this to the monitor" issues system emulation does.

Acked-by: Michael Tokarev <mjt@tls.msk.ru>
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2014-06-02 13:24:37 +01:00
parent d7d3d6092c
commit 9bb931802e
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bsd-user/bsdload.c
View File

@ -183,7 +183,7 @@ int loader_exec(const char * filename, char ** argv, char ** envp,
&& bprm.buf[3] == 'F') { && bprm.buf[3] == 'F') {
retval = load_elf_binary(&bprm,regs,infop); retval = load_elf_binary(&bprm,regs,infop);
} else { } else {
error_report("Unknown binary format"); fprintf(stderr, "Unknown binary format\n");
return -1; return -1;
} }
} }

2
bsd-user/elfload.c
View File

@ -628,7 +628,7 @@ static abi_ulong copy_elf_strings(int argc,char ** argv, void **page,
while (argc-- > 0) { while (argc-- > 0) {
tmp = argv[argc]; tmp = argv[argc];
if (!tmp) { if (!tmp) {
error_report("VFS: argc is wrong"); fprintf(stderr, "VFS: argc is wrong");
exit(-1); exit(-1);
} }
tmp1 = tmp; tmp1 = tmp;

14
bsd-user/main.c
View File

@ -378,8 +378,8 @@ void cpu_loop(CPUX86State *env)
#endif #endif
default: default:
pc = env->segs[R_CS].base + env->eip; pc = env->segs[R_CS].base + env->eip;
error_report("qemu: 0x%08lx: unhandled CPU exception 0x%x" fprintf(stderr, "qemu: 0x%08lx: unhandled CPU exception 0x%x - aborting\n",
" - aborting", (long)pc, trapnr); (long)pc, trapnr);
abort(); abort();
} }
process_pending_signals(env); process_pending_signals(env);
@ -752,7 +752,7 @@ int main(int argc, char **argv)
module_call_init(MODULE_INIT_QOM); module_call_init(MODULE_INIT_QOM);
if ((envlist = envlist_create()) == NULL) { if ((envlist = envlist_create()) == NULL) {
error_report("Unable to allocate envlist"); (void) fprintf(stderr, "Unable to allocate envlist\n");
exit(1); exit(1);
} }
@ -794,7 +794,7 @@ int main(int argc, char **argv)
} else if (!strcmp(r, "ignore-environment")) { } else if (!strcmp(r, "ignore-environment")) {
envlist_free(envlist); envlist_free(envlist);
if ((envlist = envlist_create()) == NULL) { if ((envlist = envlist_create()) == NULL) {
error_report("Unable to allocate envlist"); (void) fprintf(stderr, "Unable to allocate envlist\n");
exit(1); exit(1);
} }
} else if (!strcmp(r, "U")) { } else if (!strcmp(r, "U")) {
@ -816,7 +816,7 @@ int main(int argc, char **argv)
qemu_host_page_size = atoi(argv[optind++]); qemu_host_page_size = atoi(argv[optind++]);
if (qemu_host_page_size == 0 || if (qemu_host_page_size == 0 ||
(qemu_host_page_size & (qemu_host_page_size - 1)) != 0) { (qemu_host_page_size & (qemu_host_page_size - 1)) != 0) {
error_report("page size must be a power of two"); fprintf(stderr, "page size must be a power of two\n");
exit(1); exit(1);
} }
} else if (!strcmp(r, "g")) { } else if (!strcmp(r, "g")) {
@ -910,7 +910,7 @@ int main(int argc, char **argv)
qemu_host_page_size */ qemu_host_page_size */
env = cpu_init(cpu_model); env = cpu_init(cpu_model);
if (!env) { if (!env) {
error_report("Unable to find CPU definition"); fprintf(stderr, "Unable to find CPU definition\n");
exit(1); exit(1);
} }
cpu = ENV_GET_CPU(env); cpu = ENV_GET_CPU(env);
@ -1012,7 +1012,7 @@ int main(int argc, char **argv)
#ifndef TARGET_ABI32 #ifndef TARGET_ABI32
/* enable 64 bit mode if possible */ /* enable 64 bit mode if possible */
if (!(env->features[FEAT_8000_0001_EDX] & CPUID_EXT2_LM)) { if (!(env->features[FEAT_8000_0001_EDX] & CPUID_EXT2_LM)) {
error_report("The selected x86 CPU does not support 64 bit mode"); fprintf(stderr, "The selected x86 CPU does not support 64 bit mode\n");
exit(1); exit(1);
} }
env->cr[4] |= CR4_PAE_MASK; env->cr[4] |= CR4_PAE_MASK;