Re: [kvm-unit-tests PATCH v5 16/18] mkstandalone: add support for powerpc

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

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

On Wed, Feb 17, 2016 at 07:40:57PM +0100, Andrew Jones wrote:
> PowerPC needs firmware.
> 
> Signed-off-by: Andrew Jones <drjones@redhat.com>

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

> ---
>  configure               | 2 ++
>  powerpc/run             | 2 +-
>  scripts/mkstandalone.sh | 5 +++++
>  3 files changed, 8 insertions(+), 1 deletion(-)
> 
> diff --git a/configure b/configure
> index b2ad199da7873..7d5702e28d627 100755
> --- a/configure
> +++ b/configure
> @@ -83,6 +83,7 @@ elif [ "$arch" = "arm" ] || [ "$arch" = "arm64" ]; then
>      testdir=arm
>  elif [ "$arch" = "ppc64" ]; then
>      testdir=powerpc
> +    firmware="$testdir/boot_rom.bin"
>  else
>      testdir=$arch
>  fi
> @@ -137,4 +138,5 @@ OBJDUMP=$cross_prefix$objdump
>  AR=$cross_prefix$ar
>  API=$api
>  TEST_DIR=$testdir
> +FIRMWARE=$firmware
>  EOF
> diff --git a/powerpc/run b/powerpc/run
> index 47aecb7600832..c5108100fc5e0 100755
> --- a/powerpc/run
> +++ b/powerpc/run
> @@ -42,7 +42,7 @@ fi
>  
>  M='-machine pseries'
>  M+=",accel=$ACCEL"
> -command="$qemu $M -bios powerpc/boot_rom.bin"
> +command="$qemu $M -bios $FIRMWARE"
>  command+=" -display none -serial stdio -kernel"
>  echo $command "$@"
>  
> diff --git a/scripts/mkstandalone.sh b/scripts/mkstandalone.sh
> index b0f1e7c098afb..c7e78f83fb086 100755
> --- a/scripts/mkstandalone.sh
> +++ b/scripts/mkstandalone.sh
> @@ -53,6 +53,11 @@ generate_test ()
>  
>  	echo "trap 'rm -f \$cleanup' EXIT"
>  
> +	if [ "$FIRMWARE" ]; then
> +		temp_file FIRMWARE "$FIRMWARE"
> +		echo 'export FIRMWARE'
> +	fi
> +
>  	temp_file bin "$kernel"
>  	args[3]='$bin'
>  

-- 
David Gibson			| 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: 819 bytes --]