From e691806f4ec98ee1923451121304d3d8e8f89856 Mon Sep 17 00:00:00 2001
From: Mika Tammi <mika.tammi@unikie.com>
Date: Thu, 28 Sep 2023 18:43:48 +0300
Subject: [PATCH] lenovo-x1-carbon: Fix Chromium AppVm

As machine type has changed back to q35, remove qboot bios workaround.

Signed-off-by: Mika Tammi <mika.tammi@unikie.com>
---
 modules/virtualization/microvm/appvm.nix | 5 -----
 targets/lenovo-x1-carbon.nix             | 6 ++++--
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/modules/virtualization/microvm/appvm.nix b/modules/virtualization/microvm/appvm.nix
index 06bec0700..27939d08a 100644
--- 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
index 6da38da28..16935ea83 100644
--- 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"