From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1O1vBa-0002G2-IN for qemu-devel@nongnu.org; Wed, 14 Apr 2010 01:30:50 -0400 Received: from [140.186.70.92] (port=49007 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1O1vBV-0002E1-Qk for qemu-devel@nongnu.org; Wed, 14 Apr 2010 01:30:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1O1vBU-0005zL-8d for qemu-devel@nongnu.org; Wed, 14 Apr 2010 01:30:45 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35180) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1O1vBU-0005z7-10 for qemu-devel@nongnu.org; Wed, 14 Apr 2010 01:30:44 -0400 From: Amit Shah Date: Wed, 14 Apr 2010 10:58:26 +0530 Message-Id: <1271222917-7803-7-git-send-email-amit.shah@redhat.com> In-Reply-To: <1271222917-7803-6-git-send-email-amit.shah@redhat.com> References: <1271222917-7803-1-git-send-email-amit.shah@redhat.com> <1271222917-7803-2-git-send-email-amit.shah@redhat.com> <1271222917-7803-3-git-send-email-amit.shah@redhat.com> <1271222917-7803-4-git-send-email-amit.shah@redhat.com> <1271222917-7803-5-git-send-email-amit.shah@redhat.com> <1271222917-7803-6-git-send-email-amit.shah@redhat.com> Subject: [Qemu-devel] [PATCH v5 06/17] virtio-serial: whitespace: match surrounding code List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Anthony Liguori Cc: qemu list , Amit Shah , Gerd Hoffmann , Juan Quintela 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); } -- 1.6.2.5