Patchwork s390x: fix -drive in the absence of aliases

login
register
mail settings
Submitter Anthony Liguori
Date Feb. 3, 2012, 5:18 p.m.
Message ID <1328289484-7305-1-git-send-email-aliguori@us.ibm.com>
Download mbox | patch
Permalink /patch/139430/
State New
Headers show

Comments

Anthony Liguori - Feb. 3, 2012, 5:18 p.m.
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
---
 blockdev.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
Anthony Liguori - Feb. 3, 2012, 5:24 p.m.
On 02/03/2012 11:18 AM, Anthony Liguori wrote:
> Signed-off-by: Anthony Liguori<aliguori@us.ibm.com>
> ---
>   blockdev.c |    6 +++++-
>   1 files changed, 5 insertions(+), 1 deletions(-)

*sigh*

my work directory was dirty.  This needs a #include "arch_init.h" too.

Regards,

Anthony Liguori

>
> diff --git a/blockdev.c b/blockdev.c
> index 7e4c548..7d7ac31 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);

Patch

diff --git a/blockdev.c b/blockdev.c
index 7e4c548..7d7ac31 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);