# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1198791992 0
# Node ID 73f349c80f355f817e49f6e2897b3637f14fa109
# Parent 9093b433fa5c1f2058dfc3228ddbb5d8ef182093
hvm: More physaddrs in unsigned longs.
Signed-off-by: Tim Deegan <Tim.Deegan@xxxxxxxxxx>
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@xxxxxxxxxx>
xen-unstable changeset: 16659:717f0dce76e7
xen-unstable date: Sat Dec 22 10:27:26 2007 +0000
---
xen/arch/x86/hvm/platform.c | 10 +++++-----
xen/arch/x86/hvm/vmx/vmx.c | 2 +-
xen/include/asm-x86/hvm/io.h | 2 +-
3 files changed, 7 insertions(+), 7 deletions(-)
diff -r 9093b433fa5c -r 73f349c80f35 xen/arch/x86/hvm/platform.c
--- a/xen/arch/x86/hvm/platform.c Thu Dec 20 14:57:03 2007 +0000
+++ b/xen/arch/x86/hvm/platform.c Thu Dec 27 21:46:32 2007 +0000
@@ -885,7 +885,7 @@ void send_pio_req(unsigned long port, un
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
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, 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");
diff -r 9093b433fa5c -r 73f349c80f35 xen/arch/x86/hvm/vmx/vmx.c
--- a/xen/arch/x86/hvm/vmx/vmx.c Thu Dec 20 14:57:03 2007 +0000
+++ b/xen/arch/x86/hvm/vmx/vmx.c Thu Dec 27 21:46:32 2007 +0000
@@ -1703,7 +1703,7 @@ static void vmx_send_str_pio(struct cpu_
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 -r 9093b433fa5c -r 73f349c80f35 xen/include/asm-x86/hvm/io.h
--- a/xen/include/asm-x86/hvm/io.h Thu Dec 20 14:57:03 2007 +0000
+++ b/xen/include/asm-x86/hvm/io.h Thu Dec 27 21:46:32 2007 +0000
@@ -148,7 +148,7 @@ extern void send_pio_req(unsigned long p
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);
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home