Skip to content

Commit a89b658

Browse files
committed
fix(quickemu): simplify display device selection and remove -vga none
- Reorder and refine Windows mapping: map none|spice -> qxl-vga; cocoa|gtk|sdl|spice-app -> virtio-vga - Remove the VGA variable and the forced '-vga none' from VIDEO composition - Remove unused VGA initialization in vm_boot Signed-off-by: Martin Wimpress <martin@wimpress.org>
1 parent 23a4fb2 commit a89b658

File tree

1 file changed

+4
-16
lines changed

1 file changed

+4
-16
lines changed

quickemu

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1297,16 +1297,12 @@ function configure_display() {
12971297
esac
12981298
fi;;
12991299
macos)
1300-
# qxl-vga and VGA supports seamless mouse and sane resolutions if only
1301-
# one scanout is used. '-vga none' is added to the QEMU command line
1302-
# to avoid having two scanouts.
1300+
# VGA supports seamless mouse and sane resolutions for macOS guests
13031301
DISPLAY_DEVICE="VGA";;
13041302
windows|windows-server)
1305-
# virtio-gpu "works" with gtk but is limited to 1024x1024 and exhibits other issues
1306-
# https://kevinlocke.name/bits/2021/12/10/windows-11-guest-virtio-libvirt/#video
13071303
case ${display} in
1308-
gtk|none|spice) DISPLAY_DEVICE="qxl-vga";;
1309-
cocoa|sdl|spice-app) DISPLAY_DEVICE="virtio-vga";;
1304+
none|spice) DISPLAY_DEVICE="qxl-vga";;
1305+
cocoa|gtk|sdl|spice-app) DISPLAY_DEVICE="virtio-vga";;
13101306
esac;;
13111307
*) DISPLAY_DEVICE="qxl-vga";;
13121308
esac
@@ -1386,15 +1382,8 @@ function configure_display() {
13861382
VIDEO="${VIDEO},max_outputs=${max_outputs}"
13871383
fi
13881384

1389-
# Run QEMU with '-vga none' to avoid having two scanouts, one for VGA and
1390-
# another for virtio-vga-gl. This works around a GTK assertion failure and
1391-
# allows seamless mouse in macOS when using the qxl-vga device.
1392-
# https://www.collabora.com/news-and-blog/blog/2021/11/26/venus-on-qemu-enabling-new-virtual-vulkan-driver/
1393-
# https://github.com/quickemu-project/quickemu/issues/222
1394-
VGA="-vga none"
1395-
13961385
# Add fullscreen options
1397-
VIDEO="${VGA} ${VIDEO} ${FULLSCREEN}"
1386+
VIDEO="${VIDEO} ${FULLSCREEN}"
13981387
}
13991388

14001389
function configure_audio() {
@@ -1605,7 +1594,6 @@ function vm_boot() {
16051594
SMM="${SMM:-off}"
16061595
local TEMP_PORT=""
16071596
USB_HOST_PASSTHROUGH_CONTROLLER="qemu-xhci"
1608-
VGA=""
16091597
VIDEO=""
16101598

16111599
KERNEL_NAME="$(uname -s)"

0 commit comments

Comments
 (0)