diff mbox

[Xen-devel,v3,19/24] xen/iommu: arm: Wire iommu DOMCTL for ARM

Message ID 1421159133-31526-20-git-send-email-julien.grall@linaro.org
State Superseded, archived
Headers show

Commit Message

Julien Grall Jan. 13, 2015, 2:25 p.m. UTC 
Signed-off-by: Julien Grall <julien.grall@linaro.org>
Acked-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Cc: Jan Beulich <jbeulich@suse.com>

---
    Changes in v3:
        - Add Stefano's ack

    Changes in v2:
        - Don't move the call in common code.
---
 xen/arch/arm/domctl.c | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

Comments

Julien Grall Jan. 20, 2015, 2:32 p.m. UTC | #1 
Hi Jan,

On 20/01/15 09:22, Jan Beulich wrote:
>>>> On 13.01.15 at 15:25, <julien.grall@linaro.org> wrote:
>> Signed-off-by: Julien Grall <julien.grall@linaro.org>
>> Acked-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
>> Cc: Jan Beulich <jbeulich@suse.com>
> 
> Is this a leftover from ...
> 
>> ---
>>     Changes in v3:
>>         - Add Stefano's ack
>>
>>     Changes in v2:
>>         - Don't move the call in common code.
> 
> ... before this?

Yes. Sorry for the spam.

Regards,
diff mbox

Patch

diff --git a/xen/arch/arm/domctl.c b/xen/arch/arm/domctl.c
index 485d3aa..cc4894e 100644
--- a/xen/arch/arm/domctl.c
+++ b/xen/arch/arm/domctl.c
@@ -33,7 +33,16 @@  long arch_do_domctl(struct xen_domctl *domctl, struct domain *d,
         return p2m_cache_flush(d, s, e);
     }
     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;
+    }
     }
 }