Skip to content

Commit 7c7f199

Browse files
mbssrcbrianmcgillion
authored andcommitted
feat(netvm): netvm kernel config
Inherit netvm hardware definitions kernel config. Signed-off-by: Manuel Bluhm <manuel@ssrc.tii.ae>
1 parent 8d93589 commit 7c7f199

File tree

2 files changed

+16
-1
lines changed

2 files changed

+16
-1
lines changed

modules/hardware/common/kernel.nix

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,11 @@ in
4040
default = { };
4141
description = "AudioVM kernel configuration";
4242
};
43+
netvm = mkOption {
44+
type = types.attrs;
45+
default = { };
46+
description = "NetVM kernel configuration";
47+
};
4348
};
4449

4550
config = {
@@ -86,6 +91,15 @@ in
8691
inherit (config.ghaf.hardware.definition.audio.kernelConfig) kernelParams;
8792
};
8893
};
94+
netvm = {
95+
boot = {
96+
initrd = {
97+
inherit (config.ghaf.hardware.definition.network.kernelConfig.stage1) kernelModules;
98+
};
99+
inherit (config.ghaf.hardware.definition.network.kernelConfig.stage2) kernelModules;
100+
inherit (config.ghaf.hardware.definition.network.kernelConfig) kernelParams;
101+
};
102+
};
89103
};
90104
};
91105
}

modules/microvm/modules.nix

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ let
4141

4242
# Kernel configurations
4343
kernelConfigs = optionalAttrs fullVirtualization {
44-
inherit (configHost.ghaf.kernel) guivm audiovm;
44+
inherit (configHost.ghaf.kernel) guivm audiovm netvm;
4545
};
4646

4747
# Firmware module
@@ -177,6 +177,7 @@ in
177177
# Netvm modules
178178
netvm.extraModules = optionals cfg.netvm.enable [
179179
deviceModules.netvmPCIPassthroughModule
180+
kernelConfigs.netvm
180181
firmwareModule
181182
serviceModules.wifi
182183
serviceModules.givc

0 commit comments

Comments
 (0)