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, rkrcmar@redhat.com
Subject: [kvm-unit-tests PATCH v5 18/18] powerpc/ppc64: make a fake debug-exit
Date: Wed, 17 Feb 2016 19:40:59 +0100 [thread overview]
Message-ID: <1455734459-31902-19-git-send-email-drjones@redhat.com> (raw)
In-Reply-To: <1455734459-31902-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>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Tested-by: Laurent Vivier <lvivier@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 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
--
2.4.3
next prev parent reply other threads:[~2016-02-17 18:41 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-17 18:40 [kvm-unit-tests PATCH v5 00/18] ppc64: initial drop Andrew Jones
2016-02-17 18:40 ` [kvm-unit-tests PATCH v5 01/18] arm/arm64: trivial: another assert fix Andrew Jones
2016-02-17 18:40 ` [kvm-unit-tests PATCH v5 02/18] Makefile: cscope: also look in arch shared asm Andrew Jones
2016-02-18 2:36 ` David Gibson
2016-02-17 18:40 ` [kvm-unit-tests PATCH v5 03/18] lib: asm-generic: add missing casts Andrew Jones
2016-02-17 18:40 ` [kvm-unit-tests PATCH v5 04/18] devicetree: fix dt_get_memory_params Andrew Jones
2016-02-17 18:40 ` [kvm-unit-tests PATCH v5 05/18] arm/arm64: setup improvements Andrew Jones
2016-02-17 18:40 ` [kvm-unit-tests PATCH v5 06/18] lib: add vprintf Andrew Jones
2016-02-18 2:44 ` David Gibson
2016-02-18 6:34 ` Thomas Huth
2016-02-18 10:21 ` Andrew Jones
2016-02-17 18:40 ` [kvm-unit-tests PATCH v5 07/18] lib: share arm-selftest utility functions Andrew Jones
2016-02-17 18:40 ` [kvm-unit-tests PATCH v5 08/18] config: no need to mix arch makefiles Andrew Jones
2016-02-17 18:40 ` [kvm-unit-tests PATCH v5 09/18] powerpc/ppc64: start skeleton framework Andrew Jones
2016-02-19 2:11 ` David Gibson
2016-02-17 18:40 ` [kvm-unit-tests PATCH v5 10/18] powerpc/ppc64: ppc-ify makefiles and linker script Andrew Jones
2016-02-17 18:40 ` [kvm-unit-tests PATCH v5 11/18] powerpc/ppc64: add a boot rom Andrew Jones
2016-02-17 18:40 ` [kvm-unit-tests PATCH v5 12/18] powerpc/ppc64: add hcall support and putchar Andrew Jones
2016-02-19 3:10 ` David Gibson
2016-02-17 18:40 ` [kvm-unit-tests PATCH v5 13/18] powerpc/ppc64: adapt arm's setup Andrew Jones
2016-02-19 3:40 ` David Gibson
2016-02-19 7:49 ` Andrew Jones
2016-02-22 1:00 ` David Gibson
2016-02-17 18:40 ` [kvm-unit-tests PATCH v5 14/18] powerpc/ppc64: relocate linker VMAs Andrew Jones
2016-02-17 18:40 ` [kvm-unit-tests PATCH v5 15/18] powerpc/ppc64: add run script and unittests.cfg Andrew Jones
2016-02-19 3:43 ` David Gibson
2016-02-17 18:40 ` [kvm-unit-tests PATCH v5 16/18] mkstandalone: add support for powerpc Andrew Jones
2016-02-18 14:51 ` Radim Krčmář
2016-02-19 3:53 ` David Gibson
2016-02-17 18:40 ` [kvm-unit-tests PATCH v5 17/18] powerpc/ppc64: add RTAS support Andrew Jones
2016-02-19 4:08 ` David Gibson
2016-02-19 7:52 ` Andrew Jones
2016-02-17 18:40 ` Andrew Jones [this message]
2016-02-19 4:12 ` [kvm-unit-tests PATCH v5 18/18] powerpc/ppc64: make a fake debug-exit David Gibson
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=1455734459-31902-19-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=rkrcmar@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).