hvm: More physaddrs in unsigned longs.

Signed-off-by: Tim Deegan <Tim.Deegan@citrix.com>
xen-unstable changeset:   16657:3f0f0bd3f1c1
xen-unstable date:        Fri Dec 21 21:59:50 2007 +0000

x86: Fix PAE build.
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
xen-unstable changeset:   16659:717f0dce76e7
xen-unstable date:        Sat Dec 22 10:27:26 2007 +0000

diff --git a/xen/arch/x86/hvm/platform.c b/xen/arch/x86/hvm/platform.c
index f5b19acb789cd9ea12376bdb12e3b88102b1ae85..e2ffa08060f4d522aae0c1819b30b728e9097beb 100644 (file)
--- a/xen/arch/x86/hvm/platform.c
+++ b/xen/arch/x86/hvm/platform.c
@@ -885,7 +885,7 @@ void send_pio_req(unsigned long port, unsigned long count, int size,
     hvm_send_assist_req(v);
 }
 
-static void send_mmio_req(unsigned char type, unsigned long gpa,
+static void send_mmio_req(unsigned char type, paddr_t gpa,
                           unsigned long count, int size, paddr_t value,
                           int dir, int df, int value_is_ptr)
 {
@@ -894,8 +894,8 @@ static void send_mmio_req(unsigned char type, unsigned long gpa,
     ioreq_t *p;
 
     if ( size == 0 || count == 0 ) {
-        printk("null mmio request? type %d, gpa %lx, "
-               "count %lx, size %d, value %"PRIpaddr"x, dir %d, "
+        printk("null mmio request? type %d, gpa %"PRIpaddr", "
+               "count %lx, size %d, value %"PRIpaddr", dir %d, "
                "value_is_ptr %d.\n",
                type, gpa, count, size, value, dir, value_is_ptr);
     }
@@ -1018,7 +1018,7 @@ static void mmio_operands(int type, unsigned long gpa,
      (mmio_op->flags & REPZ ? (ad_size == WORD ? regs->ecx & 0xFFFF : regs->ecx) : 1)
 
 
-void handle_mmio(unsigned long gpa)
+void handle_mmio(paddr_t gpa)
 {
     unsigned long inst_addr;
     struct hvm_io_op *mmio_op;
@@ -1056,7 +1056,7 @@ void handle_mmio(unsigned long gpa)
         gdprintk(XENLOG_WARNING,
                  "handle_mmio: failed to decode instruction\n");
         gdprintk(XENLOG_WARNING,
-                 "mmio opcode: gpa 0x%lx, len %d:", gpa, inst_len);
+                 "mmio opcode: gpa 0x%"PRIpaddr", len %d:", gpa, inst_len);
         for ( i = 0; i < inst_len; i++ )
             printk(" %02x", inst[i] & 0xFF);
         printk("\n");

diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c
index 94b1ef5f36281e2423a00c4fb199397f683de134..e4da69745993436ea25c0cc71bdb76dfdb70f2ab 100644 (file)
--- a/xen/arch/x86/hvm/vmx/vmx.c
+++ b/xen/arch/x86/hvm/vmx/vmx.c
@@ -1703,7 +1703,7 @@ static void vmx_send_str_pio(struct cpu_user_regs *regs,
                              unsigned long inst_len, unsigned int port,
                              int sign, unsigned int size, int dir,
                              int df, unsigned long addr,
-                             unsigned long paddr, unsigned long count)
+                             paddr_t paddr, unsigned long count)
 {
     /*
      * Handle string pio instructions that cross pages or that

diff --git a/xen/include/asm-x86/hvm/io.h b/xen/include/asm-x86/hvm/io.h
index 17c2f5831a9199fb30e573bec935ddc5c7e32a51..b1c31eef153c6fa5d387626e0d6c529469a7f834 100644 (file)
--- a/xen/include/asm-x86/hvm/io.h
+++ b/xen/include/asm-x86/hvm/io.h
@@ -148,7 +148,7 @@ extern void send_pio_req(unsigned long port, unsigned long count, int size,
                          paddr_t value, int dir, int df, int value_is_ptr);
 void send_timeoffset_req(unsigned long timeoff);
 void send_invalidate_req(void);
-extern void handle_mmio(unsigned long gpa);
+extern void handle_mmio(paddr_t gpa);
 extern void hvm_interrupt_post(struct vcpu *v, int vector, int type);
 extern void hvm_io_assist(void);