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

network: drop back compat code loading actual bridge name

Browse Source 
The actual network def was updated to save the bridge name back
in 1.2.11:

  commit a3609121799d44898a3e0d0bf92b755e55e7b418
  Author: Laine Stump <laine@laine.org>
  Date:   Fri Nov 21 12:20:37 2014 -0500

    network: save bridge name in ActualNetDef when actualType==network too

The chance that someone is running libvirt < 1.2.11 and wants
todo a live upgrade to 5.3.0 without a host reboot is essentially
zero. We can thus reasonably drop the back compat code now.

Reviewed-by: Laine Stump <laine@laine.org>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrangé 2019-04-02 18:18:40 +01:00
parent e1d10f8ef2
commit 43c402aa16
1 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/network/bridge_driver.c
View File

@ -4832,17 +4832,6 @@ networkNotifyActualDevice(virNetworkPtr net,
goto error;
}
/* if we're restarting libvirtd after an upgrade from a version
* that didn't save bridge name in actualNetDef for
* actualType==network, we need to copy it in so that it will be
* available in all cases
*/
if (actualType == VIR_DOMAIN_NET_TYPE_NETWORK &&
!iface->data.network.actual->data.bridge.brname &&
(VIR_STRDUP(iface->data.network.actual->data.bridge.brname,
netdef->bridge) < 0))
goto error;
/* see if we're connected to the correct bridge */
if (netdef->bridge) {
bool useOVS = false;