From b7e36e6b15a4e94a656e6bfcf99ae2aec6163149 Mon Sep 17 00:00:00 2001 From: Amit Shah Date: Mon, 8 Mar 2010 05:20:49 -0300 Subject: [PATCH 35/42] virtio-serial: don't set MULTIPORT for 1 port dev RH-Author: Amit Shah Message-id: <1268025651-8316-4-git-send-email-amit.shah@redhat.com> Patchwork-id: 7588 O-Subject: [RHEL6 PATCH v2 3/5] virtio-serial: don't set MULTIPORT for 1 port dev Bugzilla: 567035 RH-Acked-by: Juan Quintela RH-Acked-by: Michael S. Tsirkin RH-Acked-by: Gerd Hoffmann 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. Upstream commit: ee4d45be0d791eb8bb0f767cd0f17ea8f697281b Signed-off-by: Michael S. Tsirkin Signed-off-by: Amit Shah Signed-off-by: Anthony Liguori --- hw/virtio-serial-bus.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) Signed-off-by: Eduardo Habkost --- 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.3.rc4.29.g8146