add membacking, remove dhcp in favour nixos module kea

wirecatllc · Nov 8, 2023 · 70f81d3 · 70f81d3
1 parent 6234c05
commit 70f81d3
Show file tree

Hide file tree

Showing 7 changed files with 56 additions and 279 deletions.
diff --git a/modules/networking/default.nix b/modules/networking/default.nix
@@ -5,7 +5,7 @@
     ./rename-interfaces
     ./routing
     ./wireguard
-    ./dhcp
+    # DHCP should directly use NixOS module --- kea
 
     ./isp-split-tunnel
   ];

diff --git a/modules/networking/dhcp/default.nix b/modules/networking/dhcp/default.nix
diff --git a/modules/networking/dhcp/host-options.nix b/modules/networking/dhcp/host-options.nix
diff --git a/modules/networking/dhcp/subnet-options.nix b/modules/networking/dhcp/subnet-options.nix
diff --git a/modules/networking/dhcp/utils.nix b/modules/networking/dhcp/utils.nix
diff --git a/modules/virtualization/libvirt/default.nix b/modules/virtualization/libvirt/default.nix
@@ -276,10 +276,27 @@ let
 
   buildMemoryBacking = md: ''
     <memoryBacking>
+    ${shouldWrite md.hugepages ''
+      <hugepages>
+        ${md.hugepages}
+      </hugepages>
+    ''}
+    ${shouldWrite md.nosharepages ''
+      <nosharepages/>
+    ''}
+    ${shouldWrite md.locked ''
+      <locked/>
+    ''}
     ${shouldWrite md.sourceType ''
       <source type='${md.sourceType}'/>
     ''}
       <access mode='${md.accessMode}'/>
+    ${shouldWrite md.allocation ''
+      <allocation mode=${md.allocation.mode} ${shouldWrite md.allocation.threads ''threads=${md.allocation.threads}''}
+    ''}
+     ${shouldWrite md.discard ''
+      <discard/>
+    ''}
     </memoryBacking>
   '';
 

diff --git a/modules/virtualization/libvirt/memoryBacking.nix b/modules/virtualization/libvirt/memoryBacking.nix
@@ -1,6 +1,18 @@
 { lib, ... }:
 with lib;
 let
+  allocationModule = {
+    options = {
+      mode = mkOption {
+        type = types.nullOr (types.enum ["immediate" "ondemand"]);
+        default = null;
+      };
+      threads = mkOption {
+        type = types.nullOr types.int;
+        default = null;
+      };
+    };
+  };
 in
 {
   options = {
@@ -13,5 +25,31 @@ in
       type = types.enum [ "shared" "private" ];
       default = "shared";
     };
+
+    hugepages = mkOption {
+      type = types.nullOr types.str;
+      default = null;
+      description = "add xml def or empty string to enable";
+    };
+
+    nosharepages = mkOption {
+      type = types.bool;
+      default = false;
+    };
+
+    locked = mkOption {
+      type = types.bool;
+      default = false;
+    };
+
+    allocation = mkOption {
+      type = types.nullOr (types.submodule allocationModule);
+      default = null;
+    };
+
+    discard = mkOption {
+      type = types.bool;
+      default = false;
+    };
   };
 }