dcavalca / rpms / qemu

Forked from rpms/qemu a year ago
Clone

Blame qemu-virtio-serial-features-build-fix.patch

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