Re: [PATCH 1/4] test/lib/setup: Transform i686 kernel architecture name into QEMU name (i386)

[David Gibson <david@gibson.dropbear.id.au>]

[-- Attachment #1: Type: text/plain, Size: 2842 bytes --]

On Tue, Aug 20, 2024 at 01:14:31AM +0200, Stefano Brivio wrote:
> It's qemu-system-i386, but uname -m reports i686. I didn't test i486
> and i586.
> 
> Signed-off-by: Stefano Brivio <sbrivio@redhat.com>

Reviewed-by: David Gibson <david@gibson.dropbear.id.au>

> ---
>  test/lib/setup | 10 ++++++----
>  1 file changed, 6 insertions(+), 4 deletions(-)
> 
> diff --git a/test/lib/setup b/test/lib/setup
> index 9b39b9f..58371bd 100755
> --- a/test/lib/setup
> +++ b/test/lib/setup
> @@ -17,6 +17,8 @@ INITRAMFS="${BASEPATH}/mbuto.img"
>  VCPUS="$( [ $(nproc) -ge 8 ] && echo 6 || echo $(( $(nproc) / 2 + 1 )) )"
>  __mem_kib="$(sed -n 's/MemTotal:[ ]*\([0-9]*\) kB/\1/p' /proc/meminfo)"
>  VMEM="$((${__mem_kib} / 1024 / 4))"
> +QEMU_ARCH="$(uname -m)"
> +[ "${QEMU_ARCH}" = "i686" ] && QEMU_ARCH=i386
>  
>  # setup_build() - Set up pane layout for build tests
>  setup_build() {
> @@ -53,7 +55,7 @@ setup_passt() {
>  	wait_for [ -f "${STATESETUP}/passt.pid" ]
>  
>  	GUEST_CID=94557
> -	context_run_bg qemu 'qemu-system-$(uname -m)'			   \
> +	context_run_bg qemu 'qemu-system-'"${QEMU_ARCH}"		   \
>  		' -machine accel=kvm'                                      \
>  		' -m '${VMEM}' -cpu host -smp '${VCPUS}                    \
>  		' -kernel ' "/boot/vmlinuz-$(uname -r)"			   \
> @@ -148,7 +150,7 @@ setup_passt_in_ns() {
>  	wait_for [ -f "${STATESETUP}/passt.pid" ]
>  
>  	GUEST_CID=94557
> -	context_run_bg qemu 'qemu-system-$(uname -m)'			   \
> +	context_run_bg qemu 'qemu-system-'"${QEMU_ARCH}"		   \
>  		' -machine accel=kvm'                                      \
>  		' -M accel=kvm:tcg'                                        \
>  		' -m '${VMEM}' -cpu host -smp '${VCPUS}                    \
> @@ -220,7 +222,7 @@ setup_two_guests() {
>  	wait_for [ -f "${STATESETUP}/passt_2.pid" ]
>  
>  	GUEST_1_CID=94557
> -	context_run_bg qemu_1 'qemu-system-$(uname -m)'			     \
> +	context_run_bg qemu_1 'qemu-system-'"${QEMU_ARCH}"		     \
>  		' -M accel=kvm:tcg'                                          \
>  		' -m '${VMEM}' -cpu host -smp '${VCPUS}                      \
>  		' -kernel ' "/boot/vmlinuz-$(uname -r)"			     \
> @@ -233,7 +235,7 @@ setup_two_guests() {
>  		" -device vhost-vsock-pci,guest-cid=$GUEST_1_CID"
>  
>  	GUEST_2_CID=94558
> -	context_run_bg qemu_2 'qemu-system-$(uname -m)'			     \
> +	context_run_bg qemu_2 'qemu-system-'"${QEMU_ARCH}"		     \
>  		' -M accel=kvm:tcg'                                          \
>  		' -m '${VMEM}' -cpu host -smp '${VCPUS}                      \
>  		' -kernel ' "/boot/vmlinuz-$(uname -r)"			     \

-- 
David Gibson (he or they)	| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you, not the other way
				| around.
http://www.ozlabs.org/~dgibson

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]