[Xen-changelog] [xen-unstable] [IA64] introduce compile time option to disable optvfault.

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

# HG changeset patch
# User Isaku Yamahata <yamahata@xxxxxxxxxxxxx>
# Date 1219658677 -32400
# Node ID 48db4eee7d588ea340535ae3ef60862686207210
# Parent  01e95ec5b433e62c7212a00a299cf4aeae1ed72c
[IA64] introduce compile time option to disable optvfault.

Debugging optvfault path is extremely difficult because
it was run with psr.ic = 0.
Make it easy to differentiate the bug in optvfault path from
other normal execution path with psr.ic = 0 by introducing compile
time option to disable optvfault.

Signed-off-by: Isaku Yamahata <yamahata@xxxxxxxxxxxxx>
---
 xen/arch/ia64/Rules.mk      |    4 ++++
 xen/arch/ia64/vmx/vmx_ivt.S |    2 ++
 2 files changed, 6 insertions(+)

diff -r 01e95ec5b433 -r 48db4eee7d58 xen/arch/ia64/Rules.mk
--- a/xen/arch/ia64/Rules.mk    Mon Aug 25 19:04:37 2008 +0900
+++ b/xen/arch/ia64/Rules.mk    Mon Aug 25 19:04:37 2008 +0900
@@ -14,6 +14,7 @@ xen_ia64_tlb_track    ?= y
 xen_ia64_tlb_track     ?= y
 xen_ia64_tlb_track_cnt ?= n
 xen_ia64_tlbflush_clock        ?= y
+xen_ia64_disable_optvfault ?= n
 
 # Used only by linux/Makefile.
 AFLAGS_KERNEL  += -mconstant-gp -nostdinc $(CPPFLAGS)
@@ -67,6 +68,9 @@ else
 else
 CFLAGS += -DVHPT_ENABLED=0
 endif
+ifeq ($(xen_ia64_disable_optvfault),y)
+CFLAGS += -DCONFIG_XEN_IA64_DISABLE_OPTVFAULT
+endif
 
 LDFLAGS := -g
 
diff -r 01e95ec5b433 -r 48db4eee7d58 xen/arch/ia64/vmx/vmx_ivt.S
--- a/xen/arch/ia64/vmx/vmx_ivt.S       Mon Aug 25 19:04:37 2008 +0900
+++ b/xen/arch/ia64/vmx/vmx_ivt.S       Mon Aug 25 19:04:37 2008 +0900
@@ -973,6 +973,7 @@ ENTRY(vmx_virtualization_fault)
 ENTRY(vmx_virtualization_fault)
 //    VMX_DBG_FAULT(37)
     mov r31=pr
+#ifndef CONFIG_XEN_IA64_DISABLE_OPTVFAULT
     movl r30 = virtualization_fault_table
     mov r23=b0
     ;;
@@ -981,6 +982,7 @@ ENTRY(vmx_virtualization_fault)
     mov b0=r30
     br.sptk.many b0
     ;;
+#endif
 vmx_virtualization_fault_back:
     mov r19=37
     adds r16 = IA64_VCPU_CAUSE_OFFSET,r21

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