ia64/xen-unstable

changeset 10812:a59843bb699e

[IA64] Remove unused contig mem flag for VTi

Remove the confusing flag ARCH_VMX_CONTIG_MEM for VTi domain. And add a
flag ARCH_VMX_DOMAIN to ensure VMX_DOMAIN check on all vcpus.

Signed-off-by : Zhang xiantao <xiantao.zhang@intel.com>
author awilliam@xenbuild.aw
date Thu Jul 27 08:47:39 2006 -0600 (2006-07-27)
parents 254c090854de
children 0f6baad3b842
files xen/arch/ia64/vmx/vmx_init.c xen/include/asm-ia64/vmx_vpd.h
line diff
     1.1 --- a/xen/arch/ia64/vmx/vmx_init.c	Wed Jul 26 15:59:36 2006 -0600
     1.2 +++ b/xen/arch/ia64/vmx/vmx_init.c	Thu Jul 27 08:47:39 2006 -0600
     1.3 @@ -300,6 +300,8 @@ vmx_final_setup_guest(struct vcpu *v)
     1.4  
     1.5  	/* One more step to enable interrupt assist */
     1.6  	set_bit(ARCH_VMX_INTR_ASSIST, &v->arch.arch_vmx.flags);
     1.7 +	/* Set up guest 's indicator for VTi domain*/
     1.8 +	set_bit(ARCH_VMX_DOMAIN, &v->arch.arch_vmx.flags);
     1.9  }
    1.10  
    1.11  void
    1.12 @@ -337,7 +339,6 @@ static void vmx_build_physmap_table(stru
    1.13  	struct vcpu *v = d->vcpu[0];
    1.14  	struct list_head *list_ent = d->page_list.next;
    1.15  
    1.16 -	ASSERT(!test_bit(ARCH_VMX_CONTIG_MEM, &v->arch.arch_vmx.flags));
    1.17  	ASSERT(d->max_pages == d->tot_pages);
    1.18  
    1.19  	/* Mark I/O ranges */
    1.20 @@ -393,7 +394,6 @@ static void vmx_build_physmap_table(stru
    1.21  	list_ent = mfn_to_page(mfn)->list.next;
    1.22  	ASSERT(list_ent == &d->page_list);
    1.23  
    1.24 -	set_bit(ARCH_VMX_CONTIG_MEM, &v->arch.arch_vmx.flags);
    1.25  }
    1.26  
    1.27  void vmx_setup_platform(struct domain *d)
     2.1 --- a/xen/include/asm-ia64/vmx_vpd.h	Wed Jul 26 15:59:36 2006 -0600
     2.2 +++ b/xen/include/asm-ia64/vmx_vpd.h	Thu Jul 27 08:47:39 2006 -0600
     2.3 @@ -106,7 +106,7 @@ struct arch_vmx_struct {
     2.4  
     2.5  #define ARCH_VMX_IO_WAIT        3       /* Waiting for I/O completion */
     2.6  #define ARCH_VMX_INTR_ASSIST    4       /* Need DM's assist to issue intr */
     2.7 -#define ARCH_VMX_CONTIG_MEM 	5	/* Need contiguous machine pages */
     2.8 +#define ARCH_VMX_DOMAIN         5       /* Need it to indicate VTi domain */
     2.9  
    2.10  
    2.11  #define VMX_DEBUG 1