diff options
| author | Stefano Brivio <sbrivio@redhat.com> | 2024-08-19 23:56:45 +0200 |
|---|---|---|
| committer | Stefano Brivio <sbrivio@redhat.com> | 2024-08-21 12:01:48 +0200 |
| commit | aded2b671c4b41f250d2324ab86ca9728a5503c9 (patch) | |
| tree | 533afab8269c79426816114d931a41141c6e4768 | |
| parent | 2aea1da143895540eed3d1a08defb30158c7e5a6 (diff) | |
| download | passt-aded2b671c4b41f250d2324ab86ca9728a5503c9.tar passt-aded2b671c4b41f250d2324ab86ca9728a5503c9.tar.gz passt-aded2b671c4b41f250d2324ab86ca9728a5503c9.tar.bz2 passt-aded2b671c4b41f250d2324ab86ca9728a5503c9.tar.lz passt-aded2b671c4b41f250d2324ab86ca9728a5503c9.tar.xz passt-aded2b671c4b41f250d2324ab86ca9728a5503c9.tar.zst passt-aded2b671c4b41f250d2324ab86ca9728a5503c9.zip | |
test/lib/setup: Transform i686 kernel architecture name into QEMU name (i386)
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>
| -rwxr-xr-x | test/lib/setup | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/test/lib/setup b/test/lib/setup index f6dc6a1..d764138 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)" \ @@ -153,7 +155,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} \ @@ -225,7 +227,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)" \ @@ -238,7 +240,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)" \ |