Re: [PATCH] tests: Silent various warnings with pseries

[BALATON Zoltan]

On Sun, 2 Feb 2020, BALATON Zoltan wrote:
> On Sat, 1 Feb 2020, Greg Kurz wrote:
> > Some default features of the pseries machine are only available with
> > KVM. Warnings are printed when the pseries machine is used with another
> > accelerator:
> >
> > qemu-system-ppc64: warning: TCG doesn't support requested feature,
> > cap-ccf-assist=on
> > qemu-system-ppc64: warning: Firmware Assisted Non-Maskable
> > Interrupts(FWNMI) not supported in TCG
> > qemu-system-ppc64: warning: TCG doesn't support requested feature,
> > cap-ccf-assist=on
> > qemu-system-ppc64: warning: Firmware Assisted Non-Maskable
> > Interrupts(FWNMI) not supported in TCG
> > qemu-system-ppc64: warning: TCG doesn't support requested feature,
> > cap-ccf-assist=on
> > qemu-system-ppc64: warning: Firmware Assisted Non-Maskable
> > Interrupts(FWNMI) not supported in TCG
> >
> > This is annoying for CI since it usually runs without KVM. We already
> > disable features that emit similar warnings thanks to properties of the
> > pseries machine, but this is open-coded in various places. Consolidate
> > the set of properties in a single place. Extend it to silent the above

Actually at least 3 places:
- In commit title,
- the line in commit message above,
- and in comment below
where typo exists.

Regards,
BALATON Zoltan

> > warnings. And use it in the various tests that start pseries machines.
> >
> > Signed-off-by: Greg Kurz <address@hidden>
> > ---
> >
> > This patch fixes the warnings observed with David's latest pull request.
> >
> > tests/qtest/boot-serial-test.c    |    3 ++-
> > tests/qtest/libqos/libqos-spapr.h |    8 ++++++++
> > tests/qtest/prom-env-test.c       |    3 ++-
> > tests/qtest/pxe-test.c            |    7 ++++---
> > 4 files changed, 16 insertions(+), 5 deletions(-)
> >
> > diff --git a/tests/qtest/boot-serial-test.c 
> > b/tests/qtest/boot-serial-test.c
> > index 8e8c5b0a0f0c..85a361428697 100644
> > --- a/tests/qtest/boot-serial-test.c
> > +++ b/tests/qtest/boot-serial-test.c
> > @@ -15,6 +15,7 @@
> >
> > #include "qemu/osdep.h"
> > #include "libqtest.h"
> > +#include "libqos/libqos-spapr.h"
> >
> > static const uint8_t kernel_mcf5208[] = {
> >     0x41, 0xf9, 0xfc, 0x06, 0x00, 0x00,     /* lea 0xfc060000,%a0 */
> > @@ -112,7 +113,7 @@ static testdef_t tests[] = {
> >     { "ppc64", "40p", "-m 192", "Memory: 192M" },
> >     { "ppc64", "mac99", "", "PowerPC,970FX" },
> >     { "ppc64", "pseries",
> > -      "-machine cap-cfpc=broken,cap-sbbc=broken,cap-ibs=broken",
> > +      "-machine " PSERIES_DEFAULT_CAPABILITIES,
> >       "Open Firmware" },
> >     { "ppc64", "powernv8", "", "OPAL" },
> >     { "ppc64", "powernv9", "", "OPAL" },
> > diff --git a/tests/qtest/libqos/libqos-spapr.h 
> > b/tests/qtest/libqos/libqos-spapr.h
> > index dcb5c43ad37d..e4460d08ae6e 100644
> > --- a/tests/qtest/libqos/libqos-spapr.h
> > +++ b/tests/qtest/libqos/libqos-spapr.h
> > @@ -7,4 +7,12 @@ QOSState *qtest_spapr_vboot(const char *cmdline_fmt, 
> > va_list ap);
> > QOSState *qtest_spapr_boot(const char *cmdline_fmt, ...);
> > void qtest_spapr_shutdown(QOSState *qs);
> >
> > +/* List of capabilities needed to silent warnings with TCG */
>
> Typo: I think it should be "to silence warnings" both here and in commit 
> message.
>
> Regards,
> BALATON Zoltan