From: Martin Kletzander <mkletzan@redhat.com>
Date: Sat, 11 Mar 2017 15:32:13 +0000 (+0100)
Subject: Change virQEMUCapsInitPages to virCapabilitiesInitPages
X-Git-Tag: v3.2.0-rc1~84
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=335f6373f141969b49a239a05a6d125d4bbffeb4;p=thirdparty%2Flibvirt.git

Change virQEMUCapsInitPages to virCapabilitiesInitPages

This way more drivers can utilize the functionality without copying
the code.  And we can therefore test it in one place for all of them.

Signed-off-by: Martin Kletzander <mkletzan@redhat.com>
---

diff --git a/src/conf/capabilities.c b/src/conf/capabilities.c
index d798d5364c..08907aced1 100644
--- a/src/conf/capabilities.c
+++ b/src/conf/capabilities.c
@@ -1413,3 +1413,25 @@ virCapabilitiesInitNUMA(virCapsPtr caps)
     VIR_FREE(pageinfo);
     return ret;
 }
+
+int
+virCapabilitiesInitPages(virCapsPtr caps)
+{
+    int ret = -1;
+    unsigned int *pages_size = NULL;
+    size_t npages;
+
+    if (virNumaGetPages(-1 /* Magic constant for overall info */,
+                        &pages_size, NULL, NULL, &npages) < 0)
+        goto cleanup;
+
+    caps->host.pagesSize = pages_size;
+    pages_size = NULL;
+    caps->host.nPagesSize = npages;
+    npages = 0;
+
+    ret = 0;
+ cleanup:
+    VIR_FREE(pages_size);
+    return ret;
+}
diff --git a/src/conf/capabilities.h b/src/conf/capabilities.h
index 3cb305b50b..d10eef3afd 100644
--- a/src/conf/capabilities.h
+++ b/src/conf/capabilities.h
@@ -299,6 +299,8 @@ virBitmapPtr virCapabilitiesGetCpusForNodemask(virCapsPtr caps,
 
 int virCapabilitiesGetNodeInfo(virNodeInfoPtr nodeinfo);
 
+int virCapabilitiesInitPages(virCapsPtr caps);
+
 int virCapabilitiesInitNUMA(virCapsPtr caps);
 
 #endif /* __VIR_CAPABILITIES_H */
diff --git a/src/libvirt_private.syms b/src/libvirt_private.syms
index 75c4777539..4c14ef5901 100644
--- a/src/libvirt_private.syms
+++ b/src/libvirt_private.syms
@@ -60,6 +60,7 @@ virCapabilitiesGetCpusForNodemask;
 virCapabilitiesGetNodeInfo;
 virCapabilitiesHostSecModelAddBaseLabel;
 virCapabilitiesInitNUMA;
+virCapabilitiesInitPages;
 virCapabilitiesNew;
 virCapabilitiesSetHostCPU;
 virCapabilitiesSetNetPrefix;
diff --git a/src/qemu/qemu_capabilities.c b/src/qemu/qemu_capabilities.c
index 60d2bbcb23..f51141b990 100644
--- a/src/qemu/qemu_capabilities.c
+++ b/src/qemu/qemu_capabilities.c
@@ -1086,29 +1086,6 @@ virQEMUCapsProbeHostCPUForEmulator(virCapsPtr caps,
 }
 
 
-static int
-virQEMUCapsInitPages(virCapsPtr caps)
-{
-    int ret = -1;
-    unsigned int *pages_size = NULL;
-    size_t npages;
-
-    if (virNumaGetPages(-1 /* Magic constant for overall info */,
-                        &pages_size, NULL, NULL, &npages) < 0)
-        goto cleanup;
-
-    caps->host.pagesSize = pages_size;
-    pages_size = NULL;
-    caps->host.nPagesSize = npages;
-    npages = 0;
-
-    ret = 0;
- cleanup:
-    VIR_FREE(pages_size);
-    return ret;
-}
-
-
 virCapsPtr virQEMUCapsInit(virQEMUCapsCachePtr cache)
 {
     virCapsPtr caps;
@@ -1136,7 +1113,7 @@ virCapsPtr virQEMUCapsInit(virQEMUCapsCachePtr cache)
         VIR_WARN("Failed to get host power management capabilities");
 
     /* Add huge pages info */
-    if (virQEMUCapsInitPages(caps) < 0)
+    if (virCapabilitiesInitPages(caps) < 0)
         VIR_WARN("Failed to get pages info");
 
     /* Add domain migration transport URIs */