From: Ján Tomko <jtomko@redhat.com>
Date: Sun, 2 Aug 2020 11:33:55 +0000 (+0200)
Subject: conf: use g_strdupv instead of virStringListCopy
X-Git-Tag: v6.7.0-rc1~219
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1d40d83336a5ffe8929946a71de4cca64af0d5bd;p=thirdparty%2Flibvirt.git

conf: use g_strdupv instead of virStringListCopy

Also remove the temporary variable - even virStringListCopy
aborts on OOM now.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Martin Kletzander <mkletzan@redhat.com>
---

diff --git a/src/conf/domain_capabilities.c b/src/conf/domain_capabilities.c
index 837b004334..4b867dd997 100644
--- a/src/conf/domain_capabilities.c
+++ b/src/conf/domain_capabilities.c
@@ -199,14 +199,10 @@ virDomainCapsCPUModelsAdd(virDomainCapsCPUModelsPtr cpuModels,
                           char **blockers)
 {
     g_autofree char * nameCopy = NULL;
-    VIR_AUTOSTRINGLIST blockersCopy = NULL;
     virDomainCapsCPUModelPtr cpu;
 
     nameCopy = g_strdup(name);
 
-    if (virStringListCopy(&blockersCopy, (const char **)blockers) < 0)
-        return -1;
-
     if (VIR_RESIZE_N(cpuModels->models, cpuModels->nmodels_max,
                      cpuModels->nmodels, 1) < 0)
         return -1;
@@ -216,7 +212,7 @@ virDomainCapsCPUModelsAdd(virDomainCapsCPUModelsPtr cpuModels,
 
     cpu->usable = usable;
     cpu->name = g_steal_pointer(&nameCopy);
-    cpu->blockers = g_steal_pointer(&blockersCopy);
+    cpu->blockers = g_strdupv(blockers);
 
     return 0;
 }