ia64/xen-unstable

changeset 16659:717f0dce76e7

x86: Fix PAE build.
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
author Keir Fraser <keir.fraser@citrix.com>
date Sat Dec 22 10:27:26 2007 +0000 (2007-12-22)
parents 3a2ff31ac913
children 2324110ef2c6
files xen/arch/x86/hvm/platform.c
line diff
     1.1 --- a/xen/arch/x86/hvm/platform.c	Sat Dec 22 10:27:05 2007 +0000
     1.2 +++ b/xen/arch/x86/hvm/platform.c	Sat Dec 22 10:27:26 2007 +0000
     1.3 @@ -885,7 +885,7 @@ void send_pio_req(unsigned long port, un
     1.4      hvm_send_assist_req(v);
     1.5  }
     1.6  
     1.7 -void send_mmio_req(unsigned char type, unsigned long gpa,
     1.8 +void send_mmio_req(unsigned char type, paddr_t gpa,
     1.9                     unsigned long count, int size, paddr_t value,
    1.10                     int dir, int df, int value_is_ptr)
    1.11  {
    1.12 @@ -894,8 +894,8 @@ void send_mmio_req(unsigned char type, u
    1.13      ioreq_t *p;
    1.14  
    1.15      if ( size == 0 || count == 0 ) {
    1.16 -        printk("null mmio request? type %d, gpa %lx, "
    1.17 -               "count %lx, size %d, value %"PRIpaddr"x, dir %d, "
    1.18 +        printk("null mmio request? type %d, gpa %"PRIpaddr", "
    1.19 +               "count %lx, size %d, value %"PRIpaddr", dir %d, "
    1.20                 "value_is_ptr %d.\n",
    1.21                 type, gpa, count, size, value, dir, value_is_ptr);
    1.22      }
    1.23 @@ -1019,7 +1019,7 @@ static void mmio_operands(int type, unsi
    1.24       (mmio_op->flags & REPZ ? (ad_size == WORD ? regs->ecx & 0xFFFF : regs->ecx) : 1)
    1.25  
    1.26  
    1.27 -void handle_mmio(unsigned long gpa)
    1.28 +void handle_mmio(paddr_t gpa)
    1.29  {
    1.30      unsigned long inst_addr;
    1.31      struct hvm_io_op *mmio_op;
    1.32 @@ -1056,7 +1056,7 @@ void handle_mmio(unsigned long gpa)
    1.33          gdprintk(XENLOG_WARNING,
    1.34                   "handle_mmio: failed to decode instruction\n");
    1.35          gdprintk(XENLOG_WARNING,
    1.36 -                 "mmio opcode: gpa 0x%lx, len %d:", gpa, inst_len);
    1.37 +                 "mmio opcode: gpa 0x%"PRIpaddr", len %d:", gpa, inst_len);
    1.38          for ( i = 0; i < inst_len; i++ )
    1.39              printk(" %02x", inst[i] & 0xFF);
    1.40          printk("\n");