[Xen-changelog] [xen master] fix commit xen/arm: Add support for GICv3 for domU

[patchbot@xxxxxxx]

commit 608aae36bba86cd2f3656910f3f3b079e53b9aa2
Author:     M A Young <m.a.young@xxxxxxxxxxxx>
AuthorDate: Tue Nov 11 20:28:38 2014 +0000
Commit:     Ian Campbell <ian.campbell@xxxxxxxxxx>
CommitDate: Wed Nov 12 10:39:56 2014 +0000

    fix commit xen/arm: Add support for GICv3 for domU
    
    The build of xen-4.5.0-rc2 fails if XSM_ENABLE=y due to an inconsistency
    in commit fda1614 "xen/arm: Add support for GICv3 for domU" which uses
    XEN_DOMCTL_configure_domain in xen/xsm/flask/hooks.c and
    xen/xsm/flask/policy/access_vectors but XEN_DOMCTL_arm_configure_domain
    elsewhere.
    
        Michael Young
    In fda1614 ("xen/arm: Add support for GICv3 for domU")
    XEN_DOMCTL_configure_domain is used in xen/xsm/flask/hooks.c and
    xen/xsm/flask/policy/access_vectors but XEN_DOMCTL_arm_configure_domain
    is used elsewhere.
    
    Signed-off-by: Michael Young <m.a.young@xxxxxxxxxxxx>
    Acked-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
---
 xen/xsm/flask/hooks.c               |    2 +-
 xen/xsm/flask/policy/access_vectors |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/xen/xsm/flask/hooks.c b/xen/xsm/flask/hooks.c
index 846cf88..0ba2ce9 100644
--- a/xen/xsm/flask/hooks.c
+++ b/xen/xsm/flask/hooks.c
@@ -727,7 +727,7 @@ static int flask_domctl(struct domain *d, int cmd)
     case XEN_DOMCTL_psr_cmt_op:
         return current_has_perm(d, SECCLASS_DOMAIN2, DOMAIN2__PSR_CMT_OP);
 
-    case XEN_DOMCTL_configure_domain:
+    case XEN_DOMCTL_arm_configure_domain:
         return current_has_perm(d, SECCLASS_DOMAIN2, 
DOMAIN2__CONFIGURE_DOMAIN);
 
     default:
diff --git a/xen/xsm/flask/policy/access_vectors 
b/xen/xsm/flask/policy/access_vectors
index bfe2fa5..1cd451e 100644
--- a/xen/xsm/flask/policy/access_vectors
+++ b/xen/xsm/flask/policy/access_vectors
@@ -102,7 +102,7 @@ class domain
     unpause
 # XEN_DOMCTL_resumedomain
     resume
-# XEN_DOMCTL_createdomain
+# XEN_DOMCTL_arm_createdomain
     create
 # checked in FLASK_RELABEL_DOMAIN for any relabel operation:
 #  source = the old label of the domain
--
generated by git-patchbot for /home/xen/git/xen.git#master

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