Re: [Qemu-devel] [PATCH] s390x: fix -drive in the absence of aliases

[Anthony Liguori <anthony@codemonkey.ws>]

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);