ia64/xen-unstable

changeset 16023:0040e5afdb00

[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>
author Alex Williamson <alex.williamson@hp.com>
date Tue Oct 02 10:04:56 2007 -0600 (2007-10-02)
parents c95959a0cf9c
children d6c09be8c5f5
files xen/include/asm-ia64/vmx_phy_mode.h xen/include/asm-ia64/vmx_vpd.h
line diff
     1.1 --- a/xen/include/asm-ia64/vmx_phy_mode.h	Tue Oct 02 09:59:27 2007 -0600
     1.2 +++ b/xen/include/asm-ia64/vmx_phy_mode.h	Tue Oct 02 10:04:56 2007 -0600
     1.3 @@ -86,7 +86,8 @@ extern void vmx_init_all_rr(VCPU *vcpu);
     1.4  extern void vmx_load_all_rr(VCPU *vcpu);
     1.5  extern void physical_tlb_miss(VCPU *vcpu, u64 vadr, int type);
     1.6  
     1.7 -#define is_virtual_mode(v)     ((v)->arch.arch_vmx.mmu_mode == VMX_MMU_VIRTUAL)
     1.8 +#define VMX_MMU_MODE(v)     ((v)->arch.arch_vmx.mmu_mode)
     1.9 +#define is_virtual_mode(v)  (VMX_MMU_MODE(v) == VMX_MMU_VIRTUAL)
    1.10  
    1.11  #endif /* __ASSEMBLY__ */
    1.12  
     2.1 --- a/xen/include/asm-ia64/vmx_vpd.h	Tue Oct 02 09:59:27 2007 -0600
     2.2 +++ b/xen/include/asm-ia64/vmx_vpd.h	Tue Oct 02 10:04:56 2007 -0600
     2.3 @@ -55,8 +55,8 @@ struct arch_vmx_struct {
     2.4      unsigned long   cause;
     2.5      unsigned long   opcode;
     2.6      unsigned long   mpta;
     2.7 -    unsigned long   flags;
     2.8      unsigned long   xen_port;
     2.9 +    unsigned char   flags;
    2.10      unsigned char   xtp;
    2.11      unsigned char   pal_init_pending;
    2.12      unsigned char   mmu_mode; /* Current mmu mode.  See vmx_phy_mode.h  */
    2.13 @@ -68,8 +68,7 @@ struct arch_vmx_struct {
    2.14  
    2.15  #define VMX_DOMAIN(v)   v->arch.arch_vmx.flags
    2.16  
    2.17 -#define ARCH_VMX_IO_WAIT        3       /* Waiting for I/O completion */
    2.18 -#define ARCH_VMX_DOMAIN         5       /* Need it to indicate VTi domain */
    2.19 +#define ARCH_VMX_DOMAIN         0       /* Need it to indicate VTi domain */
    2.20  
    2.21  #endif //__ASSEMBLY__
    2.22