tests/boot-serial: Check the 40p machine, too

[Qemu-devel] [PATCH] tests/boot-serial: Check the 40p machine, too

Posted by Thomas Huth 7 years, 11 months ago

The "40p" machine is using the Open Hack'Ware BIOS, just like the "prep"
machine, so we can test it accordingly with the boot-serial tester, too.
While we're at it, also change the strings that we are using for the
"prep" machine, so that this test now also checks some CLI parameters.

Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 NB: The 40p machine is currently broken - when the emulator is quit,
 there is a rcu_read_unlock assertion message printed out. This test
 here succeeds anyway since the qtest framework does not care about
 errors in the shutdown path yet.

 tests/boot-serial-test.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tests/boot-serial-test.c b/tests/boot-serial-test.c
index ece25c6..5b24cd2 100644
--- a/tests/boot-serial-test.c
+++ b/tests/boot-serial-test.c
@@ -75,11 +75,13 @@ typedef struct testdef {
 static testdef_t tests[] = {
     { "alpha", "clipper", "", "PCI:" },
     { "ppc", "ppce500", "", "U-Boot" },
-    { "ppc", "prep", "", "Open Hack'Ware BIOS" },
+    { "ppc", "prep", "-m 96", "Memory size: 96 MB" },
+    { "ppc", "40p", "-boot d", "Booting from device d" },
     { "ppc", "g3beige", "", "PowerPC,750" },
     { "ppc", "mac99", "", "PowerPC,G4" },
     { "ppc64", "ppce500", "", "U-Boot" },
-    { "ppc64", "prep", "", "Open Hack'Ware BIOS" },
+    { "ppc64", "prep", "-boot e", "Booting from device e" },
+    { "ppc64", "40p", "-m 192", "Memory size: 192 MB" },
     { "ppc64", "mac99", "", "PowerPC,970FX" },
     { "ppc64", "pseries", "", "Open Firmware" },
     { "ppc64", "powernv", "-cpu POWER8", "OPAL" },
-- 
1.8.3.1

Re: [Qemu-devel] [PATCH] tests/boot-serial: Check the 40p machine, too

Posted by Hervé Poussineau 7 years, 11 months ago

Le 07/03/2018 à 13:15, Thomas Huth a écrit :
> The "40p" machine is using the Open Hack'Ware BIOS, just like the "prep"
> machine, so we can test it accordingly with the boot-serial tester, too.
> While we're at it, also change the strings that we are using for the
> "prep" machine, so that this test now also checks some CLI parameters.
> 
> Signed-off-by: Thomas Huth <thuth@redhat.com>

Reviewed-by: Hervé Poussineau <hpoussin@reactos.org>

> ---
>   NB: The 40p machine is currently broken - when the emulator is quit,
>   there is a rcu_read_unlock assertion message printed out. This test
>   here succeeds anyway since the qtest framework does not care about
>   errors in the shutdown path yet.
> 
>   tests/boot-serial-test.c | 6 ++++--
>   1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/tests/boot-serial-test.c b/tests/boot-serial-test.c
> index ece25c6..5b24cd2 100644
> --- a/tests/boot-serial-test.c
> +++ b/tests/boot-serial-test.c
> @@ -75,11 +75,13 @@ typedef struct testdef {
>   static testdef_t tests[] = {
>       { "alpha", "clipper", "", "PCI:" },
>       { "ppc", "ppce500", "", "U-Boot" },
> -    { "ppc", "prep", "", "Open Hack'Ware BIOS" },
> +    { "ppc", "prep", "-m 96", "Memory size: 96 MB" },
> +    { "ppc", "40p", "-boot d", "Booting from device d" },
>       { "ppc", "g3beige", "", "PowerPC,750" },
>       { "ppc", "mac99", "", "PowerPC,G4" },
>       { "ppc64", "ppce500", "", "U-Boot" },
> -    { "ppc64", "prep", "", "Open Hack'Ware BIOS" },
> +    { "ppc64", "prep", "-boot e", "Booting from device e" },
> +    { "ppc64", "40p", "-m 192", "Memory size: 192 MB" },
>       { "ppc64", "mac99", "", "PowerPC,970FX" },
>       { "ppc64", "pseries", "", "Open Firmware" },
>       { "ppc64", "powernv", "-cpu POWER8", "OPAL" },
>

Re: [Qemu-devel] [PATCH] tests/boot-serial: Check the 40p machine, too

Posted by David Gibson 7 years, 11 months ago

On Wed, Mar 07, 2018 at 01:15:15PM +0100, Thomas Huth wrote:
> The "40p" machine is using the Open Hack'Ware BIOS, just like the "prep"
> machine, so we can test it accordingly with the boot-serial tester, too.
> While we're at it, also change the strings that we are using for the
> "prep" machine, so that this test now also checks some CLI parameters.
> 
> Signed-off-by: Thomas Huth <thuth@redhat.com>

Applied, thanks.

> ---
>  NB: The 40p machine is currently broken - when the emulator is quit,
>  there is a rcu_read_unlock assertion message printed out. This test
>  here succeeds anyway since the qtest framework does not care about
>  errors in the shutdown path yet.
> 
>  tests/boot-serial-test.c | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/tests/boot-serial-test.c b/tests/boot-serial-test.c
> index ece25c6..5b24cd2 100644
> --- a/tests/boot-serial-test.c
> +++ b/tests/boot-serial-test.c
> @@ -75,11 +75,13 @@ typedef struct testdef {
>  static testdef_t tests[] = {
>      { "alpha", "clipper", "", "PCI:" },
>      { "ppc", "ppce500", "", "U-Boot" },
> -    { "ppc", "prep", "", "Open Hack'Ware BIOS" },
> +    { "ppc", "prep", "-m 96", "Memory size: 96 MB" },
> +    { "ppc", "40p", "-boot d", "Booting from device d" },
>      { "ppc", "g3beige", "", "PowerPC,750" },
>      { "ppc", "mac99", "", "PowerPC,G4" },
>      { "ppc64", "ppce500", "", "U-Boot" },
> -    { "ppc64", "prep", "", "Open Hack'Ware BIOS" },
> +    { "ppc64", "prep", "-boot e", "Booting from device e" },
> +    { "ppc64", "40p", "-m 192", "Memory size: 192 MB" },
>      { "ppc64", "mac99", "", "PowerPC,970FX" },
>      { "ppc64", "pseries", "", "Open Firmware" },
>      { "ppc64", "powernv", "-cpu POWER8", "OPAL" },

-- 
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