From: Avi Kivity <[EMAIL PROTECTED]>

Noticed by Uri Lublin

Signed-off-by: Avi Kivity <[EMAIL PROTECTED]>

diff --git a/drivers/kvm/x86.c b/drivers/kvm/x86.c
index d238b30..2d4ac00 100644
--- a/drivers/kvm/x86.c
+++ b/drivers/kvm/x86.c
@@ -1692,10 +1692,8 @@ static int emulator_cmpxchg_emulated(unsigned long addr,
                val = (u64 *)new;
                page = gfn_to_page(page, gpa >> PAGE_SHIFT);
                addr = kmap_atomic(page, KM_USER0);
-               addr += offset_in_page(gpa);
-
-               set_64bit((unsigned long long *)addr, val);
-               kunmap_atomic(page, KM_USER0);
+               set_64bit((u64 *)(addr + offset_in_page(gpa), val);
+               kunmap_atomic(addr, KM_USER0);
                kvm_release_page_dirty(page);
        }
 emul_write:

-------------------------------------------------------------------------
SF.Net email is sponsored by:
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services
for just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
_______________________________________________
kvm-commits mailing list
kvm-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/kvm-commits

Reply via email to