From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:4830:134:3::10]:41243)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mst@redhat.com>) id 1a3Mxz-0000Fw-VE
	for qemu-devel@nongnu.org; Mon, 30 Nov 2015 06:50:00 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <mst@redhat.com>) id 1a3Mxu-0001jf-9v
	for qemu-devel@nongnu.org; Mon, 30 Nov 2015 06:49:57 -0500
Received: from mx1.redhat.com ([209.132.183.28]:48436)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mst@redhat.com>) id 1a3Mxu-0001jX-4s
	for qemu-devel@nongnu.org; Mon, 30 Nov 2015 06:49:54 -0500
Date: Mon, 30 Nov 2015 13:49:51 +0200
From: "Michael S. Tsirkin" <mst@redhat.com>
Message-ID: <20151130134907-mutt-send-email-mst@redhat.com>
References: <1448618826-29546-1-git-send-email-cornelia.huck@de.ibm.com>
	<1448618826-29546-4-git-send-email-cornelia.huck@de.ibm.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <1448618826-29546-4-git-send-email-cornelia.huck@de.ibm.com>
Subject: Re: [Qemu-devel] [PATCH for-2.5 3/4] s390x: no deprecation warning
	while testing
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Cornelia Huck <cornelia.huck@de.ibm.com>
Cc: borntraeger@de.ibm.com, jfrei@linux.vnet.ibm.com, qemu-devel@nongnu.org, agraf@suse.de

On Fri, Nov 27, 2015 at 11:07:05AM +0100, 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 <mst@redhat.com>
> Signed-off-by: Cornelia Huck <cornelia.huck@de.ibm.com>

Acked-by: Michael S. Tsirkin <mst@redhat.com>

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