On Mon, Nov 01, 2021 at 04:08:31PM +0100, BALATON Zoltan wrote: > Suggested-by: Peter Maydell <peter.mayd...@linaro.org> > Signed-off-by: BALATON Zoltan <bala...@eik.bme.hu>
Applied to ppc-for-6.2, thanks.
> ---
> hw/ppc/pegasos2.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/hw/ppc/pegasos2.c b/hw/ppc/pegasos2.c
> index e427ac2fe0..298e6b93e2 100644
> --- a/hw/ppc/pegasos2.c
> +++ b/hw/ppc/pegasos2.c
> @@ -23,6 +23,7 @@
> #include "hw/qdev-properties.h"
> #include "sysemu/reset.h"
> #include "sysemu/runstate.h"
> +#include "sysemu/qtest.h"
> #include "hw/boards.h"
> #include "hw/loader.h"
> #include "hw/fw-path-provider.h"
> @@ -199,7 +200,7 @@ static void pegasos2_init(MachineState *machine)
> if (!pm->vof) {
> warn_report("Option -kernel may be ineffective with -bios.");
> }
> - } else if (pm->vof) {
> + } else if (pm->vof && !qtest_enabled()) {
> warn_report("Using Virtual OpenFirmware but no -kernel option.");
> }
>
--
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
signature.asc
Description: PGP signature
