twh_eastasia/virtual-dsm
1
0
Fork 0
mirror of https://github.com/vdsm/virtual-dsm.git synced 2025-06-08 01:18:32 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update proc.sh

Browse Source
This commit is contained in:
Kroese 2024-06-05 18:15:28 +02:00 committed by GitHub
parent 7d11755a62
commit fe3414a91a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/proc.sh
View File

@ -56,12 +56,12 @@ if [[ "$KVM" != [Nn]* ]]; then
if ! grep -qw "sse4_2" <<< "$flags"; then if ! grep -qw "sse4_2" <<< "$flags"; then
info "Your CPU does not have the SSE4 instruction set that Virtual DSM requires, it will be emulated..." info "Your CPU does not have the SSE4 instruction set that Virtual DSM requires, it will be emulated..."
[ -z "$CPU_MODEL" ] && CPU_MODEL="$DEF_MODEL" [ -z "$CPU_MODEL" ] && CPU_MODEL="$DEF_MODEL"
CPU_FEATURES="$CPU_FEATURES,+ssse3,+sse4.1,+sse4.2" CPU_FEATURES+=",+ssse3,+sse4.1,+sse4.2"
fi fi
if [ -z "$CPU_MODEL" ]; then if [ -z "$CPU_MODEL" ]; then
CPU_MODEL="host" CPU_MODEL="host"
CPU_FEATURES="$CPU_FEATURES,migratable=no" CPU_FEATURES+=",migratable=no"
fi fi
if grep -qw "svm" <<< "$flags"; then if grep -qw "svm" <<< "$flags"; then
@ -69,7 +69,7 @@ if [[ "$KVM" != [Nn]* ]]; then
# AMD processor # AMD processor
if grep -qw "tsc_scale" <<< "$flags"; then if grep -qw "tsc_scale" <<< "$flags"; then
CPU_FEATURES="$CPU_FEATURES,+invtsc" CPU_FEATURES+=",+invtsc"
fi fi
else else
@ -79,7 +79,7 @@ if [[ "$KVM" != [Nn]* ]]; then
vmx=$(sed -ne '/^vmx flags/s/^.*: //p' /proc/cpuinfo) vmx=$(sed -ne '/^vmx flags/s/^.*: //p' /proc/cpuinfo)
if grep -qw "tsc_scaling" <<< "$vmx"; then if grep -qw "tsc_scaling" <<< "$vmx"; then
CPU_FEATURES="$CPU_FEATURES,+invtsc" CPU_FEATURES+=",+invtsc"
fi fi
fi fi
@ -96,13 +96,13 @@ else
if [ -z "$CPU_MODEL" ]; then if [ -z "$CPU_MODEL" ]; then
if [[ "$ARCH" == "amd64" ]]; then if [[ "$ARCH" == "amd64" ]]; then
CPU_MODEL="max" CPU_MODEL="max"
CPU_FEATURES="$CPU_FEATURES,migratable=no" CPU_FEATURES+=",migratable=no"
else else
CPU_MODEL="$DEF_MODEL" CPU_MODEL="$DEF_MODEL"
fi fi
fi fi
CPU_FEATURES="$CPU_FEATURES,+ssse3,+sse4.1,+sse4.2" CPU_FEATURES+=",+ssse3,+sse4.1,+sse4.2"
fi fi
@ -129,9 +129,9 @@ if [ -n "$HOST_CPU" ]; then
else else
HOST_CPU="QEMU, Virtual CPU," HOST_CPU="QEMU, Virtual CPU,"
if [ "$ARCH" == "amd64" ]; then if [ "$ARCH" == "amd64" ]; then
HOST_CPU="$HOST_CPU X86_64" HOST_CPU+=" X86_64"
else else
HOST_CPU="$HOST_CPU $ARCH" HOST_CPU+=" $ARCH"
fi fi
fi fi