From: Laurent Vivier Date: Mon, 25 Sep 2023 15:10:28 +0000 (+0200) Subject: linux-user/syscall.c: clean up local variable shadowing in TARGET_NR_getcpu X-Git-Tag: v8.2.0-rc0~86^2~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9962b7c213e08cbf233eb405b781ecfbb89bfd5c;p=thirdparty%2Fqemu.git linux-user/syscall.c: clean up local variable shadowing in TARGET_NR_getcpu Fix following warnings: .../linux-user/syscall.c: In function 'do_syscall1': .../linux-user/syscall.c:11180:22: warning: declaration of 'cpu' shadows a previous local [-Wshadow=local] 11180 | unsigned cpu, node; | ^~~ .../linux-user/syscall.c:8963:15: note: shadowed declaration is here 8963 | CPUState *cpu = env_cpu(cpu_env); | ^~~ Signed-off-by: Laurent Vivier Message-ID: <20230925151029.461358-5-laurent@vivier.eu> Reviewed-by: Thomas Huth Signed-off-by: Markus Armbruster --- diff --git a/linux-user/syscall.c b/linux-user/syscall.c index 0f1ecc1e0bf..97a5e9ddf25 100644 --- a/linux-user/syscall.c +++ b/linux-user/syscall.c @@ -11177,14 +11177,14 @@ static abi_long do_syscall1(CPUArchState *cpu_env, int num, abi_long arg1, } case TARGET_NR_getcpu: { - unsigned cpu, node; - ret = get_errno(sys_getcpu(arg1 ? &cpu : NULL, + unsigned cpuid, node; + ret = get_errno(sys_getcpu(arg1 ? &cpuid : NULL, arg2 ? &node : NULL, NULL)); if (is_error(ret)) { return ret; } - if (arg1 && put_user_u32(cpu, arg1)) { + if (arg1 && put_user_u32(cpuid, arg1)) { return -TARGET_EFAULT; } if (arg2 && put_user_u32(node, arg2)) {