From patchwork Mon Feb 15 13:31:36 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amit Shah X-Patchwork-Id: 45366 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 390D3B7C59 for ; Tue, 16 Feb 2010 00:39:25 +1100 (EST) Received: from localhost ([127.0.0.1]:35258 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Nh1AL-0008LO-Fc for incoming@patchwork.ozlabs.org; Mon, 15 Feb 2010 08:39:09 -0500 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Nh14I-0005cF-PR for qemu-devel@nongnu.org; Mon, 15 Feb 2010 08:32:54 -0500 Received: from [199.232.76.173] (port=49475 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Nh14H-0005bl-UZ for qemu-devel@nongnu.org; Mon, 15 Feb 2010 08:32:54 -0500 Received: from Debian-exim by monty-python.gnu.org with spam-scanned (Exim 4.60) (envelope-from ) id 1Nh14G-0001Hh-Ta for qemu-devel@nongnu.org; Mon, 15 Feb 2010 08:32:53 -0500 Received: from mx1.redhat.com ([209.132.183.28]:1025) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Nh14G-0001Hd-Gv for qemu-devel@nongnu.org; Mon, 15 Feb 2010 08:32:52 -0500 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id o1FDWp8m001161 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 15 Feb 2010 08:32:51 -0500 Received: from localhost (dhcp1-127.pnq.redhat.com [10.65.193.127]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o1FDWov2015728; Mon, 15 Feb 2010 08:32:50 -0500 From: Amit Shah To: qemu-devel@nongnu.org Date: Mon, 15 Feb 2010 19:01:36 +0530 Message-Id: <1266240696-17880-3-git-send-email-amit.shah@redhat.com> In-Reply-To: <1266240696-17880-2-git-send-email-amit.shah@redhat.com> References: <1266240696-17880-1-git-send-email-amit.shah@redhat.com> <1266240696-17880-2-git-send-email-amit.shah@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.11 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Cc: Amit Shah , kraxel@redhat.com, "Michael S. Tsirkin" Subject: [Qemu-devel] [PATCH 3/3] virtio-serial: don't set MULTIPORT for 1 port dev X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Michael S. Tsirkin 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 Signed-off-by: Amit Shah --- 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; }