From: Peter Krempa <[email protected]> Remove the unused argument and bump the 'virCheckFlags' calls to the top level.
Signed-off-by: Peter Krempa <[email protected]> --- src/lxc/lxc_driver.c | 4 +++- src/qemu/qemu_driver.c | 4 +++- src/util/virnodesuspend.c | 5 +---- src/util/virnodesuspend.h | 3 +-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/lxc/lxc_driver.c b/src/lxc/lxc_driver.c index c51da98777..df8e4e06ec 100644 --- a/src/lxc/lxc_driver.c +++ b/src/lxc/lxc_driver.c @@ -4889,10 +4889,12 @@ lxcNodeSuspendForDuration(virConnectPtr conn, unsigned long long duration, unsigned int flags) { + virCheckFlags(0, -1); + if (virNodeSuspendForDurationEnsureACL(conn) < 0) return -1; - return virNodeSuspend(target, duration, flags); + return virNodeSuspend(target, duration); } diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c index f121a0e788..558c22982d 100644 --- a/src/qemu/qemu_driver.c +++ b/src/qemu/qemu_driver.c @@ -16488,10 +16488,12 @@ qemuNodeSuspendForDuration(virConnectPtr conn, unsigned long long duration, unsigned int flags) { + virCheckFlags(0, -1); + if (virNodeSuspendForDurationEnsureACL(conn) < 0) return -1; - return virNodeSuspend(target, duration, flags); + return virNodeSuspend(target, duration); } static int diff --git a/src/util/virnodesuspend.c b/src/util/virnodesuspend.c index 37659f13ad..5b65643d06 100644 --- a/src/util/virnodesuspend.c +++ b/src/util/virnodesuspend.c @@ -138,16 +138,13 @@ static void virNodeSuspendHelper(void *cmdString) * operation is still in progress. */ int virNodeSuspend(unsigned int target, - unsigned long long duration, - unsigned int flags) + unsigned long long duration) { static virThread thread; const char *cmdString = NULL; unsigned int supported; VIR_LOCK_GUARD lock = { NULL }; - virCheckFlags(0, -1); - if (virNodeSuspendGetTargetMask(&supported) < 0) return -1; diff --git a/src/util/virnodesuspend.h b/src/util/virnodesuspend.h index f767961bff..dc8324df1d 100644 --- a/src/util/virnodesuspend.h +++ b/src/util/virnodesuspend.h @@ -24,7 +24,6 @@ #include "internal.h" int virNodeSuspend(unsigned int target, - unsigned long long duration, - unsigned int flags); + unsigned long long duration); int virNodeSuspendGetTargetMask(unsigned int *bitmask); -- 2.54.0
