From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([140.186.70.92]:37488)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <anthony@codemonkey.ws>) id 1RtMrs-00061W-4N
	for qemu-devel@nongnu.org; Fri, 03 Feb 2012 12:24:12 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <anthony@codemonkey.ws>) id 1RtMro-0001eo-1g
	for qemu-devel@nongnu.org; Fri, 03 Feb 2012 12:24:12 -0500
Received: from mail-pz0-f45.google.com ([209.85.210.45]:46831)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <anthony@codemonkey.ws>) id 1RtMrn-0001eZ-Rs
	for qemu-devel@nongnu.org; Fri, 03 Feb 2012 12:24:07 -0500
Received: by dadp14 with SMTP id p14so3717257dad.4
	for <qemu-devel@nongnu.org>; Fri, 03 Feb 2012 09:24:06 -0800 (PST)
Message-ID: <4F2C1832.90101@codemonkey.ws>
Date: Fri, 03 Feb 2012 11:24:02 -0600
From: Anthony Liguori <anthony@codemonkey.ws>
MIME-Version: 1.0
References: <1328289484-7305-1-git-send-email-aliguori@us.ibm.com>
In-Reply-To: <1328289484-7305-1-git-send-email-aliguori@us.ibm.com>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Subject: Re: [Qemu-devel] [PATCH] s390x: fix -drive in the absence of aliases
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: Anthony Liguori <aliguori@us.ibm.com>
Cc: qemu-devel@nongnu.org, Alex Graf <agraf@suse.de>

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