DEBUG: Do not handle slirp interfaces as part of network setup

Slirp interfaces configured by slirp hook-sidecar. Signed-off-by: Or Mergi <ormergi@redhat.com>
kubevirt · Aug 16, 2023 · d731eab · d731eab
1 parent f863341
commit d731eab
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/pkg/network/setup/network.go b/pkg/network/setup/network.go
@@ -60,8 +60,8 @@ func (v VMNetworkConfigurator) getPhase1NICs(launcherPID *int, networks []v1.Net
 			return nil, fmt.Errorf("no iface matching with network %s", networks[i].Name)
 		}
 
-		// SR-IOV devices are not part of the phases
-		if iface.SRIOV != nil {
+		// SR-IOV / Slirp devices are not part of the phases
+		if iface.SRIOV != nil || iface.Slirp != nil {
 			continue
 		}
 
@@ -83,8 +83,8 @@ func (v VMNetworkConfigurator) getPhase2NICs(domain *api.Domain, networks []v1.N
 			return nil, fmt.Errorf("no iface matching with network %s", networks[i].Name)
 		}
 
-		// SR-IOV devices are not part of the phases
-		if iface.SRIOV != nil {
+		// SR-IOV / Slirp devices are not part of the phases
+		if iface.SRIOV != nil || iface.Slirp != nil {
 			continue
 		}
 

diff --git a/pkg/virt-launcher/virtwrap/converter/network.go b/pkg/virt-launcher/virtwrap/converter/network.go
@@ -58,7 +58,7 @@ func CreateDomainInterfaces(vmi *v1.VirtualMachineInstance, domain *api.Domain,
 			return nil, fmt.Errorf("failed to find network %s", iface.Name)
 		}
 
-		if iface.SRIOV != nil {
+		if iface.SRIOV != nil || iface.Slirp != nil {
 			continue
 		}