From mboxrd@z Thu Jan 1 00:00:00 1970 From: Carlo Marcelo Arenas Belon Subject: [PATCH] MMU: fix cmpxchg8b emulation on i386 to use the right address Date: Fri, 4 Jan 2008 00:57:49 -0600 Message-ID: <20080104065749.GA9285@tapir> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: kvm-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org Return-path: Content-Disposition: inline List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: kvm-devel-bounces-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org Errors-To: kvm-devel-bounces-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org List-Id: kvm.vger.kernel.org change the function parameter to use vaddr instead of addr to avoid a variable name redefinition from 9a5ee611ca79bec98e9d97e93f11df8083b8af6e that resulted in : kernel/x86.c:1746: warning: passing argument 2 of 'vcpu->arch.mmu.gva_to_gpa' makes integer from pointer without a cast kernel/x86.c:1746: warning: 'addr' is used uninitialized in this function Signed-off-by: Carlo Marcelo Arenas Belon --- arch/x86/kvm/x86.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index c5b4825..abe08d1 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -1722,7 +1722,7 @@ int emulator_write_emulated(unsigned long addr, } EXPORT_SYMBOL_GPL(emulator_write_emulated); -static int emulator_cmpxchg_emulated(unsigned long addr, +static int emulator_cmpxchg_emulated(unsigned long vaddr, const void *old, const void *new, unsigned int bytes, @@ -1743,7 +1743,7 @@ static int emulator_cmpxchg_emulated(unsigned long addr, u64 val; down_read(¤t->mm->mmap_sem); - gpa = vcpu->arch.mmu.gva_to_gpa(vcpu, addr); + gpa = vcpu->arch.mmu.gva_to_gpa(vcpu, vaddr); if (gpa == UNMAPPED_GVA || (gpa & PAGE_MASK) == APIC_DEFAULT_PHYS_BASE) @@ -1763,7 +1763,7 @@ static int emulator_cmpxchg_emulated(unsigned long addr, } #endif - return emulator_write_emulated(addr, new, bytes, vcpu); + return emulator_write_emulated(vaddr, new, bytes, vcpu); } static unsigned long get_segment_base(struct kvm_vcpu *vcpu, int seg) -- 1.5.3.7 ------------------------------------------------------------------------- This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005. http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/