vbox: Rewrite vboxNode functions

Four functions are rewrite in this patch, that is:
vboxNodeGetInfo
vboxNodeGetCellsFreeMemory
vboxNodeGetFreeMemory
vboxNodeGetFreePages
Since these functions has nothing to do with vbox,
it can be directly moved to vbox_common.c. So, I
merged these things into one patch.

diff --git a/src/vbox/vbox_common.c b/src/vbox/vbox_common.c
index e6bc85f0e24e524249c8cec25ba239322d5bb049..2be8123c004f8d2c984eb74dbf433c78aa8f8561 100644 (file)
--- a/src/vbox/vbox_common.c
+++ b/src/vbox/vbox_common.c
@@ -7408,3 +7408,42 @@ vboxConnectListAllDomains(virConnectPtr conn,
     return ret;
 }
 #undef MATCH
+
+int
+vboxNodeGetInfo(virConnectPtr conn ATTRIBUTE_UNUSED,
+                virNodeInfoPtr nodeinfo)
+{
+    return nodeGetInfo(nodeinfo);
+}
+
+int
+vboxNodeGetCellsFreeMemory(virConnectPtr conn ATTRIBUTE_UNUSED,
+                           unsigned long long *freeMems,
+                           int startCell,
+                           int maxCells)
+{
+    return nodeGetCellsFreeMemory(freeMems, startCell, maxCells);
+}
+
+unsigned long long
+vboxNodeGetFreeMemory(virConnectPtr conn ATTRIBUTE_UNUSED)
+{
+    unsigned long long freeMem;
+    if (nodeGetMemory(NULL, &freeMem) < 0)
+        return 0;
+    return freeMem;
+}
+
+int
+vboxNodeGetFreePages(virConnectPtr conn ATTRIBUTE_UNUSED,
+                     unsigned int npages,
+                     unsigned int *pages,
+                     int startCell,
+                     unsigned int cellCount,
+                     unsigned long long *counts,
+                     unsigned int flags)
+{
+    virCheckFlags(0, -1);
+
+    return nodeGetFreePages(npages, pages, startCell, cellCount, counts);
+}

diff --git a/src/vbox/vbox_tmpl.c b/src/vbox/vbox_tmpl.c
index 639e4b2a4a53440db712b748c06a5bdde52cb3b7..07de778c79ba7025bf5e4771357c7930f77cf122 100644 (file)
--- a/src/vbox/vbox_tmpl.c
+++ b/src/vbox/vbox_tmpl.c
@@ -3733,48 +3733,6 @@ static char *vboxStorageVolGetPath(virStorageVolPtr vol) {
     return ret;
 }
 
-static int
-vboxNodeGetInfo(virConnectPtr conn ATTRIBUTE_UNUSED,
-                virNodeInfoPtr nodeinfo)
-{
-    return nodeGetInfo(nodeinfo);
-}
-
-
-static int
-vboxNodeGetCellsFreeMemory(virConnectPtr conn ATTRIBUTE_UNUSED,
-                           unsigned long long *freeMems,
-                           int startCell,
-                           int maxCells)
-{
-    return nodeGetCellsFreeMemory(freeMems, startCell, maxCells);
-}
-
-
-static unsigned long long
-vboxNodeGetFreeMemory(virConnectPtr conn ATTRIBUTE_UNUSED)
-{
-    unsigned long long freeMem;
-    if (nodeGetMemory(NULL, &freeMem) < 0)
-        return 0;
-    return freeMem;
-}
-
-
-static int
-vboxNodeGetFreePages(virConnectPtr conn ATTRIBUTE_UNUSED,
-                     unsigned int npages,
-                     unsigned int *pages,
-                     int startCell,
-                     unsigned int cellCount,
-                     unsigned long long *counts,
-                     unsigned int flags)
-{
-    virCheckFlags(0, -1);
-
-    return nodeGetFreePages(npages, pages, startCell, cellCount, counts);
-}
-
 static int _pfnInitialize(vboxGlobalData *data)
 {
     data->pFuncs = g_pfnGetFunctions(VBOX_XPCOMC_VERSION);

diff --git a/src/vbox/vbox_uniformed_api.h b/src/vbox/vbox_uniformed_api.h
index c105a07ab5fb13009995927b5e99bb086b36ff0c..a868ac04132b5bf0b794412d9b983eaed41750db 100644 (file)
--- a/src/vbox/vbox_uniformed_api.h
+++ b/src/vbox/vbox_uniformed_api.h
@@ -623,6 +623,19 @@ char *vboxDomainScreenshot(virDomainPtr dom, virStreamPtr st,
                            unsigned int screen, unsigned int flags);
 int vboxConnectListAllDomains(virConnectPtr conn, virDomainPtr **domains,
                               unsigned int flags);
+int vboxNodeGetInfo(virConnectPtr conn, virNodeInfoPtr nodeinfo);
+int vboxNodeGetCellsFreeMemory(virConnectPtr conn,
+                               unsigned long long *freeMems,
+                               int startCell,
+                               int maxCells);
+unsigned long long vboxNodeGetFreeMemory(virConnectPtr);
+int vboxNodeGetFreePages(virConnectPtr conn,
+                         unsigned int npages,
+                         unsigned int *pages,
+                         int startCell,
+                         unsigned int cellCount,
+                         unsigned long long *counts,
+                         unsigned int flags);
 
 /* Version specified functions for installing uniformed API */
 void vbox22InstallUniformedAPI(vboxUniformedAPI *pVBoxAPI);