commit e87f7fc67948da80a0452c4fd523ec45f0d03f26
author Anthony Liguori <aliguori@us.ibm.com> Mon Feb 06 11:07:18 2012 -0600
committer Anthony Liguori <aliguori@us.ibm.com> Mon Feb 06 11:16:20 2012 -0600
tree 76ded0b26829c0460644da2db59ac7f434a9dd39
parent 4cafe606040bfb7526a954e131daa61afc5d747a

s390x: fix qom-ification fall-out

Tested-by: Andreas Faerber <afaerber@suse.de>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

vl.c

diff --git a/vl.c b/vl.c
index 2d464cf..63dd725 100644
--- a/vl.c
+++ b/vl.c
@@ -1947,7 +1947,11 @@
     }
 
     bus_opts = qemu_opts_create(device, NULL, 0);
-    qemu_opt_set(bus_opts, "driver", "virtio-serial");
+    if (arch_type == QEMU_ARCH_S390X) {
+        qemu_opt_set(bus_opts, "driver", "virtio-serial-s390");
+    } else {
+        qemu_opt_set(bus_opts, "driver", "virtio-serial-pci");
+    } 
 
     dev_opts = qemu_opts_create(device, NULL, 0);
     qemu_opt_set(dev_opts, "driver", "virtconsole");