security: Rename virSecurityManagerGetDriver() to virSecurityManagerGetVirtDriver()

This function is in fact returning the name of the virtualization
driver that registered the security manager/driver.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Cole Robinson <crobinso@redhat.com>

diff --git a/src/security/security_manager.c b/src/security/security_manager.c
index bb083ba9c80d1fc75ade2211e9d4a501e0c8ab50..c82ef1449f26b5817bb9f905ff529a348ff4cea8 100644 (file)
--- a/src/security/security_manager.c
+++ b/src/security/security_manager.c
@@ -114,7 +114,7 @@ virSecurityManagerNewStack(virSecurityManagerPtr primary)
 {
     virSecurityManagerPtr mgr =
         virSecurityManagerNewDriver(&virSecurityDriverStack,
-                                    virSecurityManagerGetDriver(primary),
+                                    virSecurityManagerGetVirtDriver(primary),
                                     primary->flags);
 
     if (!mgr)
@@ -326,7 +326,7 @@ virSecurityManagerGetPrivateData(virSecurityManagerPtr mgr)
 
 
 const char *
-virSecurityManagerGetDriver(virSecurityManagerPtr mgr)
+virSecurityManagerGetVirtDriver(virSecurityManagerPtr mgr)
 {
     return mgr->virtDriver;
 }

diff --git a/src/security/security_manager.h b/src/security/security_manager.h
index 1d4928fae374f87513b025c611a79fde129f3b6a..306de9297871567d978ad0df6d21be00409f1706 100644 (file)
--- a/src/security/security_manager.h
+++ b/src/security/security_manager.h
@@ -80,7 +80,7 @@ void virSecurityManagerTransactionAbort(virSecurityManagerPtr mgr);
 
 void *virSecurityManagerGetPrivateData(virSecurityManagerPtr mgr);
 
-const char *virSecurityManagerGetDriver(virSecurityManagerPtr mgr);
+const char *virSecurityManagerGetVirtDriver(virSecurityManagerPtr mgr);
 const char *virSecurityManagerGetDOI(virSecurityManagerPtr mgr);
 const char *virSecurityManagerGetModel(virSecurityManagerPtr mgr);
 const char *virSecurityManagerGetBaseLabel(virSecurityManagerPtr mgr, int virtType);

diff --git a/src/security/security_selinux.c b/src/security/security_selinux.c
index ac8b7ae26494f1f8870d19b1dfa3b2f0f3970a55..58ffdc6f9d0734c629b8cdfed65b4973eec7013a 100644 (file)
--- a/src/security/security_selinux.c
+++ b/src/security/security_selinux.c
@@ -793,7 +793,7 @@ virSecuritySELinuxQEMUInitialize(virSecurityManagerPtr mgr)
 static int
 virSecuritySELinuxInitialize(virSecurityManagerPtr mgr)
 {
-    VIR_DEBUG("SELinuxInitialize %s", virSecurityManagerGetDriver(mgr));
+    VIR_DEBUG("SELinuxInitialize %s", virSecurityManagerGetVirtDriver(mgr));
 
     if (virThreadLocalInit(&contextList,
                            virSecuritySELinuxContextListFree) < 0) {
@@ -802,7 +802,7 @@ virSecuritySELinuxInitialize(virSecurityManagerPtr mgr)
         return -1;
     }
 
-    if (STREQ(virSecurityManagerGetDriver(mgr),  "LXC")) {
+    if (STREQ(virSecurityManagerGetVirtDriver(mgr), "LXC")) {
         return virSecuritySELinuxLXCInitialize(mgr);
     } else {
         return virSecuritySELinuxQEMUInitialize(mgr);
@@ -831,7 +831,7 @@ virSecuritySELinuxGenLabel(virSecurityManagerPtr mgr,
 
     data = virSecurityManagerGetPrivateData(mgr);
 
-    VIR_DEBUG("label=%s", virSecurityManagerGetDriver(mgr));
+    VIR_DEBUG("label=%s", virSecurityManagerGetVirtDriver(mgr));
     if (seclabel->type == VIR_DOMAIN_SECLABEL_DYNAMIC &&
         seclabel->label) {
         virReportError(VIR_ERR_INTERNAL_ERROR, "%s",