mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-08-28 11:31:16 +00:00
util: new function virNetDevIPInfoAddToDev
This patch takes the code out of lxcContainerRenameAndEnableInterfaces() that adds all IP addresses and IP routes to the interface, and puts it into a utility function virNetDevIPInfoAddToDev() in virnetdevip.c so that it can be used by anyone. One small change in functionality - lxcContainerRenameAndEnableInterfaces() previously would add all IP addresses to the interface while it was still offline, then set the interface online, and then add the routes. Because I don't want the utility function to set the interface online, I've moved this up so the interface is first set online, then IP addresses and routes are added. This is the same order that the network service from initscripts (in ifup-ether) does it, so it shouldn't pose any problem (and hasn't, in the tests that I've run). (This patch had been pushed earlier in commitf1e0d0da11
, but was reverted in commit05eab47559
because it had been accidentally pushed during the freeze for release 2.0.0)
This commit is contained in:
parent
60c40ce3be
commit
95309424ba
@ -1932,6 +1932,7 @@ virNetDevBridgeSetVlanFiltering;
|
|||||||
virNetDevIPAddrAdd;
|
virNetDevIPAddrAdd;
|
||||||
virNetDevIPAddrDel;
|
virNetDevIPAddrDel;
|
||||||
virNetDevIPAddrGet;
|
virNetDevIPAddrGet;
|
||||||
|
virNetDevIPInfoAddToDev;
|
||||||
virNetDevIPInfoClear;
|
virNetDevIPInfoClear;
|
||||||
virNetDevIPRouteAdd;
|
virNetDevIPRouteAdd;
|
||||||
virNetDevIPRouteFree;
|
virNetDevIPRouteFree;
|
||||||
|
@ -490,7 +490,7 @@ lxcContainerRenameAndEnableInterfaces(virDomainDefPtr vmDef,
|
|||||||
char **veths)
|
char **veths)
|
||||||
{
|
{
|
||||||
int ret = -1;
|
int ret = -1;
|
||||||
size_t i, j;
|
size_t i;
|
||||||
const char *newname;
|
const char *newname;
|
||||||
virDomainNetDefPtr netDef;
|
virDomainNetDefPtr netDef;
|
||||||
bool privNet = vmDef->features[VIR_DOMAIN_FEATURE_PRIVNET] ==
|
bool privNet = vmDef->features[VIR_DOMAIN_FEATURE_PRIVNET] ==
|
||||||
@ -509,53 +509,28 @@ lxcContainerRenameAndEnableInterfaces(virDomainDefPtr vmDef,
|
|||||||
|
|
||||||
VIR_DEBUG("Renaming %s to %s", veths[i], newname);
|
VIR_DEBUG("Renaming %s to %s", veths[i], newname);
|
||||||
if (virNetDevSetName(veths[i], newname) < 0)
|
if (virNetDevSetName(veths[i], newname) < 0)
|
||||||
goto cleanup;
|
goto cleanup;
|
||||||
|
|
||||||
for (j = 0; j < netDef->guestIP.nips; j++) {
|
|
||||||
virNetDevIPAddrPtr ip = netDef->guestIP.ips[j];
|
|
||||||
int prefix;
|
|
||||||
char *ipStr = virSocketAddrFormat(&ip->address);
|
|
||||||
|
|
||||||
if ((prefix = virSocketAddrGetIPPrefix(&ip->address,
|
|
||||||
NULL, ip->prefix)) < 0) {
|
|
||||||
ipStr = virSocketAddrFormat(&ip->address);
|
|
||||||
virReportError(VIR_ERR_INTERNAL_ERROR,
|
|
||||||
_("Failed to determine prefix for IP address '%s'"),
|
|
||||||
ipStr);
|
|
||||||
VIR_FREE(ipStr);
|
|
||||||
goto cleanup;
|
|
||||||
}
|
|
||||||
VIR_FREE(ipStr);
|
|
||||||
|
|
||||||
if (virNetDevIPAddrAdd(newname, &ip->address, NULL, prefix) < 0)
|
|
||||||
goto cleanup;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
/* Only enable this device if there is a reason to do so (either
|
||||||
|
* at least one IP was specified, or link state was set to up in
|
||||||
|
* the config)
|
||||||
|
*/
|
||||||
if (netDef->guestIP.nips ||
|
if (netDef->guestIP.nips ||
|
||||||
netDef->linkstate == VIR_DOMAIN_NET_INTERFACE_LINK_STATE_UP) {
|
netDef->linkstate == VIR_DOMAIN_NET_INTERFACE_LINK_STATE_UP) {
|
||||||
VIR_DEBUG("Enabling %s", newname);
|
VIR_DEBUG("Enabling %s", newname);
|
||||||
if (virNetDevSetOnline(newname, true) < 0)
|
if (virNetDevSetOnline(newname, true) < 0)
|
||||||
goto cleanup;
|
goto cleanup;
|
||||||
|
|
||||||
/* Set the routes */
|
|
||||||
for (j = 0; j < netDef->guestIP.nroutes; j++) {
|
|
||||||
virNetDevIPRoutePtr route = netDef->guestIP.routes[j];
|
|
||||||
|
|
||||||
if (virNetDevIPRouteAdd(newname,
|
|
||||||
virNetDevIPRouteGetAddress(route),
|
|
||||||
virNetDevIPRouteGetPrefix(route),
|
|
||||||
virNetDevIPRouteGetGateway(route),
|
|
||||||
virNetDevIPRouteGetMetric(route)) < 0) {
|
|
||||||
goto cleanup;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* set IP addresses and routes */
|
||||||
|
if (virNetDevIPInfoAddToDev(newname, &netDef->guestIP) < 0)
|
||||||
|
goto cleanup;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* enable lo device only if there were other net devices */
|
/* enable lo device only if there were other net devices */
|
||||||
if ((veths || privNet) &&
|
if ((veths || privNet) &&
|
||||||
virNetDevSetOnline("lo", true) < 0)
|
virNetDevSetOnline("lo", true) < 0)
|
||||||
goto cleanup;
|
goto cleanup;
|
||||||
|
|
||||||
ret = 0;
|
ret = 0;
|
||||||
cleanup:
|
cleanup:
|
||||||
|
@ -887,3 +887,63 @@ virNetDevIPInfoClear(virNetDevIPInfoPtr ip)
|
|||||||
virNetDevIPRouteFree(ip->routes[i]);
|
virNetDevIPRouteFree(ip->routes[i]);
|
||||||
VIR_FREE(ip->routes);
|
VIR_FREE(ip->routes);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* virNetDevIPInfoAddToDev:
|
||||||
|
* @ifname: name of device to operate on
|
||||||
|
* @ipInfo: list of routes and IP addresses to add to this device
|
||||||
|
*
|
||||||
|
* All IP routes and IP addresses in ipInfo are added to the named device.
|
||||||
|
*
|
||||||
|
* Returns: 0 on success, -1 (and error reported) on failure.
|
||||||
|
*/
|
||||||
|
int
|
||||||
|
virNetDevIPInfoAddToDev(const char *ifname,
|
||||||
|
virNetDevIPInfo const *ipInfo)
|
||||||
|
{
|
||||||
|
int ret = -1;
|
||||||
|
size_t i;
|
||||||
|
int prefix;
|
||||||
|
|
||||||
|
/* add all IP addresses */
|
||||||
|
for (i = 0; i < ipInfo->nips; i++) {
|
||||||
|
virNetDevIPAddrPtr ip = ipInfo->ips[i];
|
||||||
|
|
||||||
|
if ((prefix = virSocketAddrGetIPPrefix(&ip->address,
|
||||||
|
NULL, ip->prefix)) < 0) {
|
||||||
|
char *ipStr = virSocketAddrFormat(&ip->address);
|
||||||
|
|
||||||
|
virReportError(VIR_ERR_INTERNAL_ERROR,
|
||||||
|
_("Failed to determine prefix for IP address '%s'"),
|
||||||
|
NULLSTR(ipStr));
|
||||||
|
VIR_FREE(ipStr);
|
||||||
|
goto cleanup;
|
||||||
|
}
|
||||||
|
if (virNetDevIPAddrAdd(ifname, &ip->address, NULL, prefix) < 0)
|
||||||
|
goto cleanup;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* add all routes */
|
||||||
|
for (i = 0; i < ipInfo->nroutes; i++) {
|
||||||
|
virNetDevIPRoutePtr route = ipInfo->routes[i];
|
||||||
|
|
||||||
|
if ((prefix = virNetDevIPRouteGetPrefix(route)) < 0) {
|
||||||
|
char *ipStr = virSocketAddrFormat(&route->address);
|
||||||
|
|
||||||
|
virReportError(VIR_ERR_INTERNAL_ERROR,
|
||||||
|
_("Failed to determine prefix for route with destination '%s'"),
|
||||||
|
NULLSTR(ipStr));
|
||||||
|
VIR_FREE(ipStr);
|
||||||
|
goto cleanup;
|
||||||
|
}
|
||||||
|
if (virNetDevIPRouteAdd(ifname, &route->address, prefix,
|
||||||
|
&route->gateway,
|
||||||
|
virNetDevIPRouteGetMetric(route)) < 0)
|
||||||
|
goto cleanup;
|
||||||
|
}
|
||||||
|
|
||||||
|
ret = 0;
|
||||||
|
cleanup:
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
@ -86,5 +86,7 @@ virSocketAddrPtr virNetDevIPRouteGetGateway(virNetDevIPRoutePtr def);
|
|||||||
|
|
||||||
/* virNetDevIPInfo object */
|
/* virNetDevIPInfo object */
|
||||||
void virNetDevIPInfoClear(virNetDevIPInfoPtr ip);
|
void virNetDevIPInfoClear(virNetDevIPInfoPtr ip);
|
||||||
|
int virNetDevIPInfoAddToDev(const char *ifname,
|
||||||
|
virNetDevIPInfo const *ipInfo);
|
||||||
|
|
||||||
#endif /* __VIR_NETDEVIP_H__ */
|
#endif /* __VIR_NETDEVIP_H__ */
|
||||||
|
Loading…
Reference in New Issue
Block a user