Commit 77cd337f authored by Harvey Harrison's avatar Harvey Harrison Committed by Avi Kivity

KVM: x86 emulator: fix sparse warnings in x86_emulate.c

Nesting __emulate_2op_nobyte inside__emulate_2op produces many shadowed
variable warnings on the internal variable _tmp used by both macros.

Change the outer macro to use __tmp.

Avoids a sparse warning like the following at every call site of __emulate_2op
arch/x86/kvm/x86_emulate.c:1091:3: warning: symbol '_tmp' shadows an earlier one
arch/x86/kvm/x86_emulate.c:1091:3: originally declared here
[18 more warnings suppressed]
Signed-off-by: default avatarHarvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: default avatarAvi Kivity <avi@qumranet.com>
parent f11c3a8d
...@@ -371,7 +371,7 @@ static u16 group2_table[] = { ...@@ -371,7 +371,7 @@ static u16 group2_table[] = {
#define __emulate_2op(_op,_src,_dst,_eflags,_bx,_by,_wx,_wy,_lx,_ly,_qx,_qy) \ #define __emulate_2op(_op,_src,_dst,_eflags,_bx,_by,_wx,_wy,_lx,_ly,_qx,_qy) \
do { \ do { \
unsigned long _tmp; \ unsigned long __tmp; \
switch ((_dst).bytes) { \ switch ((_dst).bytes) { \
case 1: \ case 1: \
__asm__ __volatile__ ( \ __asm__ __volatile__ ( \
...@@ -379,7 +379,7 @@ static u16 group2_table[] = { ...@@ -379,7 +379,7 @@ static u16 group2_table[] = {
_op"b %"_bx"3,%1; " \ _op"b %"_bx"3,%1; " \
_POST_EFLAGS("0", "4", "2") \ _POST_EFLAGS("0", "4", "2") \
: "=m" (_eflags), "=m" ((_dst).val), \ : "=m" (_eflags), "=m" ((_dst).val), \
"=&r" (_tmp) \ "=&r" (__tmp) \
: _by ((_src).val), "i" (EFLAGS_MASK)); \ : _by ((_src).val), "i" (EFLAGS_MASK)); \
break; \ break; \
default: \ default: \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment