From: Marc Hartmayer <mhartmay@linux.ibm.com>
Date: Tue, 3 Jul 2018 11:37:35 +0000 (+0200)
Subject: virThreadPool: Prevent switching between zero and non-zero maxWorkers
X-Git-Tag: v4.6.0-rc1~132
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=46d258d1fda80b2fe6c518c0dfa9794f38e307de;p=thirdparty%2Flibvirt.git

virThreadPool: Prevent switching between zero and non-zero maxWorkers

...since maxWorkers=0 is only intended for virtlockd or virlogd which
must not be multithreaded.

Signed-off-by: Marc Hartmayer <mhartmay@linux.ibm.com>
Reviewed-by: Boris Fiuczynski <fiuczy@linux.ibm.com>
Reviewed-by: Bjoern Walk <bwalk@linux.ibm.com>
Reviewed-by: John Ferlan <jferlan@redhat.com>
---

diff --git a/src/util/virthreadpool.c b/src/util/virthreadpool.c
index 10f2bd2c3a..4635170141 100644
--- a/src/util/virthreadpool.c
+++ b/src/util/virthreadpool.c
@@ -442,6 +442,14 @@ virThreadPoolSetParameters(virThreadPoolPtr pool,
         goto error;
     }
 
+    if ((maxWorkers == 0 && pool->maxWorkers > 0) ||
+        (maxWorkers > 0 && pool->maxWorkers == 0)) {
+        virReportError(VIR_ERR_INVALID_ARG, "%s",
+                       _("maxWorkers must not be switched from zero to non-zero"
+                         " and vice versa"));
+        goto error;
+    }
+
     if (minWorkers >= 0) {
         if ((size_t) minWorkers > pool->nWorkers &&
             virThreadPoolExpand(pool, minWorkers - pool->nWorkers,