diff options
| author | Cornelia Huck <cornelia.huck@de.ibm.com> | 2015-11-12 16:46:09 +0100 |
|---|---|---|
| committer | Cornelia Huck <cornelia.huck@de.ibm.com> | 2015-12-01 09:57:27 +0100 |
| commit | 567c88c354904d669dfac6170b8ac5f60b41d9bd (patch) | |
| tree | 1ee5dcb37a47835c3de7f57de517cabf2250000b | |
| parent | 07af4c53a5cafba31853d2c9188b0668ae9f53b7 (diff) | |
| download | qemu-567c88c354904d669dfac6170b8ac5f60b41d9bd.tar.gz qemu-567c88c354904d669dfac6170b8ac5f60b41d9bd.tar.bz2 qemu-567c88c354904d669dfac6170b8ac5f60b41d9bd.zip | |
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 <mst@redhat.com>
Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>
Acked-by: Christian Borntraeger <borntraeger@de.ibm.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
| -rw-r--r-- | hw/s390x/s390-virtio.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/hw/s390x/s390-virtio.c b/hw/s390x/s390-virtio.c index 51dc0a8aaf..ae55760d64 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."); |