Unverified Commit 5e793581 authored by Kroese's avatar Kroese Committed by GitHub
Browse files

feat: Enable L3 cache (#427)

parent c73a1f54
Loading
Loading
Loading
Loading
+6 −4
Original line number Diff line number Diff line
@@ -41,12 +41,14 @@ if [[ "${BOOT_MODE,,}" != "legacy" ]] && [[ "${BOOT_MODE,,}" != "windows_legacy"

  if [ ! -f "$DEST.rom" ]; then
    [ ! -f "$OVMF/$ROM" ] && error "UEFI boot file ($OVMF/$ROM) not found!" && exit 44
    cp "$OVMF/$ROM" "$DEST.rom"
    dd if=/dev/zero "of=$DEST.rom" bs=1M count=4 status=none
    dd "if=$OVMF/$ROM" "of=$DEST.rom" conv=notrunc status=none
  fi

  if [ ! -f "$DEST.vars" ]; then
    [ ! -f "$OVMF/$VARS" ] && error "UEFI vars file ($OVMF/$VARS) not found!" && exit 45
    cp "$OVMF/$VARS" "$DEST.vars"
    dd if=/dev/zero "of=$DEST.vars" bs=1M count=4 status=none
    dd "if=$OVMF/$VARS" "of=$DEST.vars" conv=notrunc status=none
  fi

  if [[ "${BOOT_MODE,,}" != "uefi" ]]; then
+2 −2
Original line number Diff line number Diff line
@@ -26,9 +26,9 @@ if [[ "$GPU" != [Yy1]* ]] || [[ "$ARCH" != "amd64" ]]; then
  return 0
fi

[[ "${VGA,,}" == "virtio" ]] && VGA="virtio-gl"
[[ "${VGA,,}" == "virtio" ]] && VGA="virtio-vga-gl"
DISPLAY_OPTS="-display egl-headless,rendernode=/dev/dri/renderD128"
DISPLAY_OPTS="$DISPLAY_OPTS -vga $VGA"
DISPLAY_OPTS="$DISPLAY_OPTS -device $VGA"

[[ "${DISPLAY,,}" == "vnc" ]] && DISPLAY_OPTS="$DISPLAY_OPTS -vnc :0"
[[ "${DISPLAY,,}" == "web" ]] && DISPLAY_OPTS="$DISPLAY_OPTS -vnc :0,websocket=5700"
+26 −16
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ set -Eeuo pipefail

: "${KVM:="Y"}"
: "${CPU_FLAGS:=""}"
: "${CPU_MODEL:="host"}"
: "${CPU_MODEL:="qemu64"}"

[ "$ARCH" != "amd64" ] && KVM="N"

@@ -36,35 +36,45 @@ fi

if [[ "$KVM" != [Nn]* ]]; then

  CPU_FEATURES="kvm=on"
  CPU_MODEL="host"
  KVM_OPTS=",accel=kvm -enable-kvm"

  if [[ "${BOOT_MODE,,}" == "windows" ]] || [[ "${BOOT_MODE,,}" == "windows_legacy" ]]; then

    CPU_FEATURES="kvm=on,+hypervisor,+invtsc,l3-cache=on,migratable=no,hv_passthrough"

  fi
  CPU_FEATURES="kvm=on,l3-cache=on,migratable=no"
  WIN_FEATURES="+hypervisor,+invtsc,hv_passthrough"

else

  KVM_OPTS=""
  CPU_FEATURES="+ssse3,+sse4.1,+sse4.2"

  if [[ "${CPU_MODEL,,}" == "host"* ]]; then
  CPU_FEATURES="l3-cache=on"
  WIN_FEATURES="+hypervisor,hv_passthrough"

  if [[ "$ARCH" == "amd64" ]]; then
      CPU_MODEL="max"
    else
      CPU_MODEL="qemu64"
      CPU_FEATURES="$CPU_FEATURES,migratable=no"
  fi

  CPU_FEATURES="$CPU_FEATURES,+ssse3,+sse4.1,+sse4.2"

fi

if [[ "${BOOT_MODE,,}" == "windows" ]] || [[ "${BOOT_MODE,,}" == "windows_legacy" ]]; then

  [ -n "$CPU_FEATURES" ] && CPU_FEATURES="$CPU_FEATURES,"
  CPU_FEATURES="$CPU_FEATURES${WIN_FEATURES}"

fi

if [ -z "$CPU_FLAGS" ]; then
  if [ -z "$CPU_FEATURES" ]; then
    CPU_FLAGS="$CPU_MODEL"
  else
    CPU_FLAGS="$CPU_MODEL,$CPU_FEATURES"
  fi
else
  if [ -z "$CPU_FEATURES" ]; then
    CPU_FLAGS="$CPU_MODEL,$CPU_FLAGS"
  else
    CPU_FLAGS="$CPU_MODEL,$CPU_FEATURES,$CPU_FLAGS"
  fi
fi

return 0
+1 −1

File changed.

Contains only whitespace changes.

+1 −1

File changed.

Contains only whitespace changes.