From 3a23f64836e58e40b35101bf86cce05e3cc271d5 Mon Sep 17 00:00:00 2001 From: Yousong Zhou Date: Tue, 1 Dec 2020 15:29:39 +0800 Subject: [PATCH] fix(host): make sure it won't match vpc guests by accident --- pkg/hostman/guestman/qemu-kvm.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkg/hostman/guestman/qemu-kvm.go b/pkg/hostman/guestman/qemu-kvm.go index 0483965005..0a157a0f46 100644 --- a/pkg/hostman/guestman/qemu-kvm.go +++ b/pkg/hostman/guestman/qemu-kvm.go @@ -971,10 +971,13 @@ func (s *SKVMGuestInstance) ExecSuspendTask(ctx context.Context) { func (s *SKVMGuestInstance) GetNicDescMatch(mac, ip, port, bridge string) jsonutils.JSONObject { nics, _ := s.Desc.GetArray("nics") for _, nic := range nics { + nicBridge, _ := nic.GetString("bridge") + if bridge == "" && nicBridge != "" && nicBridge == options.HostOptions.OvnIntegrationBridge { + continue + } nicMac, _ := nic.GetString("mac") nicIp, _ := nic.GetString("ip") nicPort, _ := nic.GetString("ifname") - nicBridge, _ := nic.GetString("bridge") if (len(mac) == 0 || netutils2.MacEqual(nicMac, mac)) && (len(ip) == 0 || nicIp == ip) && (len(port) == 0 || nicPort == port) &&