Commit 567c88c3 authored by Cornelia Huck's avatar Cornelia Huck
Browse files

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: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
Acked-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
Acked-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent 07af4c53

hw/s390x/s390-virtio.c

+6 −3
Original line number Diff line number Diff line
@@ -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;



    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.");