272dfe3
--- a/hw/virtio-serial-bus.c	2010-02-09 00:41:21.000000000 -0600
272dfe3
+++ b/hw/virtio-serial-bus.c	2010-02-09 00:07:13.000000000 -0600
272dfe3
@@ -68,7 +68,7 @@ static VirtIOSerialPort *find_port_by_vq
272dfe3
 
272dfe3
 static bool use_multiport(VirtIOSerial *vser)
272dfe3
 {
272dfe3
-    return vser->vdev.features & (1 << VIRTIO_CONSOLE_F_MULTIPORT);
272dfe3
+    return vser->vdev.guest_features & (1 << VIRTIO_CONSOLE_F_MULTIPORT);
272dfe3
 }
272dfe3
 
272dfe3
 static size_t write_to_port(VirtIOSerialPort *port,
272dfe3
@@ -333,9 +333,11 @@ static void handle_input(VirtIODevice *v
272dfe3
 {
272dfe3
 }
272dfe3
 
272dfe3
-static uint32_t get_features(VirtIODevice *vdev)
272dfe3
+static uint32_t get_features(VirtIODevice *vdev, uint32_t features)
272dfe3
 {
272dfe3
-    return 1 << VIRTIO_CONSOLE_F_MULTIPORT;
272dfe3
+    features |= (1 << VIRTIO_CONSOLE_F_MULTIPORT);
272dfe3
+
272dfe3
+    return features;
272dfe3
 }
272dfe3
 
272dfe3
 /* Guest requested config info */