util: netdevopenvswitch: use VIR_AUTOPTR for aggregate types

By making use of GNU C's cleanup attribute handled by the
VIR_AUTOPTR macro for declaring aggregate pointer variables,
majority of the calls to *Free functions can be dropped, which
in turn leads to getting rid of most of our cleanup sections.

Signed-off-by: Sukrit Bhatnagar <skrtbhtngr@gmail.com>
Reviewed-by: Erik Skultety <eskultet@redhat.com>

src/util/virnetdevopenvswitch.c

@@ -144,11 +144,10 @@ int virNetDevOpenvswitchAddPort(const char *brname, const char *ifname,
                                    virNetDevVPortProfilePtr ovsport,
                                    virNetDevVlanPtr virtVlan)
 {
-    int ret = -1;
-    virCommandPtr cmd = NULL;
     char macaddrstr[VIR_MAC_STRING_BUFLEN];
     char ifuuidstr[VIR_UUID_STRING_BUFLEN];
     char vmuuidstr[VIR_UUID_STRING_BUFLEN];
+    VIR_AUTOPTR(virCommand) cmd = NULL;
     VIR_AUTOFREE(char *) attachedmac_ex_id = NULL;
     VIR_AUTOFREE(char *) ifaceid_ex_id = NULL;
     VIR_AUTOFREE(char *) profile_ex_id = NULL;
@@ -160,17 +159,17 @@ int virNetDevOpenvswitchAddPort(const char *brname, const char *ifname,
 
     if (virAsprintf(&attachedmac_ex_id, "external-ids:attached-mac=\"%s\"",
                     macaddrstr) < 0)
-        goto cleanup;
+        return -1;
     if (virAsprintf(&ifaceid_ex_id, "external-ids:iface-id=\"%s\"",
                     ifuuidstr) < 0)
-        goto cleanup;
+        return -1;
     if (virAsprintf(&vmid_ex_id, "external-ids:vm-id=\"%s\"",
                     vmuuidstr) < 0)
-        goto cleanup;
+        return -1;
     if (ovsport->profileID[0] != '\0') {
         if (virAsprintf(&profile_ex_id, "external-ids:port-profile=\"%s\"",
                         ovsport->profileID) < 0)
-            goto cleanup;
+            return -1;
     }
 
     cmd = virCommandNew(OVSVSCTL);
@@ -179,7 +178,7 @@ int virNetDevOpenvswitchAddPort(const char *brname, const char *ifname,
                          ifname, "--", "add-port", brname, ifname, NULL);
 
     if (virNetDevOpenvswitchConstructVlans(cmd, virtVlan) < 0)
-        goto cleanup;
+        return -1;
 
     if (ovsport->profileID[0] == '\0') {
         virCommandAddArgList(cmd,
@@ -204,13 +203,10 @@ int virNetDevOpenvswitchAddPort(const char *brname, const char *ifname,
         virReportError(VIR_ERR_INTERNAL_ERROR,
                        _("Unable to add port %s to OVS bridge %s"),
                        ifname, brname);
-        goto cleanup;
+        return -1;
     }
 
-    ret = 0;
+    return 0;
- cleanup:
-    virCommandFree(cmd);
-    return ret;
 }
 
 /**
@@ -223,8 +219,7 @@ int virNetDevOpenvswitchAddPort(const char *brname, const char *ifname,
  */
 int virNetDevOpenvswitchRemovePort(const char *brname ATTRIBUTE_UNUSED, const char *ifname)
 {
-    int ret = -1;
+    VIR_AUTOPTR(virCommand) cmd = NULL;
-    virCommandPtr cmd = NULL;
 
     cmd = virCommandNew(OVSVSCTL);
     virNetDevOpenvswitchAddTimeout(cmd);
@@ -233,13 +228,10 @@ int virNetDevOpenvswitchRemovePort(const char *brname ATTRIBUTE_UNUSED, const ch
     if (virCommandRun(cmd, NULL) < 0) {
         virReportError(VIR_ERR_INTERNAL_ERROR,
                        _("Unable to delete port %s from OVS"), ifname);
-        goto cleanup;
+        return -1;
     }
 
-    ret = 0;
+    return 0;
- cleanup:
-    virCommandFree(cmd);
-    return ret;
 }
 
 /**
@@ -253,9 +245,8 @@ int virNetDevOpenvswitchRemovePort(const char *brname ATTRIBUTE_UNUSED, const ch
  */
 int virNetDevOpenvswitchGetMigrateData(char **migrate, const char *ifname)
 {
-    virCommandPtr cmd = NULL;
     size_t len;
-    int ret = -1;
+    VIR_AUTOPTR(virCommand) cmd = NULL;
 
     cmd = virCommandNew(OVSVSCTL);
     virNetDevOpenvswitchAddTimeout(cmd);
@@ -269,7 +260,7 @@ int virNetDevOpenvswitchGetMigrateData(char **migrate, const char *ifname)
         virReportError(VIR_ERR_INTERNAL_ERROR,
                        _("Unable to run command to get OVS port data for "
                          "interface %s"), ifname);
-        goto cleanup;
+        return -1;
     }
 
     /* Wipeout the newline, if it exists */
@@ -277,10 +268,7 @@ int virNetDevOpenvswitchGetMigrateData(char **migrate, const char *ifname)
     if (len > 0)
         (*migrate)[len - 1] = '\0';
 
-    ret = 0;
+    return 0;
- cleanup:
-    virCommandFree(cmd);
-    return ret;
 }
 
 /**
@@ -294,8 +282,7 @@ int virNetDevOpenvswitchGetMigrateData(char **migrate, const char *ifname)
  */
 int virNetDevOpenvswitchSetMigrateData(char *migrate, const char *ifname)
 {
-    virCommandPtr cmd = NULL;
+    VIR_AUTOPTR(virCommand) cmd = NULL;
-    int ret = -1;
 
     if (!migrate) {
         VIR_DEBUG("No OVS port data for interface %s", ifname);
@@ -312,13 +299,10 @@ int virNetDevOpenvswitchSetMigrateData(char *migrate, const char *ifname)
         virReportError(VIR_ERR_INTERNAL_ERROR,
                        _("Unable to run command to set OVS port data for "
                          "interface %s"), ifname);
-        goto cleanup;
+        return -1;
     }
 
-    ret = 0;
+    return 0;
- cleanup:
-    virCommandFree(cmd);
-    return ret;
 }
 
 /**
@@ -334,10 +318,9 @@ int
 virNetDevOpenvswitchInterfaceStats(const char *ifname,
                                    virDomainInterfaceStatsPtr stats)
 {
-    virCommandPtr cmd = NULL;
     char *tmp;
     bool gotStats = false;
-    int ret = -1;
+    VIR_AUTOPTR(virCommand) cmd = NULL;
     VIR_AUTOFREE(char *) output = NULL;
 
     /* Just ensure the interface exists in ovs */
@@ -350,7 +333,7 @@ virNetDevOpenvswitchInterfaceStats(const char *ifname,
         /* no ovs-vsctl or interface 'ifname' doesn't exists in ovs */
         virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
                        _("Interface not found"));
-        goto cleanup;
+        return -1;
     }
 
 #define GET_STAT(name, member) \
@@ -369,7 +352,7 @@ virNetDevOpenvswitchInterfaceStats(const char *ifname,
                 *tmp != '\n') { \
                 virReportError(VIR_ERR_INTERNAL_ERROR, "%s", \
                                _("Fail to parse ovs-vsctl output")); \
-                goto cleanup; \
+                return -1; \
             } \
             gotStats = true; \
         } \
@@ -389,14 +372,10 @@ virNetDevOpenvswitchInterfaceStats(const char *ifname,
     if (!gotStats) {
         virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
                        _("Interface doesn't have any statistics"));
-        goto cleanup;
+        return -1;
     }
 
-    ret = 0;
+    return 0;
-
- cleanup:
-    virCommandFree(cmd);
-    return ret;
 }
 
 
@@ -467,12 +446,12 @@ int
 virNetDevOpenvswitchGetVhostuserIfname(const char *path,
                                        char **ifname)
 {
-    virCommandPtr cmd = NULL;
     char *tmpIfname = NULL;
     char **tokens = NULL;
     size_t ntokens = 0;
     int status;
     int ret = -1;
+    VIR_AUTOPTR(virCommand) cmd = NULL;
 
     /* Openvswitch vhostuser path are hardcoded to
      * /<runstatedir>/openvswitch/<ifname>
@@ -503,7 +482,6 @@ virNetDevOpenvswitchGetVhostuserIfname(const char *path,
 
  cleanup:
     virStringListFreeCount(tokens, ntokens);
-    virCommandFree(cmd);
     return ret;
 }
 
@@ -519,8 +497,7 @@ virNetDevOpenvswitchGetVhostuserIfname(const char *path,
 int virNetDevOpenvswitchUpdateVlan(const char *ifname,
                                    virNetDevVlanPtr virtVlan)
 {
-    int ret = -1;
+    VIR_AUTOPTR(virCommand) cmd = NULL;
-    virCommandPtr cmd = NULL;
 
     cmd = virCommandNew(OVSVSCTL);
     virNetDevOpenvswitchAddTimeout(cmd);
@@ -531,16 +508,13 @@ int virNetDevOpenvswitchUpdateVlan(const char *ifname,
                          "--", "--if-exists", "set", "Port", ifname, NULL);
 
     if (virNetDevOpenvswitchConstructVlans(cmd, virtVlan) < 0)
-        goto cleanup;
+        return -1;
 
     if (virCommandRun(cmd, NULL) < 0) {
         virReportError(VIR_ERR_INTERNAL_ERROR,
                        _("Unable to set vlan configuration on port %s"), ifname);
-        goto cleanup;
+        return -1;
     }
 
-    ret = 0;
+    return 0;
- cleanup:
-    virCommandFree(cmd);
-    return ret;
 }