From: Peter Krempa <pkrempa@redhat.com>
Date: Tue, 3 Aug 2021 13:08:54 +0000 (+0200)
Subject: xenParseXMDisk: Use automatic memory clearing and remove 'ret' variable
X-Git-Tag: v7.7.0-rc1~277
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=18e65eef04550c88df417e8a5e60f2d287698fc9;p=thirdparty%2Flibvirt.git

xenParseXMDisk: Use automatic memory clearing and remove 'ret' variable

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
---

diff --git a/src/libxl/xen_xm.c b/src/libxl/xen_xm.c
index ac86ddf9b7..f978b94f93 100644
--- a/src/libxl/xen_xm.c
+++ b/src/libxl/xen_xm.c
@@ -238,9 +238,9 @@ xenParseXMDisk(char *entry, int hvm)
 static int
 xenParseXMDiskList(virConf *conf, virDomainDef *def)
 {
-    char **disks = NULL, **entries;
+    g_auto(GStrv) disks = NULL;
+    GStrv entries;
     int hvm = def->os.type == VIR_DOMAIN_OSTYPE_HVM;
-    int ret = -1;
     int rc;
 
     rc = virConfGetValueStringList(conf, "disk", false, &disks);
@@ -258,10 +258,7 @@ xenParseXMDiskList(virConf *conf, virDomainDef *def)
         VIR_APPEND_ELEMENT(def->disks, def->ndisks, disk);
     }
 
-    ret = 0;
-
-    g_strfreev(disks);
-    return ret;
+    return 0;
 }