[PATCH] flask: Update XEN_SYSCTL_cputopoinfo name

[PATCH] flask: Update XEN_SYSCTL_cputopoinfo name

[Boris Ostrovsky]

Commit 2090f14c5cbd ("sysctl: make XEN_SYSCTL_topologyinfo sysctl a
little more efficient") renamed XEN_SYSCTL_topologyinfo to
XEN_SYSCTL_cputopoinfo.

It, however, neglected to update this macro for flask-related files.

Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Reported-by: Wei Liu <wei.liu2@citrix.com>
---
 docs/misc/xsm-flask.txt             |    2 +-
 xen/xsm/flask/hooks.c               |    2 +-
 xen/xsm/flask/policy/access_vectors |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/misc/xsm-flask.txt b/docs/misc/xsm-flask.txt
index e169937..90a2aef 100644
--- a/docs/misc/xsm-flask.txt
+++ b/docs/misc/xsm-flask.txt
@@ -116,7 +116,7 @@ __HYPERVISOR_sysctl (xen/include/public/sysctl.h)
  * XEN_SYSCTL_pm_op
  * XEN_SYSCTL_page_offline_op
  * XEN_SYSCTL_lockprof_op
- * XEN_SYSCTL_topologyinfo
+ * XEN_SYSCTL_cputopoinfo
  * XEN_SYSCTL_numainfo
  * XEN_SYSCTL_cpupool_op
  * XEN_SYSCTL_scheduler_op
diff --git a/xen/xsm/flask/hooks.c b/xen/xsm/flask/hooks.c
index 05dafed..4e2c1b7 100644
--- a/xen/xsm/flask/hooks.c
+++ b/xen/xsm/flask/hooks.c
@@ -783,7 +783,7 @@ static int flask_sysctl(int cmd)
         return domain_has_xen(current->domain, XEN__CPUPOOL_OP);
 
     case XEN_SYSCTL_physinfo:
-    case XEN_SYSCTL_topologyinfo:
+    case XEN_SYSCTL_cputopoinfo:
     case XEN_SYSCTL_numainfo:
         return domain_has_xen(current->domain, XEN__PHYSINFO);
 
diff --git a/xen/xsm/flask/policy/access_vectors b/xen/xsm/flask/policy/access_vectors
index 8f44b9d..fe5406d 100644
--- a/xen/xsm/flask/policy/access_vectors
+++ b/xen/xsm/flask/policy/access_vectors
@@ -27,7 +27,7 @@ class xen
     mtrr_read
 # XENPF_microcode_update
     microcode
-# XEN_SYSCTL_physinfo, XEN_SYSCTL_topologyinfo, XEN_SYSCTL_numainfo
+# XEN_SYSCTL_physinfo, XEN_SYSCTL_cputopoinfo, XEN_SYSCTL_numainfo
     physinfo
 # XENPF_platform_quirk
     quirk
-- 
1.7.1

Re: [PATCH] flask: Update XEN_SYSCTL_cputopoinfo name

[Daniel De Graaf]

On 03/30/2015 04:17 PM, Boris Ostrovsky wrote:
> Commit 2090f14c5cbd ("sysctl: make XEN_SYSCTL_topologyinfo sysctl a
> little more efficient") renamed XEN_SYSCTL_topologyinfo to
> XEN_SYSCTL_cputopoinfo.
>
> It, however, neglected to update this macro for flask-related files.
>
> Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
> Reported-by: Wei Liu <wei.liu2@citrix.com>

Acked-by: Daniel De Graaf <dgdegra@tycho.nsa.gov>

Re: [PATCH] flask: Update XEN_SYSCTL_cputopoinfo name

[Ian Campbell]

On Mon, 2015-03-30 at 16:17 -0400, Daniel De Graaf wrote:
> On 03/30/2015 04:17 PM, Boris Ostrovsky wrote:
> > Commit 2090f14c5cbd ("sysctl: make XEN_SYSCTL_topologyinfo sysctl a
> > little more efficient") renamed XEN_SYSCTL_topologyinfo to
> > XEN_SYSCTL_cputopoinfo.
> >
> > It, however, neglected to update this macro for flask-related files.
> >
> > Signed-off-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
> > Reported-by: Wei Liu <wei.liu2@citrix.com>
> 
> Acked-by: Daniel De Graaf <dgdegra@tycho.nsa.gov>

Applied, thanks.