[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@free.fr>

diff --git a/xen/include/asm-ia64/vmx_phy_mode.h b/xen/include/asm-ia64/vmx_phy_mode.h
index 10b358268243b8b7cd8d5b9f0901afd759dff7a1..7089de638c248bb45a942556a96c50061d3f77f6 100644 (file)
--- a/xen/include/asm-ia64/vmx_phy_mode.h
+++ b/xen/include/asm-ia64/vmx_phy_mode.h
@@ -86,7 +86,8 @@ extern void vmx_init_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 --git a/xen/include/asm-ia64/vmx_vpd.h b/xen/include/asm-ia64/vmx_vpd.h
index dece9da9f314b8ec4c732cb77f6abdde0e3122fb..c351f3f702789e34ed7ecf2e17e5306ffd710685 100644 (file)
--- a/xen/include/asm-ia64/vmx_vpd.h
+++ b/xen/include/asm-ia64/vmx_vpd.h
@@ -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__