[prev in list] [next in list] [prev in thread] [next in thread] 

List:       xen-cvs
Subject:    [Xen-changelog] [xen-unstable] x86: Fix PAE build.
From:       Xen patchbot-unstable <patchbot-unstable () lists ! xensource ! com>
Date:       2007-12-22 14:30:09
Message-ID: 200712221430.lBMEU9Oa006697 () xenbits ! xensource ! com
[Download RAW message or body]

# HG changeset patch
# User Keir Fraser <keir.fraser@citrix.com>
# Date 1198319246 0
# Node ID 717f0dce76e7859dbd0648190ce8dfc3ec0f8170
# Parent  3a2ff31ac913f57c3c75b9f14dce09e9fbd92442
x86: Fix PAE build.
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
---
 xen/arch/x86/hvm/platform.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff -r 3a2ff31ac913 -r 717f0dce76e7 xen/arch/x86/hvm/platform.c
--- a/xen/arch/x86/hvm/platform.c	Sat Dec 22 10:27:05 2007 +0000
+++ b/xen/arch/x86/hvm/platform.c	Sat Dec 22 10:27:26 2007 +0000
@@ -885,7 +885,7 @@ void send_pio_req(unsigned long port, un
     hvm_send_assist_req(v);
 }
 
-void send_mmio_req(unsigned char type, unsigned long gpa,
+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 @@ void send_mmio_req(unsigned char type, u
     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);
     }
@@ -1019,7 +1019,7 @@ static void mmio_operands(int type, unsi
      (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");

_______________________________________________
Xen-changelog mailing list
Xen-changelog@lists.xensource.com
http://lists.xensource.com/xen-changelog
[prev in list] [next in list] [prev in thread] [next in thread]