1.1 --- a/xen/arch/x86/hvm/vmx/vmx.c	Thu Dec 20 17:30:27 2007 +0000
     1.2 +++ b/xen/arch/x86/hvm/vmx/vmx.c	Fri Dec 21 21:59:50 2007 +0000
     1.3 @@ -1613,7 +1613,7 @@ static void vmx_send_str_pio(struct cpu_
     1.4                               unsigned long inst_len, unsigned int port,
     1.5                               int sign, unsigned int size, int dir,
     1.6                               int df, unsigned long addr,
     1.7 -                             unsigned long paddr, unsigned long count)
     1.8 +                             paddr_t paddr, unsigned long count)
     1.9  {
    1.10      /*
    1.11       * Handle string pio instructions that cross pages or that
    1.12 @@ -2455,7 +2455,7 @@ static void vmx_free_vlapic_mapping(stru
    1.13  
    1.14  static void vmx_install_vlapic_mapping(struct vcpu *v)
    1.15  {
    1.16 -    unsigned long virt_page_ma, apic_page_ma;
    1.17 +    paddr_t virt_page_ma, apic_page_ma;
    1.18  
    1.19      if ( !cpu_has_vmx_virtualize_apic_accesses )
    1.20          return;

     2.1 --- a/xen/include/asm-x86/hvm/io.h	Thu Dec 20 17:30:27 2007 +0000
     2.2 +++ b/xen/include/asm-x86/hvm/io.h	Fri Dec 21 21:59:50 2007 +0000
     2.3 @@ -149,14 +149,14 @@ static inline int register_buffered_io_h
     2.4      return register_io_handler(d, addr, size, action, HVM_BUFFERED_IO);
     2.5  }
     2.6  
     2.7 -void send_mmio_req(unsigned char type, unsigned long gpa,
     2.8 +void send_mmio_req(unsigned char type, paddr_t gpa,
     2.9                     unsigned long count, int size, paddr_t value,
    2.10                     int dir, int df, int value_is_ptr);
    2.11  void send_pio_req(unsigned long port, unsigned long count, int size,
    2.12                    paddr_t value, int dir, int df, int value_is_ptr);
    2.13  void send_timeoffset_req(unsigned long timeoff);
    2.14  void send_invalidate_req(void);
    2.15 -extern void handle_mmio(unsigned long gpa);
    2.16 +extern void handle_mmio(paddr_t gpa);
    2.17  extern void hvm_interrupt_post(struct vcpu *v, int vector, int type);
    2.18  extern void hvm_io_assist(void);
    2.19  extern void hvm_dpci_eoi(struct domain *d, unsigned int guest_irq,