External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-01-10 23:07:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

network: use virNetDevTapReattachBridge API

Browse Source 
Switch over to use the new API for re-attaching the bridge device

Reviewed-by: Cole Robinson <crobinso@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrangé 2019-02-01 13:46:33 +00:00
parent de938b92c9
commit 3e213d43b1
1 changed files with 10 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/network/bridge_driver.c
View File

@ -4816,7 +4816,6 @@ networkNotifyActualDevice(virNetworkPtr net,
virNetworkDefPtr netdef; virNetworkDefPtr netdef;
virNetworkForwardIfDefPtr dev = NULL; virNetworkForwardIfDefPtr dev = NULL;
size_t i; size_t i;
char *master = NULL;
obj = virNetworkObjFindByName(driver->networks, net->name); obj = virNetworkObjFindByName(driver->networks, net->name);
if (!obj) { if (!obj) {
@ -4843,42 +4842,17 @@ networkNotifyActualDevice(virNetworkPtr net,
/* see if we're connected to the correct bridge */ /* see if we're connected to the correct bridge */
if (netdef->bridge) { if (netdef->bridge) {
bool useOVS = false; /*
* NB: we can't notify the guest of any MTU change anyway,
if (virNetDevGetMaster(iface->ifname, &master) < 0) * so there is no point in trying to learn the actualMTU
* (final arg to virNetDevTapReattachBridge())
*/
if (virNetDevTapReattachBridge(iface->ifname, netdef->bridge,
&iface->mac, dom->uuid,
virDomainNetGetActualVirtPortProfile(iface),
virDomainNetGetActualVlan(iface),
iface->mtu, NULL) < 0) {
goto error; goto error;
/* IFLA_MASTER for a tap on an OVS switch is always "ovs-system" */
if (STREQ_NULLABLE(master, "ovs-system")) {
useOVS = true;
VIR_FREE(master);
if (virNetDevOpenvswitchInterfaceGetMaster(iface->ifname, &master) < 0)
goto error;
}
if (STRNEQ_NULLABLE(netdef->bridge, master)) {
/* disconnect from current (incorrect) bridge */
if (master) {
VIR_INFO("Removing %s from %s", iface->ifname, master);
if (useOVS)
ignore_value(virNetDevOpenvswitchRemovePort(master, iface->ifname));
else
ignore_value(virNetDevBridgeRemovePort(master, iface->ifname));
}
/* attach/reattach to correct bridge.
* NB: we can't notify the guest of any MTU change anyway,
* so there is no point in trying to learn the actualMTU
* (final arg to virNetDevTapAttachBridge())
*/
VIR_INFO("Attaching %s to %s", iface->ifname, netdef->bridge);
if (virNetDevTapAttachBridge(iface->ifname, netdef->bridge,
&iface->mac, dom->uuid,
virDomainNetGetActualVirtPortProfile(iface),
virDomainNetGetActualVlan(iface),
iface->mtu, NULL) < 0) {
goto error;
}
} }
} }
@ -5013,7 +4987,6 @@ networkNotifyActualDevice(virNetworkPtr net,
cleanup: cleanup:
virNetworkObjEndAPI(&obj); virNetworkObjEndAPI(&obj);
VIR_FREE(master);
return; return;
error: error: