提交 ce937d37 编写于 作者: M Michal Privoznik

security: Drop virSecurityManagerSetHugepages

Since its introduction in 2012 this internal API did nothing.
Moreover we have the same API that does exactly the same:
virSecurityManagerDomainSetPathLabel.
Signed-off-by: NMichal Privoznik <mprivozn@redhat.com>
上级 f55afd83
...@@ -1164,7 +1164,6 @@ virSecurityManagerSetChildProcessLabel; ...@@ -1164,7 +1164,6 @@ virSecurityManagerSetChildProcessLabel;
virSecurityManagerSetDaemonSocketLabel; virSecurityManagerSetDaemonSocketLabel;
virSecurityManagerSetDiskLabel; virSecurityManagerSetDiskLabel;
virSecurityManagerSetHostdevLabel; virSecurityManagerSetHostdevLabel;
virSecurityManagerSetHugepages;
virSecurityManagerSetImageFDLabel; virSecurityManagerSetImageFDLabel;
virSecurityManagerSetImageLabel; virSecurityManagerSetImageLabel;
virSecurityManagerSetProcessLabel; virSecurityManagerSetProcessLabel;
......
...@@ -3250,7 +3250,7 @@ qemuProcessBuildDestroyHugepagesPath(virQEMUDriverPtr driver, ...@@ -3250,7 +3250,7 @@ qemuProcessBuildDestroyHugepagesPath(virQEMUDriverPtr driver,
goto cleanup; goto cleanup;
} }
if (virSecurityManagerSetHugepages(driver->securityManager, if (virSecurityManagerDomainSetPathLabel(driver->securityManager,
vm->def, hugepagePath) < 0) { vm->def, hugepagePath) < 0) {
virReportError(VIR_ERR_INTERNAL_ERROR, virReportError(VIR_ERR_INTERNAL_ERROR,
"%s", _("Unable to set huge path in security driver")); "%s", _("Unable to set huge path in security driver"));
......
...@@ -168,7 +168,6 @@ struct _virSecurityDriver { ...@@ -168,7 +168,6 @@ struct _virSecurityDriver {
virSecurityDomainSetTapFDLabel domainSetSecurityTapFDLabel; virSecurityDomainSetTapFDLabel domainSetSecurityTapFDLabel;
virSecurityDomainGetMountOptions domainGetSecurityMountOptions; virSecurityDomainGetMountOptions domainGetSecurityMountOptions;
virSecurityDomainSetHugepages domainSetSecurityHugepages;
virSecurityDriverGetBaseLabel getBaseLabel; virSecurityDriverGetBaseLabel getBaseLabel;
......
...@@ -969,23 +969,6 @@ virSecurityManagerGetNested(virSecurityManagerPtr mgr) ...@@ -969,23 +969,6 @@ virSecurityManagerGetNested(virSecurityManagerPtr mgr)
} }
int
virSecurityManagerSetHugepages(virSecurityManagerPtr mgr,
virDomainDefPtr vm,
const char *path)
{
if (mgr->drv->domainSetSecurityHugepages) {
int ret;
virObjectLock(mgr);
ret = mgr->drv->domainSetSecurityHugepages(mgr, vm, path);
virObjectUnlock(mgr);
return ret;
}
return 0;
}
int int
virSecurityManagerDomainSetPathLabel(virSecurityManagerPtr mgr, virSecurityManagerDomainSetPathLabel(virSecurityManagerPtr mgr,
virDomainDefPtr vm, virDomainDefPtr vm,
......
...@@ -149,9 +149,6 @@ int virSecurityManagerSetTapFDLabel(virSecurityManagerPtr mgr, ...@@ -149,9 +149,6 @@ int virSecurityManagerSetTapFDLabel(virSecurityManagerPtr mgr,
char *virSecurityManagerGetMountOptions(virSecurityManagerPtr mgr, char *virSecurityManagerGetMountOptions(virSecurityManagerPtr mgr,
virDomainDefPtr vm); virDomainDefPtr vm);
virSecurityManagerPtr* virSecurityManagerGetNested(virSecurityManagerPtr mgr); virSecurityManagerPtr* virSecurityManagerGetNested(virSecurityManagerPtr mgr);
int virSecurityManagerSetHugepages(virSecurityManagerPtr mgr,
virDomainDefPtr sec,
const char *hugepages_path);
int virSecurityManagerSetImageLabel(virSecurityManagerPtr mgr, int virSecurityManagerSetImageLabel(virSecurityManagerPtr mgr,
virDomainDefPtr vm, virDomainDefPtr vm,
......
...@@ -511,23 +511,6 @@ virSecurityStackSetTapFDLabel(virSecurityManagerPtr mgr, ...@@ -511,23 +511,6 @@ virSecurityStackSetTapFDLabel(virSecurityManagerPtr mgr,
return rc; return rc;
} }
static int
virSecurityStackSetHugepages(virSecurityManagerPtr mgr,
virDomainDefPtr vm,
const char *path)
{
virSecurityStackDataPtr priv = virSecurityManagerGetPrivateData(mgr);
virSecurityStackItemPtr item = priv->itemsHead;
int rc = 0;
for (; item; item = item->next) {
if (virSecurityManagerSetHugepages(item->securityManager, vm, path) < 0)
rc = -1;
}
return rc;
}
static char * static char *
virSecurityStackGetMountOptions(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED, virSecurityStackGetMountOptions(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED,
virDomainDefPtr vm ATTRIBUTE_UNUSED) virDomainDefPtr vm ATTRIBUTE_UNUSED)
...@@ -663,8 +646,6 @@ virSecurityDriver virSecurityDriverStack = { ...@@ -663,8 +646,6 @@ virSecurityDriver virSecurityDriverStack = {
.domainGetSecurityMountOptions = virSecurityStackGetMountOptions, .domainGetSecurityMountOptions = virSecurityStackGetMountOptions,
.domainSetSecurityHugepages = virSecurityStackSetHugepages,
.getBaseLabel = virSecurityStackGetBaseLabel, .getBaseLabel = virSecurityStackGetBaseLabel,
.domainSetPathLabel = virSecurityStackDomainSetPathLabel, .domainSetPathLabel = virSecurityStackDomainSetPathLabel,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册