lenovo-x1-carbon: Fix Chromium AppVm

As machine type has changed back to q35, remove qboot bios workaround. Signed-off-by: Mika Tammi <[email protected]>
tiiuae · Sep 28, 2023 · e691806 · e691806
1 parent 5887df5
commit e691806
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/modules/virtualization/microvm/appvm.nix b/modules/virtualization/microvm/appvm.nix
@@ -73,11 +73,6 @@
                 mac = vm.macAddress;
               }
             ];
-            # Use qboot BIOS on x86_64-linux as workaround
-            qemu.extraArgs = lib.optionals (config.nixpkgs.hostPlatform.system == "x86_64-linux") [
-              "-bios"
-              "${pkgs.qboot}/bios.bin"
-            ];
           };
 
           networking.nat = {

diff --git a/targets/lenovo-x1-carbon.nix b/targets/lenovo-x1-carbon.nix
@@ -145,9 +145,11 @@
                         nixpkgs.config.pulseaudio = true;
 
                         microvm.qemu.extraArgs = [
-                          # APPVMs use microvm qemu machine which has pcie disabled by default
+                          # APPVMs use microvm qemu machine which has pcie
+                          # disabled by default, and it also causes other
+                          # problems.
                           "-M"
-                          "microvm,pcie=on,accel=kvm:tcg,pit=off,pic=off,rtc=off,mem-merge=on"
+                          "q35,accel=kvm:tcg,mem-merge=on,sata=off"
                           # Lenovo X1 integrated usb webcam
                           "-device"
                           "qemu-xhci"