From c142aa8dbff8ac1ecb65cf4ecc90b32a3478967f Mon Sep 17 00:00:00 2001
From: Dmitry Vyukov <dvyukov@google.com>
Date: Thu, 18 Apr 2024 10:59:34 +0200
Subject: pkg/ipc: dedup features to flags conversion

Currently it's duplicated 4 times, dedup it.
---
 tools/syz-execprog/execprog.go | 34 +---------------------------------
 1 file changed, 1 insertion(+), 33 deletions(-)

(limited to 'tools/syz-execprog')

diff --git a/tools/syz-execprog/execprog.go b/tools/syz-execprog/execprog.go
index 5d68dd2dd..9cfebf15b 100644
--- a/tools/syz-execprog/execprog.go
+++ b/tools/syz-execprog/execprog.go
@@ -375,38 +375,6 @@ func createConfig(target *prog.Target, features *host.Features, featuresFlags cs
 		}
 		execOpts.ExecFlags |= ipc.FlagCollectComps
 	}
-	if features[host.FeatureExtraCoverage].Enabled {
-		execOpts.EnvFlags |= ipc.FlagExtraCover
-	}
-	if features[host.FeatureDelayKcovMmap].Enabled {
-		execOpts.EnvFlags |= ipc.FlagDelayKcovMmap
-	}
-	if featuresFlags["tun"].Enabled && features[host.FeatureNetInjection].Enabled {
-		execOpts.EnvFlags |= ipc.FlagEnableTun
-	}
-	if featuresFlags["net_dev"].Enabled && features[host.FeatureNetDevices].Enabled {
-		execOpts.EnvFlags |= ipc.FlagEnableNetDev
-	}
-	if featuresFlags["net_reset"].Enabled {
-		execOpts.EnvFlags |= ipc.FlagEnableNetReset
-	}
-	if featuresFlags["cgroups"].Enabled {
-		execOpts.EnvFlags |= ipc.FlagEnableCgroups
-	}
-	if featuresFlags["close_fds"].Enabled {
-		execOpts.EnvFlags |= ipc.FlagEnableCloseFds
-	}
-	if featuresFlags["devlink_pci"].Enabled && features[host.FeatureDevlinkPCI].Enabled {
-		execOpts.EnvFlags |= ipc.FlagEnableDevlinkPCI
-	}
-	if featuresFlags["nic_vf"].Enabled && features[host.FeatureNicVF].Enabled {
-		execOpts.EnvFlags |= ipc.FlagEnableNicVF
-	}
-	if featuresFlags["vhci"].Enabled && features[host.FeatureVhciInjection].Enabled {
-		execOpts.EnvFlags |= ipc.FlagEnableVhciInjection
-	}
-	if featuresFlags["wifi"].Enabled && features[host.FeatureWifiEmulation].Enabled {
-		execOpts.EnvFlags |= ipc.FlagEnableWifi
-	}
+	execOpts.EnvFlags |= ipc.FeaturesToFlags(features, featuresFlags)
 	return config, execOpts
 }
-- 
cgit mrf-deployment