[libvirt RFCv7 13/40] tools: make use of params in cmdRestore

[Claudio Fontana]

Signed-off-by: Claudio Fontana <cfont...@suse.de>
---
 tools/virsh-domain.c | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/tools/virsh-domain.c b/tools/virsh-domain.c
index be5679df0f..18498540f6 100644
--- a/tools/virsh-domain.c
+++ b/tools/virsh-domain.c
@@ -5316,14 +5316,22 @@ static bool
 cmdRestore(vshControl *ctl, const vshCmd *cmd)
 {
     const char *from = NULL;
+    virTypedParameterPtr params = NULL;
+    int nparams = 0;
+    int maxparams = 0;
     unsigned int flags = 0;
     const char *xmlfile = NULL;
     g_autofree char *xml = NULL;
     virshControl *priv = ctl->privData;
-    int rc;
+    int rc = -1;
 
-    if (vshCommandOptStringReq(ctl, cmd, "file", &from) < 0)
-        return false;
+    if (vshCommandOptStringReq(ctl, cmd, "file", &from) < 0) {
+        goto out;
+    } else {
+        if (virTypedParamsAddString(&params, &nparams, &maxparams,
+                                    VIR_SAVE_PARAM_FILE, from) < 0)
+            goto out;
+    }
 
     if (vshCommandOptBool(cmd, "bypass-cache"))
         flags |= VIR_DOMAIN_SAVE_BYPASS_CACHE;
@@ -5335,25 +5343,27 @@ cmdRestore(vshControl *ctl, const vshCmd *cmd)
         flags |= VIR_DOMAIN_SAVE_RESET_NVRAM;
 
     if (vshCommandOptStringReq(ctl, cmd, "xml", &xmlfile) < 0)
-        return false;
+        goto out;
 
     if (xmlfile &&
         virFileReadAll(xmlfile, VSH_MAX_XML_FILE, &xml) < 0)
-        return false;
+        goto out;
 
     if (flags || xml) {
-        rc = virDomainRestoreFlags(priv->conn, from, xml, flags);
+        rc = virDomainRestoreParams(priv->conn, params, nparams, flags);
     } else {
         rc = virDomainRestore(priv->conn, from);
     }
 
     if (rc < 0) {
         vshError(ctl, _("Failed to restore domain from %s"), from);
-        return false;
+        goto out;
     }
 
     vshPrintExtra(ctl, _("Domain restored from %s\n"), from);
-    return true;
+ out:
+    virTypedParamsFree(params, nparams);
+    return rc >= 0;
 }
 
 /*
-- 
2.35.3