# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1198274390 0
# Node ID 3f0f0bd3f1c1f1c0808dc1a1f0019f014396b0f8
# Parent 1f4b29eaf7f417e17920d0b7fb5f6d17ba3179e2
hvm: More physaddrs in unsigned longs.
Signed-off-by: Tim Deegan <Tim.Deegan@xxxxxxxxxx>
---
xen/arch/x86/hvm/vmx/vmx.c | 4 ++--
xen/include/asm-x86/hvm/io.h | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff -r 1f4b29eaf7f4 -r 3f0f0bd3f1c1 xen/arch/x86/hvm/vmx/vmx.c
--- a/xen/arch/x86/hvm/vmx/vmx.c Thu Dec 20 17:30:27 2007 +0000
+++ b/xen/arch/x86/hvm/vmx/vmx.c Fri Dec 21 21:59:50 2007 +0000
@@ -1613,7 +1613,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
@@ -2455,7 +2455,7 @@ static void vmx_free_vlapic_mapping(stru
static void vmx_install_vlapic_mapping(struct vcpu *v)
{
- unsigned long virt_page_ma, apic_page_ma;
+ paddr_t virt_page_ma, apic_page_ma;
if ( !cpu_has_vmx_virtualize_apic_accesses )
return;
diff -r 1f4b29eaf7f4 -r 3f0f0bd3f1c1 xen/include/asm-x86/hvm/io.h
--- a/xen/include/asm-x86/hvm/io.h Thu Dec 20 17:30:27 2007 +0000
+++ b/xen/include/asm-x86/hvm/io.h Fri Dec 21 21:59:50 2007 +0000
@@ -149,14 +149,14 @@ static inline int register_buffered_io_h
return register_io_handler(d, addr, size, action, HVM_BUFFERED_IO);
}
-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);
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);
extern void hvm_dpci_eoi(struct domain *d, unsigned int guest_irq,
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home