From d749538e9eeb04268c6bcd625860c63bb34d4dd7 Mon Sep 17 00:00:00 2001 From: Daniel Barlow Date: Mon, 14 Apr 2025 21:22:25 +0100 Subject: [PATCH] remove qemu vga adapter it doesn't work with qemu 9.2 (coming soon) but we don't need it anyway --- devices/families/qemu.nix | 4 ++-- pkgs/run-liminix-vm/run-liminix-vm.fnl | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/devices/families/qemu.nix b/devices/families/qemu.nix index afe602b..9feb4e0 100644 --- a/devices/families/qemu.nix +++ b/devices/families/qemu.nix @@ -42,11 +42,11 @@ in { wan = link.build { - devpath = "/devices/pci0000:00/0000:00:13.0/virtio0"; + devpath = "/devices/pci0000:00/0000:00:12.0/virtio0"; ifname = "wan"; }; lan = link.build { - devpath = "/devices/pci0000:00/0000:00:14.0/virtio1"; + devpath = "/devices/pci0000:00/0000:00:13.0/virtio1"; ifname = "lan"; }; diff --git a/pkgs/run-liminix-vm/run-liminix-vm.fnl b/pkgs/run-liminix-vm/run-liminix-vm.fnl index bce1a20..257ed5e 100644 --- a/pkgs/run-liminix-vm/run-liminix-vm.fnl +++ b/pkgs/run-liminix-vm/run-liminix-vm.fnl @@ -132,7 +132,7 @@ options.u-boot options.disk-image)) (appendm (access-net options.wan)) (appendm (local-net options.lan)) - (appendm ["-display" "none"]))) + (appendm ["-display" "none" "-vga" "none"]))) (each [n a (ipairs exec-args)] (print (.. (if (> n 1) " " "") (string.format "%q" a))))