From: Peter Krempa <pkrempa@redhat.com> The utility functions which get CPU map and stats don't actually use the flags. Remove the argument and move the 'virCheckFlags' to driver implementation. Signed-off-by: Peter Krempa <pkrempa@redhat.com> --- src/bhyve/bhyve_driver.c | 8 ++++++-- src/ch/ch_driver.c | 7 +++++-- src/lxc/lxc_driver.c | 8 ++++++-- src/openvz/openvz_driver.c | 8 ++++++-- src/qemu/qemu_driver.c | 8 ++++++-- src/util/virhostcpu.c | 10 ++-------- src/util/virhostcpu.h | 6 ++---- src/vz/vz_driver.c | 8 ++++++-- tests/virhostcputest.c | 2 +- 9 files changed, 40 insertions(+), 25 deletions(-) diff --git a/src/bhyve/bhyve_driver.c b/src/bhyve/bhyve_driver.c index c8dd1a728a..2718c074f3 100644 --- a/src/bhyve/bhyve_driver.c +++ b/src/bhyve/bhyve_driver.c @@ -1145,10 +1145,12 @@ bhyveNodeGetCPUStats(virConnectPtr conn, int *nparams, unsigned int flags) { + virCheckFlags(0, -1); + if (virNodeGetCPUStatsEnsureACL(conn) < 0) return -1; - return virHostCPUGetStats(cpuNum, params, nparams, flags); + return virHostCPUGetStats(cpuNum, params, nparams); } static int @@ -1359,10 +1361,12 @@ bhyveNodeGetCPUMap(virConnectPtr conn, unsigned int *online, unsigned int flags) { + virCheckFlags(0, -1); + if (virNodeGetCPUMapEnsureACL(conn) < 0) return -1; - return virHostCPUGetMap(cpumap, online, flags); + return virHostCPUGetMap(cpumap, online); } static int diff --git a/src/ch/ch_driver.c b/src/ch/ch_driver.c index 662857f88e..874fca2193 100644 --- a/src/ch/ch_driver.c +++ b/src/ch/ch_driver.c @@ -1642,12 +1642,15 @@ chDomainGetVcpuPinInfo(virDomain *dom, static int chNodeGetCPUMap(virConnectPtr conn, unsigned char **cpumap, - unsigned int *online, unsigned int flags) + unsigned int *online, + unsigned int flags) { + virCheckFlags(0, -1); + if (virNodeGetCPUMapEnsureACL(conn) < 0) return -1; - return virHostCPUGetMap(cpumap, online, flags); + return virHostCPUGetMap(cpumap, online); } diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index c0a93c0444..db00288900 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -4785,10 +4785,12 @@ lxcNodeGetCPUStats(virConnectPtr conn, int *nparams, unsigned int flags) { + virCheckFlags(0, -1); + if (virNodeGetCPUStatsEnsureACL(conn) < 0) return -1; - return virHostCPUGetStats(cpuNum, params, nparams, flags); + return virHostCPUGetStats(cpuNum, params, nparams); } @@ -4866,10 +4868,12 @@ lxcNodeGetCPUMap(virConnectPtr conn, unsigned int *online, unsigned int flags) { + virCheckFlags(0, -1); + if (virNodeGetCPUMapEnsureACL(conn) < 0) return -1; - return virHostCPUGetMap(cpumap, online, flags); + return virHostCPUGetMap(cpumap, online); } diff --git a/src/openvz/openvz_driver.c b/src/openvz/openvz_driver.c index 19bdfa37f2..60b8a9534b 100644 --- a/src/openvz/openvz_driver.c +++ b/src/openvz/openvz_driver.c @@ -1849,7 +1849,9 @@ openvzNodeGetCPUStats(virConnectPtr conn G_GNUC_UNUSED, int *nparams, unsigned int flags) { - return virHostCPUGetStats(cpuNum, params, nparams, flags); + virCheckFlags(0, -1); + + return virHostCPUGetStats(cpuNum, params, nparams); } @@ -1890,7 +1892,9 @@ openvzNodeGetCPUMap(virConnectPtr conn G_GNUC_UNUSED, unsigned int *online, unsigned int flags) { - return virHostCPUGetMap(cpumap, online, flags); + virCheckFlags(0, -1); + + return virHostCPUGetMap(cpumap, online); } diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index 80b21d4650..52c6ce2f27 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -16384,10 +16384,12 @@ qemuNodeGetCPUStats(virConnectPtr conn, int *nparams, unsigned int flags) { + virCheckFlags(0, -1); + if (virNodeGetCPUStatsEnsureACL(conn) < 0) return -1; - return virHostCPUGetStats(cpuNum, params, nparams, flags); + return virHostCPUGetStats(cpuNum, params, nparams); } @@ -16465,10 +16467,12 @@ qemuNodeGetCPUMap(virConnectPtr conn, unsigned int *online, unsigned int flags) { + virCheckFlags(0, -1); + if (virNodeGetCPUMapEnsureACL(conn) < 0) return -1; - return virHostCPUGetMap(cpumap, online, flags); + return virHostCPUGetMap(cpumap, online); } diff --git a/src/util/virhostcpu.c b/src/util/virhostcpu.c index 870338edad..60743765a4 100644 --- a/src/util/virhostcpu.c +++ b/src/util/virhostcpu.c @@ -1043,11 +1043,8 @@ virHostCPUGetInfo(virArch hostarch G_GNUC_UNUSED, int virHostCPUGetStats(int cpuNum G_GNUC_UNUSED, virNodeCPUStatsPtr params G_GNUC_UNUSED, - int *nparams G_GNUC_UNUSED, - unsigned int flags) + int *nparams G_GNUC_UNUSED) { - virCheckFlags(0, -1); - #ifdef __linux__ { int ret; @@ -1144,14 +1141,11 @@ virHostCPUGetOnlineBitmap(void) int virHostCPUGetMap(unsigned char **cpumap, - unsigned int *online, - unsigned int flags) + unsigned int *online) { g_autoptr(virBitmap) cpus = NULL; int ncpus = virHostCPUGetCount(); - virCheckFlags(0, -1); - if (!cpumap && !online) return ncpus; diff --git a/src/util/virhostcpu.h b/src/util/virhostcpu.h index 289ae41439..238054ed34 100644 --- a/src/util/virhostcpu.h +++ b/src/util/virhostcpu.h @@ -36,8 +36,7 @@ struct _virHostCPUTscInfo { int virHostCPUGetStats(int cpuNum, virNodeCPUStatsPtr params, - int *nparams, - unsigned int flags); + int *nparams); bool virHostCPUHasBitmap(void); virBitmap *virHostCPUGetPresentBitmap(void); @@ -49,8 +48,7 @@ int virHostCPUGetCount(void); int virHostCPUGetThreadsPerSubcore(virArch arch) ATTRIBUTE_MOCKABLE; int virHostCPUGetMap(unsigned char **cpumap, - unsigned int *online, - unsigned int flags); + unsigned int *online); int virHostCPUGetInfo(virArch hostarch, unsigned int *cpus, unsigned int *mhz, diff --git a/src/vz/vz_driver.c b/src/vz/vz_driver.c index 2d8878fe7f..f8193367c9 100644 --- a/src/vz/vz_driver.c +++ b/src/vz/vz_driver.c @@ -1000,10 +1000,12 @@ vzNodeGetCPUMap(virConnectPtr conn, unsigned int *online, unsigned int flags) { + virCheckFlags(0, -1); + if (virNodeGetCPUMapEnsureACL(conn) < 0) return -1; - return virHostCPUGetMap(cpumap, online, flags); + return virHostCPUGetMap(cpumap, online); } static int @@ -1964,10 +1966,12 @@ vzNodeGetCPUStats(virConnectPtr conn, int *nparams, unsigned int flags) { + virCheckFlags(0, -1); + if (virNodeGetCPUStatsEnsureACL(conn) < 0) return -1; - return virHostCPUGetStats(cpuNum, params, nparams, flags); + return virHostCPUGetStats(cpuNum, params, nparams); } static int diff --git a/tests/virhostcputest.c b/tests/virhostcputest.c index 4b31b79444..e362ee8d39 100644 --- a/tests/virhostcputest.c +++ b/tests/virhostcputest.c @@ -249,7 +249,7 @@ linuxTestHostCPUGetMap(const void *data G_GNUC_UNUSED) { g_autofree unsigned char *cpumap = NULL; - int ncpus = virHostCPUGetMap(&cpumap, NULL, 0); + int ncpus = virHostCPUGetMap(&cpumap, NULL); g_autoptr(virBitmap) actual = virBitmapNewData(cpumap, VIR_DIV_UP(ncpus, 8)); g_autoptr(virBitmap) expected = NULL; -- 2.54.0