[v3,09/19] linux-user: Propagate goto unimplemented_nowarn to return

Message ID 20180612005145.3375-10-richard.henderson@linaro.org
State New
Headers show
Series
  • linux-user: Split do_syscall
Related show

Commit Message

Richard Henderson June 12, 2018, 12:51 a.m.
Reviewed-by: Laurent Vivier <laurent@vivier.eu>

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>

---
 linux-user/syscall.c | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

-- 
2.17.1

Comments

Philippe Mathieu-Daudé June 12, 2018, 4:28 p.m. | #1
On 06/11/2018 09:51 PM, Richard Henderson wrote:
> Reviewed-by: Laurent Vivier <laurent@vivier.eu>

> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>


Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>


> ---

>  linux-user/syscall.c | 11 ++++-------

>  1 file changed, 4 insertions(+), 7 deletions(-)

> 

> diff --git a/linux-user/syscall.c b/linux-user/syscall.c

> index a6b8268332..06205d3d65 100644

> --- a/linux-user/syscall.c

> +++ b/linux-user/syscall.c

> @@ -11807,7 +11807,7 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1,

>            return 0;

>        }

>  #else

> -      goto unimplemented_nowarn;

> +      return -TARGET_ENOSYS;

>  #endif

>  #endif

>  #ifdef TARGET_NR_get_thread_area

> @@ -11820,12 +11820,12 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1,

>              return ts->tp_value;

>          }

>  #else

> -        goto unimplemented_nowarn;

> +        return -TARGET_ENOSYS;

>  #endif

>  #endif

>  #ifdef TARGET_NR_getdomainname

>      case TARGET_NR_getdomainname:

> -        goto unimplemented_nowarn;

> +        return -TARGET_ENOSYS;

>  #endif

>  

>  #ifdef TARGET_NR_clock_settime

> @@ -11910,7 +11910,7 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1,

>           * holding a mutex that is shared with another process via

>           * shared memory).

>           */

> -        goto unimplemented_nowarn;

> +        return -TARGET_ENOSYS;

>  #endif

>  

>  #if defined(TARGET_NR_utimensat)

> @@ -12564,9 +12564,6 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1,

>      default:

>      unimplemented:

>          gemu_log("qemu: Unsupported syscall: %d\n", num);

> -#if defined(TARGET_NR_setxattr) || defined(TARGET_NR_get_thread_area) || defined(TARGET_NR_getdomainname) || defined(TARGET_NR_set_robust_list)

> -    unimplemented_nowarn:

> -#endif

>          return -TARGET_ENOSYS;

>      }

>  fail:

>

Patch

diff --git a/linux-user/syscall.c b/linux-user/syscall.c
index a6b8268332..06205d3d65 100644
--- a/linux-user/syscall.c
+++ b/linux-user/syscall.c
@@ -11807,7 +11807,7 @@  static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1,
           return 0;
       }
 #else
-      goto unimplemented_nowarn;
+      return -TARGET_ENOSYS;
 #endif
 #endif
 #ifdef TARGET_NR_get_thread_area
@@ -11820,12 +11820,12 @@  static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1,
             return ts->tp_value;
         }
 #else
-        goto unimplemented_nowarn;
+        return -TARGET_ENOSYS;
 #endif
 #endif
 #ifdef TARGET_NR_getdomainname
     case TARGET_NR_getdomainname:
-        goto unimplemented_nowarn;
+        return -TARGET_ENOSYS;
 #endif
 
 #ifdef TARGET_NR_clock_settime
@@ -11910,7 +11910,7 @@  static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1,
          * holding a mutex that is shared with another process via
          * shared memory).
          */
-        goto unimplemented_nowarn;
+        return -TARGET_ENOSYS;
 #endif
 
 #if defined(TARGET_NR_utimensat)
@@ -12564,9 +12564,6 @@  static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1,
     default:
     unimplemented:
         gemu_log("qemu: Unsupported syscall: %d\n", num);
-#if defined(TARGET_NR_setxattr) || defined(TARGET_NR_get_thread_area) || defined(TARGET_NR_getdomainname) || defined(TARGET_NR_set_robust_list)
-    unimplemented_nowarn:
-#endif
         return -TARGET_ENOSYS;
     }
 fail: