From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1NfwSH-0004Z6-AB
	for qemu-devel@nongnu.org; Fri, 12 Feb 2010 09:25:13 -0500
Received: from [199.232.76.173] (port=55715 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1NfwSG-0004Yl-Vb
	for qemu-devel@nongnu.org; Fri, 12 Feb 2010 09:25:13 -0500
Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim
	4.60) (envelope-from <amit.shah@redhat.com>) id 1NfwSF-0002dI-FH
	for qemu-devel@nongnu.org; Fri, 12 Feb 2010 09:25:12 -0500
Received: from mx20.gnu.org ([199.232.41.8]:59436)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <amit.shah@redhat.com>)
	id 1NfwSF-0002bI-1T
	for qemu-devel@nongnu.org; Fri, 12 Feb 2010 09:25:11 -0500
Received: from mx1.redhat.com ([209.132.183.28])
	by mx20.gnu.org with esmtp (Exim 4.60)
	(envelope-from <amit.shah@redhat.com>) id 1NfwS9-000511-Bo
	for qemu-devel@nongnu.org; Fri, 12 Feb 2010 09:25:05 -0500
Received: from int-mx08.intmail.prod.int.phx2.redhat.com
	(int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.21])
	by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o1CEP2NR029547
	(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK)
	for <qemu-devel@nongnu.org>; Fri, 12 Feb 2010 09:25:02 -0500
Date: Fri, 12 Feb 2010 19:53:49 +0530
From: Amit Shah <amit.shah@redhat.com>
Message-ID: <20100212142349.GB25859@amit-x200.redhat.com>
References: <20100212134214.GA4214@redhat.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20100212134214.GA4214@redhat.com>
Subject: [Qemu-devel] Re: [PATCH] virtio-serial: don't set MULTIPORT for 1
	port dev
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: "Michael S. Tsirkin" <mst@redhat.com>
Cc: qemu-devel@nongnu.org, kraxel@redhat.com

On (Fri) Feb 12 2010 [15:42:14], Michael S. Tsirkin wrote:
> Since commit 98b19252cf1bd97c54bc4613f3537c5ec0aae263, all
> serial devices declare MULTIPORT feature.
> To allow 0.12 compatibility, we should clear this when
> max_nr_ports is 1.

In addition to this, setting max_nr_ports to 1 is needed when -M 0.12 is
selected.

However, is this the only way to do it? Gerd?

> 
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> ---
>  hw/virtio-serial-bus.c |    6 ++++--
>  1 files changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/hw/virtio-serial-bus.c b/hw/virtio-serial-bus.c
> index ab456ea..d0e0219 100644
> --- a/hw/virtio-serial-bus.c
> +++ b/hw/virtio-serial-bus.c
> @@ -335,8 +335,10 @@ static void handle_input(VirtIODevice *vdev, VirtQueue *vq)
>  
>  static uint32_t get_features(VirtIODevice *vdev, uint32_t features)
>  {
> -    features |= (1 << VIRTIO_CONSOLE_F_MULTIPORT);
> -
> +    VirtIOSerial *vser = DO_UPCAST(VirtIOSerial, vdev, vdev);
> +    if (vser->bus->max_nr_ports > 1) {
> +        features |= (1 << VIRTIO_CONSOLE_F_MULTIPORT);
> +    }
>      return features;
>  }
>  
> -- 
> 1.6.6.144.g5c3af

		Amit