Index: qemu-kvm-0.12.5/vl.c
===================================================================
--- qemu-kvm-0.12.5.orig/vl.c
+++ qemu-kvm-0.12.5/vl.c
@@ -2440,7 +2440,11 @@ DriveInfo *drive_init(QemuOpts *opts, vo
     case IF_VIRTIO:
         /* add virtio block device */
         opts = qemu_opts_create(&qemu_device_opts, NULL, 0);
+#ifdef TARGET_S390X
+        qemu_opt_set(opts, "driver", "virtio-blk-s390");
+#else
         qemu_opt_set(opts, "driver", "virtio-blk-pci");
+#endif
         qemu_opt_set(opts, "drive", dinfo->id);
         if (devaddr)
             qemu_opt_set(opts, "addr", devaddr);