From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Nfvpp-0003cR-ME for qemu-devel@nongnu.org; Fri, 12 Feb 2010 08:45:29 -0500 Received: from [199.232.76.173] (port=51746 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Nfvpp-0003bt-2z for qemu-devel@nongnu.org; Fri, 12 Feb 2010 08:45:29 -0500 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1Nfvpo-0006oy-0m for qemu-devel@nongnu.org; Fri, 12 Feb 2010 08:45:28 -0500 Received: from mx1.redhat.com ([209.132.183.28]:28007) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Nfvpn-0006oq-KZ for qemu-devel@nongnu.org; Fri, 12 Feb 2010 08:45:27 -0500 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o1CDjQkw003211 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 12 Feb 2010 08:45:26 -0500 Date: Fri, 12 Feb 2010 15:42:14 +0200 From: "Michael S. Tsirkin" Message-ID: <20100212134214.GA4214@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Subject: [Qemu-devel] [PATCH] virtio-serial: don't set MULTIPORT for 1 port dev List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, amit.shah@redhat.com, kraxel@redhat.com Since commit 98b19252cf1bd97c54bc4613f3537c5ec0aae263, all serial devices declare MULTIPORT feature. To allow 0.12 compatibility, we should clear this when max_nr_ports is 1. Signed-off-by: Michael S. Tsirkin --- 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