ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

linux-user: Make target_strerror() return 'const char *' 

Make target_strerror() return 'const char *' rather than just 'char *';
this will allow us to return constant strings from it for some special
cases.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Riku Voipio <riku.voipio@linaro.org>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
This commit is contained in:
Peter Maydell 2016-06-06 19:58:18 +01:00 committed by Riku Voipio
parent 8efb2ed5ec
commit 7dcdaeafe0
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
linux-user/qemu.h
View File

@ -195,7 +195,7 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1,
void gemu_log(const char *fmt, ...) GCC_FMT_ATTR(1, 2); void gemu_log(const char *fmt, ...) GCC_FMT_ATTR(1, 2);
extern THREAD CPUState *thread_cpu; extern THREAD CPUState *thread_cpu;
void cpu_loop(CPUArchState *env); void cpu_loop(CPUArchState *env);
char *target_strerror(int err); const char *target_strerror(int err);
int get_osversion(void); int get_osversion(void);
void init_qemu_uname_release(void); void init_qemu_uname_release(void);
void fork_start(void); void fork_start(void);

4
linux-user/strace.c
View File

@ -281,7 +281,7 @@ print_ipc(const struct syscallname *name,
static void static void
print_syscall_ret_addr(const struct syscallname *name, abi_long ret) print_syscall_ret_addr(const struct syscallname *name, abi_long ret)
{ {
char *errstr = NULL; const char *errstr = NULL;
if (ret < 0) { if (ret < 0) {
errstr = target_strerror(-ret); errstr = target_strerror(-ret);
@ -1594,7 +1594,7 @@ void
print_syscall_ret(int num, abi_long ret) print_syscall_ret(int num, abi_long ret)
{ {
int i; int i;
char *errstr = NULL; const char *errstr = NULL;
for(i=0;i<nsyscalls;i++) for(i=0;i<nsyscalls;i++)
if( scnames[i].nr == num ) { if( scnames[i].nr == num ) {

2
linux-user/syscall.c
View File

@ -630,7 +630,7 @@ static inline int is_error(abi_long ret)
return (abi_ulong)ret >= (abi_ulong)(-4096); return (abi_ulong)ret >= (abi_ulong)(-4096);
} }
char *target_strerror(int err) const char *target_strerror(int err)
{ {
if ((err >= ERRNO_TABLE_SIZE) || (err < 0)) { if ((err >= ERRNO_TABLE_SIZE) || (err < 0)) {
return NULL; return NULL;