From 43c402aa1604e25ea611b7eeb70d295633b8ed73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20P=2E=20Berrang=C3=A9?= Date: Tue, 2 Apr 2019 18:18:40 +0100 Subject: [PATCH] network: drop back compat code loading actual bridge name MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The actual network def was updated to save the bridge name back in 1.2.11: commit a3609121799d44898a3e0d0bf92b755e55e7b418 Author: Laine Stump 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 Signed-off-by: Daniel P. Berrangé --- src/network/bridge_driver.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/src/network/bridge_driver.c b/src/network/bridge_driver.c index bcc2bb5b3e..a10013d6a1 100644 --- a/src/network/bridge_driver.c +++ b/src/network/bridge_driver.c @@ -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;