From mboxrd@z Thu Jan  1 00:00:00 1970
From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Subject: [PATCH 1 of 3] Made arch_memory_op propagate (instead
	of ignore) errors from guest_physmap_add_page
Date: Thu, 03 Dec 2009 18:50:01 -0000
Message-ID: <f9eeb0545e1c48cd9fc0.1259866201@phenom.dumpdata.com>
References: <patchbomb.1259866200@phenom.dumpdata.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <xen-devel-bounces@lists.xensource.com>
In-Reply-To: <patchbomb.1259866200@phenom.dumpdata.com>
List-Unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xensource.com>
List-Help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-Subscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
Sender: xen-devel-bounces@lists.xensource.com
Errors-To: xen-devel-bounces@lists.xensource.com
To: xen-devel@lists.xensource.com
Cc: keir.fraser@eu.citrix.com
List-Id: xen-devel@lists.xenproject.org

# HG changeset patch
# User konrad@phenom.dumpdata.com
# Date 1259769438 18000
# Node ID f9eeb0545e1c48cd9fc090c3be8d994b258dd636
# Parent  50aaf5df87ff75fbffffdc7cf9e6d128adef8ecb
Made arch_memory_op propagate (instead of ignore) errors from guest_physmap_add_page.

Authored-by: David Lively
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>

diff -r 50aaf5df87ff -r f9eeb0545e1c xen/arch/x86/mm.c
--- a/xen/arch/x86/mm.c	Wed Dec 02 10:35:41 2009 -0500
+++ b/xen/arch/x86/mm.c	Wed Dec 02 10:57:18 2009 -0500
@@ -4005,6 +4005,7 @@
         struct xen_add_to_physmap xatp;
         unsigned long prev_mfn, mfn = 0, gpfn;
         struct domain *d;
+        int rc = 0;
 
         if ( copy_from_guest(&xatp, arg, 1) )
             return -EFAULT;
@@ -4089,7 +4090,7 @@
             guest_physmap_remove_page(d, gpfn, mfn, 0);
 
         /* Map at new location. */
-        guest_physmap_add_page(d, xatp.gpfn, mfn, 0);
+        rc = guest_physmap_add_page(d, xatp.gpfn, mfn, 0);
 
         domain_unlock(d);
 
@@ -4098,7 +4099,7 @@
 
         rcu_unlock_domain(d);
 
-        break;
+        return rc;
     }
 
     case XENMEM_set_memory_map: