xen-changelog

[Top] [All Lists]

[Xen-changelog] [xen-unstable] merge

from [Xen patchbot-unstable]

[Permanent Link][Original]

To:	xen-changelog@xxxxxxxxxxxxxxxxxxx
Subject:	[Xen-changelog] [xen-unstable] merge
From:	Xen patchbot-unstable <patchbot@xxxxxxx>
Date:	Thu, 16 Jun 2011 11:12:12 +0100
Delivery-date:	Thu, 16 Jun 2011 03:23:04 -0700
Envelope-to:	www-data@xxxxxxxxxxxxxxxxxxx
List-help:	<mailto:xen-changelog-request@lists.xensource.com?subject=help>
List-id:	BK change log <xen-changelog.lists.xensource.com>
List-post:	<mailto:xen-changelog@lists.xensource.com>
List-subscribe:	<http://lists.xensource.com/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=subscribe>
List-unsubscribe:	<http://lists.xensource.com/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=unsubscribe>
Reply-to:	xen-devel@xxxxxxxxxxxxxxxxxxx
Sender:	xen-changelog-bounces@xxxxxxxxxxxxxxxxxxx

# 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

[More with this subject...]

<Prev in Thread]	Current Thread	[Next in Thread>
[Xen-changelog] [xen-unstable] Merge, Xen patchbot-unstable [Xen-changelog] [xen-unstable] merge, Xen patchbot-unstable <= [Xen-changelog] [xen-unstable] Merge, Xen patchbot-unstable [Xen-changelog] [xen-unstable] Merge, Xen patchbot-unstable

Previous by Date:	[Xen-changelog] [xen-unstable] hvmloader: setup PCI bus in a common function again., Xen patchbot-unstable
Next by Date:	[Xen-changelog] [xen-unstable] hvmloader: call SMP setup from common code again., Xen patchbot-unstable
Previous by Thread:	[Xen-changelog] [xen-unstable] Merge, Xen patchbot-unstable
Next by Thread:	[Xen-changelog] [xen-unstable] Merge, Xen patchbot-unstable
Indexes:	[Date] [Thread] [Top] [All Lists]