From patchwork Fri Dec 7 15:14:50 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Borntraeger X-Patchwork-Id: 204522 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 4047B2C0131 for ; Sat, 8 Dec 2012 02:14:59 +1100 (EST) Received: from localhost ([::1]:44719 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tgzdg-0005Cl-LW for incoming@patchwork.ozlabs.org; Fri, 07 Dec 2012 10:14:56 -0500 Received: from eggs.gnu.org ([208.118.235.92]:44088) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TgzdY-0005Cb-9T for qemu-devel@nongnu.org; Fri, 07 Dec 2012 10:14:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TgzdV-0000ZX-Em for qemu-devel@nongnu.org; Fri, 07 Dec 2012 10:14:48 -0500 Received: from e06smtp18.uk.ibm.com ([195.75.94.114]:48402) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TgzdV-0000Yp-5u for qemu-devel@nongnu.org; Fri, 07 Dec 2012 10:14:45 -0500 Received: from /spool/local by e06smtp18.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 7 Dec 2012 15:14:32 -0000 Received: from b06cxnps3074.portsmouth.uk.ibm.com (9.149.109.194) by e06smtp18.uk.ibm.com (192.168.101.148) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Fri, 7 Dec 2012 15:14:29 -0000 Received: from d06av11.portsmouth.uk.ibm.com (d06av11.portsmouth.uk.ibm.com [9.149.37.252]) by b06cxnps3074.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id qB7FEVOf32309396 for ; Fri, 7 Dec 2012 15:14:31 GMT Received: from d06av11.portsmouth.uk.ibm.com (loopback [127.0.0.1]) by d06av11.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id qB7FEdiv018933 for ; Fri, 7 Dec 2012 08:14:39 -0700 Received: from tuxmaker.boeblingen.de.ibm.com (tuxmaker.boeblingen.de.ibm.com [9.152.85.9]) by d06av11.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id qB7FEcJj018917; Fri, 7 Dec 2012 08:14:38 -0700 Received: by tuxmaker.boeblingen.de.ibm.com (Postfix, from userid 25651) id D1F281224437; Fri, 7 Dec 2012 16:14:38 +0100 (CET) From: Christian Borntraeger To: Alexander Graf Date: Fri, 7 Dec 2012 16:14:50 +0100 Message-Id: <1354893290-53019-3-git-send-email-borntraeger@de.ibm.com> X-Mailer: git-send-email 1.7.10.1 In-Reply-To: <1354893290-53019-1-git-send-email-borntraeger@de.ibm.com> References: <1354888531-47836-3-git-send-email-jfrei@linux.vnet.ibm.com> <1354893290-53019-1-git-send-email-borntraeger@de.ibm.com> x-cbid: 12120715-6892-0000-0000-000003C2646A X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x-2.6.x [generic] X-Received-From: 195.75.94.114 Cc: Heinz Graalfs , qemu-devel , Christian Borntraeger , Jens Freimann , Cornelia Huck , Einar Lueck Subject: [Qemu-devel] [RFC/PATCH 2/2] s390: enable ipl device for virtio-ccw X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org In case of virtio-ccw we also want to get a disk by its device id. Signed-off-by: Christian Borntraeger --- hw/s390x/ipl-disk.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/hw/s390x/ipl-disk.c b/hw/s390x/ipl-disk.c index 1aab32b..6a83d9c 100644 --- a/hw/s390x/ipl-disk.c +++ b/hw/s390x/ipl-disk.c @@ -21,6 +21,7 @@ #include #include "hw/loader.h" #include "hw/s390-virtio-bus.h" +#include "hw/s390x/virtio-ccw.h" #include "hw/sysbus.h" #include "hw/s390x/ipl.h" #include "hw/s390x/ipl-disk.h" @@ -435,6 +436,10 @@ static VirtIOBlkConf *getVirtIOBlkConf(DeviceState *dev, const char *id) VirtIOS390Device *s390dev; s390dev = DO_UPCAST(VirtIOS390Device, qdev, dev); blk = &s390dev->blk; + } else if (strcmp(dev->parent_bus->name, "virtio-ccw") == 0) { + VirtioCcwData *ccwdev; + ccwdev = DO_UPCAST(VirtioCcwData, qdev, dev); + blk = &ccwdev->blk; } else { error_report("s390-ipl: device '%s' is not a virtio device", id ? id : "0");