| Message ID | 1406818852-31856-18-git-send-email-julien.grall@linaro.org |
|---|---|
| State | Superseded, archived |
| Headers | show |
On Thu, 31 Jul 2014, Julien Grall wrote: > Signed-off-by: Julien Grall <julien.grall@linaro.org> > Cc: Jan Beulich <jbeulich@suse.com> > > --- > Changes in v2: > - Don't move the call in common code. Acked-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com> > xen/arch/arm/domctl.c | 11 ++++++++++- > 1 file changed, 10 insertions(+), 1 deletion(-) > > diff --git a/xen/arch/arm/domctl.c b/xen/arch/arm/domctl.c > index bab92b2..370dd99 100644 > --- a/xen/arch/arm/domctl.c > +++ b/xen/arch/arm/domctl.c > @@ -43,7 +43,16 @@ long arch_do_domctl(struct xen_domctl *domctl, struct domain *d, > } > > default: > - return subarch_do_domctl(domctl, d, u_domctl); > + { > + int rc; > + > + rc = subarch_do_domctl(domctl, d, u_domctl); > + > + if ( rc == -ENOSYS ) > + rc = iommu_do_domctl(domctl, d, u_domctl); > + > + return rc; > + } > } > } > > -- > 1.7.10.4 >
diff --git a/xen/arch/arm/domctl.c b/xen/arch/arm/domctl.c index bab92b2..370dd99 100644 --- a/xen/arch/arm/domctl.c +++ b/xen/arch/arm/domctl.c @@ -43,7 +43,16 @@ long arch_do_domctl(struct xen_domctl *domctl, struct domain *d, } default: - return subarch_do_domctl(domctl, d, u_domctl); + { + int rc; + + rc = subarch_do_domctl(domctl, d, u_domctl); + + if ( rc == -ENOSYS ) + rc = iommu_do_domctl(domctl, d, u_domctl); + + return rc; + } } }
Signed-off-by: Julien Grall <julien.grall@linaro.org> Cc: Jan Beulich <jbeulich@suse.com> --- Changes in v2: - Don't move the call in common code. --- xen/arch/arm/domctl.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)