From: Anthony Liguori <aliguori@us.ibm.com>
Date: Fri, 3 Feb 2012 17:13:30 +0000 (-0600)
Subject: s390x: fix -drive in the absence of aliases
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=eeb9c1b552c7e30d6fc10e8c5ccab4b0ea4826c0;p=qemu.git

s390x: fix -drive in the absence of aliases

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
---

diff --git a/blockdev.c b/blockdev.c
index 7e4c548426..7d7ac31677 100644
--- a/blockdev.c
+++ b/blockdev.c
@@ -565,7 +565,11 @@ DriveInfo *drive_init(QemuOpts *opts, int default_to_scsi)
     case IF_VIRTIO:
         /* add virtio block device */
         opts = qemu_opts_create(qemu_find_opts("device"), NULL, 0);
-        qemu_opt_set(opts, "driver", "virtio-blk");
+        if (arch_type == QEMU_ARCH_S390X) {
+            qemu_opt_set(opts, "driver", "virtio-blk-s390");
+        } else {
+            qemu_opt_set(opts, "driver", "virtio-blk-pci");
+        }
         qemu_opt_set(opts, "drive", dinfo->id);
         if (devaddr)
             qemu_opt_set(opts, "addr", devaddr);