diff options
| author | Peter Maydell | 2018-02-06 15:21:40 +0100 |
|---|---|---|
| committer | Peter Maydell | 2018-02-06 15:21:41 +0100 |
| commit | 20e0d439a6ded635ec89f6135c08cd5541c68962 (patch) | |
| tree | d0aa6765c85d66876f3719276f46878dd065efb5 /tests/boot-serial-test.c | |
| parent | Merge remote-tracking branch 'remotes/stefanberger/tags/pull-tpm-2018-02-03-1... (diff) | |
| parent | roms/seabios-hppa: Update submodule and image (diff) | |
| download | qemu-20e0d439a6ded635ec89f6135c08cd5541c68962.tar.gz qemu-20e0d439a6ded635ec89f6135c08cd5541c68962.tar.xz qemu-20e0d439a6ded635ec89f6135c08cd5541c68962.zip | |
Merge remote-tracking branch 'remotes/rth/tags/pull-hppa-20180204' into staging
hppa-softmmu update
# gpg: Signature made Sun 04 Feb 2018 22:20:40 GMT
# gpg: using RSA key 64DF38E8AF7E215F
# gpg: Good signature from "Richard Henderson <richard.henderson@linaro.org>"
# Primary key fingerprint: 7A48 1E78 868B 4DB6 A85A 05C0 64DF 38E8 AF7E 215F
* remotes/rth/tags/pull-hppa-20180204:
roms/seabios-hppa: Update submodule and image
tests: Enable boot-serial-test for hppa
hw/hppa: Use qemu_log_mask instead of fprintf to stderr
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests/boot-serial-test.c')
| -rw-r--r-- | tests/boot-serial-test.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/boot-serial-test.c b/tests/boot-serial-test.c index 418c5b92dc..ea87a80be7 100644 --- a/tests/boot-serial-test.c +++ b/tests/boot-serial-test.c @@ -87,6 +87,7 @@ static testdef_t tests[] = { sizeof(kernel_plml605), kernel_plml605 }, { "moxie", "moxiesim", "", "TT", sizeof(bios_moxiesim), 0, bios_moxiesim }, { "arm", "raspi2", "", "TT", sizeof(bios_raspi2), 0, bios_raspi2 }, + { "hppa", "hppa", "", "SeaBIOS wants SYSTEM HALT" }, { NULL } }; |