tests/boot-serial-test: fix powernv support

[Qemu-devel] [PATCH] tests/boot-serial-test: fix powernv support

Cédric Le Goater posted 1 patch 6 years, 3 months ago

Download mbox

Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20180115122417.15871-1-clg@kaod.org

Test checkpatch passed

Test docker passed

Test ppc passed

Test s390x passed

tests/boot-serial-test.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

Expand all Fold all

[Qemu-devel] [PATCH] tests/boot-serial-test: fix powernv support

Posted by Cédric Le Goater 6 years, 3 months ago

Recent commit introduced the firmware image skiboot 5.9 which
has a different first line ouput.

Signed-off-by: Cédric Le Goater <clg@kaod.org>
---
 tests/boot-serial-test.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/boot-serial-test.c b/tests/boot-serial-test.c
index dd3828c49b38..0a848a1eeb6f 100644
--- a/tests/boot-serial-test.c
+++ b/tests/boot-serial-test.c
@@ -41,7 +41,7 @@ static testdef_t tests[] = {
     { "ppc64", "ppce500", "", "U-Boot" },
     { "ppc64", "prep", "", "Open Hack'Ware BIOS" },
     { "ppc64", "pseries", "", "Open Firmware" },
-    { "ppc64", "powernv", "-cpu POWER8", "SkiBoot" },
+    { "ppc64", "powernv", "-cpu POWER8", "OPAL" },
     { "i386", "isapc", "-cpu qemu32 -device sga", "SGABIOS" },
     { "i386", "pc", "-device sga", "SGABIOS" },
     { "i386", "q35", "-device sga", "SGABIOS" },
-- 
2.13.6

Re: [Qemu-devel] [PATCH] tests/boot-serial-test: fix powernv support

Posted by David Gibson 6 years, 3 months ago

On Mon, Jan 15, 2018 at 01:24:17PM +0100, Cédric Le Goater wrote:
> Recent commit introduced the firmware image skiboot 5.9 which
> has a different first line ouput.
> 
> Signed-off-by: Cédric Le Goater <clg@kaod.org>

Applied to ppc-for-2.12.

> ---
>  tests/boot-serial-test.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tests/boot-serial-test.c b/tests/boot-serial-test.c
> index dd3828c49b38..0a848a1eeb6f 100644
> --- a/tests/boot-serial-test.c
> +++ b/tests/boot-serial-test.c
> @@ -41,7 +41,7 @@ static testdef_t tests[] = {
>      { "ppc64", "ppce500", "", "U-Boot" },
>      { "ppc64", "prep", "", "Open Hack'Ware BIOS" },
>      { "ppc64", "pseries", "", "Open Firmware" },
> -    { "ppc64", "powernv", "-cpu POWER8", "SkiBoot" },
> +    { "ppc64", "powernv", "-cpu POWER8", "OPAL" },
>      { "i386", "isapc", "-cpu qemu32 -device sga", "SGABIOS" },
>      { "i386", "pc", "-device sga", "SGABIOS" },
>      { "i386", "q35", "-device sga", "SGABIOS" },

-- 
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson