From 4834c9a4bd1527adc4c54eea9aafe065d327a9a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A1n=20Tomko?= Date: Tue, 12 Feb 2019 11:42:36 +0100 Subject: [PATCH] virsh: do not assign negative values to niothreads MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Use a temporary 'rc' variable to avoid comparing signed and unsigned integers in the cleanup section. Bug introduced by commit 3072ded which added the comparison against the unsigned 'i'. Also make niothreads size_t to mark that it should be unsigned. Signed-off-by: Ján Tomko Reviewed-by: John Ferlan --- tools/virsh-domain.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c index a1c09abf71..de19f5b6fe 100644 --- a/tools/virsh-domain.c +++ b/tools/virsh-domain.c @@ -7531,7 +7531,7 @@ cmdIOThreadInfo(vshControl *ctl, const vshCmd *cmd) bool config = vshCommandOptBool(cmd, "config"); bool live = vshCommandOptBool(cmd, "live"); bool current = vshCommandOptBool(cmd, "current"); - int niothreads = 0; + size_t niothreads = 0; virDomainIOThreadInfoPtr *info; size_t i; int maxcpu; @@ -7539,6 +7539,7 @@ cmdIOThreadInfo(vshControl *ctl, const vshCmd *cmd) virshControlPtr priv = ctl->privData; vshTablePtr table = NULL; bool ret = false; + int rc; VSH_EXCLUSIVE_OPTIONS_VAR(current, live); VSH_EXCLUSIVE_OPTIONS_VAR(current, config); @@ -7554,10 +7555,11 @@ cmdIOThreadInfo(vshControl *ctl, const vshCmd *cmd) if ((maxcpu = virshNodeGetCPUCount(priv->conn)) < 0) goto cleanup; - if ((niothreads = virDomainGetIOThreadInfo(dom, &info, flags)) < 0) { + if ((rc = virDomainGetIOThreadInfo(dom, &info, flags)) < 0) { vshError(ctl, _("Unable to get domain IOThreads information")); goto cleanup; } + niothreads = rc; if (niothreads == 0) { ret = true;