[Xen-changelog] [xen-4.1-testing] fix backport oversight in 23383:addf106cc90f

[Xen patchbot-4.1-testing <patchbot@xxxxxxx>]

# HG changeset patch
# User Jan Beulich <jbeulich@xxxxxxxx>
# Date 1353314628 -3600
# Node ID 5639047d6c9fafa3b2d455cb60cf1d17be4035e0
# Parent  ce405f5fd5ee75e5241afece9b41c114891fc20d
fix backport oversight in 23383:addf106cc90f

This fixes an omission in said backport (of -unstable
25931:149805919569): While the XEN_DOMCTL_memory_mapping code
pointlessly sets "ret" to zero, the XEN_DOMCTL_ioport_mapping code
needs to because of an XSM call (leaving ret set to zero when reaching
the code in question) present in -unstable, but absent in 4.1-testing.

Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
---


diff -r ce405f5fd5ee -r 5639047d6c9f xen/arch/x86/domctl.c
--- a/xen/arch/x86/domctl.c     Thu Nov 15 09:41:51 2012 +0000
+++ b/xen/arch/x86/domctl.c     Mon Nov 19 09:43:48 2012 +0100
@@ -979,7 +979,6 @@ long arch_do_domctl(
         if ( unlikely((d = rcu_lock_domain_by_id(domctl->domain)) == NULL) )
             break;
 
-        ret=0;
         if ( domctl->u.memory_mapping.add_mapping )
         {
             gdprintk(XENLOG_INFO,
@@ -1079,6 +1078,7 @@ long arch_do_domctl(
                     found = 1;
                     break;
                 }
+            ret = 0;
             if ( !found )
             {
                 g2m_ioport = xmalloc(struct g2m_ioport);

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