From 567c88c354904d669dfac6170b8ac5f60b41d9bd Mon Sep 17 00:00:00 2001 From: Cornelia Huck Date: Thu, 12 Nov 2015 16:46:09 +0100 Subject: [PATCH] s390x: no deprecation warning while testing 'make check' tries to start all available machines; the deprecation message for the s390-virtio machine is both useless and annoying there. Silence it while testing. Reported-by: Michael S. Tsirkin Signed-off-by: Cornelia Huck Acked-by: Christian Borntraeger Acked-by: Michael S. Tsirkin --- hw/s390x/s390-virtio.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/hw/s390x/s390-virtio.c b/hw/s390x/s390-virtio.c index 51dc0a8aafac..ae55760d64c3 100644 --- a/hw/s390x/s390-virtio.c +++ b/hw/s390x/s390-virtio.c @@ -33,6 +33,7 @@ #include "hw/virtio/virtio.h" #include "sysemu/kvm.h" #include "exec/address-spaces.h" +#include "sysemu/qtest.h" #include "hw/s390x/s390-virtio-bus.h" #include "hw/s390x/sclp.h" @@ -268,9 +269,11 @@ static void s390_init(MachineState *machine) hwaddr virtio_region_len; hwaddr virtio_region_start; - error_printf("WARNING\n" - "The s390-virtio machine (non-ccw) is deprecated.\n" - "It will be removed in 2.6. Please use s390-ccw-virtio\n"); + if (!qtest_enabled()) { + error_printf("WARNING\n" + "The s390-virtio machine (non-ccw) is deprecated.\n" + "It will be removed in 2.6. Please use s390-ccw-virtio\n"); + } if (machine->ram_slots) { error_report("Memory hotplug not supported by the selected machine.");