From: Martin Kletzander Date: Fri, 16 Sep 2016 06:33:47 +0000 (+0200) Subject: util: Expose virHostCPUStatsAssign on non-Linux X-Git-Tag: v2.3.0-rc1~140 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b51e26f755bdbb13c5409c01595735ec71066063;p=thirdparty%2Flibvirt.git util: Expose virHostCPUStatsAssign on non-Linux There is nothing Linux-specific in that function. Also since commit 8c3b5bf48123783b812b97360db7ac51f1889e17 mingw build is broken due to the fact that this function is not compiled in the library. Signed-off-by: Martin Kletzander --- diff --git a/src/util/virhostcpu.c b/src/util/virhostcpu.c index 856d83c3e4..f68176f387 100644 --- a/src/util/virhostcpu.c +++ b/src/util/virhostcpu.c @@ -781,21 +781,6 @@ virHostCPUGetInfoPopulateLinux(FILE *cpuinfo, return ret; } -int -virHostCPUStatsAssign(virNodeCPUStatsPtr param, - const char *name, - unsigned long long value) -{ - if (virStrcpyStatic(param->field, name) == NULL) { - virReportError(VIR_ERR_INTERNAL_ERROR, - "%s", _("kernel cpu time field is too long" - " for the destination")); - return -1; - } - param->value = value; - return 0; -} - # define TICK_TO_NSEC (1000ull * 1000ull * 1000ull / sysconf(_SC_CLK_TCK)) int @@ -952,6 +937,22 @@ virHostCPUParseMapLinux(int max_cpuid, const char *path) #endif +int +virHostCPUStatsAssign(virNodeCPUStatsPtr param, + const char *name, + unsigned long long value) +{ + if (virStrcpyStatic(param->field, name) == NULL) { + virReportError(VIR_ERR_INTERNAL_ERROR, + "%s", _("kernel cpu time field is too long" + " for the destination")); + return -1; + } + param->value = value; + return 0; +} + + int virHostCPUGetInfo(virArch hostarch ATTRIBUTE_UNUSED, unsigned int *cpus ATTRIBUTE_UNUSED,