qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] ppc/pegasos2: Suppress warning when qtest enabled
@ 2021-11-01 15:08 BALATON Zoltan
  2021-11-01 17:52 ` Richard Henderson
  2021-11-03  0:18 ` David Gibson
  0 siblings, 2 replies; 3+ messages in thread
From: BALATON Zoltan @ 2021-11-01 15:08 UTC (permalink / raw)
  To: qemu-devel, qemu-ppc; +Cc: Peter Maydell, David Gibson

Suggested-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
---
 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.");
     }
 
-- 
2.21.4



^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH] ppc/pegasos2: Suppress warning when qtest enabled
  2021-11-01 15:08 [PATCH] ppc/pegasos2: Suppress warning when qtest enabled BALATON Zoltan
@ 2021-11-01 17:52 ` Richard Henderson
  2021-11-03  0:18 ` David Gibson
  1 sibling, 0 replies; 3+ messages in thread
From: Richard Henderson @ 2021-11-01 17:52 UTC (permalink / raw)
  To: BALATON Zoltan, qemu-devel, qemu-ppc; +Cc: Peter Maydell, David Gibson

On 11/1/21 11:08 AM, BALATON Zoltan wrote:
> Suggested-by: Peter Maydell<peter.maydell@linaro.org>
> Signed-off-by: BALATON Zoltan<balaton@eik.bme.hu>
> ---
>   hw/ppc/pegasos2.c | 3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>

r~


^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] ppc/pegasos2: Suppress warning when qtest enabled
  2021-11-01 15:08 [PATCH] ppc/pegasos2: Suppress warning when qtest enabled BALATON Zoltan
  2021-11-01 17:52 ` Richard Henderson
@ 2021-11-03  0:18 ` David Gibson
  1 sibling, 0 replies; 3+ messages in thread
From: David Gibson @ 2021-11-03  0:18 UTC (permalink / raw)
  To: BALATON Zoltan; +Cc: Peter Maydell, qemu-ppc, qemu-devel

[-- Attachment #1: Type: text/plain, Size: 1255 bytes --]

On Mon, Nov 01, 2021 at 04:08:31PM +0100, BALATON Zoltan wrote:
> Suggested-by: Peter Maydell <peter.maydell@linaro.org>
> Signed-off-by: BALATON Zoltan <balaton@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

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2021-11-03  0:21 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-11-01 15:08 [PATCH] ppc/pegasos2: Suppress warning when qtest enabled BALATON Zoltan
2021-11-01 17:52 ` Richard Henderson
2021-11-03  0:18 ` David Gibson

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).