diff options
| author | Jan Beulich <jbeulich@suse.com> | 2012-11-19 09:43:48 +0100 |
|---|---|---|
| committer | Jan Beulich <jbeulich@suse.com> | 2012-11-19 09:43:48 +0100 |
| commit | 44f7bcf93bc77318f35d9a92e638e4ea76a69c08 (patch) | |
| tree | a97557d76d9992b2619e14e99ae0f60635578934 | |
| parent | 290fc9d3ea04c5de6500005be4dac1768d25d158 (diff) | |
| download | xen-44f7bcf93bc77318f35d9a92e638e4ea76a69c08.tar.gz xen-44f7bcf93bc77318f35d9a92e638e4ea76a69c08.tar.bz2 xen-44f7bcf93bc77318f35d9a92e638e4ea76a69c08.zip | |
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@suse.com>
| -rw-r--r-- | xen/arch/x86/domctl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index 2eab5132db..b285003b8f 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -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); |