Merge branch 'faq' into 'main'

Faq

See merge request helmutg/debvm!26

1 files changed, 17 insertions, 3 deletions

diff --git a/bin/debvm-run b/bin/debvm-run
index 3c3e528..0ef8740 100755
--- a/bin/debvm-run
+++ b/bin/debvm-run
@@ -64,9 +64,9 @@ F<rootfs.ext4>, resulting in an ephemeral run.
 
 =item The debvm-run console renders wrong.
 
-Get C<echo $LINES $COLUMNS> from an other terminal and run C<stty rows $LINES cols $COLUMNS> in the console or use ssh.
-Another option is to run C<eval $(resize)>, which is available from the B<xterm> package.
-Also set C<$TERM> to the outside value.
+Make sure C<$TERM> is set to a value known inside the VM.
+You may need to install B<ncurses-term> for more definitions.
+It also helps to run C<setterm --resize> after boot and when resizing the terminal emulator.
 
 =item How can I kill debvm-run?
 
@@ -233,6 +233,9 @@ if test "$ARCHITECTURE" = "$VMARCH"; then
 else
 	QEMU="qemu-system-$VMARCH"
 	case "$VMARCH" in
+		amd64)
+			QEMU=qemu-system-x86_64
+		;;
 		arm64)
 			QEMU=qemu-system-aarch64
 			set -- -machine virt -cpu max "$@"
@@ -266,6 +269,11 @@ else
 		;;
 	esac
 fi
+case "$VMARCH" in
+	amd64)
+		set -- -machine q35 "$@"
+	;;
+esac
 if test -z "$MAX_SMP" || test "$MAX_SMP" -gt 1; then
 	NPROC=$(nproc)
 	test -n "$MAX_SMP" && test "$NPROC" -gt "$MAX_SMP" && NPROC=$MAX_SMP
@@ -282,6 +290,12 @@ if test -z "$GRAPHICAL"; then
 	if test -t 0 && test -t 1 && test -n "$TERM"; then
 		KERNEL_CMDLINE="$KERNEL_CMDLINE TERM=$TERM"
 	fi
+else
+	case "$VMARCH" in
+		amd64|i386)
+			set -- -vga virtio "$@"
+		;;
+	esac
 fi
 
 if test -n "$SSHPORT"; then