From: Peter Krempa <pkrempa@redhat.com>
Date: Wed, 19 Apr 2023 10:39:00 +0000 (+0200)
Subject: virsh: cmdIOThreadSet: Use bigger types for --poll-grow and --poll-shrink
X-Git-Tag: v9.4.0-rc1~115
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6df1d137dd3adfa507d17cf3bf8d11459ab443d0;p=thirdparty%2Flibvirt.git

virsh: cmdIOThreadSet: Use bigger types for --poll-grow and --poll-shrink

The qemu driver now accepts also _ULLONG as type for bigger numbers. Use
the 'virTypedParamListAddUnsigned' helper to use the bigger typed
parameter type if necessary to allow full range of the values while
preserving compatibility.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
index d37e27000b..db47d63d85 100644
--- a/tools/virsh-domain.c
+++ b/tools/virsh-domain.c
@@ -7853,8 +7853,7 @@ cmdIOThreadSet(vshControl *ctl, const vshCmd *cmd)
     g_autoptr(virTypedParamList) params = virTypedParamListNew();
     virTypedParameterPtr par;
     size_t npar = 0;
-    unsigned long long poll_max;
-    unsigned int poll_val;
+    unsigned long long poll_val;
     int thread_val;
     int rc;
 
@@ -7876,20 +7875,20 @@ cmdIOThreadSet(vshControl *ctl, const vshCmd *cmd)
         return false;
     }
 
-    if ((rc = vshCommandOptULongLong(ctl, cmd, "poll-max-ns", &poll_max)) < 0)
+    if ((rc = vshCommandOptULongLong(ctl, cmd, "poll-max-ns", &poll_val)) < 0)
         return false;
     if (rc > 0)
-        virTypedParamListAddULLong(params, poll_max, VIR_DOMAIN_IOTHREAD_POLL_MAX_NS);
+        virTypedParamListAddULLong(params, poll_val, VIR_DOMAIN_IOTHREAD_POLL_MAX_NS);
 
-    if ((rc = vshCommandOptUInt(ctl, cmd, "poll-grow", &poll_val)) < 0)
+    if ((rc = vshCommandOptULongLong(ctl, cmd, "poll-grow", &poll_val)) < 0)
         return false;
     if (rc > 0)
-        virTypedParamListAddUInt(params, poll_val, VIR_DOMAIN_IOTHREAD_POLL_GROW);
+        virTypedParamListAddUnsigned(params, poll_val, VIR_DOMAIN_IOTHREAD_POLL_GROW);
 
-    if ((rc = vshCommandOptUInt(ctl, cmd, "poll-shrink", &poll_val)) < 0)
+    if ((rc = vshCommandOptULongLong(ctl, cmd, "poll-shrink", &poll_val)) < 0)
         return false;
     if (rc > 0)
-        virTypedParamListAddUInt(params, poll_val, VIR_DOMAIN_IOTHREAD_POLL_SHRINK);
+        virTypedParamListAddUnsigned(params, poll_val, VIR_DOMAIN_IOTHREAD_POLL_SHRINK);
 
     if ((rc = vshCommandOptInt(ctl, cmd, "thread-pool-min", &thread_val)) < 0)
         return false;