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 v2 14/14] powerpc/ppc64: HACK: make a fake debug-exit
Date: Mon, 8 Feb 2016 19:53:14 +0100 [thread overview]
Message-ID: <1454957594-30601-15-git-send-email-drjones@redhat.com> (raw)
In-Reply-To: <1454957594-30601-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..276eb4c0ebd41 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 4509429f9712b..7247e167e2ac6 100755
--- a/powerpc/run
+++ b/powerpc/run
@@ -51,7 +51,10 @@ command="$qemu $M -bios $boot_rom"
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-08 18:53 UTC|newest]
Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-08 18:53 [kvm-unit-tests PATCH v2 00/14] ppc64: initial drop Andrew Jones
2016-02-08 18:53 ` [kvm-unit-tests PATCH v2 01/14] lib: asm-generic: add missing casts Andrew Jones
2016-02-12 12:05 ` Thomas Huth
2016-02-12 13:58 ` Andrew Jones
2016-02-08 18:53 ` [kvm-unit-tests PATCH v2 02/14] lib: share arm-selftest utility functions Andrew Jones
2016-02-12 12:40 ` Thomas Huth
2016-02-08 18:53 ` [kvm-unit-tests PATCH v2 03/14] config: no need to mix arch makefiles Andrew Jones
2016-02-08 18:53 ` [kvm-unit-tests PATCH v2 04/14] powerpc/ppc64: start skeleton framework Andrew Jones
2016-02-08 18:53 ` [kvm-unit-tests PATCH v2 05/14] powerpc/pp64: ppc-ify makefiles and linker script Andrew Jones
2016-02-09 17:54 ` [kvm-unit-tests PATCH] align toc to 256 bytes Andrew Jones
2016-02-08 18:53 ` [kvm-unit-tests PATCH v2 06/14] powerpc/ppc64: add boot rom source Andrew Jones
2016-02-12 6:27 ` Thomas Huth
2016-02-12 10:07 ` Andrew Jones
2016-02-08 18:53 ` [kvm-unit-tests PATCH v2 07/14] powerpc/ppc64: add bootloader to bounce into memory Andrew Jones
2016-02-08 18:53 ` [kvm-unit-tests PATCH v2 08/14] powerpc/ppc64: add HV putchar Andrew Jones
2016-02-12 17:08 ` Thomas Huth
2016-02-12 17:45 ` Thomas Huth
2016-02-08 18:53 ` [kvm-unit-tests PATCH v2 09/14] powerpc/ppc64: adapt arm's setup Andrew Jones
2016-02-12 11:50 ` Thomas Huth
2016-02-12 13:59 ` Andrew Jones
2016-02-08 18:53 ` [kvm-unit-tests PATCH v2 10/14] powerpc/ppc64: relocate linker VMAs Andrew Jones
2016-02-08 18:53 ` [kvm-unit-tests PATCH v2 11/14] powerpc/ppc64: add run script and unittests.cfg Andrew Jones
2016-02-08 18:53 ` [kvm-unit-tests PATCH v2 12/14] mkstandalone: add support for powerpc Andrew Jones
2016-02-08 18:53 ` [kvm-unit-tests PATCH v2 13/14] powerpc/ppc64: add RTAS support Andrew Jones
2016-02-12 17:51 ` Thomas Huth
2016-02-08 18:53 ` Andrew Jones [this message]
2016-02-12 18:07 ` [kvm-unit-tests PATCH v2 14/14] powerpc/ppc64: HACK: make a fake debug-exit Thomas Huth
2016-02-12 22:50 ` Paolo Bonzini
2016-02-09 17:49 ` [kvm-unit-tests PATCH v2 00/14] ppc64: initial drop Andrew Jones
2016-02-10 14:27 ` Paolo Bonzini
2016-02-11 11:56 ` Andrew Jones
2016-02-11 12:36 ` Paolo Bonzini
2016-02-11 13:36 ` Laurent Vivier
2016-02-11 15:29 ` Andrew Jones
2016-02-11 16:44 ` Laurent Vivier
2016-02-11 17:22 ` Andrew Jones
2016-02-11 17:47 ` Laurent Vivier
2016-02-12 10:06 ` Andrew Jones
2016-02-12 10:31 ` Laurent Vivier
2016-02-12 10:57 ` Andrew Jones
2016-02-12 13:44 ` Andrew Jones
2016-02-14 22:43 ` 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=1454957594-30601-15-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).