They're unreachable / dead otherwise. Really resource_{,un}plug_pci() is
further limited to PCI pass-through.
Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
--- a/xen/include/xsm/dummy.h
+++ b/xen/include/xsm/dummy.h
@@ -394,6 +394,8 @@ static XSM_INLINE int cf_check xsm_get_d
}
#endif /* HAS_PASSTHROUGH && HAS_PCI */
+#if defined(CONFIG_HAS_PASSTHROUGH) && defined(CONFIG_HAS_PCI)
+
static XSM_INLINE int cf_check xsm_resource_plug_pci(
XSM_DEFAULT_ARG uint32_t machine_bdf)
{
@@ -408,6 +410,10 @@ static XSM_INLINE int cf_check xsm_resou
return xsm_default_action(action, current->domain, NULL);
}
+#endif /* CONFIG_HAS_PASSTHROUGH && CONFIG_HAS_PCI */
+
+#ifdef CONFIG_HAS_PCI
+
static XSM_INLINE int cf_check xsm_resource_setup_pci(
XSM_DEFAULT_ARG uint32_t machine_bdf)
{
@@ -421,6 +427,8 @@ static XSM_INLINE int cf_check xsm_resou
return xsm_default_action(action, current->domain, NULL);
}
+#endif /* CONFIG_HAS_PCI */
+
static XSM_INLINE int cf_check xsm_resource_setup_misc(XSM_DEFAULT_VOID)
{
XSM_ASSERT_ACTION(XSM_PRIV);
@@ -524,6 +532,7 @@ static XSM_INLINE int cf_check xsm_iomem
return xsm_default_action(action, current->domain, d);
}
+#ifdef CONFIG_HAS_PCI
static XSM_INLINE int cf_check xsm_pci_config_permission(
XSM_DEFAULT_ARG struct domain *d, uint32_t machine_bdf, uint16_t start,
uint16_t end, uint8_t access)
@@ -531,6 +540,7 @@ static XSM_INLINE int cf_check xsm_pci_c
XSM_ASSERT_ACTION(XSM_HOOK);
return xsm_default_action(action, current->domain, d);
}
+#endif /* CONFIG_HAS_PCI */
static XSM_INLINE int cf_check xsm_add_to_physmap(
XSM_DEFAULT_ARG struct domain *d1, struct domain *d2)
--- a/xen/include/xsm/hooks.h
+++ b/xen/include/xsm/hooks.h
@@ -77,21 +77,24 @@ XSM_HOOK(int, unbind_pt_irq, struct doma
XSM_HOOK(int, irq_permission, struct domain *, int, uint8_t)
XSM_HOOK(int, iomem_permission, struct domain *, uint64_t, uint64_t, uint8_t)
-XSM_HOOK(int, pci_config_permission, struct domain *, uint32_t, uint16_t,
- uint16_t, uint8_t)
XSM_HOOK(int, iomem_mapping, struct domain *, uint64_t, uint64_t, uint8_t)
XSM_HOOK(int, iomem_mapping_vpci, struct domain *, uint64_t, uint64_t,
uint8_t)
#if defined(CONFIG_HAS_PASSTHROUGH) && defined(CONFIG_HAS_PCI)
+XSM_HOOK(int, resource_plug_pci, uint32_t)
+XSM_HOOK(int, resource_unplug_pci, uint32_t)
XSM_HOOK(int, get_device_group, uint32_t)
#endif
-XSM_HOOK(int, resource_plug_pci, uint32_t)
-XSM_HOOK(int, resource_unplug_pci, uint32_t)
+XSM_HOOK(int, resource_setup_misc)
+
+#ifdef CONFIG_HAS_PCI
XSM_HOOK(int, resource_setup_pci, uint32_t)
XSM_HOOK(int, resource_setup_gsi, int)
-XSM_HOOK(int, resource_setup_misc)
+XSM_HOOK(int, pci_config_permission, struct domain *, uint32_t, uint16_t,
+ uint16_t, uint8_t)
+#endif
XSM_HOOK(int, hypfs_op)
--- a/xen/xsm/flask/hooks.c
+++ b/xen/xsm/flask/hooks.c
@@ -1225,6 +1225,7 @@ static int cf_check flask_iomem_mapping(
}
#define flask_iomem_mapping_vpci flask_iomem_mapping
+#ifdef CONFIG_HAS_PCI
static int cf_check flask_pci_config_permission(
struct domain *d, uint32_t machine_bdf, uint16_t start, uint16_t end,
uint8_t access)
@@ -1250,6 +1251,7 @@ static int cf_check flask_pci_config_per
return avc_has_perm(dsid, rsid, SECCLASS_RESOURCE, perm, &ad);
}
+#endif /* CONFIG_HAS_PCI */
#if defined(CONFIG_SYSCTL) || defined(CONFIG_X86)
static int flask_resource_plug_core(void)
@@ -1270,6 +1272,8 @@ static int flask_resource_use_core(void)
}
#endif /* CONFIG_SYSCTL */
+#if defined(CONFIG_HAS_PASSTHROUGH) && defined(CONFIG_HAS_PCI)
+
static int cf_check flask_resource_plug_pci(uint32_t machine_bdf)
{
uint32_t rsid;
@@ -1300,6 +1304,10 @@ static int cf_check flask_resource_unplu
return avc_current_has_perm(rsid, SECCLASS_RESOURCE, RESOURCE__UNPLUG,
&ad);
}
+#endif /* CONFIG_HAS_PASSTHROUGH && CONFIG_HAS_PCI */
+
+#ifdef CONFIG_HAS_PCI
+
static int cf_check flask_resource_setup_pci(uint32_t machine_bdf)
{
uint32_t rsid;
@@ -1328,6 +1336,8 @@ static int cf_check flask_resource_setup
return avc_current_has_perm(rsid, SECCLASS_RESOURCE, RESOURCE__SETUP,
&ad);
}
+#endif /* CONFIG_HAS_PCI */
+
static int cf_check flask_resource_setup_misc(void)
{
return avc_current_has_perm(SECINITSID_XEN, SECCLASS_RESOURCE,
RESOURCE__SETUP, NULL);
