[1/3] S390: Loop through virtio console devices

Submitted by Alexander Graf on Dec. 17, 2009, 12:06 p.m.

Details

Message ID 1261051569-7503-2-git-send-email-agraf@suse.de
State New
Headers show

Commit Message

Alexander Graf Dec. 17, 2009, 12:06 p.m.
We used to always create one single virtio console device. This breaks when
either zero of multiple virtio console devices are requested, so let's use
the same code as on x86.

Signed-off-by: Alexander Graf <agraf@suse.de>
---
 hw/s390-virtio.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

Patch hide | download patch | download mbox

diff --git a/hw/s390-virtio.c b/hw/s390-virtio.c
index b57fa9c..e54ef0e 100644
--- a/hw/s390-virtio.c
+++ b/hw/s390-virtio.c
@@ -201,7 +201,11 @@  static void s390_init(ram_addr_t ram_size,
     }
 
     /* Create VirtIO console */
-    qdev_init_nofail(qdev_create((BusState *)s390_bus, "virtio-console-s390"));
+    for(i = 0; i < MAX_VIRTIO_CONSOLES; i++) {
+        if (virtcon_hds[i]) {
+            qdev_init_nofail(qdev_create((BusState *)s390_bus, "virtio-console-s390"));
+        }
+    }
 
     /* Create VirtIO network adapters */
     for(i = 0; i < nb_nics; i++) {