Re: [Xen-ia64-devel] [patch 03/12] ia64: kexec: Unpin the correct VHPT TR in ia64_do_tlb_purge

[Isaku Yamahata <yamahata@xxxxxxxxxxxxx>]

Hi Simon-san.
I guess that this patch isn't copmiled as inteneded.
With the VHPT_ENABLED patch which make sure VHPT_ENABLED always
defined to 1 or 0, I got compilation errors.


[IA64] compilation fix with VHPT_ENABLED=1

Enabling VHPT_ENABLED=1 results in compilation error in vmx_phy_mode.c
and vmx_vcpu.c. This patch fixes them.
vmx_phy_mode.c: In function 'vmx_load_all_rr':
vmx_phy_mode.c:175: warning: implicit declaration of function 'vcpu_vhpt_maddr'
vmx_phy_mode.c:175: error: 'v' undeclared (first use in this function)
vmx_phy_mode.c:175: error: (Each undeclared identifier is reported only once
vmx_phy_mode.c:175: error: for each function it appears in.)
PATCHNAME: compilation_fix_with_vhpt_enabled

Signed-off-by: Isaku Yamahata <yamahata@xxxxxxxxxxxxx>

diff -r 992b994fac12 xen/arch/ia64/vmx/vmx_phy_mode.c
--- a/xen/arch/ia64/vmx/vmx_phy_mode.c  Wed May 07 16:46:22 2008 +0900
+++ b/xen/arch/ia64/vmx/vmx_phy_mode.c  Wed May 07 16:57:21 2008 +0900
@@ -27,6 +27,7 @@
 #include <asm/vmx_phy_mode.h>
 #include <asm/pgtable.h>
 #include <asm/vmmu.h>
+#include <asm/vhpt.h>
 #include <asm/debugger.h>
 
 #define MODE_IND(psr)   \
@@ -172,7 +173,7 @@
        ia64_set_rr((VRN6 << VRN_SHIFT), vrrtomrr(vcpu, VMX(vcpu, vrr[VRN6])));
        ia64_dv_serialize_data();
 #if VHPT_ENABLED
-    __get_cpu_var(inserted_vhpt) = __va_ul(vcpu_vhpt_maddr(v));
+    __get_cpu_var(inserted_vhpt) = __va_ul(vcpu_vhpt_maddr(vcpu));
 #endif
        __get_cpu_var(inserted_privregs) = __va_ul(vcpu->arch.privregs);
        vmx_switch_rr7(vrrtomrr(vcpu,VMX(vcpu, vrr[VRN7])),
diff -r 992b994fac12 xen/arch/ia64/vmx/vmx_vcpu.c
--- a/xen/arch/ia64/vmx/vmx_vcpu.c      Wed May 07 16:46:22 2008 +0900
+++ b/xen/arch/ia64/vmx/vmx_vcpu.c      Wed May 07 16:57:21 2008 +0900
@@ -32,6 +32,7 @@
 #include <asm/delay.h>
 #include <asm/regs.h>
 #include <asm/gcc_intrin.h>
+#include <asm/vhpt.h>
 #include <asm/vmx_mm_def.h>
 #include <asm/vmx.h>
 #include <asm/vmx_phy_mode.h>
@@ -182,7 +183,7 @@
     case VRN7:
         if (likely(vcpu == current)) {
 #if VHPT_ENABLED
-            __get_cpu_var(inserted_vhpt) = __va_ul(vcpu_vhpt_maddr(v));
+            __get_cpu_var(inserted_vhpt) = __va_ul(vcpu_vhpt_maddr(vcpu));
 #endif
             __get_cpu_var(inserted_privregs) = __va_ul(vcpu->arch.privregs);
             vmx_switch_rr7(vrrtomrr(vcpu,val), (void *)vcpu->arch.vhpt.hash,


-- 
yamahata

Attachment: 20-vhpt_neabled_compilation_fix.patch
Description: Text Data

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