[libvirt] [PATCH 10/23] openvz: Ditch openvzGetNodeCPUs
There is particular function for this, there is no need to build whole
nodeinfo for it.
Signed-off-by: Martin Kletzander <mkletzan(a)redhat.com>
---
src/openvz/openvz_conf.c | 14 ++------------
src/openvz/openvz_conf.h | 1 -
src/openvz/openvz_driver.c | 2 +-
3 files changed, 3 insertions(+), 14 deletions(-)
diff --git a/src/openvz/openvz_conf.c b/src/openvz/openvz_conf.c
index b02e1aab8b86..e4d7634d2eff 100644
--- a/src/openvz/openvz_conf.c
+++ b/src/openvz/openvz_conf.c
@@ -51,6 +51,7 @@
#include "virfile.h"
#include "vircommand.h"
#include "virstring.h"
+#include "virhostcpu.h"
#define VIR_FROM_THIS VIR_FROM_OPENVZ
@@ -570,7 +571,7 @@ int openvzLoadDomains(struct openvz_driver *driver)
}
if (ret == 0 || vcpus == 0)
- vcpus = openvzGetNodeCPUs();
+ vcpus = virHostCPUGetCount();
if (virDomainDefSetVcpusMax(def, vcpus, driver->xmlopt) < 0)
goto cleanup;
@@ -628,17 +629,6 @@ int openvzLoadDomains(struct openvz_driver *driver)
return -1;
}
-unsigned int
-openvzGetNodeCPUs(void)
-{
- virNodeInfo nodeinfo;
-
- if (nodeGetInfo(&nodeinfo) < 0)
- return 0;
-
- return nodeinfo.cpus;
-}
-
static int
openvzWriteConfigParam(const char * conf_file, const char *param, const char *value)
{
diff --git a/src/openvz/openvz_conf.h b/src/openvz/openvz_conf.h
index fc36740d26c6..be7e16df531d 100644
--- a/src/openvz/openvz_conf.h
+++ b/src/openvz/openvz_conf.h
@@ -67,7 +67,6 @@ int openvzLoadDomains(struct openvz_driver *driver);
void openvzFreeDriver(struct openvz_driver *driver);
int strtoI(const char *str);
int openvzSetDefinedUUID(int vpsid, unsigned char *uuid);
-unsigned int openvzGetNodeCPUs(void);
int openvzGetVEID(const char *name);
int openvzReadNetworkConf(virDomainDefPtr def, int veid);
diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c
index eaa9ef68c576..01ad7628455a 100644
--- a/src/openvz/openvz_driver.c
+++ b/src/openvz/openvz_driver.c
@@ -1362,7 +1362,7 @@ static int openvzDomainSetVcpusInternal(virDomainObjPtr vm,
const char *prog[] = { VZCTL, "--quiet", "set",
PROGRAM_SENTINEL,
"--cpus", str_vcpus, "--save", NULL };
unsigned int pcpus;
- pcpus = openvzGetNodeCPUs();
+ pcpus = virHostCPUGetCount();
if (pcpus > 0 && pcpus < nvcpus)
nvcpus = pcpus;
--
2.12.0