Fabio/qemu-arm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat: Detect number of physical CPU sockets (#91)

Browse source
This commit is contained in:
Kroese 2024-05-23 02:22:58 +02:00 committed by GitHub
parent 08cc4a7cf1
commit 09694075b6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/boot.sh
View file

@ -4,9 +4,9 @@ set -Eeuo pipefail
# Docker environment variables # Docker environment variables
: "${BIOS:=""}" # Bios file : "${BIOS:=""}" # Bios file
SECURE="off"
BOOT_OPTS="" BOOT_OPTS=""
BOOT_DESC="" BOOT_DESC=""
SECURE=",secure=off"
DIR="/usr/share/qemu" DIR="/usr/share/qemu"
case "${BOOT_MODE,,}" in case "${BOOT_MODE,,}" in
@ -15,7 +15,7 @@ case "${BOOT_MODE,,}" in
VARS="AAVMF_VARS.fd" VARS="AAVMF_VARS.fd"
;; ;;
secure) secure)
SECURE=",secure=on" SECURE="on"
BOOT_DESC=" securely" BOOT_DESC=" securely"
ROM="AAVMF_CODE.secboot.fd" ROM="AAVMF_CODE.secboot.fd"
VARS="AAVMF_VARS.fd" VARS="AAVMF_VARS.fd"
@ -26,7 +26,7 @@ case "${BOOT_MODE,,}" in
BOOT_OPTS="-rtc base=localtime" BOOT_OPTS="-rtc base=localtime"
;; ;;
windows_secure) windows_secure)
SECURE=",secure=on" SECURE="on"
BOOT_DESC=" securely" BOOT_DESC=" securely"
ROM="AAVMF_CODE.ms.fd" ROM="AAVMF_CODE.ms.fd"
VARS="AAVMF_VARS.ms.fd" VARS="AAVMF_VARS.ms.fd"

2
src/config.sh
View file

@ -11,7 +11,7 @@ USB_OPTS="-device $USB -device usb-kbd -device usb-tablet"
RAM_OPTS=$(echo "-m ${RAM_SIZE^^}" | sed 's/MB/M/g;s/GB/G/g;s/TB/T/g') RAM_OPTS=$(echo "-m ${RAM_SIZE^^}" | sed 's/MB/M/g;s/GB/G/g;s/TB/T/g')
CPU_OPTS="-cpu $CPU_FLAGS -smp $CPU_CORES,sockets=1,dies=1,cores=$CPU_CORES,threads=1" CPU_OPTS="-cpu $CPU_FLAGS -smp $CPU_CORES,sockets=1,dies=1,cores=$CPU_CORES,threads=1"
MON_OPTS="-monitor $MONITOR -name $PROCESS,process=$PROCESS,debug-threads=on" MON_OPTS="-monitor $MONITOR -name $PROCESS,process=$PROCESS,debug-threads=on"
MAC_OPTS="-machine type=${MACHINE}${SECURE},dump-guest-core=off${KVM_OPTS}" MAC_OPTS="-machine type=${MACHINE},secure=${SECURE},dump-guest-core=off${KVM_OPTS}"
DEV_OPTS="-object rng-random,id=objrng0,filename=/dev/urandom" DEV_OPTS="-object rng-random,id=objrng0,filename=/dev/urandom"
DEV_OPTS="$DEV_OPTS -device virtio-rng-pci,rng=objrng0,id=rng0,bus=pcie.0,addr=0x1c" DEV_OPTS="$DEV_OPTS -device virtio-rng-pci,rng=objrng0,id=rng0,bus=pcie.0,addr=0x1c"
[[ "${BOOT_MODE,,}" != "windows"* ]] && DEV_OPTS="$DEV_OPTS -device virtio-balloon-pci,id=balloon0,bus=pcie.0,addr=0x4" [[ "${BOOT_MODE,,}" != "windows"* ]] && DEV_OPTS="$DEV_OPTS -device virtio-balloon-pci,id=balloon0,bus=pcie.0,addr=0x4"

3
src/reset.sh
View file

@ -44,7 +44,8 @@ HOST=$(hostname -s)
KERNEL=$(echo "$SYS" | cut -b 1) KERNEL=$(echo "$SYS" | cut -b 1)
MINOR=$(echo "$SYS" | cut -d '.' -f2) MINOR=$(echo "$SYS" | cut -d '.' -f2)
ARCH=$(dpkg --print-architecture) ARCH=$(dpkg --print-architecture)
CPU=$(lscpu | grep -m 1 'Model name' | cut -f 2 -d ":" | awk '{$1=$1}1' | sed 's# @.*##g' | sed s/"(R)"//g | sed 's/[^[:alnum:] ]\+/ /g' | sed 's/ */ /g') SOCKETS=$(lscpu | grep -m 1 -i 'socket(s)' | awk '{print $(2)}')
CPU=$(lscpu | grep -m 1 -i 'model name' | cut -f 2 -d ":" | awk '{$1=$1}1' | sed 's# @.*##g' | sed s/"(R)"//g | sed 's/[^[:alnum:] ]\+/ /g' | sed 's/ */ /g')
# Check system # Check system