[Xen-changelog] [xen-unstable] [IA64] cleanup in vmx headers

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

# HG changeset patch
# User Alex Williamson <alex.williamson@xxxxxx>
# Date 1191341096 21600
# Node ID 0040e5afdb0023f5da1aac797841aac27fcc6cb8
# Parent  c95959a0cf9c73a5d8ebab3bb3c965d8f9a7abc8
[IA64] cleanup in vmx headers

Reduce size of arch_vmx_struct (flags is now 1 byte).
Remove unused macro.
Add VMX_MMU_MODE macro.

Signed-off-by: Tristan Gingold <tgingold@xxxxxxx>
---
 xen/include/asm-ia64/vmx_phy_mode.h |    3 ++-
 xen/include/asm-ia64/vmx_vpd.h      |    5 ++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff -r c95959a0cf9c -r 0040e5afdb00 xen/include/asm-ia64/vmx_phy_mode.h
--- a/xen/include/asm-ia64/vmx_phy_mode.h       Tue Oct 02 09:59:27 2007 -0600
+++ b/xen/include/asm-ia64/vmx_phy_mode.h       Tue Oct 02 10:04:56 2007 -0600
@@ -86,7 +86,8 @@ extern void vmx_load_all_rr(VCPU *vcpu);
 extern void vmx_load_all_rr(VCPU *vcpu);
 extern void physical_tlb_miss(VCPU *vcpu, u64 vadr, int type);
 
-#define is_virtual_mode(v)     ((v)->arch.arch_vmx.mmu_mode == VMX_MMU_VIRTUAL)
+#define VMX_MMU_MODE(v)     ((v)->arch.arch_vmx.mmu_mode)
+#define is_virtual_mode(v)  (VMX_MMU_MODE(v) == VMX_MMU_VIRTUAL)
 
 #endif /* __ASSEMBLY__ */
 
diff -r c95959a0cf9c -r 0040e5afdb00 xen/include/asm-ia64/vmx_vpd.h
--- a/xen/include/asm-ia64/vmx_vpd.h    Tue Oct 02 09:59:27 2007 -0600
+++ b/xen/include/asm-ia64/vmx_vpd.h    Tue Oct 02 10:04:56 2007 -0600
@@ -55,8 +55,8 @@ struct arch_vmx_struct {
     unsigned long   cause;
     unsigned long   opcode;
     unsigned long   mpta;
-    unsigned long   flags;
     unsigned long   xen_port;
+    unsigned char   flags;
     unsigned char   xtp;
     unsigned char   pal_init_pending;
     unsigned char   mmu_mode; /* Current mmu mode.  See vmx_phy_mode.h  */
@@ -68,8 +68,7 @@ struct arch_vmx_struct {
 
 #define VMX_DOMAIN(v)   v->arch.arch_vmx.flags
 
-#define ARCH_VMX_IO_WAIT        3       /* Waiting for I/O completion */
-#define ARCH_VMX_DOMAIN         5       /* Need it to indicate VTi domain */
+#define ARCH_VMX_DOMAIN         0       /* Need it to indicate VTi domain */
 
 #endif //__ASSEMBLY__
 

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