[Xen-changelog] [xen-unstable] [IA64] Remove unused contig mem flag for VTi

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

# HG changeset patch
# User awilliam@xxxxxxxxxxx
# Node ID a59843bb699e1f5cb446074c81ca750518271bc4
# Parent  254c090854de353cf9859575c2bed0549d0ff5dd
[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@xxxxxxxxx>
---
 xen/arch/ia64/vmx/vmx_init.c   |    4 ++--
 xen/include/asm-ia64/vmx_vpd.h |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff -r 254c090854de -r a59843bb699e xen/arch/ia64/vmx/vmx_init.c
--- a/xen/arch/ia64/vmx/vmx_init.c      Wed Jul 26 15:59:36 2006 -0600
+++ b/xen/arch/ia64/vmx/vmx_init.c      Thu Jul 27 08:47:39 2006 -0600
@@ -300,6 +300,8 @@ vmx_final_setup_guest(struct vcpu *v)
 
        /* One more step to enable interrupt assist */
        set_bit(ARCH_VMX_INTR_ASSIST, &v->arch.arch_vmx.flags);
+       /* Set up guest 's indicator for VTi domain*/
+       set_bit(ARCH_VMX_DOMAIN, &v->arch.arch_vmx.flags);
 }
 
 void
@@ -337,7 +339,6 @@ static void vmx_build_physmap_table(stru
        struct vcpu *v = d->vcpu[0];
        struct list_head *list_ent = d->page_list.next;
 
-       ASSERT(!test_bit(ARCH_VMX_CONTIG_MEM, &v->arch.arch_vmx.flags));
        ASSERT(d->max_pages == d->tot_pages);
 
        /* Mark I/O ranges */
@@ -393,7 +394,6 @@ static void vmx_build_physmap_table(stru
        list_ent = mfn_to_page(mfn)->list.next;
        ASSERT(list_ent == &d->page_list);
 
-       set_bit(ARCH_VMX_CONTIG_MEM, &v->arch.arch_vmx.flags);
 }
 
 void vmx_setup_platform(struct domain *d)
diff -r 254c090854de -r a59843bb699e xen/include/asm-ia64/vmx_vpd.h
--- a/xen/include/asm-ia64/vmx_vpd.h    Wed Jul 26 15:59:36 2006 -0600
+++ b/xen/include/asm-ia64/vmx_vpd.h    Thu Jul 27 08:47:39 2006 -0600
@@ -106,7 +106,7 @@ struct arch_vmx_struct {
 
 #define ARCH_VMX_IO_WAIT        3       /* Waiting for I/O completion */
 #define ARCH_VMX_INTR_ASSIST    4       /* Need DM's assist to issue intr */
-#define ARCH_VMX_CONTIG_MEM    5       /* Need contiguous machine pages */
+#define ARCH_VMX_DOMAIN         5       /* Need it to indicate VTi domain */
 
 
 #define VMX_DEBUG 1

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