From patchwork Tue Jan 15 14:09:24 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: fred.konrad@greensocs.com X-Patchwork-Id: 212185 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 0925E2C007A for ; Wed, 16 Jan 2013 01:34:23 +1100 (EST) Received: from localhost ([::1]:56214 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tv7GA-0005Ma-4c for incoming@patchwork.ozlabs.org; Tue, 15 Jan 2013 09:13:02 -0500 Received: from eggs.gnu.org ([208.118.235.92]:45745) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tv7EN-0001Iz-QJ for qemu-devel@nongnu.org; Tue, 15 Jan 2013 09:12:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Tv7E5-00013X-1Y for qemu-devel@nongnu.org; Tue, 15 Jan 2013 09:11:11 -0500 Received: from greensocs.com ([87.106.252.221]:60415 helo=s15328186.onlinehome-server.info) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tv7E4-00013H-Ky for qemu-devel@nongnu.org; Tue, 15 Jan 2013 09:10:52 -0500 Received: from localhost (unknown [127.0.0.1]) by s15328186.onlinehome-server.info (Postfix) with ESMTP id 2703E43EE36; Tue, 15 Jan 2013 14:10:51 +0000 (UTC) Received: from s15328186.onlinehome-server.info ([127.0.0.1]) by localhost (s15328186.onlinehome-server.info [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ss6Ap9KdkCxI; Tue, 15 Jan 2013 15:10:50 +0100 (CET) Received: by s15328186.onlinehome-server.info (Postfix, from userid 491) id 8813E43EE37; Tue, 15 Jan 2013 15:10:23 +0100 (CET) Received: from compaq.katmai.xl.cx.katmai.xl.cx (lan31-11-83-155-143-136.fbx.proxad.net [83.155.143.136]) by s15328186.onlinehome-server.info (Postfix) with ESMTPSA id 1160143EE33; Tue, 15 Jan 2013 15:10:22 +0100 (CET) From: fred.konrad@greensocs.com To: qemu-devel@nongnu.org, aliguori@us.ibm.com Date: Tue, 15 Jan 2013 15:09:24 +0100 Message-Id: <1358258998-6504-11-git-send-email-fred.konrad@greensocs.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1358258998-6504-1-git-send-email-fred.konrad@greensocs.com> References: <1358258998-6504-1-git-send-email-fred.konrad@greensocs.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 87.106.252.221 Cc: kwolf@redhat.com, peter.maydell@linaro.org, e.voevodin@samsung.com, mst@redhat.com, mark.burton@greensocs.com, agraf@suse.de, amit.shah@redhat.com, aneesh.kumar@linux.vnet.ibm.com, stefanha@redhat.com, deepakcs@linux.vnet.ibm.com, cornelia.huck@de.ibm.com, pbonzini@redhat.com, afaerber@suse.de, fred.konrad@greensocs.com Subject: [Qemu-devel] [PATCH V3 10/44] virtio-net-s390: switch to the new API. 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: KONRAD Frederic Here the virtio-net-s390 is modified for the new API. The device virtio-net-s390 extends virtio-s390-device as before. It creates and connects a virtio-net during the init. The properties are not modified. Signed-off-by: KONRAD Frederic --- hw/s390-virtio-bus.c | 32 ++++++++++++++++++++------------ hw/s390-virtio-bus.h | 15 +++++++++++++-- 2 files changed, 33 insertions(+), 14 deletions(-) diff --git a/hw/s390-virtio-bus.c b/hw/s390-virtio-bus.c index 6b0be09..8f72fc6 100644 --- a/hw/s390-virtio-bus.c +++ b/hw/s390-virtio-bus.c @@ -151,16 +151,23 @@ static int s390_virtio_device_init(VirtIOS390Device *dev, VirtIODevice *vdev) return 0; } -static int s390_virtio_net_init(VirtIOS390Device *dev) +static int s390_virtio_net_init(VirtIOS390Device *s390_dev) { - VirtIODevice *vdev; - - vdev = virtio_net_init((DeviceState *)dev, &dev->nic, &dev->net); - if (!vdev) { + VirtIONetS390 *dev = VIRTIO_NET_S390(s390_dev); + DeviceState *vdev = DEVICE(&dev->vdev); + virtio_net_set_conf(vdev, &(dev->net), &(dev->nic)); + qdev_set_parent_bus(vdev, BUS(&s390_dev->bus)); + if (qdev_init(vdev) < 0) { return -1; } + return s390_virtio_device_init(s390_dev, VIRTIO_DEVICE(vdev)); +} - return s390_virtio_device_init(dev, vdev); +static void s390_virtio_net_instance_init(Object *obj) +{ + VirtIONetS390 *dev = VIRTIO_NET_S390(obj); + object_initialize(OBJECT(&dev->vdev), TYPE_VIRTIO_NET); + object_property_add_child(obj, "virtio-backend", OBJECT(&dev->vdev), NULL); } static int s390_virtio_blk_init(VirtIOS390Device *s390_dev) @@ -409,12 +416,12 @@ static const VirtIOBindings virtio_s390_bindings = { }; static Property s390_virtio_net_properties[] = { - DEFINE_NIC_PROPERTIES(VirtIOS390Device, nic), - DEFINE_PROP_UINT32("x-txtimer", VirtIOS390Device, + DEFINE_NIC_PROPERTIES(VirtIONetS390, nic), + DEFINE_PROP_UINT32("x-txtimer", VirtIONetS390, net.txtimer, TX_TIMER_INTERVAL), - DEFINE_PROP_INT32("x-txburst", VirtIOS390Device, + DEFINE_PROP_INT32("x-txburst", VirtIONetS390, net.txburst, TX_BURST), - DEFINE_PROP_STRING("tx", VirtIOS390Device, net.tx), + DEFINE_PROP_STRING("tx", VirtIONetS390, net.tx), DEFINE_PROP_END_OF_LIST(), }; @@ -428,9 +435,10 @@ static void s390_virtio_net_class_init(ObjectClass *klass, void *data) } static const TypeInfo s390_virtio_net = { - .name = "virtio-net-s390", + .name = TYPE_VIRTIO_NET_S390, .parent = TYPE_VIRTIO_S390_DEVICE, - .instance_size = sizeof(VirtIOS390Device), + .instance_size = sizeof(VirtIONetS390), + .instance_init = s390_virtio_net_instance_init, .class_init = s390_virtio_net_class_init, }; diff --git a/hw/s390-virtio-bus.h b/hw/s390-virtio-bus.h index ecbc301..a568904 100644 --- a/hw/s390-virtio-bus.h +++ b/hw/s390-virtio-bus.h @@ -89,10 +89,8 @@ struct VirtIOS390Device { ram_addr_t feat_offs; uint8_t feat_len; VirtIODevice *vdev; - NICConf nic; uint32_t host_features; virtio_serial_conf serial; - virtio_net_conf net; VirtIOSCSIConf scsi; VirtIORNGConf rng; VirtioBusState bus; @@ -131,5 +129,18 @@ typedef struct VirtIOBlkS390 { VirtIOBlkConf blk; } VirtIOBlkS390; +/* virtio-net-s390 */ + +#define TYPE_VIRTIO_NET_S390 "virtio-net-s390" +#define VIRTIO_NET_S390(obj) \ + OBJECT_CHECK(VirtIONetS390, (obj), TYPE_VIRTIO_NET_S390) + +typedef struct VirtIONetS390 { + VirtIOS390Device parent_obj; + VirtIONet vdev; + virtio_net_conf net; + NICConf nic; +} VirtIONetS390; + #endif