mirror of
				https://github.com/vdsm/virtual-dsm.git
				synced 2025-11-04 08:54:51 +08:00 
			
		
		
		
	fix: CPU configuration
This commit is contained in:
		
							parent
							
								
									8925323a6e
								
							
						
					
					
						commit
						970a662170
					
				@ -3,32 +3,12 @@ set -Eeuo pipefail
 | 
			
		||||
 | 
			
		||||
# Docker environment variables
 | 
			
		||||
 | 
			
		||||
: ${HOST_CPU:=''}
 | 
			
		||||
: ${HOST_MAC:=''}
 | 
			
		||||
: ${HOST_DEBUG:=''}
 | 
			
		||||
: ${HOST_SERIAL:=''}
 | 
			
		||||
: ${HOST_MODEL:=''}
 | 
			
		||||
: ${GUEST_SERIAL:=''}
 | 
			
		||||
 | 
			
		||||
if [ -z "$HOST_CPU" ] && [ "$CPU_MODEL" == "host"* ]; then
 | 
			
		||||
  HOST_CPU=$(lscpu | grep 'Model name' | cut -f 2 -d ":" | awk '{$1=$1}1' | sed 's# @.*##g' | sed s/"(R)"//g | sed 's/[^[:alnum:] ]\+/ /g' | sed 's/  */ /g')
 | 
			
		||||
fi
 | 
			
		||||
 | 
			
		||||
if [ -n "$HOST_CPU" ]; then
 | 
			
		||||
  HOST_CPU="${HOST_CPU%%,*},,"
 | 
			
		||||
else
 | 
			
		||||
  if [ "$CPU_MODEL" == "host"* ] || [ "$CPU_MODEL" == "qemu"* ]; then
 | 
			
		||||
    HOST_CPU="QEMU"
 | 
			
		||||
  else
 | 
			
		||||
    HOST_CPU="${CPU_MODEL%%,*}"
 | 
			
		||||
  fi
 | 
			
		||||
  if [ "$ARCH" == "amd64" ]; then
 | 
			
		||||
    HOST_CPU="${HOST_CPU%%,*}, Virtual CPU, X86_64"
 | 
			
		||||
  else
 | 
			
		||||
    HOST_CPU="${HOST_CPU%%,*}, Virtual CPU, $ARCH"
 | 
			
		||||
  fi
 | 
			
		||||
fi
 | 
			
		||||
 | 
			
		||||
HOST_ARGS=()
 | 
			
		||||
HOST_ARGS+=("-cpu=$CPU_CORES")
 | 
			
		||||
HOST_ARGS+=("-cpu_arch=$HOST_CPU")
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user