| Message ID | 1456492533-17171-8-git-send-email-alex.bennee@linaro.org |
|---|---|
| State | New |
| Headers | show |
On Fri, Feb 26, 2016 at 01:15:29PM +0000, Alex Bennée wrote: > AArch64 hosts can happily run AArch32 binaries. We just need to ensure > that we use "cpu host,aarch64=off" when specifying the CPU type. > > Signed-off-by: Alex Bennée <alex.bennee@linaro.org> > --- > arm/run | 10 +++++++++- > 1 file changed, 9 insertions(+), 1 deletion(-) > > diff --git a/arm/run b/arm/run > index 0eaf23a..f1a6b7d 100755 > --- a/arm/run > +++ b/arm/run > @@ -38,7 +38,15 @@ if [ "$HOST" = "aarch64" ] && [ "$ACCEL" = "kvm" ]; then > fi > fi > > -qemu="${QEMU:-qemu-system-$ARCH_NAME}" > +if [ "$ARCH" = "arm" ] && [ "$HOST" = "aarch64" ]; then > + qemu="${QEMU:-qemu-system-$HOST}" > + if [ "$ACCEL" = "kvm" ]; then > + processor="host,aarch64=off" > + fi > +else > + qemu="${QEMU:-qemu-system-$ARCH_NAME}" > +fi We've got 3382e7795 "arm/run: allow tests to run in AArch32 mode" already, so I this patch should no longer be necessary. Thanks, drew > + > qpath=$(which $qemu 2>/dev/null) > > if [ -z "$qpath" ]; then > -- > 2.7.1 >
Andrew Jones <drjones@redhat.com> writes: > On Fri, Feb 26, 2016 at 01:15:29PM +0000, Alex Bennée wrote: >> AArch64 hosts can happily run AArch32 binaries. We just need to ensure >> that we use "cpu host,aarch64=off" when specifying the CPU type. >> >> Signed-off-by: Alex Bennée <alex.bennee@linaro.org> >> --- >> arm/run | 10 +++++++++- >> 1 file changed, 9 insertions(+), 1 deletion(-) >> >> diff --git a/arm/run b/arm/run >> index 0eaf23a..f1a6b7d 100755 >> --- a/arm/run >> +++ b/arm/run >> @@ -38,7 +38,15 @@ if [ "$HOST" = "aarch64" ] && [ "$ACCEL" = "kvm" ]; then >> fi >> fi >> >> -qemu="${QEMU:-qemu-system-$ARCH_NAME}" >> +if [ "$ARCH" = "arm" ] && [ "$HOST" = "aarch64" ]; then >> + qemu="${QEMU:-qemu-system-$HOST}" >> + if [ "$ACCEL" = "kvm" ]; then >> + processor="host,aarch64=off" >> + fi >> +else >> + qemu="${QEMU:-qemu-system-$ARCH_NAME}" >> +fi > > We've got 3382e7795 "arm/run: allow tests to run in AArch32 mode" > already, so I this patch should no longer be necessary. Ahh good spot. I'll drop that. Thanks. > > Thanks, > drew > > >> + >> qpath=$(which $qemu 2>/dev/null) >> >> if [ -z "$qpath" ]; then >> -- >> 2.7.1 >> -- Alex Bennée
diff --git a/arm/run b/arm/run index 0eaf23a..f1a6b7d 100755 --- a/arm/run +++ b/arm/run @@ -38,7 +38,15 @@ if [ "$HOST" = "aarch64" ] && [ "$ACCEL" = "kvm" ]; then fi fi -qemu="${QEMU:-qemu-system-$ARCH_NAME}" +if [ "$ARCH" = "arm" ] && [ "$HOST" = "aarch64" ]; then + qemu="${QEMU:-qemu-system-$HOST}" + if [ "$ACCEL" = "kvm" ]; then + processor="host,aarch64=off" + fi +else + qemu="${QEMU:-qemu-system-$ARCH_NAME}" +fi + qpath=$(which $qemu 2>/dev/null) if [ -z "$qpath" ]; then
AArch64 hosts can happily run AArch32 binaries. We just need to ensure that we use "cpu host,aarch64=off" when specifying the CPU type. Signed-off-by: Alex Bennée <alex.bennee@linaro.org> --- arm/run | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)