Skip to content
This repository has been archived by the owner on Jun 21, 2022. It is now read-only.

Commit

Permalink
arm/run: fix mkstandalone when building with tcg
Browse files Browse the repository at this point in the history
DRYRUN only expects a command line to be output. Make it so.
Also, a standalone test should allow kvm and tcg, so we should
revert that behavior.

Signed-off-by: Andrew Jones <drjones@redhat.com>
  • Loading branch information
Andrew Jones committed Aug 2, 2015
1 parent de4442b commit be290c1
Showing 1 changed file with 8 additions and 4 deletions.
12 changes: 8 additions & 4 deletions arm/run
Expand Up @@ -30,11 +30,15 @@ if ! $qemu -machine '?' 2>&1 | grep 'ARM Virtual Machine' > /dev/null; then
fi

M='-machine virt'
if [ "$usingkvm" = "yes" ]; then
M+=',accel=kvm'
if [ "$DRYRUN" != "yes" ]; then
if [ "$usingkvm" = "yes" ]; then
M+=',accel=kvm'
else
echo "Running with TCG"
M+=',accel=tcg'
fi
else
echo "Running with TCG"
M+=',accel=tcg'
M+=',accel=kvm:tcg'
fi

if ! $qemu $M -device '?' 2>&1 | grep virtconsole > /dev/null; then
Expand Down

0 comments on commit be290c1

Please sign in to comment.