File 20576-add-to-physmap-error-code.patch of Package xen
# HG changeset patch
# User Keir Fraser <keir.fraser@citrix.com>
# 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@oracle.com>
--- a/xen/arch/x86/mm.c
+++ b/xen/arch/x86/mm.c
@@ -3893,13 +3893,13 @@ 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);
rcu_unlock_domain(d);
- break;
+ return rc;
}
case XENMEM_set_memory_map: