External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-10-04 13:25:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

openvz: refactor openvzDomainSetNetwork

Browse Source 
Signed-off-by: Ján Tomko <jtomko@redhat.com>
Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
This commit is contained in:
Ján Tomko 2021-12-13 19:08:49 +01:00
parent 83b063ca60
commit 0681365dc3
1 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/openvz/openvz_driver.c
View File

@ -661,13 +661,12 @@ openvzDomainSetNetwork(virConnectPtr conn, const char *vpsid,
virDomainNetDef *net, virDomainNetDef *net,
virBuffer *configBuf) virBuffer *configBuf)
{ {
int rc = -1;
char macaddr[VIR_MAC_STRING_BUFLEN]; char macaddr[VIR_MAC_STRING_BUFLEN];
virMacAddr host_mac; virMacAddr host_mac;
char host_macaddr[VIR_MAC_STRING_BUFLEN]; char host_macaddr[VIR_MAC_STRING_BUFLEN];
struct openvz_driver *driver = conn->privateData; struct openvz_driver *driver = conn->privateData;
virCommand *cmd = NULL; g_autoptr(virCommand) cmd = NULL;
char *guest_ifname = NULL; g_autofree char *guest_ifname = NULL;
if (net == NULL) if (net == NULL)
return 0; return 0;
@ -703,7 +702,7 @@ openvzDomainSetNetwork(virConnectPtr conn, const char *vpsid,
if (guest_ifname == NULL) { if (guest_ifname == NULL) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("Could not generate eth name for container")); _("Could not generate eth name for container"));
goto cleanup; return -1;
} }
} }
@ -714,7 +713,7 @@ openvzDomainSetNetwork(virConnectPtr conn, const char *vpsid,
if (net->ifname == NULL) { if (net->ifname == NULL) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s", virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("Could not generate veth name")); _("Could not generate veth name"));
goto cleanup; return -1;
} }
} }
@ -744,23 +743,17 @@ openvzDomainSetNetwork(virConnectPtr conn, const char *vpsid,
/* --ipadd ip */ /* --ipadd ip */
for (i = 0; i < net->guestIP.nips; i++) { for (i = 0; i < net->guestIP.nips; i++) {
char *ipStr = virSocketAddrFormat(&net->guestIP.ips[i]->address); g_autofree char *ipStr = virSocketAddrFormat(&net->guestIP.ips[i]->address);
if (!ipStr) if (!ipStr)
goto cleanup; return -1;
virCommandAddArgList(cmd, "--ipadd", ipStr, NULL); virCommandAddArgList(cmd, "--ipadd", ipStr, NULL);
VIR_FREE(ipStr);
} }
} }
/* TODO: processing NAT and physical device */ /* TODO: processing NAT and physical device */
virCommandAddArg(cmd, "--save"); virCommandAddArg(cmd, "--save");
rc = virCommandRun(cmd, NULL); return virCommandRun(cmd, NULL);
cleanup:
virCommandFree(cmd);
VIR_FREE(guest_ifname);
return rc;
} }