External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-24 06:35:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

qemu: agent: split out qemuAgentGetAllInterfaceAddresses

Browse Source 
Remove more logic from qemuAgentGetInterfaces.

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-07 14:33:08 +02:00
parent 031514e022
commit 6ddb1f803e
1 changed files with 32 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
src/qemu/qemu_agent.c
View File

@ -2201,6 +2201,37 @@ qemuAgentGetInterfaceAddresses(virDomainInterfacePtr **ifaces_ret,
} }
static int
qemuAgentGetAllInterfaceAddresses(virDomainInterfacePtr **ifaces_ret,
virJSONValuePtr ret_array)
{
g_autoptr(virHashTable) ifaces_store = NULL;
size_t ifaces_count = 0;
size_t i;
/* Hash table to handle the interface alias */
ifaces_store = virHashNew(NULL);
for (i = 0; i < virJSONValueArraySize(ret_array); i++) {
virJSONValuePtr iface_obj = virJSONValueArrayGet(ret_array, i);
if (qemuAgentGetInterfaceAddresses(ifaces_ret, &ifaces_count,
ifaces_store, iface_obj) < 0)
goto error;
}
return ifaces_count;
error:
if (ifaces_ret) {
for (i = 0; i < ifaces_count; i++)
virDomainInterfaceFree(*ifaces_ret[i]);
}
VIR_FREE(*ifaces_ret);
return -1;
}
/* /*
* qemuAgentGetInterfaces: * qemuAgentGetInterfaces:
* @agent: agent object * @agent: agent object
@ -2216,16 +2247,9 @@ int
qemuAgentGetInterfaces(qemuAgentPtr agent, qemuAgentGetInterfaces(qemuAgentPtr agent,
virDomainInterfacePtr **ifaces) virDomainInterfacePtr **ifaces)
{ {
size_t i;
g_autoptr(virJSONValue) cmd = NULL; g_autoptr(virJSONValue) cmd = NULL;
g_autoptr(virJSONValue) reply = NULL; g_autoptr(virJSONValue) reply = NULL;
virJSONValuePtr ret_array = NULL; virJSONValuePtr ret_array = NULL;
size_t ifaces_count = 0;
virDomainInterfacePtr *ifaces_ret = NULL;
g_autoptr(virHashTable) ifaces_store = NULL;
/* Hash table to handle the interface alias */
ifaces_store = virHashNew(NULL);
if (!(cmd = qemuAgentMakeCommand("guest-network-get-interfaces", NULL))) if (!(cmd = qemuAgentMakeCommand("guest-network-get-interfaces", NULL)))
return -1; return -1;
@ -2239,24 +2263,7 @@ qemuAgentGetInterfaces(qemuAgentPtr agent,
return -1; return -1;
} }
for (i = 0; i < virJSONValueArraySize(ret_array); i++) { return qemuAgentGetAllInterfaceAddresses(ifaces, ret_array);
virJSONValuePtr iface_obj = virJSONValueArrayGet(ret_array, i);
if (qemuAgentGetInterfaceAddresses(&ifaces_ret, &ifaces_count,
ifaces_store, iface_obj) < 0)
goto error;
}
*ifaces = g_steal_pointer(&ifaces_ret);
return ifaces_count;
error:
if (ifaces_ret) {
for (i = 0; i < ifaces_count; i++)
virDomainInterfaceFree(ifaces_ret[i]);
}
VIR_FREE(ifaces_ret);
return -1;
} }