From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Jones Date: Mon, 15 Feb 2016 13:49:26 +0000 Subject: [kvm-unit-tests PATCH v4 17/17] powerpc/ppc64: make a fake debug-exit Message-Id: <1455544166-19766-18-git-send-email-drjones@redhat.com> List-Id: References: <1455544166-19766-1-git-send-email-drjones@redhat.com> In-Reply-To: <1455544166-19766-1-git-send-email-drjones@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: kvm@vger.kernel.org, kvm-ppc@vger.kernel.org Cc: thuth@redhat.com, dgibson@redhat.com, david@gibson.dropbear.id.au, agraf@suse.de, lvivier@redhat.com, pbonzini@redhat.com 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 Reviewed-by: Thomas Huth Tested-by: Laurent Vivier --- 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 e57a28c583eb0..ba90a08650b9d 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 -- 2.4.3