run_qemu.sh: add new --qmachine argument

Initial support for q35 and "virt". Default to the host architecture.

Progress towards supporting ARM64 as discussed in pmem#140, pmem#143 and others.

Signed-off-by: Marc Herbert <[email protected]>

Author: marc-hb

parser_generator.m4

@@ -4,6 +4,7 @@
 echo "This is just a parsing library template, not the library - pass this file to 'argbash' to fix this." >&2
 exit 11  #)Created by argbash-init v2.9.0
 # Rearrange the order of options below according to what you would like to see in the help message.
+# ARG_OPTIONAL_SINGLE([qmachine], , [QEMU machine: q35, virt,... Defaults to host architecture])
 # ARG_OPTIONAL_SINGLE([rootfs], , [Non-default rootfs image to use], [root.img])
 # ARG_OPTIONAL_SINGLE([rebuild], [r], [Choose one of:\n wipe: wipe builddir, removing package cache\n imgcache: remove mkosi's cached pre-images to rebuild the image without an 'incremental build'\n img: rebuild rootfs from scratch and kernel\n kmod: rebuild kernel, update rootfs modules\n none: don't rebuild anything, start qemu\n], [kmod])
 # ARG_OPTIONAL_BOOLEAN([strip-modules], , [Strip kernel modules after they are installed], [off])

run_qemu.sh

@@ -13,7 +13,6 @@ legacy_pmem_size="2"   #in GiB
 pmem_size="16384"  #in MiB
 pmem_label_size=2  #in MiB
 pmem_final_size="$((pmem_size + pmem_label_size))"
-: "${qemu:=qemu-system-x86_64}"
 : "${gdb:=gdb}"
 : "${ndctl:=$(readlink -e ~/git/ndctl)}"
 selftests_home=root/built-selftests
@@ -87,6 +86,51 @@ fail()
 	exit 1
 }
 
+set_qemu_machine()
+{
+	if test -n "$_arg_qmachine"; then
+		qemu_machine="$_arg_qmachine"
+		return
+	fi
+
+	case "${host_arch}" in
+	    x86_64)
+		qemu_machine=q35
+		;;
+	    aarch)
+		qemu_machine=virt
+		;;
+	    *) fail 'Unknown host architecture';;
+	esac
+}
+
+# If this grows too big, switch to sourcing separate ${qemu_machine}.sh files
+set_guest_params()
+{
+	case "${qemu_machine}" in
+	    q35)
+		guest_arch_toolchain=x86_64
+		guest_arch_linux=x86_64
+		machine_args=('q35')
+		;;
+	    virt)
+		guest_arch_toolchain=aarch64
+		guest_arch_linux=arm64
+		machine_args=('virt')
+		;;
+	    *)
+		fail "Unknown QEMU machine=%s" "$qemu_machine";;
+	esac
+	test -n "$qemu" || qemu=qemu-system-"$guest_arch_linux"
+}
+
+arch_init()
+{
+	host_arch=$(uname -m)
+	set_qemu_machine
+	set_guest_params
+}
+
 script_dir="$(cd "$(dirname "$(readlink -e "${BASH_SOURCE[0]}")")" && pwd)"
 parser_generator="${script_dir}/parser_generator.m4"
 parser_lib="${script_dir}/run_qemu_parser.sh"
@@ -327,6 +371,9 @@ process_options_logic()
 	if [[ $_arg_debug == "on" ]]; then
 		set -x
 	fi
+
+	arch_init
+
 	if [[ $_arg_cxl_test_run == "on" ]]; then
 		_arg_cxl_debug="on"
 		_arg_cxl_test="on"
@@ -447,11 +494,7 @@ make_install_kernel()
 		exit 1
 	}
 
-	if [[ $(arch) != "aarch64" ]]; then
-		cat arch/x86_64/boot/bzImage > "$inst_path"/vmlinuz-"$kver"
-	else
-		cat arch/arm64/boot/Image > "$inst_path"/vmlinuz-"$kver"
-	fi
+	cat arch/"${guest_arch_linux}"/boot/*Image > "$inst_path"/vmlinuz-"$kver"
 	cp System.map "$inst_path"/System.map-"$kver"
 	ln -fs vmlinuz-"$kver" "$inst_path"/vmlinuz
 	ln -fs System.map-"$kver" "$inst_path"/System.map
@@ -929,7 +972,9 @@ __update_existing_rootfs()
 	    local _trace_sh='-x'
 	fi
 	#shellcheck disable=SC2086
-	sudo -E bash $_trace_sh -e -c "$(declare -f make_install_kernel); kver=$kver make_install_kernel $inst_path"
+	sudo -E bash $_trace_sh -e -c "$(declare -f make_install_kernel);
+		kver=$kver guest_arch_linux=$guest_arch_linux
+		make_install_kernel $inst_path"
 
 	if [[ $_arg_cxl_test == "off" ]]; then
 		sudo rm -f "$inst_prefix"/usr/lib/modules/"$kver"/extra/cxl_*.ko
@@ -1533,13 +1578,7 @@ prepare_qcmd()
 	if [[ $_arg_kvm = "off" ]]; then
 		accel="tcg" # the default
 	fi
-
-	if [[ $(arch) != "aarch64" ]]; then
-		machine_args=("q35" "accel=$accel")
-	else
-		machine_args=("virt,highmem=on,gic-version=3" "accel=$accel")
-	fi
-
+	machine_args+=("accel=$accel")
 	if [[ "$num_pmems" -gt 0 ]]; then
 		machine_args+=("nvdimm=on")
 	fi