[PATCH 08/11] xen/xsm: Wrap around xsm_resource_(un)plug_core

Jiqian Chen posted 11 patches 3 months, 1 week ago
[PATCH 08/11] xen/xsm: Wrap around xsm_resource_(un)plug_core
Posted by Jiqian Chen 3 months, 1 week ago
Since xsm_resource_plug_core and xsm_resource_unplug_core are only
used for arch/x86/platform_hypercall.c and arch/sysctl.c, so wrap
around them with CONFIG_SYSCTL and CONFIG_PLATFORM_OP.

Signed-off-by: Jiqian Chen <Jiqian.Chen@amd.com>
---
cc: "Daniel P. Smith" <dpsmith@apertussolutions.com>
---
 xen/include/xsm/xsm.h | 8 ++++++++
 xen/xsm/dummy.c       | 2 ++
 2 files changed, 10 insertions(+)

diff --git a/xen/include/xsm/xsm.h b/xen/include/xsm/xsm.h
index bc0a0776c895..546a1aa57e37 100644
--- a/xen/include/xsm/xsm.h
+++ b/xen/include/xsm/xsm.h
@@ -577,12 +577,20 @@ static inline int xsm_resource_unplug_pci(
 
 static inline int xsm_resource_plug_core(xsm_default_t def)
 {
+#if defined(CONFIG_SYSCTL) || defined(CONFIG_PLATFORM_OP)
     return alternative_call(xsm_ops.resource_plug_core);
+#else
+    return -EOPNOTSUPP;
+#endif
 }
 
 static inline int xsm_resource_unplug_core(xsm_default_t def)
 {
+#if defined(CONFIG_SYSCTL) || defined(CONFIG_PLATFORM_OP)
     return alternative_call(xsm_ops.resource_unplug_core);
+#else
+    return -EOPNOTSUPP;
+#endif
 }
 
 static inline int xsm_resource_setup_pci(
diff --git a/xen/xsm/dummy.c b/xen/xsm/dummy.c
index d9f4d3ee12b1..ab6eb2149376 100644
--- a/xen/xsm/dummy.c
+++ b/xen/xsm/dummy.c
@@ -90,8 +90,10 @@ static const struct xsm_ops __initconst_cf_clobber dummy_ops = {
     .deassign_dtdevice             = xsm_deassign_dtdevice,
 #endif
 
+#if defined(CONFIG_SYSCTL) || defined(CONFIG_PLATFORM_OP)
     .resource_plug_core            = xsm_resource_plug_core,
     .resource_unplug_core          = xsm_resource_unplug_core,
+#endif
     .resource_plug_pci             = xsm_resource_plug_pci,
     .resource_unplug_pci           = xsm_resource_unplug_pci,
     .resource_setup_pci            = xsm_resource_setup_pci,
-- 
2.34.1