From b7ca3fc659da1dae7121a24c7e80f48a6212d982 Mon Sep 17 00:00:00 2001 From: Amit Shah Date: Tue, 27 Apr 2010 09:07:33 -0300 Subject: [PATCH 06/20] virtio-serial: whitespace: match surrounding code RH-Author: Amit Shah Message-id: <1272359264-8464-7-git-send-email-amit.shah@redhat.com> Patchwork-id: 8852 O-Subject: [RHEL6 PATCH v4 06/17] virtio-serial: whitespace: match surrounding code Bugzilla: 574296 RH-Acked-by: Gerd Hoffmann RH-Acked-by: Juan Quintela RH-Acked-by: Alon Levy The virtio-serial code doesn't mix declarations and definitions, so separate them out on different lines. Bugzilla: 574296 Upstream: Signed-off-by: Amit Shah --- hw/virtio-serial-bus.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) Signed-off-by: Eduardo Habkost --- 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.7.0.3