[Xen-changelog] [xen-unstable] [hvm] Move the mapping of the shared IO page slightly earlier

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User sos22@xxxxxxxxxxxxxxxxxxxx
# Node ID 857e7b864bb0a87cc6fc286bc1abb958df7d8db1
# Parent  abd14c5c54960d96292808ea4a4741bee3da97ca
[hvm] Move the mapping of the shared IO page slightly earlier
in the initialisation sequence for HVM guests, so that we can
write vp_eport into the shared after creating the port.

Signed-off-by: Steven Smith <ssmith@xxxxxxxxxxxxx>
---
 xen/arch/x86/hvm/hvm.c        |    1 -
 xen/include/asm-x86/hvm/hvm.h |    9 +++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff -r abd14c5c5496 -r 857e7b864bb0 xen/arch/x86/hvm/hvm.c
--- a/xen/arch/x86/hvm/hvm.c    Tue Aug 08 10:36:32 2006 +0100
+++ b/xen/arch/x86/hvm/hvm.c    Tue Aug 08 11:17:52 2006 +0100
@@ -175,7 +175,6 @@ void hvm_setup_platform(struct domain* d
     }
 
     hvm_zap_iommu_pages(d);
-    hvm_map_io_shared_page(v);
 
     platform = &d->arch.hvm_domain;
     pic_init(&platform->vpic, pic_irq_request, &platform->interrupt_request);
diff -r abd14c5c5496 -r 857e7b864bb0 xen/include/asm-x86/hvm/hvm.h
--- a/xen/include/asm-x86/hvm/hvm.h     Tue Aug 08 10:36:32 2006 +0100
+++ b/xen/include/asm-x86/hvm/hvm.h     Tue Aug 08 11:17:52 2006 +0100
@@ -77,12 +77,17 @@ hvm_disable(void)
         hvm_funcs.disable();
 }
 
+void hvm_map_io_shared_page(struct vcpu *v);
+
 static inline int
 hvm_initialize_guest_resources(struct vcpu *v)
 {
+    int ret = 1;
     if ( hvm_funcs.initialize_guest_resources )
-        return hvm_funcs.initialize_guest_resources(v);
-    return 0;
+        ret = hvm_funcs.initialize_guest_resources(v);
+    if ( ret == 1 )
+        hvm_map_io_shared_page(v);
+    return ret;
 }
 
 static inline void

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog