From: Pavel Hrdina <phrdina@redhat.com>
Date: Thu, 20 Mar 2025 22:43:59 +0000 (+0100)
Subject: tools: use virDomainRestoreParams only when necessary
X-Git-Tag: v11.2.0-rc1~23
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b982583d9230d288a3c9474881fca62613985ad1;p=thirdparty%2Flibvirt.git

tools: use virDomainRestoreParams only when necessary

We should use the newest API only when user sets parallel-channels.

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Jim Fehlig <jfehlig@suse.com>
---

diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
index 56ddf4d701..c21cf847c8 100644
--- a/tools/virsh-domain.c
+++ b/tools/virsh-domain.c
@@ -5707,10 +5707,6 @@ cmdRestore(vshControl *ctl, const vshCmd *cmd)
 
     if (vshCommandOptString(ctl, cmd, "file", &from) < 0)
         return false;
-    if (from &&
-        virTypedParamsAddString(&params, &nparams, &maxparams,
-                                VIR_DOMAIN_SAVE_PARAM_FILE, from) < 0)
-        return false;
 
     if (vshCommandOptString(ctl, cmd, "xml", &xmlfile) < 0)
         return false;
@@ -5718,10 +5714,6 @@ cmdRestore(vshControl *ctl, const vshCmd *cmd)
     if (xmlfile &&
         virFileReadAll(xmlfile, VSH_MAX_XML_FILE, &xml) < 0)
         return false;
-    if (xml &&
-        virTypedParamsAddString(&params, &nparams, &maxparams,
-                                VIR_DOMAIN_SAVE_PARAM_DXML, xml) < 0)
-        return false;
 
     if ((rc = vshCommandOptInt(ctl, cmd, "parallel-channels", &nchannels)) < 0)
         return false;
@@ -5730,8 +5722,20 @@ cmdRestore(vshControl *ctl, const vshCmd *cmd)
                              VIR_DOMAIN_SAVE_PARAM_PARALLEL_CHANNELS, nchannels) < 0)
         return false;
 
-    if (flags || xml) {
+    if (nparams > 0) {
+        if (from &&
+            virTypedParamsAddString(&params, &nparams, &maxparams,
+                                    VIR_DOMAIN_SAVE_PARAM_FILE, from) < 0)
+            return false;
+
+        if (xml &&
+            virTypedParamsAddString(&params, &nparams, &maxparams,
+                                    VIR_DOMAIN_SAVE_PARAM_DXML, xml) < 0)
+            return false;
+
         rc = virDomainRestoreParams(priv->conn, params, nparams, flags);
+    } else if (flags || xml) {
+        rc = virDomainRestoreFlags(priv->conn, from, xml, flags);
     } else {
         rc = virDomainRestore(priv->conn, from);
     }