1.1 --- a/xen/arch/ia64/Rules.mk	Wed Jan 17 21:45:34 2007 -0700
     1.2 +++ b/xen/arch/ia64/Rules.mk	Tue Jan 23 08:48:39 2007 -0700
     1.3 @@ -4,7 +4,6 @@
     1.4  HAS_ACPI := y
     1.5  HAS_VGA  := y
     1.6  xenoprof := y
     1.7 -VALIDATE_VT	?= n
     1.8  no_warns ?= n
     1.9  xen_ia64_expose_p2m	?= y
    1.10  xen_ia64_pervcpu_vhpt	?= y
    1.11 @@ -37,9 +36,6 @@ CFLAGS	+= -DIA64 -DXEN -DLINUX_2_6
    1.12  CFLAGS	+= -ffixed-r13 -mfixed-range=f2-f5,f12-f127
    1.13  CFLAGS	+= -g
    1.14  #CFLAGS  += -DVTI_DEBUG
    1.15 -ifeq ($(VALIDATE_VT),y)
    1.16 -CFLAGS  += -DVALIDATE_VT
    1.17 -endif
    1.18  ifeq ($(xen_ia64_expose_p2m),y)
    1.19  CFLAGS	+= -DCONFIG_XEN_IA64_EXPOSE_P2M
    1.20  endif

     2.1 --- a/xen/arch/ia64/linux-xen/head.S	Wed Jan 17 21:45:34 2007 -0700
     2.2 +++ b/xen/arch/ia64/linux-xen/head.S	Tue Jan 23 08:48:39 2007 -0700
     2.3 @@ -267,13 +267,8 @@ start_ap:
     2.4  	/*
     2.5  	 * Switch into virtual mode:
     2.6  	 */
     2.7 -#if defined(XEN) && defined(VALIDATE_VT)
     2.8 -	movl r16=(IA64_PSR_IT|IA64_PSR_IC|IA64_PSR_DT|IA64_PSR_RT|IA64_PSR_DFH\
     2.9 -		  |IA64_PSR_DI)
    2.10 -#else
    2.11  	movl r16=(IA64_PSR_IT|IA64_PSR_IC|IA64_PSR_DT|IA64_PSR_RT|IA64_PSR_DFH|IA64_PSR_BN \
    2.12  		  |IA64_PSR_DI)
    2.13 -#endif
    2.14  	;;
    2.15  	mov cr.ipsr=r16
    2.16  	movl r17=1f
    2.17 @@ -292,11 +287,7 @@ 1:	// now we are in virtual mode
    2.18  	;;
    2.19  
    2.20  	// set IVT entry point---can't access I/O ports without it
    2.21 -#if defined(XEN) && defined(VALIDATE_VT)
    2.22 -	movl r3=vmx_ia64_ivt
    2.23 -#else
    2.24  	movl r3=ia64_ivt
    2.25 -#endif
    2.26  	;;
    2.27  	mov cr.iva=r3
    2.28  	movl r2=FPSR_DEFAULT
    2.29 @@ -368,15 +359,8 @@ 1:	// now we are in virtual mode
    2.30  	
    2.31  .load_current:
    2.32  	// load the "current" pointer (r13) and ar.k6 with the current task
    2.33 -#if defined(XEN) && defined(VALIDATE_VT)
    2.34 -	mov r21=r2
    2.35 -	;;
    2.36 -	bsw.1
    2.37 -	;;
    2.38 -#else
    2.39  	mov IA64_KR(CURRENT)=r2		// virtual address
    2.40  	mov IA64_KR(CURRENT_STACK)=r16
    2.41 -#endif
    2.42  	mov r13=r2
    2.43  	/*
    2.44  	 * Reserve space at the top of the stack for "struct pt_regs".  Kernel

     3.1 --- a/xen/arch/ia64/xen/domain.c	Wed Jan 17 21:45:34 2007 -0700
     3.2 +++ b/xen/arch/ia64/xen/domain.c	Tue Jan 23 08:48:39 2007 -0700
     3.3 @@ -996,12 +996,6 @@ int construct_dom0(struct domain *d,
     3.4  	unsigned long bp_mpa;
     3.5  	struct ia64_boot_param *bp;
     3.6  
     3.7 -#ifdef VALIDATE_VT
     3.8 -	unsigned int vmx_dom0 = 0;
     3.9 -	unsigned long mfn;
    3.10 -	struct page_info *page = NULL;
    3.11 -#endif
    3.12 -
    3.13  //printk("construct_dom0: starting\n");
    3.14  
    3.15  	/* Sanity! */
    3.16 @@ -1022,23 +1016,6 @@ int construct_dom0(struct domain *d,
    3.17  	if ( rc != 0 )
    3.18  	    return rc;
    3.19  
    3.20 -#ifdef VALIDATE_VT
    3.21 -	/* Temp workaround */
    3.22 -	if (running_on_sim)
    3.23 -	    dsi.xen_section_string = (char *)1;
    3.24 -
    3.25 -	/* Check whether dom0 is vti domain */
    3.26 -	if ((!vmx_enabled) && !dsi.xen_section_string) {
    3.27 -	    printk("Lack of hardware support for unmodified vmx dom0\n");
    3.28 -	    panic("");
    3.29 -	}
    3.30 -
    3.31 -	if (vmx_enabled && !dsi.xen_section_string) {
    3.32 -	    printk("Dom0 is vmx domain!\n");
    3.33 -	    vmx_dom0 = 1;
    3.34 -	}
    3.35 -#endif
    3.36 -
    3.37  	p_start = dsi.v_start;
    3.38  	pkern_start = dsi.v_kernstart;
    3.39  	pkern_end = dsi.v_kernend;
    3.40 @@ -1132,14 +1109,6 @@ int construct_dom0(struct domain *d,
    3.41  
    3.42  	printk("Dom0: 0x%lx\n", (u64)dom0);
    3.43  
    3.44 -#ifdef VALIDATE_VT
    3.45 -	/* VMX specific construction for Dom0, if hardware supports VMX
    3.46 -	 * and Dom0 is unmodified image
    3.47 -	 */
    3.48 -	if (vmx_dom0)
    3.49 -	    vmx_final_setup_guest(v);
    3.50 -#endif
    3.51 -
    3.52  	set_bit(_VCPUF_initialised, &v->vcpu_flags);
    3.53  
    3.54  	/* Build firmware.

     4.1 --- a/xen/include/asm-ia64/config.h	Wed Jan 17 21:45:34 2007 -0700
     4.2 +++ b/xen/include/asm-ia64/config.h	Tue Jan 23 08:48:39 2007 -0700
     4.3 @@ -183,11 +183,7 @@ void sort_main_extable(void);
     4.4  #define find_first_set_bit(x)	(ffs(x)-1)	// FIXME: Is this right???
     4.5  
     4.6  // see drivers/char/console.c
     4.7 -#ifndef VALIDATE_VT
     4.8  #define	OPT_CONSOLE_STR "com1"
     4.9 -#else
    4.10 -#define	OPT_CONSOLE_STR "com2"
    4.11 -#endif
    4.12  
    4.13  #define __nocast
    4.14