From patchwork Tue Apr 27 12:34:00 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Amit Shah X-Patchwork-Id: 51063 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 5D293B7D43 for ; Tue, 27 Apr 2010 22:53:33 +1000 (EST) Received: from localhost ([127.0.0.1]:36482 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O6kGK-0002ec-5m for incoming@patchwork.ozlabs.org; Tue, 27 Apr 2010 08:51:40 -0400 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1O6k1S-00061H-4Y for qemu-devel@nongnu.org; Tue, 27 Apr 2010 08:36:18 -0400 Received: from [140.186.70.92] (port=51321 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O6k1Q-00060d-Q0 for qemu-devel@nongnu.org; Tue, 27 Apr 2010 08:36:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1O6k1L-0002km-CM for qemu-devel@nongnu.org; Tue, 27 Apr 2010 08:36:16 -0400 Received: from mx1.redhat.com ([209.132.183.28]:10270) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1O6k1K-0002kX-OA for qemu-devel@nongnu.org; Tue, 27 Apr 2010 08:36:10 -0400 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 o3RCa87o013522 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 27 Apr 2010 08:36:08 -0400 Received: from localhost (vpn-238-78.phx2.redhat.com [10.3.238.78]) by int-mx08.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id o3RCa7tv006755; Tue, 27 Apr 2010 08:36:07 -0400 From: Amit Shah To: Anthony Liguori Date: Tue, 27 Apr 2010 18:04:00 +0530 Message-Id: <1272371652-23087-7-git-send-email-amit.shah@redhat.com> In-Reply-To: <1272371652-23087-6-git-send-email-amit.shah@redhat.com> References: <1272371652-23087-1-git-send-email-amit.shah@redhat.com> <1272371652-23087-2-git-send-email-amit.shah@redhat.com> <1272371652-23087-3-git-send-email-amit.shah@redhat.com> <1272371652-23087-4-git-send-email-amit.shah@redhat.com> <1272371652-23087-5-git-send-email-amit.shah@redhat.com> <1272371652-23087-6-git-send-email-amit.shah@redhat.com> X-Scanned-By: MIMEDefang 2.67 on 10.5.11.21 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. Cc: Amit Shah , qemu list , Juan Quintela Subject: [Qemu-devel] [PATCH v6 06/18] virtio-serial: whitespace: match surrounding code 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 The virtio-serial code doesn't mix declarations and definitions, so separate them out on different lines. Signed-off-by: Amit Shah --- hw/virtio-serial-bus.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/hw/virtio-serial-bus.c b/hw/virtio-serial-bus.c index bb11a9b..8efba0b 100644 --- a/hw/virtio-serial-bus.c +++ b/hw/virtio-serial-bus.c @@ -354,7 +354,10 @@ static void handle_input(VirtIODevice *vdev, VirtQueue *vq) static uint32_t get_features(VirtIODevice *vdev, uint32_t features) { - VirtIOSerial *vser = DO_UPCAST(VirtIOSerial, vdev, vdev); + VirtIOSerial *vser; + + vser = DO_UPCAST(VirtIOSerial, vdev, vdev); + if (vser->bus->max_nr_ports > 1) { features |= (1 << VIRTIO_CONSOLE_F_MULTIPORT); }