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: Michal Privoznik <mprivozn@redhat.com>

diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 6303dec8b314a5b7ff3f2928dd2215b3fc5d9c2e..826efbd29363f609431c864f32aa8afc358aa997 100644 (file)
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -1164,7 +1164,6 @@ virSecurityManagerSetChildProcessLabel;
 virSecurityManagerSetDaemonSocketLabel;
 virSecurityManagerSetDiskLabel;
 virSecurityManagerSetHostdevLabel;
-virSecurityManagerSetHugepages;
 virSecurityManagerSetImageFDLabel;
 virSecurityManagerSetImageLabel;
 virSecurityManagerSetProcessLabel;

diff --git a/src/qemu/qemu_process.c b/src/qemu/qemu_process.c
index 4241263a72fe410a6fc262450db6ec6acf4cb307..f6b17ddec81400613bfb7d65afe42037d26d6f56 100644 (file)
--- a/src/qemu/qemu_process.c
+++ b/src/qemu/qemu_process.c
@@ -3250,8 +3250,8 @@ qemuProcessBuildDestroyHugepagesPath(virQEMUDriverPtr driver,
                     goto cleanup;
                 }
 
-                if (virSecurityManagerSetHugepages(driver->securityManager,
-                                                   vm->def, hugepagePath) < 0) {
+                if (virSecurityManagerDomainSetPathLabel(driver->securityManager,
+                                                         vm->def, hugepagePath) < 0) {
                     virReportError(VIR_ERR_INTERNAL_ERROR,
                                    "%s", _("Unable to set huge path in security driver"));
                     goto cleanup;

diff --git a/src/security/security_driver.h b/src/security/security_driver.h
index 7cb62f0293432620580f3f531aa91d15151c6801..b48f2aaed8621ea7103a0b2a2040522c5827157e 100644 (file)
--- a/src/security/security_driver.h
+++ b/src/security/security_driver.h
@@ -168,7 +168,6 @@ struct _virSecurityDriver {
     virSecurityDomainSetTapFDLabel domainSetSecurityTapFDLabel;
 
     virSecurityDomainGetMountOptions domainGetSecurityMountOptions;
-    virSecurityDomainSetHugepages domainSetSecurityHugepages;
 
     virSecurityDriverGetBaseLabel getBaseLabel;
 

diff --git a/src/security/security_manager.c b/src/security/security_manager.c
index ecb4a40f05c80a49b1d4d7fabe51335535082d9b..f98c7d2d1cff2e2566d3e1d5b22750eb2e384a1b 100644 (file)
--- a/src/security/security_manager.c
+++ b/src/security/security_manager.c
@@ -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
 virSecurityManagerDomainSetPathLabel(virSecurityManagerPtr mgr,
                                      virDomainDefPtr vm,

diff --git a/src/security/security_manager.h b/src/security/security_manager.h
index 4cbc2d85d0f122c06f0219d2777e022da6cf02e0..0d22cb15fcb2c496549248347fdae8839b03c45e 100644 (file)
--- a/src/security/security_manager.h
+++ b/src/security/security_manager.h
@@ -149,9 +149,6 @@ int virSecurityManagerSetTapFDLabel(virSecurityManagerPtr mgr,
 char *virSecurityManagerGetMountOptions(virSecurityManagerPtr mgr,
                                         virDomainDefPtr vm);
 virSecurityManagerPtr* virSecurityManagerGetNested(virSecurityManagerPtr mgr);
-int virSecurityManagerSetHugepages(virSecurityManagerPtr mgr,
-                                   virDomainDefPtr sec,
-                                   const char *hugepages_path);
 
 int virSecurityManagerSetImageLabel(virSecurityManagerPtr mgr,
                                     virDomainDefPtr vm,

diff --git a/src/security/security_stack.c b/src/security/security_stack.c
index 3ea27518fcc10acce46b14c7da6e4230c971ebee..c123931a0bd0f72d84d4c43c45e13f239ad162a8 100644 (file)
--- a/src/security/security_stack.c
+++ b/src/security/security_stack.c
@@ -511,23 +511,6 @@ virSecurityStackSetTapFDLabel(virSecurityManagerPtr mgr,
     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 *
 virSecurityStackGetMountOptions(virSecurityManagerPtr mgr ATTRIBUTE_UNUSED,
                                 virDomainDefPtr vm ATTRIBUTE_UNUSED)
@@ -663,8 +646,6 @@ virSecurityDriver virSecurityDriverStack = {
 
     .domainGetSecurityMountOptions      = virSecurityStackGetMountOptions,
 
-    .domainSetSecurityHugepages         = virSecurityStackSetHugepages,
-
     .getBaseLabel                       = virSecurityStackGetBaseLabel,
 
     .domainSetPathLabel                 = virSecurityStackDomainSetPathLabel,