nodeinfo: Add sysfs_prefix to nodeGetCPUMap

Add the sysfs_prefix argument to the call to allow for setting the
path for tests to something other than SYSFS_SYSTEM_PATH.

diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c
index dc76cf702df706ae2d979e79610faaa2e3be634e..68dff6c8d9f994421e669284ad0e918d7f9a335e 100644 (file)
--- a/src/bhyve/bhyve_driver.c
+++ b/src/bhyve/bhyve_driver.c
@@ -1299,7 +1299,7 @@ bhyveNodeGetCPUMap(virConnectPtr conn,
     if (virNodeGetCPUMapEnsureACL(conn) < 0)
         return -1;
 
-    return nodeGetCPUMap(cpumap, online, flags);
+    return nodeGetCPUMap(NULL, cpumap, online, flags);
 }
 
 static int

diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c
index cc1277bddc594fd983608feaea3c971b5c8e666f..31201a0e5a534c398947087ae4d1aa4414f848f7 100644 (file)
--- a/src/lxc/lxc_driver.c
+++ b/src/lxc/lxc_driver.c
@@ -5553,7 +5553,7 @@ lxcNodeGetCPUMap(virConnectPtr conn,
     if (virNodeGetCPUMapEnsureACL(conn) < 0)
         return -1;
 
-    return nodeGetCPUMap(cpumap, online, flags);
+    return nodeGetCPUMap(NULL, cpumap, online, flags);
 }
 
 

diff --git a/src/nodeinfo.c b/src/nodeinfo.c
index 75e0a02a8342191a67f42597d529fb0a5119cc7c..bf4f751e556a022e2448db8824ff9320c5833312 100644 (file)
--- a/src/nodeinfo.c
+++ b/src/nodeinfo.c
@@ -1624,10 +1624,12 @@ nodeGetMemoryParameters(virTypedParameterPtr params ATTRIBUTE_UNUSED,
 }
 
 int
-nodeGetCPUMap(unsigned char **cpumap,
+nodeGetCPUMap(const char *sysfs_prefix,
+              unsigned char **cpumap,
               unsigned int *online,
               unsigned int flags)
 {
+    const char *prefix = sysfs_prefix ? sysfs_prefix : SYSFS_SYSTEM_PATH;
     virBitmapPtr cpus = NULL;
     int maxpresent;
     int ret = -1;
@@ -1636,9 +1638,9 @@ nodeGetCPUMap(unsigned char **cpumap,
     virCheckFlags(0, -1);
 
     if (!cpumap && !online)
-        return nodeGetCPUCount(NULL);
+        return nodeGetCPUCount(prefix);
 
-    if (!(cpus = nodeGetCPUBitmap(NULL, &maxpresent)))
+    if (!(cpus = nodeGetCPUBitmap(prefix, &maxpresent)))
         goto cleanup;
 
     if (cpumap && virBitmapToData(cpus, cpumap, &dummy) < 0)

diff --git a/src/nodeinfo.h b/src/nodeinfo.h
index 439ef35ed6a34a8fdd40cb4af77d4cbcea211a70..9e6904f2d4dfddbac646864f2a30e26cc3dfae46 100644 (file)
--- a/src/nodeinfo.h
+++ b/src/nodeinfo.h
@@ -55,7 +55,8 @@ int nodeSetMemoryParameters(virTypedParameterPtr params,
                             int nparams,
                             unsigned int flags);
 
-int nodeGetCPUMap(unsigned char **cpumap,
+int nodeGetCPUMap(const char *sysfs_prefix,
+                  unsigned char **cpumap,
                   unsigned int *online,
                   unsigned int flags);
 

diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c
index d1a327c00a52240ae11ec1fd2f22de8eb6156219..fc6f1017419fc42fb18aa031a0c0e71e95961abf 100644 (file)
--- a/src/openvz/openvz_driver.c
+++ b/src/openvz/openvz_driver.c
@@ -2207,7 +2207,7 @@ openvzNodeGetCPUMap(virConnectPtr conn ATTRIBUTE_UNUSED,
                     unsigned int *online,
                     unsigned int flags)
 {
-    return nodeGetCPUMap(cpumap, online, flags);
+    return nodeGetCPUMap(NULL, cpumap, online, flags);
 }
 
 

diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
index 0ca81e1c68e87d732ccb049667d688cccc6b55a0..9b085559fe2a56c3735c3ca609db71a6897d63fb 100644 (file)
--- a/src/qemu/qemu_driver.c
+++ b/src/qemu/qemu_driver.c
@@ -18501,7 +18501,7 @@ qemuNodeGetCPUMap(virConnectPtr conn,
     if (virNodeGetCPUMapEnsureACL(conn) < 0)
         return -1;
 
-    return nodeGetCPUMap(cpumap, online, flags);
+    return nodeGetCPUMap(NULL, cpumap, online, flags);
 }
 
 

diff --git a/src/uml/uml_driver.c b/src/uml/uml_driver.c
index 7a95458119117545baab68257c6dd035dd29b7c2..99162f72ade586c6819dca0756e85d6a37df8441 100644 (file)
--- a/src/uml/uml_driver.c
+++ b/src/uml/uml_driver.c
@@ -2877,7 +2877,7 @@ umlNodeGetCPUMap(virConnectPtr conn,
     if (virNodeGetCPUMapEnsureACL(conn) < 0)
         return -1;
 
-    return nodeGetCPUMap(cpumap, online, flags);
+    return nodeGetCPUMap(NULL, cpumap, online, flags);
 }
 
 

diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c
index 9f0c52f29f4f2ef57ca95d0e91676cb8fc90b1ef..bfa901dd4564a3a5073fec088d2e2b674cafcfe1 100644 (file)
--- a/src/vz/vz_driver.c
+++ b/src/vz/vz_driver.c
@@ -852,7 +852,7 @@ vzNodeGetCPUMap(virConnectPtr conn ATTRIBUTE_UNUSED,
                 unsigned int *online,
                 unsigned int flags)
 {
-    return nodeGetCPUMap(cpumap, online, flags);
+    return nodeGetCPUMap(NULL, cpumap, online, flags);
 }
 
 static int