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

[David Gibson <david@gibson.dropbear.id.au>]

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

On Sat, Feb 01, 2020 at 11:46:16PM +0100, 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
> warnings. And use it in the various tests that start pseries machines.
> 
> Signed-off-by: Greg Kurz <groug@kaod.org>

Applied to ppc-for-5.0.

> ---
> 
> 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 */
> +#define PSERIES_DEFAULT_CAPABILITIES             \
> +    "cap-cfpc=broken,"                           \
> +    "cap-sbbc=broken,"                           \
> +    "cap-ibs=broken,"                            \
> +    "cap-ccf-assist=off,"                        \
> +    "cap-fwnmi-mce=off"
> +
>  #endif
> diff --git a/tests/qtest/prom-env-test.c b/tests/qtest/prom-env-test.c
> index 9be52c766fe3..60e6ec315335 100644
> --- a/tests/qtest/prom-env-test.c
> +++ b/tests/qtest/prom-env-test.c
> @@ -21,6 +21,7 @@
>  
>  #include "qemu/osdep.h"
>  #include "libqtest.h"
> +#include "libqos/libqos-spapr.h"
>  
>  #define MAGIC   0xcafec0de
>  #define ADDRESS 0x4000
> @@ -54,7 +55,7 @@ static void test_machine(const void *machine)
>       */
>      if (strcmp(machine, "pseries") == 0) {
>          extra_args = "-nodefaults"
> -            " -machine cap-cfpc=broken,cap-sbbc=broken,cap-ibs=broken";
> +            " -machine " PSERIES_DEFAULT_CAPABILITIES;
>      }
>  
>      qts = qtest_initf("-M %s -accel tcg %s -prom-env 'use-nvramrc?=true' "
> diff --git a/tests/qtest/pxe-test.c b/tests/qtest/pxe-test.c
> index f68d0aadbb4d..1161a773a4a7 100644
> --- a/tests/qtest/pxe-test.c
> +++ b/tests/qtest/pxe-test.c
> @@ -17,6 +17,7 @@
>  #include "qemu-common.h"
>  #include "libqtest.h"
>  #include "boot-sector.h"
> +#include "libqos/libqos-spapr.h"
>  
>  #define NETNAME "net0"
>  
> @@ -46,15 +47,15 @@ static testdef_t x86_tests_slow[] = {
>  
>  static testdef_t ppc64_tests[] = {
>      { "pseries", "spapr-vlan",
> -      "-machine cap-cfpc=broken,cap-sbbc=broken,cap-ibs=broken,vsmt=8" },
> +      "-machine vsmt=8," PSERIES_DEFAULT_CAPABILITIES },
>      { "pseries", "virtio-net-pci",
> -      "-machine cap-cfpc=broken,cap-sbbc=broken,cap-ibs=broken,vsmt=8" },
> +      "-machine vsmt=8," PSERIES_DEFAULT_CAPABILITIES },
>      { NULL },
>  };
>  
>  static testdef_t ppc64_tests_slow[] = {
>      { "pseries", "e1000",
> -      "-machine cap-cfpc=broken,cap-sbbc=broken,cap-ibs=broken,vsmt=8" },
> +      "-machine vsmt=8," PSERIES_DEFAULT_CAPABILITIES },
>      { NULL },
>  };
>  
> 

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