diff mbox

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

Message ID 1430231563-25648-11-git-send-email-julien.grall@citrix.com
State New
Headers show

Commit Message

Julien Grall April 28, 2015, 2:32 p.m. UTC 
From: Julien Grall <julien.grall@linaro.org>

Signed-off-by: Julien Grall <julien.grall@linaro.org>
Acked-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>

---
    Changes in v4:
        - Add Ian's ack

    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(-)
diff mbox

Patch

diff --git a/xen/arch/arm/domctl.c b/xen/arch/arm/domctl.c
index 4600019..30453d8 100644
--- a/xen/arch/arm/domctl.c
+++ b/xen/arch/arm/domctl.c
@@ -109,7 +109,16 @@  long arch_do_domctl(struct xen_domctl *domctl, struct domain *d,
         return 0;
     }
     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;
+    }
     }
 }