From patchwork Fri Feb 19 15:58:23 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Jones X-Patchwork-Id: 585276 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 2212614090B for ; Sat, 20 Feb 2016 02:59:46 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1948057AbcBSP7m (ORCPT ); Fri, 19 Feb 2016 10:59:42 -0500 Received: from mx1.redhat.com ([209.132.183.28]:55089 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1947215AbcBSP7Z (ORCPT ); Fri, 19 Feb 2016 10:59:25 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (Postfix) with ESMTPS id 2640D8E760; Fri, 19 Feb 2016 15:59:25 +0000 (UTC) Received: from hawk.localdomain.com (dhcp-1-251.brq.redhat.com [10.34.1.251]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u1JFwWkR002316; Fri, 19 Feb 2016 10:59:22 -0500 From: Andrew Jones 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, rkrcmar@redhat.com Subject: [kvm-unit-tests PATCH v6 18/18] powerpc/ppc64: make a fake debug-exit Date: Fri, 19 Feb 2016 16:58:23 +0100 Message-Id: <1455897503-11835-19-git-send-email-drjones@redhat.com> In-Reply-To: <1455897503-11835-1-git-send-email-drjones@redhat.com> References: <1455897503-11835-1-git-send-email-drjones@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 Sender: kvm-ppc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm-ppc@vger.kernel.org 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 Reviewed-by: David Gibson --- 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