From: Andrew Jones <drjones@redhat.com>
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
Subject: [kvm-unit-tests PATCH v3 17/17] powerpc/ppc64: make a fake debug-exit
Date: Sat, 13 Feb 2016 17:28:30 +0100 [thread overview]
Message-ID: <1455380910-30604-18-git-send-email-drjones@redhat.com> (raw)
In-Reply-To: <1455380910-30604-1-git-send-email-drjones@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 <drjones@redhat.com>
---
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
next prev parent reply other threads:[~2016-02-13 16:29 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-13 16:28 [kvm-unit-tests PATCH v3 00/17] ppc64: initial drop Andrew Jones
2016-02-13 16:28 ` [kvm-unit-tests PATCH v3 01/17] arm/arm64: trivial: another assert fix Andrew Jones
2016-02-14 22:55 ` David Gibson
2016-02-15 6:38 ` Thomas Huth
2016-02-13 16:28 ` [kvm-unit-tests PATCH v3 02/17] Makefile: cscope: also look in arch shared asm Andrew Jones
2016-02-13 16:28 ` [kvm-unit-tests PATCH v3 03/17] lib: asm-generic: add missing casts Andrew Jones
2016-02-14 22:57 ` David Gibson
2016-02-13 16:28 ` [kvm-unit-tests PATCH v3 04/17] devicetree: fix dt_get_memory_params Andrew Jones
2016-02-14 23:00 ` David Gibson
2016-02-15 7:22 ` Thomas Huth
2016-02-13 16:28 ` [kvm-unit-tests PATCH v3 05/17] arm/arm64: setup improvements Andrew Jones
2016-02-13 16:28 ` [kvm-unit-tests PATCH v3 06/17] lib: share arm-selftest utility functions Andrew Jones
2016-02-13 16:28 ` [kvm-unit-tests PATCH v3 07/17] config: no need to mix arch makefiles Andrew Jones
2016-02-13 16:28 ` [kvm-unit-tests PATCH v3 08/17] powerpc/ppc64: start skeleton framework Andrew Jones
2016-02-15 7:28 ` Thomas Huth
2016-02-13 16:28 ` [kvm-unit-tests PATCH v3 09/17] powerpc/ppc64: ppc-ify makefiles and linker script Andrew Jones
2016-02-15 7:46 ` Thomas Huth
2016-02-13 16:28 ` [kvm-unit-tests PATCH v3 10/17] powerpc/ppc64: add a boot rom Andrew Jones
2016-02-15 8:00 ` Thomas Huth
2016-02-13 16:28 ` [kvm-unit-tests PATCH v3 11/17] powerpc/ppc64: add hcall support and putchar Andrew Jones
2016-02-14 23:29 ` David Gibson
2016-02-15 8:44 ` Thomas Huth
2016-02-15 8:54 ` Andrew Jones
2016-02-15 8:58 ` Thomas Huth
2016-02-13 16:28 ` [kvm-unit-tests PATCH v3 12/17] powerpc/ppc64: adapt arm's setup Andrew Jones
2016-02-15 9:01 ` Thomas Huth
2016-02-13 16:28 ` [kvm-unit-tests PATCH v3 13/17] powerpc/ppc64: relocate linker VMAs Andrew Jones
2016-02-13 16:28 ` [kvm-unit-tests PATCH v3 14/17] powerpc/ppc64: add run script and unittests.cfg Andrew Jones
2016-02-15 9:36 ` Thomas Huth
2016-02-13 16:28 ` [kvm-unit-tests PATCH v3 15/17] mkstandalone: add support for powerpc Andrew Jones
2016-02-13 16:28 ` [kvm-unit-tests PATCH v3 16/17] powerpc/ppc64: add RTAS support Andrew Jones
2016-02-13 17:18 ` Andrew Jones
2016-02-15 9:59 ` Thomas Huth
2016-02-15 12:00 ` Andrew Jones
2016-02-15 12:15 ` Thomas Huth
2016-02-13 16:28 ` Andrew Jones [this message]
2016-02-15 10:01 ` [kvm-unit-tests PATCH v3 17/17] powerpc/ppc64: make a fake debug-exit Thomas Huth
2016-02-15 10:37 ` [kvm-unit-tests PATCH v3 00/17] ppc64: initial drop Laurent Vivier
2016-02-15 12:08 ` Andrew Jones
2016-02-15 12:12 ` Laurent Vivier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1455380910-30604-18-git-send-email-drjones@redhat.com \
--to=drjones@redhat.com \
--cc=agraf@suse.de \
--cc=david@gibson.dropbear.id.au \
--cc=dgibson@redhat.com \
--cc=kvm-ppc@vger.kernel.org \
--cc=kvm@vger.kernel.org \
--cc=lvivier@redhat.com \
--cc=pbonzini@redhat.com \
--cc=thuth@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).