[Xen-changelog] [xen-unstable] merge

[Xen patchbot-unstable <patchbot@xxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir@xxxxxxx>
# Date 1306942959 -3600
# Node ID cf6c61f71ee3e49efcbd74cfd0ad39ad94e82b74
# Parent  aa7970ca61e1b9dc3972411558d2b974213fd52e
# Parent  d4f6310f1ef5fd9f523888542a50054901598e01
merge
---


diff -r aa7970ca61e1 -r cf6c61f71ee3 xen/arch/x86/mm/mem_paging.c
--- a/xen/arch/x86/mm/mem_paging.c      Wed Jun 01 16:41:42 2011 +0100
+++ b/xen/arch/x86/mm/mem_paging.c      Wed Jun 01 16:42:39 2011 +0100
@@ -31,6 +31,10 @@
     int rc;
     struct p2m_domain *p2m = p2m_get_hostp2m(d);
 
+    /* Only HAP is supported */
+    if ( !hap_enabled(d) )
+         return -ENODEV;
+
     switch( mec->op )
     {
     case XEN_DOMCTL_MEM_EVENT_OP_PAGING_NOMINATE:
diff -r aa7970ca61e1 -r cf6c61f71ee3 xen/arch/x86/mm/mem_sharing.c
--- a/xen/arch/x86/mm/mem_sharing.c     Wed Jun 01 16:41:42 2011 +0100
+++ b/xen/arch/x86/mm/mem_sharing.c     Wed Jun 01 16:42:39 2011 +0100
@@ -737,6 +737,10 @@
 {
     int rc;
 
+    /* Only HAP is supported */
+    if ( !hap_enabled(d) )
+         return -ENODEV;
+
     switch(mec->op)
     {
         case XEN_DOMCTL_MEM_SHARING_OP_CONTROL:

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