Skip to content

Commit

Permalink
lenovo-x1-carbon: Fix Chromium AppVm
Browse files Browse the repository at this point in the history
As machine type has changed back to q35, remove qboot bios workaround.

Signed-off-by: Mika Tammi <[email protected]>
  • Loading branch information
Mika Tammi authored and brianmcgillion committed Sep 28, 2023
1 parent dee7313 commit b79e9be
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 7 deletions.
5 changes: 0 additions & 5 deletions modules/virtualization/microvm/appvm.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down
6 changes: 4 additions & 2 deletions targets/lenovo-x1-carbon.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit b79e9be

Please sign in to comment.