[Xen-changelog] [xen-unstable] x86: XENMEM_add_to_physmap should propagate errors from guest_physmap_add_page().

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1259909973 0
# Node ID ecda56356037f8f1fd56734fda920461d144643d
# Parent  0930d17589a6309933cbf8a5848f45dd393e617d
x86: XENMEM_add_to_physmap should propagate errors from 
guest_physmap_add_page().

Authored-by: David Lively
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx>
---
 xen/arch/x86/mm.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff -r 0930d17589a6 -r ecda56356037 xen/arch/x86/mm.c
--- a/xen/arch/x86/mm.c Fri Dec 04 06:58:08 2009 +0000
+++ b/xen/arch/x86/mm.c Fri Dec 04 06:59:33 2009 +0000
@@ -4005,6 +4005,7 @@ long arch_memory_op(int op, XEN_GUEST_HA
         struct xen_add_to_physmap xatp;
         unsigned long prev_mfn, mfn = 0, gpfn;
         struct domain *d;
+        int rc;
 
         if ( copy_from_guest(&xatp, arg, 1) )
             return -EFAULT;
@@ -4089,7 +4090,7 @@ long arch_memory_op(int op, XEN_GUEST_HA
             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 @@ long arch_memory_op(int op, XEN_GUEST_HA
 
         rcu_unlock_domain(d);
 
-        break;
+        return rc;
     }
 
     case XENMEM_set_memory_map:

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