Message ID | 20170724182751.18261-26-f4bug@amsat.org |
---|---|
State | New |
Headers | show |
Le 24/07/2017 à 20:27, Philippe Mathieu-Daudé a écrit : > Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > linux-user/qemu.h | 5 +++++ > linux-user/syscall.c | 5 ----- > 2 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/linux-user/qemu.h b/linux-user/qemu.h > index 4edd7d0c08..97b7cfdb63 100644 > --- a/linux-user/qemu.h > +++ b/linux-user/qemu.h > @@ -614,6 +614,11 @@ static inline void *lock_user_string(abi_ulong guest_addr) > > #include <pthread.h> > > +static inline int is_error(abi_long ret) > +{ > + return (abi_ulong)ret >= (abi_ulong)(-4096); > +} > + > /* Include target-specific struct and function definitions; > * they may need access to the target-independent structures > * above, so include them last. > diff --git a/linux-user/syscall.c b/linux-user/syscall.c > index 003943b736..fcd20fa276 100644 > --- a/linux-user/syscall.c > +++ b/linux-user/syscall.c > @@ -837,11 +837,6 @@ static inline abi_long get_errno(abi_long ret) > return ret; > } > > -static inline int is_error(abi_long ret) > -{ > - return (abi_ulong)ret >= (abi_ulong)(-4096); > -} > - > const char *target_strerror(int err) > { > if (err == TARGET_ERESTARTSYS) { > I think you should fold this one into the following one. Laurent
diff --git a/linux-user/qemu.h b/linux-user/qemu.h index 4edd7d0c08..97b7cfdb63 100644 --- a/linux-user/qemu.h +++ b/linux-user/qemu.h @@ -614,6 +614,11 @@ static inline void *lock_user_string(abi_ulong guest_addr) #include <pthread.h> +static inline int is_error(abi_long ret) +{ + return (abi_ulong)ret >= (abi_ulong)(-4096); +} + /* Include target-specific struct and function definitions; * they may need access to the target-independent structures * above, so include them last. diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 003943b736..fcd20fa276 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -837,11 +837,6 @@ static inline abi_long get_errno(abi_long ret) return ret; } -static inline int is_error(abi_long ret) -{ - return (abi_ulong)ret >= (abi_ulong)(-4096); -} - const char *target_strerror(int err) { if (err == TARGET_ERESTARTSYS) {
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> --- linux-user/qemu.h | 5 +++++ linux-user/syscall.c | 5 ----- 2 files changed, 5 insertions(+), 5 deletions(-)