Add options to directly specify VM width and height on cmdline or config

This commit is contained in:
Doc Norberg 2023-11-18 18:30:19 -08:00 committed by Martin Wimpress
parent 35a6588825
commit 286ac1bcfe
1 changed files with 24 additions and 1 deletions

View File

@ -770,7 +770,11 @@ function vm_boot() {
# Try and coerce the display resolution for Linux guests only. # Try and coerce the display resolution for Linux guests only.
if [ "${guest_os}" == "linux" ]; then if [ "${guest_os}" == "linux" ]; then
VIDEO="${VIDEO},xres=${X_RES},yres=${Y_RES}" if [ -n "${WIDTH}" ] && [ -n "${HEIGHT}" ]; then
VIDEO="${VIDEO},xres=${WIDTH},yres=${HEIGHT}"
else
VIDEO="${VIDEO},xres=${X_RES},yres=${Y_RES}"
fi
fi fi
# Allocate VRAM to VGA devices # Allocate VRAM to VGA devices
@ -1354,6 +1358,8 @@ function usage() {
echo " --snapshot info : Show disk/snapshot info." echo " --snapshot info : Show disk/snapshot info."
echo " --status-quo : Do not commit any changes to disk/snapshot." echo " --status-quo : Do not commit any changes to disk/snapshot."
echo " --viewer <viewer> : Choose an alternative viewer. @Options: 'spicy' (default), 'remote-viewer', 'none'" echo " --viewer <viewer> : Choose an alternative viewer. @Options: 'spicy' (default), 'remote-viewer', 'none'"
echo " --width <width> : Set VM screen width. Does nothing without --height"
echo " --height <height> : Set VM screen height. Does nothing without --width"
echo " --ssh-port <port> : Set ssh-port manually" echo " --ssh-port <port> : Set ssh-port manually"
echo " --spice-port <port> : Set spice-port manually" echo " --spice-port <port> : Set spice-port manually"
echo " --public-dir <path> : Expose share directory. @Options: '' (default: xdg-user-dir PUBLICSHARE), '<directory>', 'none'" echo " --public-dir <path> : Expose share directory. @Options: '' (default: xdg-user-dir PUBLICSHARE), '<directory>', 'none'"
@ -1491,6 +1497,8 @@ secureboot="off"
tpm="off" tpm="off"
usb_devices=() usb_devices=()
viewer="spicy" viewer="spicy"
width=""
height=""
ssh_port="" ssh_port=""
spice_port="" spice_port=""
public_dir="" public_dir=""
@ -1533,6 +1541,8 @@ VMDIR=""
VMNAME="" VMNAME=""
VMPATH="" VMPATH=""
VIEWER="" VIEWER=""
WIDTH=""
HEIGHT=""
SSH_PORT="" SSH_PORT=""
SPICE_PORT="" SPICE_PORT=""
MONITOR="" MONITOR=""
@ -1651,6 +1661,14 @@ else
VIEWER="${2}" VIEWER="${2}"
shift shift
shift;; shift;;
-width|--width)
WIDTH="${2}"
shift;
shift;;
-height|--height)
HEIGHT="${2}"
shift;
shift;;
-ssh-port|--ssh-port) -ssh-port|--ssh-port)
SSH_PORT="${2}" SSH_PORT="${2}"
shift; shift;
@ -1767,6 +1785,11 @@ if [ -n "${VM}" ] && [ -e "${VM}" ]; then
fi fi
viewer_param_check viewer_param_check
if [ -z "${WIDTH}" ] || [ -z "${HEIGHT}" ] ; then
WIDTH="${width}"
HEIGHT="${height}"
fi
# Set the default 3D acceleration. # Set the default 3D acceleration.
if [ -z "${gl}" ]; then if [ -z "${gl}" ]; then
gl="on" gl="on"