aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKeir Fraser <keir.fraser@citrix.com>2007-12-22 10:27:26 +0000
committerKeir Fraser <keir.fraser@citrix.com>2007-12-22 10:27:26 +0000
commitbcaa6b863d31951f59e6b83f6f174c9b8cfbab8f (patch)
tree3cb52f1e469414ae103f5aebc55478731cd58a9d
parentcba79aee5b72b27d319128297d0099a1e65167b8 (diff)
downloadxen-bcaa6b863d31951f59e6b83f6f174c9b8cfbab8f.tar.gz
xen-bcaa6b863d31951f59e6b83f6f174c9b8cfbab8f.tar.bz2
xen-bcaa6b863d31951f59e6b83f6f174c9b8cfbab8f.zip
x86: Fix PAE build.
Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
-rw-r--r--xen/arch/x86/hvm/platform.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/xen/arch/x86/hvm/platform.c b/xen/arch/x86/hvm/platform.c
index 155a48bcb4..66c30d74fd 100644
--- 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);
}
-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, 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);
}
@@ -1019,7 +1019,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");