From 2961474fa05c34f2103364269790fede0eed4203 Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Thu, 30 Jan 2020 11:54:07 +0000 Subject: [PATCH] kvm: Fix router migration issue when router has control/public nics on other physical network than guest --- agent/bindir/libvirtqemuhook.in | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/agent/bindir/libvirtqemuhook.in b/agent/bindir/libvirtqemuhook.in index 27e07119ccc3..894d68c7b0b1 100755 --- a/agent/bindir/libvirtqemuhook.in +++ b/agent/bindir/libvirtqemuhook.in @@ -65,11 +65,15 @@ def handleMigrateBegin(): bridge = source.getAttribute("bridge") if isOldStyleBridge(bridge): vlanId = bridge.replace("cloudVirBr", "") + phyDev = getGuestNetworkDevice() elif isNewStyleBridge(bridge): vlanId = re.sub(r"br(\w+)-", "", bridge) + phyDev = re.sub(r"-(\d+)$", "" , re.sub(r"^br", "" ,bridge)) + netlib = networkConfig() + if not netlib.isNetworkDev(phyDev): + phyDev = getGuestNetworkDevice() else: continue - phyDev = getGuestNetworkDevice() newBrName = "br" + phyDev + "-" + vlanId source.setAttribute("bridge", newBrName) print(domain.toxml())