From 3bf94ab0fce9e957b0dc54de889fb6fa4b30c767 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 13 Feb 2024 11:17:15 +0100
Subject: [PATCH] use virtio-console instead of serial for vm

---
 pkgs/clan-cli/clan_cli/vms/run.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/clan-cli/clan_cli/vms/run.py b/pkgs/clan-cli/clan_cli/vms/run.py
index 80bacd65..a4fc9e00 100644
--- a/pkgs/clan-cli/clan_cli/vms/run.py
+++ b/pkgs/clan-cli/clan_cli/vms/run.py
@@ -100,7 +100,7 @@ def qemu_command(
         (Path(nixos_config["toplevel"]) / "kernel-params").read_text(),
         f'init={nixos_config["toplevel"]}/init',
         f'regInfo={nixos_config["regInfo"]}/registration',
-        "console=ttyS0,115200n8",
+        "console=hvc0",
     ]
     if not vm.waypipe:
         kernel_cmdline.append("console=tty0")
@@ -136,6 +136,11 @@ def qemu_command(
         "-chardev", f"socket,path={qga_socket_file},server=on,wait=off,id=qga0",
         "-device", "virtio-serial",
         "-device", "virtserialport,chardev=qga0,name=org.qemu.guest_agent.0",
+
+        "-serial", "null",
+        "-chardev", "stdio,mux=on,id=char0,signal=off",
+        "-mon", "chardev=char0,mode=readline",
+        "-device", "virtconsole,chardev=char0,nr=0",
     ]  # fmt: on
 
     vsock_cid = None