From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59425) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a2GwT-0005wp-NS for qemu-devel@nongnu.org; Fri, 27 Nov 2015 06:11:54 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a2GwP-0006yD-Oc for qemu-devel@nongnu.org; Fri, 27 Nov 2015 06:11:53 -0500 Received: from e06smtp16.uk.ibm.com ([195.75.94.112]:43094) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a2GwP-0006y2-E6 for qemu-devel@nongnu.org; Fri, 27 Nov 2015 06:11:49 -0500 Received: from localhost by e06smtp16.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 27 Nov 2015 11:11:46 -0000 Received: from b06cxnps4074.portsmouth.uk.ibm.com (d06relay11.portsmouth.uk.ibm.com [9.149.109.196]) by d06dlp03.portsmouth.uk.ibm.com (Postfix) with ESMTP id EC4421B0806B for ; Fri, 27 Nov 2015 11:12:07 +0000 (GMT) Received: from d06av07.portsmouth.uk.ibm.com (d06av07.portsmouth.uk.ibm.com [9.149.37.248]) by b06cxnps4074.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id tARBBhLf9961802 for ; Fri, 27 Nov 2015 11:11:44 GMT Received: from d06av07.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av07.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id tARBBhUM025304 for ; Fri, 27 Nov 2015 04:11:43 -0700 References: <1448618826-29546-1-git-send-email-cornelia.huck@de.ibm.com> <1448618826-29546-4-git-send-email-cornelia.huck@de.ibm.com> From: Christian Borntraeger Message-ID: <56583A6E.2020404@de.ibm.com> Date: Fri, 27 Nov 2015 12:11:42 +0100 MIME-Version: 1.0 In-Reply-To: <1448618826-29546-4-git-send-email-cornelia.huck@de.ibm.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH for-2.5 3/4] s390x: no deprecation warning while testing List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Cornelia Huck , qemu-devel@nongnu.org Cc: jfrei@linux.vnet.ibm.com, agraf@suse.de On 11/27/2015 11:07 AM, Cornelia Huck wrote: > '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 > --- > 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 51dc0a8..ae55760 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."); >