[Xen-changelog] [xen-unstable] VMX: Only write top-half of machine addresses into VMCS fields in PAE mode.

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User kfraser@xxxxxxxxxxxxxxxxxxxxx
# Date 1180624151 -3600
# Node ID b182bd560e47ba3497211603a840ffb3afa13dc8
# Parent  2d3034d0b36b380da7f5769638a21f55c0fda0d7
VMX: Only write top-half of machine addresses into VMCS fields in PAE mode.
Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>
---
 xen/arch/x86/hvm/vmx/vmcs.c |    4 ++--
 xen/arch/x86/hvm/vmx/vmx.c  |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff -r 2d3034d0b36b -r b182bd560e47 xen/arch/x86/hvm/vmx/vmcs.c
--- a/xen/arch/x86/hvm/vmx/vmcs.c       Thu May 31 16:05:27 2007 +0100
+++ b/xen/arch/x86/hvm/vmx/vmcs.c       Thu May 31 16:09:11 2007 +0100
@@ -438,9 +438,9 @@ static void construct_vmcs(struct vcpu *
 
     if ( cpu_has_vmx_tpr_shadow )
     {
-        uint64_t virt_page_ma = page_to_maddr(vcpu_vlapic(v)->regs_page);
+        paddr_t virt_page_ma = page_to_maddr(vcpu_vlapic(v)->regs_page);
         __vmwrite(VIRTUAL_APIC_PAGE_ADDR, virt_page_ma);
-#if defined (__i386__)
+#if defined (CONFIG_X86_PAE)
         __vmwrite(VIRTUAL_APIC_PAGE_ADDR_HIGH, virt_page_ma >> 32);
 #endif
         __vmwrite(TPR_THRESHOLD, 0);
diff -r 2d3034d0b36b -r b182bd560e47 xen/arch/x86/hvm/vmx/vmx.c
--- a/xen/arch/x86/hvm/vmx/vmx.c        Thu May 31 16:05:27 2007 +0100
+++ b/xen/arch/x86/hvm/vmx/vmx.c        Thu May 31 16:09:11 2007 +0100
@@ -2540,7 +2540,7 @@ static void vmx_install_vlapic_mapping(s
     vmx_vmcs_enter(v);
     __vmwrite(VIRTUAL_APIC_PAGE_ADDR, virt_page_ma);
     __vmwrite(APIC_ACCESS_ADDR, apic_page_ma);
-#if defined (__i386__)
+#if defined (CONFIG_X86_PAE)
     __vmwrite(VIRTUAL_APIC_PAGE_ADDR_HIGH, virt_page_ma >> 32);
     __vmwrite(APIC_ACCESS_ADDR_HIGH, apic_page_ma >> 32);
 #endif

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog