On Wed, Feb 17, 2016 at 07:40:59PM +0100, Andrew Jones wrote:
> We should use a QEMU debug-exit device like chr-testdev, but for
> now we just fake things by outputting the exit code (which we
> parse later) and quitting with RTAS (which always exits with zero).
>
> (When we've got a real debug-exit working, then this patch can
> be reverted.)
>
> Signed-off-by: Andrew Jones <drjones@xxxxxxxxxx>
> Reviewed-by: Thomas Huth <thuth@xxxxxxxxxx>
> Tested-by: Laurent Vivier <lvivier@xxxxxxxxxx>
Reviewed-by: David Gibson <david@xxxxxxxxxxxxxxxxxxxxx>
> ---
> lib/powerpc/io.c | 4 ++++
> powerpc/run | 7 +++++--
> 2 files changed, 9 insertions(+), 2 deletions(-)
>
> diff --git a/lib/powerpc/io.c b/lib/powerpc/io.c
> index c4c61ea8ac1cf..6a94bcc4f76d4 100644
> --- a/lib/powerpc/io.c
> +++ b/lib/powerpc/io.c
> @@ -29,5 +29,9 @@ void puts(const char *s)
>
> void exit(int code)
> {
> +// FIXME: change this print-exit/rtas-poweroff to chr_testdev_exit(),
> +// maybe by plugging chr-testdev into a spapr-vty.
> + printf("\nEXIT: STATUS=%d\n", ((code) << 1) | 1);
> + rtas_power_off();
> halt(code);
> }
> diff --git a/powerpc/run b/powerpc/run
> index c5108100fc5e0..45492a1cb8afc 100755
> --- a/powerpc/run
> +++ b/powerpc/run
> @@ -46,7 +46,10 @@ command="$qemu $M -bios $FIRMWARE"
> command+=" -display none -serial stdio -kernel"
> echo $command "$@"
>
> -$command "$@"
> -ret=$?
> +#FIXME: rtas-poweroff always exits with zero, so we have to parse
> +# the true exit code from the output.
> +lines=$($command "$@")
> +echo "$lines"
> +ret=$(grep '^EXIT: ' <<<"$lines" | sed 's/.*STATUS=\([0-9][0-9]*\).*/\1/')
> echo Return value from qemu: $ret
> exit $ret
--
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:
signature.asc
Description: PGP signature
