[Xen-changelog] [xen-unstable] Make the prototype of p2m_mem_access_resume consistent

[Xen patchbot-unstable <patchbot@xxxxxxx>]

# HG changeset patch
# User Andres Lagar-Cavilla <andres@xxxxxxxxxxxxxxxx>
# Date 1322762297 0
# Node ID 6bac468165044ccabe234b8710ae5b3b86e106a4
# Parent  3b409f65abae294b8ba9b6b34c5324854d780514
Make the prototype of p2m_mem_access_resume consistent

Signed-off-by: Adin Scannell <adin@xxxxxxxxxxx>
Signed-off-by: Keir Fraser <keir@xxxxxxx>
Signed-off-by: Andres Lagar-Cavilla <andres@xxxxxxxxxxxxxxxx>
Acked-by: Tim Deegan <tim@xxxxxxx>
Committed-by: Tim Deegan <tim@xxxxxxx>
---


diff -r 3b409f65abae -r 6bac46816504 xen/arch/x86/mm/mem_access.c
--- a/xen/arch/x86/mm/mem_access.c      Thu Dec 01 17:26:48 2011 +0000
+++ b/xen/arch/x86/mm/mem_access.c      Thu Dec 01 17:58:17 2011 +0000
@@ -29,13 +29,12 @@
                       XEN_GUEST_HANDLE(void) u_domctl)
 {
     int rc;
-    struct p2m_domain *p2m = p2m_get_hostp2m(d);
 
     switch( mec->op )
     {
     case XEN_DOMCTL_MEM_EVENT_OP_ACCESS_RESUME:
     {
-        p2m_mem_access_resume(p2m);
+        p2m_mem_access_resume(d);
         rc = 0;
     }
     break;
diff -r 3b409f65abae -r 6bac46816504 xen/arch/x86/mm/p2m.c
--- a/xen/arch/x86/mm/p2m.c     Thu Dec 01 17:26:48 2011 +0000
+++ b/xen/arch/x86/mm/p2m.c     Thu Dec 01 17:58:17 2011 +0000
@@ -1142,9 +1142,8 @@
     /* VCPU paused, mem event request sent */
 }
 
-void p2m_mem_access_resume(struct p2m_domain *p2m)
+void p2m_mem_access_resume(struct domain *d)
 {
-    struct domain *d = p2m->domain;
     mem_event_response_t rsp;
 
     mem_event_get_response(&d->mem_event->access, &rsp);
diff -r 3b409f65abae -r 6bac46816504 xen/include/asm-x86/p2m.h
--- a/xen/include/asm-x86/p2m.h Thu Dec 01 17:26:48 2011 +0000
+++ b/xen/include/asm-x86/p2m.h Thu Dec 01 17:58:17 2011 +0000
@@ -495,7 +495,7 @@
 void p2m_mem_access_check(unsigned long gpa, bool_t gla_valid, unsigned long 
gla, 
                           bool_t access_r, bool_t access_w, bool_t access_x);
 /* Resumes the running of the VCPU, restarting the last instruction */
-void p2m_mem_access_resume(struct p2m_domain *p2m);
+void p2m_mem_access_resume(struct domain *d);
 
 /* Set access type for a region of pfns.
  * If start_pfn == -1ul, sets the default access type */

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