[Xen-changelog] [xen-unstable] x86/mm: mem-paging and mem-sharing only work with HAP

[Xen patchbot-unstable <patchbot@xxxxxxx>]

# HG changeset patch
# User Tim Deegan <Tim.Deegan@xxxxxxxxxx>
# Date 1306923103 -3600
# Node ID d4f6310f1ef5fd9f523888542a50054901598e01
# Parent  4d28306d6e33dc88301cfa71f15f0ddd08b90036
x86/mm: mem-paging and mem-sharing only work with HAP
so don't let the tools shoot themselves in the foot.

Signed-off-by: Tim Deegan <Tim.Deegan@xxxxxxxxxx>
---


diff -r 4d28306d6e33 -r d4f6310f1ef5 xen/arch/x86/mm/mem_paging.c
--- a/xen/arch/x86/mm/mem_paging.c      Tue May 31 13:57:45 2011 +0100
+++ b/xen/arch/x86/mm/mem_paging.c      Wed Jun 01 11:11:43 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 4d28306d6e33 -r d4f6310f1ef5 xen/arch/x86/mm/mem_sharing.c
--- a/xen/arch/x86/mm/mem_sharing.c     Tue May 31 13:57:45 2011 +0100
+++ b/xen/arch/x86/mm/mem_sharing.c     Wed Jun 01 11:11:43 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