Mailing List Archive

xen/arch/x86/mm/mem_access.c | 3 +--
xen/arch/x86/mm/p2m.c | 3 +--
xen/include/asm-x86/p2m.h | 2 +-
3 files changed, 3 insertions(+), 5 deletions(-)


Signed-off-by: Adin Scannell <adin@scannell.ca>
Signed-off-by: Keir Fraser <keir@xen.org>
Signed-off-by: Andres Lagar-Cavilla <andres@lagarcavilla.org>

diff -r b3cdfb5b76d0 -r 106296812c3f xen/arch/x86/mm/mem_access.c
--- a/xen/arch/x86/mm/mem_access.c
+++ b/xen/arch/x86/mm/mem_access.c
@@ -29,13 +29,12 @@ int mem_access_domctl(struct domain *d,
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 b3cdfb5b76d0 -r 106296812c3f xen/arch/x86/mm/p2m.c
--- a/xen/arch/x86/mm/p2m.c
+++ b/xen/arch/x86/mm/p2m.c
@@ -1150,9 +1150,8 @@ void p2m_mem_access_check(unsigned long
/* VCPU paused */
}

-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;

/* Pull all responses off the ring */
diff -r b3cdfb5b76d0 -r 106296812c3f xen/include/asm-x86/p2m.h
--- a/xen/include/asm-x86/p2m.h
+++ b/xen/include/asm-x86/p2m.h
@@ -493,7 +493,7 @@ static inline void p2m_mem_paging_popula
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-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel