From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: passt.top; dmarc=none (p=none dis=none) header.from=gibson.dropbear.id.au Authentication-Results: passt.top; dkim=fail reason="key not found in DNS" header.d=gibson.dropbear.id.au header.i=@gibson.dropbear.id.au header.a=rsa-sha256 header.s=202312 header.b=AWVwp4is; dkim-atps=neutral Received: from mail.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by passt.top (Postfix) with ESMTPS id 351AA5A027A for ; Tue, 20 Aug 2024 02:50:02 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gibson.dropbear.id.au; s=202312; t=1724114993; bh=Wr8/MTZLioSL2gxuCQhlRN9gudSdkX4zRNoBaB9QXNA=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=AWVwp4iszl9+btHcUqGTQt2i5eCu1dhFhPKo1R/1fy9xtMna2Or1BMQTt/pMzHagO ea7Tr7DxHA6Z8Mk+cdIIQPwcfIMPniSTI07N8it4c/KIxH7Ouhhgv+XSgo4FF7MoQx CJiXiMCgcfrAPCL/pXPByJNZ8Ri9YjwPDkbH4xlO332TdOPLLQQU9QV+AsBT+0ygiM JFJZ5r93I63VUl3fx6fT4ycwMHoSm2jGFrpfSdKF8Bg3SIYaWlYc1GrTzF4ukx4mWW Z4Zvp6qx6m7fZDN0hDS1QoX6xrzIACCaVGQtqL7XlHLF/l0er76U0a8R4Fn/RI9klB g0tL43Qjy8wGw== Received: by gandalf.ozlabs.org (Postfix, from userid 1007) id 4WnrTY3XwCz4x11; Tue, 20 Aug 2024 10:49:53 +1000 (AEST) Date: Tue, 20 Aug 2024 10:45:06 +1000 From: David Gibson To: Stefano Brivio Subject: Re: [PATCH 1/4] test/lib/setup: Transform i686 kernel architecture name into QEMU name (i386) Message-ID: References: <20240819231434.1481576-1-sbrivio@redhat.com> <20240819231434.1481576-2-sbrivio@redhat.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="XHhNSqkzFDKsv2YH" Content-Disposition: inline In-Reply-To: <20240819231434.1481576-2-sbrivio@redhat.com> Message-ID-Hash: 7BTSLJD3PHOHMXX5SLXBA4WI3FUJFNGJ X-Message-ID-Hash: 7BTSLJD3PHOHMXX5SLXBA4WI3FUJFNGJ X-MailFrom: dgibson@gandalf.ozlabs.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: passt-dev@passt.top X-Mailman-Version: 3.3.8 Precedence: list List-Id: Development discussion and patches for passt Archived-At: Archived-At: List-Archive: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: --XHhNSqkzFDKsv2YH Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable 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. >=20 > Signed-off-by: Stefano Brivio Reviewed-by: David Gibson > --- > test/lib/setup | 10 ++++++---- > 1 file changed, 6 insertions(+), 4 deletions(-) >=20 > 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=3D"${BASEPATH}/mbuto.img" > VCPUS=3D"$( [ $(nproc) -ge 8 ] && echo 6 || echo $(( $(nproc) / 2 + 1 ))= )" > __mem_kib=3D"$(sed -n 's/MemTotal:[ ]*\([0-9]*\) kB/\1/p' /proc/meminfo)" > VMEM=3D"$((${__mem_kib} / 1024 / 4))" > +QEMU_ARCH=3D"$(uname -m)" > +[ "${QEMU_ARCH}" =3D "i686" ] && QEMU_ARCH=3Di386 > =20 > # setup_build() - Set up pane layout for build tests > setup_build() { > @@ -53,7 +55,7 @@ setup_passt() { > wait_for [ -f "${STATESETUP}/passt.pid" ] > =20 > GUEST_CID=3D94557 > - context_run_bg qemu 'qemu-system-$(uname -m)' \ > + context_run_bg qemu 'qemu-system-'"${QEMU_ARCH}" \ > ' -machine accel=3Dkvm' \ > ' -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" ] > =20 > GUEST_CID=3D94557 > - context_run_bg qemu 'qemu-system-$(uname -m)' \ > + context_run_bg qemu 'qemu-system-'"${QEMU_ARCH}" \ > ' -machine accel=3Dkvm' \ > ' -M accel=3Dkvm:tcg' \ > ' -m '${VMEM}' -cpu host -smp '${VCPUS} \ > @@ -220,7 +222,7 @@ setup_two_guests() { > wait_for [ -f "${STATESETUP}/passt_2.pid" ] > =20 > GUEST_1_CID=3D94557 > - context_run_bg qemu_1 'qemu-system-$(uname -m)' \ > + context_run_bg qemu_1 'qemu-system-'"${QEMU_ARCH}" \ > ' -M accel=3Dkvm: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=3D$GUEST_1_CID" > =20 > GUEST_2_CID=3D94558 > - context_run_bg qemu_2 'qemu-system-$(uname -m)' \ > + context_run_bg qemu_2 'qemu-system-'"${QEMU_ARCH}" \ > ' -M accel=3Dkvm:tcg' \ > ' -m '${VMEM}' -cpu host -smp '${VCPUS} \ > ' -kernel ' "/boot/vmlinuz-$(uname -r)" \ --=20 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 --XHhNSqkzFDKsv2YH Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEO+dNsU4E3yXUXRK2zQJF27ox2GcFAmbD5xEACgkQzQJF27ox 2Gevgg//c1dXZ6Iq61d3z/TnPrkO4B7FYDEbsEINKOzR+AZLd5XuKpS9NyB0T6Sz XE88dn3slyi3pTlxlup8vt5SLdXyvVyqbXfIcVM8Mxx5sppzG3rjHTjMXPD1S0Si fcyDfQyupyxpglxsX6KsPVfUVMdwSw3jqC463od6ujZxfsxiSKjmOPvqgcXt326A xTDXs95cFBAebPHGg9EKWD93gOjUkmgyjcxdsA+i3fNC5UAgLkoH6JZob6zmUtmz ZVhqj82MdDseGszPKiD/MybFUmI0nvy0wfIg0L7tJzBQbt+B7qL2V5aotgRtgLdz QYrSqGIt2wmdh0J/5cGMSKlLtTInzxDFqmBfowXOgyx7iBm8Y7RsVhs433Y0X5qq v7I5y7F+nbFFp8J4zrzkpo0vab/lNBsOp0Y3eH5P9vZhjRY/ni27UZNHot5jCzBt 4J0VYxn2K95ZlbMXN/qgAVAFAFxjy3efu0myn5TQVEwQzai0flfNxH1WoIGo1GCX RcE0uv+hJ6LAR044Mx9shj+xmvlWb0ViMNaLJibfODpNTpDOqXTLfC+EggjnZsLA QyqU+isdguW8/UrNplFK9zG8/tJyqNCOXP3ygu6KkVQPpbSqLbQFNrg/nNirRoE+ C8YzYZmBV0dy5LxiRoQuLDoIFCmpljNypSKeL+0UNeKDvQK3VrM= =zNkg -----END PGP SIGNATURE----- --XHhNSqkzFDKsv2YH--