feat: Add VirtIO GPU device (#19)
This commit is contained in:
parent
fdff3518e2
commit
ac5c88c93a
2 changed files with 4 additions and 16 deletions
|
@ -6,10 +6,10 @@ set -Eeuo pipefail
|
||||||
: "${VGA:=""}" # VGA adaptor
|
: "${VGA:=""}" # VGA adaptor
|
||||||
: "${DISPLAY:="web"}" # Display type
|
: "${DISPLAY:="web"}" # Display type
|
||||||
|
|
||||||
if [[ "${BOOT_MODE,,}" == "windows" ]]; then
|
if [[ "${BOOT_MODE,,}" != "windows" ]]; then
|
||||||
[ -z "$VGA" ] && VGA="ramfb"
|
|
||||||
else
|
|
||||||
[ -z "$VGA" ] && VGA="virtio-gpu"
|
[ -z "$VGA" ] && VGA="virtio-gpu"
|
||||||
|
else
|
||||||
|
[ -z "$VGA" ] && VGA="ramfb -device virtio-gpu"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
case "${DISPLAY,,}" in
|
case "${DISPLAY,,}" in
|
||||||
|
|
14
src/proc.sh
14
src/proc.sh
|
@ -33,12 +33,8 @@ fi
|
||||||
|
|
||||||
if [[ "$KVM" != [Nn]* ]]; then
|
if [[ "$KVM" != [Nn]* ]]; then
|
||||||
|
|
||||||
WIN_FEATURES=""
|
|
||||||
CPU_FEATURES=""
|
CPU_FEATURES=""
|
||||||
KVM_OPTS=",accel=kvm -enable-kvm -global kvm-pit.lost_tick_policy=discard"
|
KVM_OPTS=",accel=kvm -enable-kvm"
|
||||||
|
|
||||||
#CPU_FEATURES="kvm=on,l3-cache=on"
|
|
||||||
#WIN_FEATURES="+hypervisor,+invtsc,hv_passthrough"
|
|
||||||
|
|
||||||
if [ -z "$CPU_MODEL" ]; then
|
if [ -z "$CPU_MODEL" ]; then
|
||||||
CPU_MODEL="host"
|
CPU_MODEL="host"
|
||||||
|
@ -47,7 +43,6 @@ if [[ "$KVM" != [Nn]* ]]; then
|
||||||
else
|
else
|
||||||
|
|
||||||
CPU_FEATURES=""
|
CPU_FEATURES=""
|
||||||
WIN_FEATURES=""
|
|
||||||
KVM_OPTS=" -accel tcg,thread=multi"
|
KVM_OPTS=" -accel tcg,thread=multi"
|
||||||
|
|
||||||
if [ -z "$CPU_MODEL" ]; then
|
if [ -z "$CPU_MODEL" ]; then
|
||||||
|
@ -64,13 +59,6 @@ else
|
||||||
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ "${BOOT_MODE,,}" == "windows" ]]; then
|
|
||||||
|
|
||||||
[ -n "$CPU_FEATURES" ] && CPU_FEATURES="$CPU_FEATURES,"
|
|
||||||
CPU_FEATURES="$CPU_FEATURES${WIN_FEATURES}"
|
|
||||||
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ -z "$CPU_FLAGS" ]; then
|
if [ -z "$CPU_FLAGS" ]; then
|
||||||
if [ -z "$CPU_FEATURES" ]; then
|
if [ -z "$CPU_FEATURES" ]; then
|
||||||
CPU_FLAGS="$CPU_MODEL"
|
CPU_FLAGS="$CPU_MODEL"
|
||||||
|
|
Loading…
Reference in a new issue