From patchwork Fri Apr 26 12:12:56 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dominik Dingel X-Patchwork-Id: 239837 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 C993D2C010D for ; Fri, 26 Apr 2013 22:15:05 +1000 (EST) Received: from localhost ([::1]:41450 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UVhYN-0005l1-V8 for incoming@patchwork.ozlabs.org; Fri, 26 Apr 2013 08:15:03 -0400 Received: from eggs.gnu.org ([208.118.235.92]:58436) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UVhWd-0003HU-08 for qemu-devel@nongnu.org; Fri, 26 Apr 2013 08:13:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UVhWZ-0002FV-Lq for qemu-devel@nongnu.org; Fri, 26 Apr 2013 08:13:14 -0400 Received: from e06smtp18.uk.ibm.com ([195.75.94.114]:45863) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UVhWZ-0002FO-CA for qemu-devel@nongnu.org; Fri, 26 Apr 2013 08:13:11 -0400 Received: from /spool/local by e06smtp18.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 26 Apr 2013 13:09:21 +0100 Received: from d06dlp01.portsmouth.uk.ibm.com (9.149.20.13) by e06smtp18.uk.ibm.com (192.168.101.148) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Fri, 26 Apr 2013 13:09:20 +0100 Received: from b06cxnps4074.portsmouth.uk.ibm.com (d06relay11.portsmouth.uk.ibm.com [9.149.109.196]) by d06dlp01.portsmouth.uk.ibm.com (Postfix) with ESMTP id 49B4D17D8019 for ; Fri, 26 Apr 2013 13:14:08 +0100 (BST) Received: from d06av02.portsmouth.uk.ibm.com (d06av02.portsmouth.uk.ibm.com [9.149.37.228]) by b06cxnps4074.portsmouth.uk.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id r3QCCxu151904656 for ; Fri, 26 Apr 2013 12:12:59 GMT Received: from d06av02.portsmouth.uk.ibm.com (loopback [127.0.0.1]) by d06av02.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id r3QCD7iN024100 for ; Fri, 26 Apr 2013 06:13:08 -0600 Received: from tuxmaker.boeblingen.de.ibm.com (tuxmaker.boeblingen.de.ibm.com [9.152.85.9]) by d06av02.portsmouth.uk.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id r3QCD79t024086; Fri, 26 Apr 2013 06:13:07 -0600 Received: by tuxmaker.boeblingen.de.ibm.com (Postfix, from userid 2944) id 5A78A1224437; Fri, 26 Apr 2013 14:13:07 +0200 (CEST) From: Dominik Dingel To: qemu-devel@nongnu.org Date: Fri, 26 Apr 2013 14:12:56 +0200 Message-Id: <1366978377-16823-10-git-send-email-dingel@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.12.4 In-Reply-To: <1366978377-16823-1-git-send-email-dingel@linux.vnet.ibm.com> References: <1366978377-16823-1-git-send-email-dingel@linux.vnet.ibm.com> X-TM-AS-MML: No X-Content-Scanned: Fidelis XPS MAILER x-cbid: 13042612-6892-0000-0000-000004F74CD5 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: Christian Paro , Christian Borntraeger , Alexander Graf Subject: [Qemu-devel] [PATCH 09/10] S390: Pass per-device loadparm values for CCW blk and net devs. 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 From: Christian Paro Provide a loadparm property which can be used to pass IPL load parameters on a per-device basis for VirtioCcwDevice instances representing block and network devices. Signed-off-by: Christian Paro diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c index 56539d3..23d042f 100644 --- a/hw/s390x/virtio-ccw.c +++ b/hw/s390x/virtio-ccw.c @@ -791,6 +791,7 @@ static const VirtIOBindings virtio_ccw_bindings = { static Property virtio_ccw_net_properties[] = { DEFINE_PROP_STRING("devno", VirtioCcwDevice, bus_id), + DEFINE_PROP_UINT32("loadparm", VirtioCcwDevice, loadparm, 0), DEFINE_VIRTIO_NET_FEATURES(VirtioCcwDevice, host_features[0]), DEFINE_VIRTIO_NET_PROPERTIES(VirtIONetCcw, vdev.net_conf), DEFINE_NIC_PROPERTIES(VirtIONetCcw, vdev.nic_conf), @@ -818,6 +819,7 @@ static const TypeInfo virtio_ccw_net = { static Property virtio_ccw_blk_properties[] = { DEFINE_PROP_STRING("devno", VirtioCcwDevice, bus_id), + DEFINE_PROP_UINT32("loadparm", VirtioCcwDevice, loadparm, 0), DEFINE_VIRTIO_BLK_FEATURES(VirtioCcwDevice, host_features[0]), DEFINE_VIRTIO_BLK_PROPERTIES(VirtIOBlkCcw, blk), DEFINE_PROP_END_OF_LIST(), diff --git a/hw/s390x/virtio-ccw.h b/hw/s390x/virtio-ccw.h index 84055e7..a3f706a 100644 --- a/hw/s390x/virtio-ccw.h +++ b/hw/s390x/virtio-ccw.h @@ -76,6 +76,7 @@ struct VirtioCcwDevice { SubchDev *sch; VirtIODevice *vdev; char *bus_id; + uint32_t loadparm; uint32_t host_features[VIRTIO_CCW_FEATURE_SIZE]; VirtIORNGConf rng; VirtioBusState bus;