From 876f278fdbf804f330c5f981e9fb95ca072efd65 Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Mon, 15 Jun 2020 13:27:01 +0800 Subject: [PATCH] wfvm: use '-display none' instead of '-nographic' --- artiq-fast/wfvm/utils.nix | 2 +- artiq-fast/wfvm/win.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/artiq-fast/wfvm/utils.nix b/artiq-fast/wfvm/utils.nix index 33557b7..cdb4ae5 100644 --- a/artiq-fast/wfvm/utils.nix +++ b/artiq-fast/wfvm/utils.nix @@ -69,7 +69,7 @@ rec { (map ({ listenAddr, targetAddr, port }: ",guestfwd=tcp:${listenAddr}:${toString port}-cmd:${pkgs.socat}/bin/socat\\ -\\ tcp:${targetAddr}:${toString port}" ) forwardedPorts); - qemuParams = mkQemuFlags (pkgs.lib.optional (!display) "-nographic" ++ [ + qemuParams = mkQemuFlags (pkgs.lib.optional (!display) "-display none" ++ [ "-drive" "file=${image},index=0,media=disk,cache=unsafe" "-snapshot" diff --git a/artiq-fast/wfvm/win.nix b/artiq-fast/wfvm/win.nix index 45fd41e..b7776bd 100644 --- a/artiq-fast/wfvm/win.nix +++ b/artiq-fast/wfvm/win.nix @@ -74,7 +74,7 @@ let installScript = pkgs.writeScript "windows-install-script" ( let - qemuParams = utils.mkQemuFlags (lib.optional (!impureMode) "-nographic" ++ [ + qemuParams = utils.mkQemuFlags (lib.optional (!impureMode) "-display none" ++ [ # "CD" drive with bootstrap pkgs "-drive" "id=virtio-win,file=${bootstrapPkgs},if=none,format=raw,readonly=on" @@ -127,7 +127,7 @@ let ] ++ (v.buildInputs or []); } (let script = pkgs.writeScript "${v.name}-script" v.script; - qemuParams = utils.mkQemuFlags (lib.optional (!impureMode) "-nographic" ++ [ + qemuParams = utils.mkQemuFlags (lib.optional (!impureMode) "-display none" ++ [ # Output image "-drive" "file=c.img,index=0,media=disk,cache=unsafe"