External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-07 17:28:15 +00:00
Code

Fix a invalid usage of virDomainNetDef in OpenVZ driver

Browse Source 
OpenVZ was accessing ethernet data to obtain the guest iface name
regardless the domain is configured to use ethernet or bridged
networking. This prevented the guest network interface to be rightly
named for bridged networking.
This commit is contained in:
Alvaro Polo 2013-06-04 09:44:32 +02:00 committed by Eric Blake
parent 3452400673
commit 7a5ac83520
1 changed files with 13 additions and 7 deletions

20
src/openvz/openvz_driver.c

@ -815,6 +815,7 @@ openvzDomainSetNetwork(virConnectPtr conn, const char *vpsid,
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;
virCommandPtr cmd = NULL; virCommandPtr cmd = NULL;
char *guest_ifname = NULL;
if (net == NULL) if (net == NULL)
return 0; return 0;
@ -840,11 +841,15 @@ openvzDomainSetNetwork(virConnectPtr conn, const char *vpsid,
virBuffer buf = VIR_BUFFER_INITIALIZER; virBuffer buf = VIR_BUFFER_INITIALIZER;
int veid = openvzGetVEID(vpsid); int veid = openvzGetVEID(vpsid);
/* if user doesn't specify guest interface name, /* if net is ethernet and the user has specified guest interface name,
* then we need to generate it */ * let's use it; otherwise generate a new one */
if (net->data.ethernet.dev == NULL) { if (net->type == VIR_DOMAIN_NET_TYPE_ETHERNET &&
net->data.ethernet.dev = openvzGenerateContainerVethName(veid); net->data.ethernet.dev != NULL) {
if (net->data.ethernet.dev == NULL) { if (VIR_STRDUP(guest_ifname, net->data.ethernet.dev) == -1)
goto cleanup;
} else {
guest_ifname = openvzGenerateContainerVethName(veid);
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; goto cleanup;
@ -862,7 +867,7 @@ openvzDomainSetNetwork(virConnectPtr conn, const char *vpsid,
} }
} }
virBufferAdd(&buf, net->data.ethernet.dev, -1); /* Guest dev */ virBufferAdd(&buf, guest_ifname, -1); /* Guest dev */
virBufferAsprintf(&buf, ",%s", macaddr); /* Guest dev mac */ virBufferAsprintf(&buf, ",%s", macaddr); /* Guest dev mac */
virBufferAsprintf(&buf, ",%s", net->ifname); /* Host dev */ virBufferAsprintf(&buf, ",%s", net->ifname); /* Host dev */
virBufferAsprintf(&buf, ",%s", host_macaddr); /* Host dev mac */ virBufferAsprintf(&buf, ",%s", host_macaddr); /* Host dev mac */
@ -871,7 +876,7 @@ openvzDomainSetNetwork(virConnectPtr conn, const char *vpsid,
if (driver->version >= VZCTL_BRIDGE_MIN_VERSION) { if (driver->version >= VZCTL_BRIDGE_MIN_VERSION) {
virBufferAsprintf(&buf, ",%s", net->data.bridge.brname); /* Host bridge */ virBufferAsprintf(&buf, ",%s", net->data.bridge.brname); /* Host bridge */
} else { } else {
virBufferAsprintf(configBuf, "ifname=%s", net->data.ethernet.dev); virBufferAsprintf(configBuf, "ifname=%s", guest_ifname);
virBufferAsprintf(configBuf, ",mac=%s", macaddr); /* Guest dev mac */ virBufferAsprintf(configBuf, ",mac=%s", macaddr); /* Guest dev mac */
virBufferAsprintf(configBuf, ",host_ifname=%s", net->ifname); /* Host dev */ virBufferAsprintf(configBuf, ",host_ifname=%s", net->ifname); /* Host dev */
virBufferAsprintf(configBuf, ",host_mac=%s", host_macaddr); /* Host dev mac */ virBufferAsprintf(configBuf, ",host_mac=%s", host_macaddr); /* Host dev mac */
@ -895,6 +900,7 @@ openvzDomainSetNetwork(virConnectPtr conn, const char *vpsid,
cleanup: cleanup:
virCommandFree(cmd); virCommandFree(cmd);
VIR_FREE(guest_ifname);
return rc; return rc;
} }