qemu: agent: expand addrs upfront

qemuAgentGetInterfaceOneAddress returns exactly one address
for every iteration of the loop (and we error out if not).

Instead of expanding the addrs by one on every iteration,
do it upfront since we know how many times the loop will
execute.

Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Jonathon Jongsma <jjongsma@redhat.com>
Reviewed-by: Neal Gompa <ngompa13@gmail.com>
This commit is contained in:
Ján Tomko 2020-10-05 21:26:01 +02:00
parent 269af9f692
commit 89b43c3e25

View File

@ -2213,20 +2213,18 @@ qemuAgentGetInterfaces(qemuAgentPtr agent,
/* If current iface already exists, continue with the count */
addrs_count = iface->naddrs;
if (VIR_EXPAND_N(iface->addrs, addrs_count,
virJSONValueArraySize(ip_addr_arr)) < 0)
goto error;
for (j = 0; j < virJSONValueArraySize(ip_addr_arr); j++) {
virJSONValuePtr ip_addr_obj = virJSONValueArrayGet(ip_addr_arr, j);
virDomainIPAddressPtr ip_addr;
if (VIR_EXPAND_N(iface->addrs, addrs_count, 1) < 0)
goto error;
ip_addr = &iface->addrs[addrs_count - 1];
virDomainIPAddressPtr ip_addr = iface->addrs + iface->naddrs;
iface->naddrs++;
if (qemuAgentGetInterfaceOneAddress(ip_addr, ip_addr_obj, name) < 0)
goto error;
}
iface->naddrs = addrs_count;
}
*ifaces = g_steal_pointer(&ifaces_ret);