[Xen-devel] [PATCH 6/8] xsm: rename security_pirq_sid to security_irq_sid

[Daniel De Graaf <dgdegra@xxxxxxxxxxxxx>]

Attempting to manage the PIRQ namespace is not useful as guests can
assign any mapping of IRQ to PIRQ (although the identity mapping is the
most common). Change the internal names to reflect this change.

Signed-off-by: Daniel De Graaf <dgdegra@xxxxxxxxxxxxx>
---
 xen/xsm/flask/hooks.c            |    4 ++--
 xen/xsm/flask/include/security.h |    2 +-
 xen/xsm/flask/ss/services.c      |    4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/xen/xsm/flask/hooks.c b/xen/xsm/flask/hooks.c
index 1bea498..0feb070 100644
--- a/xen/xsm/flask/hooks.c
+++ b/xen/xsm/flask/hooks.c
@@ -666,7 +666,7 @@ static int flask_irq_permission (struct domain *d, int 
pirq, uint8_t access)
     ssec = current->domain->ssid;
     tsec = d->ssid;
 
-    rc = security_pirq_sid(pirq, &rsid);
+    rc = security_irq_sid(pirq, &rsid);
     if ( rc )
         return rc;
 
@@ -1151,7 +1151,7 @@ static int flask_bind_pt_irq (struct domain *d, struct 
xen_domctl_bind_pt_irq *b
 
     irq = domain_pirq_to_irq(d, bind->machine_irq);
 
-    rc = security_pirq_sid(irq, &rsid);
+    rc = security_irq_sid(irq, &rsid);
     if ( rc )
         return rc;
 
diff --git a/xen/xsm/flask/include/security.h b/xen/xsm/flask/include/security.h
index 0dc21c8..67ca6d0 100644
--- a/xen/xsm/flask/include/security.h
+++ b/xen/xsm/flask/include/security.h
@@ -71,7 +71,7 @@ int security_context_to_sid(char *scontext, u32 scontext_len, 
u32 *out_sid);
 
 int security_get_user_sids(u32 callsid, char *username, u32 **sids, u32 *nel);
 
-int security_pirq_sid(int pirq, u32 *out_sid);
+int security_irq_sid(int pirq, u32 *out_sid);
 
 int security_iomem_sid(unsigned long, u32 *out_sid);
 
diff --git a/xen/xsm/flask/ss/services.c b/xen/xsm/flask/ss/services.c
index b880762..1eb8e4c 100644
--- a/xen/xsm/flask/ss/services.c
+++ b/xen/xsm/flask/ss/services.c
@@ -1514,11 +1514,11 @@ err:
 }
 
 /**
- * security_pirq_sid - Obtain the SID for a physical irq.
+ * security_irq_sid - Obtain the SID for a physical irq.
  * @pirq: physical irq
  * @out_sid: security identifier
  */
-int security_pirq_sid(int pirq, u32 *out_sid)
+int security_irq_sid(int pirq, u32 *out_sid)
 {
     int rc = 0;
     struct ocontext *c;
-- 
1.7.7.3


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel