shaba/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-08 09:57:26 +03:00
Code Releases Activity

qemu domain allow to set ip address, peer address and route

Browse Source 
Signed-off-by: Vasiliy Tolstov <v.tolstov@selfip.ru>
This commit is contained in:
Vasiliy Tolstov 2016-04-04 21:00:06 +00:00 committed by Daniel P. Berrange
parent afee47d07c
commit 6e244c659f
2 changed files with 47 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/qemu/qemu_interface.c
View File

@ -438,6 +438,7 @@ qemuInterfaceEthernetConnect(virDomainDefPtr def,
bool template_ifname = false; bool template_ifname = false;
virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver); virQEMUDriverConfigPtr cfg = virQEMUDriverGetConfig(driver);
const char *tunpath = "/dev/net/tun"; const char *tunpath = "/dev/net/tun";
size_t i;
if (net->backend.tap) { if (net->backend.tap) {
tunpath = net->backend.tap; tunpath = net->backend.tap;
@ -474,6 +475,45 @@ qemuInterfaceEthernetConnect(virDomainDefPtr def,
if (virNetDevSetMAC(net->ifname, &tapmac) < 0) if (virNetDevSetMAC(net->ifname, &tapmac) < 0)
goto cleanup; goto cleanup;
for (i = 0; i < net->nips; i++) {
virDomainNetIpDefPtr ip = net->ips[i];
unsigned int prefix = (ip->prefix > 0) ? ip->prefix :
VIR_SOCKET_ADDR_DEFAULT_PREFIX;
char *ipStr = virSocketAddrFormat(&ip->address);
VIR_DEBUG("Adding IP address '%s/%u' to '%s'",
ipStr, ip->prefix, net->ifname);
if (virNetDevSetIPAddress(net->ifname, &ip->address, &ip->peer, prefix) < 0) {
virReportError(VIR_ERR_SYSTEM_ERROR,
_("Failed to set IP address '%s' on %s"),
ipStr, net->ifname);
VIR_FREE(ipStr);
goto cleanup;
}
VIR_FREE(ipStr);
}
if (net->linkstate == VIR_DOMAIN_NET_INTERFACE_LINK_STATE_UP ||
net->linkstate == VIR_DOMAIN_NET_INTERFACE_LINK_STATE_DEFAULT) {
if (virNetDevSetOnline(net->ifname, true) < 0)
goto cleanup;
/* Set the routes */
for (i = 0; i < net->nroutes; i++) {
virNetworkRouteDefPtr route = net->routes[i];
if (virNetDevAddRoute(net->ifname,
virNetworkRouteDefGetAddress(route),
virNetworkRouteDefGetPrefix(route),
virNetworkRouteDefGetGateway(route),
virNetworkRouteDefGetMetric(route)) < 0) {
goto cleanup;
}
}
}
if (net->script && if (net->script &&
qemuExecuteEthernetScript(net->ifname, net->script) < 0) qemuExecuteEthernetScript(net->ifname, net->script) < 0)
goto cleanup; goto cleanup;
@ -493,7 +533,6 @@ qemuInterfaceEthernetConnect(virDomainDefPtr def,
cleanup: cleanup:
if (ret < 0) { if (ret < 0) {
size_t i;
for (i = 0; i < tapfdSize && tapfd[i] >= 0; i++) for (i = 0; i < tapfdSize && tapfd[i] >= 0; i++)
VIR_FORCE_CLOSE(tapfd[i]); VIR_FORCE_CLOSE(tapfd[i]);
if (template_ifname) if (template_ifname)

7
tests/qemuxml2argvmock.c
View File

@ -124,6 +124,13 @@ virNetDevSetMAC(const char *ifname ATTRIBUTE_UNUSED,
return 0; return 0;
} }
int
virNetDevSetOnline(const char *ifname ATTRIBUTE_UNUSED,
bool online ATTRIBUTE_UNUSED)
{
return 0;
}
int int
virCommandRun(virCommandPtr cmd ATTRIBUTE_UNUSED, virCommandRun(virCommandPtr cmd ATTRIBUTE_UNUSED,
int *exitstatus) int *exitstatus)