lkml.org 
[lkml]   [2008]   [Apr]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 03/35] KVM: x86 emulator: fix sparse warnings in x86_emulate.c
    Date
    From: Harvey Harrison <harvey.harrison@gmail.com>

    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: Harvey Harrison <harvey.harrison@gmail.com>
    Signed-off-by: Avi Kivity <avi@qumranet.com>
    ---
    arch/x86/kvm/x86_emulate.c | 4 ++--
    1 files changed, 2 insertions(+), 2 deletions(-)

    diff --git a/arch/x86/kvm/x86_emulate.c b/arch/x86/kvm/x86_emulate.c
    index cacdcf5..f59ed93 100644
    --- a/arch/x86/kvm/x86_emulate.c
    +++ b/arch/x86/kvm/x86_emulate.c
    @@ -371,7 +371,7 @@ static u16 group2_table[] = {

    #define __emulate_2op(_op,_src,_dst,_eflags,_bx,_by,_wx,_wy,_lx,_ly,_qx,_qy) \
    do { \
    - unsigned long _tmp; \
    + unsigned long __tmp; \
    switch ((_dst).bytes) { \
    case 1: \
    __asm__ __volatile__ ( \
    @@ -379,7 +379,7 @@ static u16 group2_table[] = {
    _op"b %"_bx"3,%1; " \
    _POST_EFLAGS("0", "4", "2") \
    : "=m" (_eflags), "=m" ((_dst).val), \
    - "=&r" (_tmp) \
    + "=&r" (__tmp) \
    : _by ((_src).val), "i" (EFLAGS_MASK)); \
    break; \
    default: \
    --
    1.5.4.5


    \
     
     \ /
      Last update: 2008-04-03 21:37    [W:4.840 / U:0.204 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site