Bump microvm.nix to enable latest features

Signed-off-by: Brian McGillion <[email protected]>
brianmcgillion · Apr 11, 2024 · 56d07af · 56d07af
1 parent f5dcb09
commit 56d07af
Show file tree

Hide file tree

Showing 5 changed files with 77 additions and 30 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/modules/microvm/virtualization/microvm/appvm.nix b/modules/microvm/virtualization/microvm/appvm.nix
@@ -103,12 +103,22 @@
             ];
             writableStoreOverlay = lib.mkIf config.ghaf.development.debug.tools.enable "/nix/.rw-store";
 
-            qemu.extraArgs = [
-              "-M"
-              "q35,accel=kvm:tcg,mem-merge=on,sata=off"
-              "-device"
-              "vhost-vsock-pci,guest-cid=${toString cid}"
-            ];
+            qemu = {
+              extraArgs = [
+                "-M"
+                "accel=kvm:tcg,mem-merge=on,sata=off"
+                "-device"
+                "vhost-vsock-pci,guest-cid=${toString cid}"
+              ];
+
+              machine =
+                {
+                  # Use the same machine type as the host
+                  x86_64-linux = "q35";
+                  aarch64-linux = "virt";
+                }
+                .${configHost.nixpkgs.hostPlatform.system};
+            };
           };
           fileSystems."/run/waypipe-ssh-public-key".options = ["ro"];
 

diff --git a/modules/microvm/virtualization/microvm/guivm.nix b/modules/microvm/virtualization/microvm/guivm.nix
@@ -94,10 +94,20 @@
           ];
           writableStoreOverlay = lib.mkIf config.ghaf.development.debug.tools.enable "/nix/.rw-store";
 
-          qemu.extraArgs = [
-            "-device"
-            "vhost-vsock-pci,guest-cid=${toString cfg.vsockCID}"
-          ];
+          qemu = {
+            extraArgs = [
+              "-device"
+              "vhost-vsock-pci,guest-cid=${toString cfg.vsockCID}"
+            ];
+
+            machine =
+              {
+                # Use the same machine type as the host
+                x86_64-linux = "q35";
+                aarch64-linux = "virt";
+              }
+              .${configHost.nixpkgs.hostPlatform.system};
+          };
         };
 
         imports = [

diff --git a/modules/microvm/virtualization/microvm/netvm.nix b/modules/microvm/virtualization/microvm/netvm.nix
@@ -35,8 +35,6 @@
         nixpkgs.buildPlatform.system = configHost.nixpkgs.buildPlatform.system;
         nixpkgs.hostPlatform.system = configHost.nixpkgs.hostPlatform.system;
 
-        microvm.hypervisor = "qemu";
-
         networking = {
           firewall.allowedTCPPorts = [53];
           firewall.allowedUDPPorts = [53];
@@ -88,6 +86,7 @@
 
         microvm = {
           optimize.enable = true;
+          hypervisor = "qemu";
           shares = [
             {
               tag = "ro-store";
@@ -96,6 +95,15 @@
             }
           ];
           writableStoreOverlay = lib.mkIf config.ghaf.development.debug.tools.enable "/nix/.rw-store";
+          qemu = {
+            machine =
+              {
+                # Use the same machine type as the host
+                x86_64-linux = "q35";
+                aarch64-linux = "virt";
+              }
+              .${configHost.nixpkgs.hostPlatform.system};
+          };
         };
 
         imports = [../../../common];

diff --git a/targets/lenovo-x1/guivmExtraModules.nix b/targets/lenovo-x1/guivmExtraModules.nix
@@ -136,20 +136,22 @@
     # Early KMS needed for GNOME to work inside GuiVM
     boot.initrd.kernelModules = ["i915"];
 
-    microvm.qemu.extraArgs = [
-      # Lenovo X1 Lid button
-      "-device"
-      "button"
-      # Lenovo X1 battery
-      "-device"
-      "battery"
-      # Lenovo X1 AC adapter
-      "-device"
-      "acad"
-      # Connect sound device to hosts pulseaudio socket
-      "-audiodev"
-      "pa,id=pa1,server=unix:/run/pulse/native"
-    ];
+    microvm.qemu = {
+      extraArgs = [
+        # Lenovo X1 Lid button
+        "-device"
+        "button"
+        # Lenovo X1 battery
+        "-device"
+        "battery"
+        # Lenovo X1 AC adapter
+        "-device"
+        "acad"
+        # Connect sound device to hosts pulseaudio socket
+        "-audiodev"
+        "pa,id=pa1,server=unix:/run/pulse/native"
+      ];
+    };
   };
 in [
   ./sshkeys.nix