diff mbox series

[PULL,14/25] ppc/pegasos2: Warn when using VOF but no kernel is specified

Message ID 20211021042027.345405-15-david@gibson.dropbear.id.au
State Superseded
Headers show
Series [PULL,01/25] spapr/xive: Add source status helpers | expand

Commit Message

David Gibson Oct. 21, 2021, 4:20 a.m. UTC 
From: BALATON Zoltan <balaton@eik.bme.hu>

Issue a warning when using VOF (which is the default) but no -kernel
option given to let users know that it will likely fail as the guest
has nothing to run. It is not a hard error because it may still be
useful to start the machine without further options for testing or
inspecting it from monitor without actually booting it.

Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
Message-Id: <a4ec9a900df772b91e9f69ca7a0799d8ae293e5a.1634241019.git.balaton@eik.bme.hu>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
---
 hw/ppc/pegasos2.c | 3 +++
 1 file changed, 3 insertions(+)

Comments

Peter Maydell Nov. 1, 2021, 2:23 p.m. UTC | #1 
On Thu, 21 Oct 2021 at 05:20, David Gibson <david@gibson.dropbear.id.au> wrote:
>
> From: BALATON Zoltan <balaton@eik.bme.hu>
>
> Issue a warning when using VOF (which is the default) but no -kernel
> option given to let users know that it will likely fail as the guest
> has nothing to run. It is not a hard error because it may still be
> useful to start the machine without further options for testing or
> inspecting it from monitor without actually booting it.
>
> Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
> Message-Id: <a4ec9a900df772b91e9f69ca7a0799d8ae293e5a.1634241019.git.balaton@eik.bme.hu>
> Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
> ---
>  hw/ppc/pegasos2.c | 3 +++
>  1 file changed, 3 insertions(+)
>
> diff --git a/hw/ppc/pegasos2.c b/hw/ppc/pegasos2.c
> index 474cfdeabf..a1dd1f6752 100644
> --- a/hw/ppc/pegasos2.c
> +++ b/hw/ppc/pegasos2.c
> @@ -194,7 +194,10 @@ static void pegasos2_init(MachineState *machine)
>          if (!pm->vof) {
>              warn_report("Option -kernel may be ineffective with -bios.");
>          }
> +    } else if (pm->vof) {
> +        warn_report("Using Virtual OpenFirmware but no -kernel option.");
>      }
> +

Hi; this change seems to have introduced new "warning" messages
during "make check":

MALLOC_PERTURB_=${MALLOC_PERTURB_:-$(( ${RANDOM:-0} % 255 + 1))}
QTEST_QEMU_IMG=./qemu-img
G_TEST_DBUS_DAEMON=/home/qemu/qemu-test.3HLBcg/src/test
s/dbus-vmstate-daemon.sh QTEST_QEMU_BINARY=./qemu-system-ppc
tests/qtest/qom-test --tap -k
PASS 1 qtest-ppc/qom-test /ppc/qom/virtex-ml507
PASS 2 qtest-ppc/qom-test /ppc/qom/mac99
PASS 3 qtest-ppc/qom-test /ppc/qom/ppce500
PASS 4 qtest-ppc/qom-test /ppc/qom/sam460ex
qemu-system-ppc: warning: Using Virtual OpenFirmware but no -kernel option.
PASS 5 qtest-ppc/qom-test /ppc/qom/pegasos2
PASS 6 qtest-ppc/qom-test /ppc/qom/none
PASS 7 qtest-ppc/qom-test /ppc/qom/bamboo
PASS 8 qtest-ppc/qom-test /ppc/qom/40p
PASS 9 qtest-ppc/qom-test /ppc/qom/ref405ep
PASS 10 qtest-ppc/qom-test /ppc/qom/g3beige
PASS 11 qtest-ppc/qom-test /ppc/qom/mpc8544ds
PASS 12 qtest-ppc/qom-test /ppc/qom/taihu

(similarly for ppc64).

Could we suppress it for qtest tests, please?

thanks
-- PMM
diff mbox series

Patch

diff --git a/hw/ppc/pegasos2.c b/hw/ppc/pegasos2.c
index 474cfdeabf..a1dd1f6752 100644
--- a/hw/ppc/pegasos2.c
+++ b/hw/ppc/pegasos2.c
@@ -194,7 +194,10 @@  static void pegasos2_init(MachineState *machine)
         if (!pm->vof) {
             warn_report("Option -kernel may be ineffective with -bios.");
         }
+    } else if (pm->vof) {
+        warn_report("Using Virtual OpenFirmware but no -kernel option.");
     }
+
     if (!pm->vof && machine->kernel_cmdline && machine->kernel_cmdline[0]) {
         warn_report("Option -append may be ineffective with -bios.");
     }