oSoWoSo/DistroHopper
1
0
Fork 0
mirror of https://github.com/oSoWoSo/DistroHopper.git synced 2024-08-14 22:46:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Refactor CPU and graphics configuration

Browse source
This commit is contained in:
Martin Wimpress 2021-09-25 13:13:26 +01:00
parent f061c3a67f
commit f7bcd3ccf5
No known key found for this signature in database
GPG key ID: 61DF940515E06DA3
1 changed files with 36 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

63
quickemu
View file

@ -153,15 +153,13 @@ function vm_boot() {
VMNAME=$(basename "${VM}" .conf) VMNAME=$(basename "${VM}" .conf)
local VMDIR="" local VMDIR=""
VMDIR=$(dirname "${disk_img}") VMDIR=$(dirname "${disk_img}")
local CPU="-cpu host,kvm=on" local CPU=""
local GUEST_TWEAKS=""
local DISPLAY_DEVICE="" local DISPLAY_DEVICE=""
local VIDEO=""
local GL="on" local GL="on"
local VIRGL="on" local GUEST_TWEAKS=""
local OUTPUT="sdl" local OSK=""
local OUTPUT_EXTRA=""
local QEMU_VER="" local QEMU_VER=""
local VIDEO=""
QEMU_VER=$(${QEMU} -version | head -n1 | cut -d' ' -f4 | cut -d'(' -f1) QEMU_VER=$(${QEMU} -version | head -n1 | cut -d' ' -f4 | cut -d'(' -f1)
echo "Starting ${VM}" echo "Starting ${VM}"
echo " - QEMU: ${QEMU} v${QEMU_VER}" echo " - QEMU: ${QEMU} v${QEMU_VER}"
@ -203,25 +201,20 @@ function vm_boot() {
# Make any OS specific adjustments # Make any OS specific adjustments
case ${guest_os} in case ${guest_os} in
linux) linux)
DISPLAY_DEVICE="virtio-vga" CPU="-cpu host,kvm=on"
;; ;;
macos) macos)
CPU="-cpu Penryn,vendor=GenuineIntel,kvm=on,+aes,+avx,+avx2,+bmi1,+bmi2,+fma,+invtsc,+movbe,+pcid,+smep,+sse3,+sse4.2,+xgetbv1,+xsave,+xsavec,+xsaveopt" CPU="-cpu Penryn,vendor=GenuineIntel,kvm=on,+aes,+avx,+avx2,+bmi1,+bmi2,+fma,+invtsc,+movbe,+pcid,+smep,+sse3,+sse4.2,+xgetbv1,+xsave,+xsavec,+xsaveopt"
OSK=""
OSK=$(echo "bheuneqjbexolgurfrjbeqfthneqrqcyrnfrqbagfgrny(p)NccyrPbzchgreVap" | rot13) OSK=$(echo "bheuneqjbexolgurfrjbeqfthneqrqcyrnfrqbagfgrny(p)NccyrPbzchgreVap" | rot13)
GUEST_TWEAKS="-device isa-applesmc,osk=${OSK}" GUEST_TWEAKS="-device isa-applesmc,osk=${OSK}"
DISPLAY_DEVICE="VGA"
VIRGL="off"
;; ;;
windows) windows)
CPU="${CPU},hv_time" CPU="-cpu host,kvm=on,hv_time"
GUEST_TWEAKS="-no-hpet" GUEST_TWEAKS="-no-hpet"
DISPLAY_DEVICE="qxl-vga"
;; ;;
*) *)
CPU="-cpu host,kvm=on"
echo "WARNING! Unrecognised guest OS: ${guest_os}" echo "WARNING! Unrecognised guest OS: ${guest_os}"
DISPLAY_DEVICE="VGA"
VIRGL="off"
;; ;;
esac esac
echo " - Guest: ${guest_os^} optimised" echo " - Guest: ${guest_os^} optimised"
@ -347,30 +340,43 @@ function vm_boot() {
fi fi
fi fi
# GL is not working with GTK currently echo " - Screen: ${X_RES}x${Y_RES}"
if [ "${OUTPUT}" == "gtk" ]; then echo " - Display: ${OUTPUT^^}"
GL="off"
OUTPUT_EXTRA=",grab-on-hover=on,zoom-to-fit=off" # https://www.kraxel.org/blog/2019/09/display-devices-in-qemu/
if [ "${guest_os}" == "linux" ]; then
DISPLAY_DEVICE="virtio-vga"
elif [ "${guest_os}" == "macos" ]; then
DISPLAY_DEVICE="VGA"
#DISPLAY_DEVICE="bochs-display"
elif [ "${guest_os}" == "windows" ]; then
DISPLAY_DEVICE="qxl-vga"
else else
echo " - Screen: ${X_RES}x${Y_RES}" DISPLAY_DEVICE="qxl-vga"
fi fi
echo " - Video: ${DISPLAY_DEVICE}"
# Allocate VRAM to VGA devices
if [ "${DISPLAY_DEVICE}" == "qxl-vga" ] || [ "${DISPLAY_DEVICE}" == "VGA" ]; then if [ "${DISPLAY_DEVICE}" == "qxl-vga" ] || [ "${DISPLAY_DEVICE}" == "VGA" ]; then
VIDEO="-device ${DISPLAY_DEVICE},vgamem_mb=128,xres=${X_RES},yres=${Y_RES} ${FULLSCREEN}" VIDEO="-device ${DISPLAY_DEVICE},xres=${X_RES},yres=${Y_RES},vgamem_mb=128 ${FULLSCREEN}"
else else
VIDEO="-device ${DISPLAY_DEVICE},xres=${X_RES},yres=${Y_RES} ${FULLSCREEN}" VIDEO="-device ${DISPLAY_DEVICE},xres=${X_RES},yres=${Y_RES} ${FULLSCREEN}"
fi fi
echo " - Video: ${DISPLAY_DEVICE}" if [ "${OUTPUT}" == "gtk" ]; then
echo " - GL: ${GL^^}" OUTPUT="${OUTPUT},grab-on-hover=on,zoom-to-fit=off"
# GL is not working with GTK and virtio-vga # GL is not working with GTK and virtio-vga
echo " - Display: ${OUTPUT^^}" if [ "${DISPLAY_DEVICE}" == "virtio-vga" ]; then
GL="off"
# Set the hostname of the VM fi
local NET="user,hostname=${VMNAME}"
fi fi
if [ "${OUTPUT}" != "none" ]; then
OUTPUT="${OUTPUT},gl=${GL}"
fi
echo " - GL: ${GL^^}"
if [ "${GL}" == "on" ] && [ "${DISPLAY_DEVICE}" == "virtio-vga" ]; then if [ "${GL}" == "on" ] && [ "${DISPLAY_DEVICE}" == "virtio-vga" ]; then
DISPLAY_DEVICE="${DISPLAY_DEVICE},virgl=on" DISPLAY_DEVICE="${DISPLAY_DEVICE},virgl=on"
echo " - Virgil3D: ON" echo " - Virgil3D: ON"
@ -378,6 +384,9 @@ function vm_boot() {
echo " - Virgil3D: OFF" echo " - Virgil3D: OFF"
fi fi
# Set the hostname of the VM
local NET="user,hostname=${VMNAME}"
# Find a free port to expose ssh to the guest # Find a free port to expose ssh to the guest
local PORT="" local PORT=""
PORT=$(get_port 22220 9) PORT=$(get_port 22220 9)