From: Michal Privoznik <mprivozn@redhat.com>
Date: Tue, 5 Sep 2023 10:13:39 +0000 (+0200)
Subject: ch: Use uint for @maxvcpus in virCHDomainRefreshThreadInfo()
X-Git-Tag: v9.8.0-rc1~203
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e96db2ae015f13bb28a64da473565d6833a9fa36;p=thirdparty%2Flibvirt.git

ch: Use uint for @maxvcpus in virCHDomainRefreshThreadInfo()

The @maxvcpus variable inside of virCHDomainRefreshThreadInfo()
holds retval of virDomainDefGetVcpusMax() which returns an
unsigned int. Also, the variable is then passed to VIR_WARN()
with incorrect format directive (%ld). Switch variable to uint
and fix the format directive.

Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/src/ch/ch_domain.c b/src/ch/ch_domain.c
index 35e3471cba..d6b64b6c59 100644
--- a/src/ch/ch_domain.c
+++ b/src/ch/ch_domain.c
@@ -225,7 +225,7 @@ chValidateDomainDeviceDef(const virDomainDeviceDef *dev,
 int
 virCHDomainRefreshThreadInfo(virDomainObj *vm)
 {
-    size_t maxvcpus = virDomainDefGetVcpusMax(vm->def);
+    unsigned int maxvcpus = virDomainDefGetVcpusMax(vm->def);
     virCHMonitorThreadInfo *info = NULL;
     size_t nthreads;
     size_t ncpus = 0;
@@ -252,7 +252,7 @@ virCHDomainRefreshThreadInfo(virDomainObj *vm)
 
     /* TODO: Remove the warning when hotplug is implemented.*/
     if (ncpus != maxvcpus)
-        VIR_WARN("Mismatch in the number of cpus, expected: %ld, actual: %ld",
+        VIR_WARN("Mismatch in the number of cpus, expected: %u, actual: %zu",
                  maxvcpus, ncpus);
 
     return 0;