[libvirt PATCH 14/14] qemu: agent: rename tmp_iface to iface_obj

Ján Tomko jtomko at redhat.com
Tue Oct 6 06:58:50 UTC 2020


Signed-off-by: Ján Tomko <jtomko at redhat.com>
---
 src/qemu/qemu_agent.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/qemu/qemu_agent.c b/src/qemu/qemu_agent.c
index b6c37b6b0d..3de951fc97 100644
--- a/src/qemu/qemu_agent.c
+++ b/src/qemu/qemu_agent.c
@@ -2108,7 +2108,7 @@ static int
 qemuAgentGetInterfaceAddresses(virDomainInterfacePtr **ifaces_ret,
                                size_t *ifaces_count,
                                virHashTablePtr ifaces_store,
-                               virJSONValuePtr tmp_iface)
+                               virJSONValuePtr iface_obj)
 {
     virJSONValuePtr ip_addr_arr = NULL;
     const char *hwaddr, *name = NULL;
@@ -2118,7 +2118,7 @@ qemuAgentGetInterfaceAddresses(virDomainInterfacePtr **ifaces_ret,
     size_t j;
 
     /* interface name is required to be presented */
-    name = virJSONValueObjectGetString(tmp_iface, "name");
+    name = virJSONValueObjectGetString(iface_obj, "name");
     if (!name) {
         virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
                        _("qemu agent didn't provide 'name' field"));
@@ -2144,13 +2144,13 @@ qemuAgentGetInterfaceAddresses(virDomainInterfacePtr **ifaces_ret,
         iface->naddrs = 0;
         iface->name = g_strdup(ifname);
 
-        hwaddr = virJSONValueObjectGetString(tmp_iface, "hardware-address");
+        hwaddr = virJSONValueObjectGetString(iface_obj, "hardware-address");
         iface->hwaddr = g_strdup(hwaddr);
     }
 
     /* as well as IP address which - moreover -
      * can be presented multiple times */
-    ip_addr_arr = virJSONValueObjectGet(tmp_iface, "ip-addresses");
+    ip_addr_arr = virJSONValueObjectGet(iface_obj, "ip-addresses");
     if (!ip_addr_arr)
         return 0;
 
@@ -2218,10 +2218,10 @@ qemuAgentGetInterfaces(qemuAgentPtr agent,
     }
 
     for (i = 0; i < virJSONValueArraySize(ret_array); i++) {
-        virJSONValuePtr tmp_iface = virJSONValueArrayGet(ret_array, i);
+        virJSONValuePtr iface_obj = virJSONValueArrayGet(ret_array, i);
 
         if (qemuAgentGetInterfaceAddresses(&ifaces_ret, &ifaces_count,
-                                           ifaces_store, tmp_iface) < 0)
+                                           ifaces_store, iface_obj) < 0)
             goto error;
 
     }
-- 
2.26.2




More information about the libvir-list mailing list