From patchwork Thu Apr 11 14:30:00 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: 235780 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 E1B332C0087 for ; Fri, 12 Apr 2013 00:52:28 +1000 (EST) Received: from localhost ([::1]:51977 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UQIa1-00006y-1S for incoming@patchwork.ozlabs.org; Thu, 11 Apr 2013 10:34:25 -0400 Received: from eggs.gnu.org ([208.118.235.92]:33994) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UQIWv-0003lj-4h for qemu-devel@nongnu.org; Thu, 11 Apr 2013 10:31:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UQIWq-0006mD-A9 for qemu-devel@nongnu.org; Thu, 11 Apr 2013 10:31:13 -0400 Received: from greensocs.com ([87.106.252.221]:49326 helo=s15328186.onlinehome-server.info) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UQIWq-0006m4-0Z for qemu-devel@nongnu.org; Thu, 11 Apr 2013 10:31:08 -0400 Received: from localhost (unknown [127.0.0.1]) by s15328186.onlinehome-server.info (Postfix) with ESMTP id 81EF840EC6C; Thu, 11 Apr 2013 14:31:07 +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 sNw6NFf+vpR4; Thu, 11 Apr 2013 16:31:05 +0200 (CEST) Received: by s15328186.onlinehome-server.info (Postfix, from userid 491) id B934E40EC6D; Thu, 11 Apr 2013 16:31:05 +0200 (CEST) Received: from localhost.localdomain (unknown [84.7.168.138]) by s15328186.onlinehome-server.info (Postfix) with ESMTPSA id 2C14240EC69; Thu, 11 Apr 2013 16:31:05 +0200 (CEST) From: fred.konrad@greensocs.com To: aliguori@us.ibm.com, qemu-devel@nongnu.org Date: Thu, 11 Apr 2013 16:30:00 +0200 Message-Id: <1365690602-22729-6-git-send-email-fred.konrad@greensocs.com> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1365690602-22729-1-git-send-email-fred.konrad@greensocs.com> References: <1365690602-22729-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: cornelia.huck@de.ibm.com, peter.maydell@linaro.org, mark.burton@greensocs.com, fred.konrad@greensocs.com Subject: [Qemu-devel] [PATCH v3 5/7] virtio-net-ccw: 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-ccw is modified for the new API. The device virtio-net-ccw extends virtio-ccw-device as before. It creates and connects a virtio-net-device during the init. The properties are not modified. Signed-off-by: KONRAD Frederic --- hw/s390x/virtio-ccw.c | 31 +++++++++++++++++-------------- hw/s390x/virtio-ccw.h | 13 +++++++++++-- 2 files changed, 28 insertions(+), 16 deletions(-) diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c index f675fbc..d624346 100644 --- a/hw/s390x/virtio-ccw.c +++ b/hw/s390x/virtio-ccw.c @@ -551,23 +551,25 @@ static int virtio_ccw_exit(VirtioCcwDevice *dev) return 0; } -static int virtio_ccw_net_init(VirtioCcwDevice *dev) +static int virtio_ccw_net_init(VirtioCcwDevice *ccw_dev) { - VirtIODevice *vdev; + VirtIONetCcw *dev = VIRTIO_NET_CCW(ccw_dev); + DeviceState *vdev = DEVICE(&dev->vdev); - vdev = virtio_net_init((DeviceState *)dev, &dev->nic, &dev->net, - dev->host_features[0]); - if (!vdev) { + virtio_net_set_config_size(&dev->vdev, ccw_dev->host_features[0]); + qdev_set_parent_bus(vdev, BUS(&ccw_dev->bus)); + if (qdev_init(vdev) < 0) { return -1; } - return virtio_ccw_device_init(dev, vdev); + return virtio_ccw_device_init(ccw_dev, VIRTIO_DEVICE(vdev)); } -static int virtio_ccw_net_exit(VirtioCcwDevice *dev) +static void virtio_ccw_net_instance_init(Object *obj) { - virtio_net_exit(dev->vdev); - return virtio_ccw_exit(dev); + VirtIONetCcw *dev = VIRTIO_NET_CCW(obj); + object_initialize(OBJECT(&dev->vdev), TYPE_VIRTIO_NET); + object_property_add_child(obj, "virtio-backend", OBJECT(&dev->vdev), NULL); } static int virtio_ccw_blk_init(VirtioCcwDevice *ccw_dev) @@ -734,8 +736,8 @@ static const VirtIOBindings virtio_ccw_bindings = { static Property virtio_ccw_net_properties[] = { DEFINE_PROP_STRING("devno", VirtioCcwDevice, bus_id), DEFINE_VIRTIO_NET_FEATURES(VirtioCcwDevice, host_features[0]), - DEFINE_NIC_PROPERTIES(VirtioCcwDevice, nic), - DEFINE_VIRTIO_NET_PROPERTIES(VirtioCcwDevice, net), + DEFINE_VIRTIO_NET_PROPERTIES(VirtIONetCcw, vdev.net_conf), + DEFINE_NIC_PROPERTIES(VirtIONetCcw, vdev.nic_conf), DEFINE_PROP_END_OF_LIST(), }; @@ -745,15 +747,16 @@ static void virtio_ccw_net_class_init(ObjectClass *klass, void *data) VirtIOCCWDeviceClass *k = VIRTIO_CCW_DEVICE_CLASS(klass); k->init = virtio_ccw_net_init; - k->exit = virtio_ccw_net_exit; + k->exit = virtio_ccw_exit; dc->reset = virtio_ccw_reset; dc->props = virtio_ccw_net_properties; } static const TypeInfo virtio_ccw_net = { - .name = "virtio-net-ccw", + .name = TYPE_VIRTIO_NET_CCW, .parent = TYPE_VIRTIO_CCW_DEVICE, - .instance_size = sizeof(VirtioCcwDevice), + .instance_size = sizeof(VirtIONetCcw), + .instance_init = virtio_ccw_net_instance_init, .class_init = virtio_ccw_net_class_init, }; diff --git a/hw/s390x/virtio-ccw.h b/hw/s390x/virtio-ccw.h index 2208a11..35ab1a5 100644 --- a/hw/s390x/virtio-ccw.h +++ b/hw/s390x/virtio-ccw.h @@ -73,9 +73,7 @@ struct VirtioCcwDevice { SubchDev *sch; VirtIODevice *vdev; char *bus_id; - NICConf nic; uint32_t host_features[VIRTIO_CCW_FEATURE_SIZE]; - virtio_net_conf net; VirtIORNGConf rng; VirtioBusState bus; /* Guest provided values: */ @@ -137,6 +135,17 @@ typedef struct VirtioSerialCcw { VirtIOSerial vdev; } VirtioSerialCcw; +/* virtio-net-ccw */ + +#define TYPE_VIRTIO_NET_CCW "virtio-net-ccw" +#define VIRTIO_NET_CCW(obj) \ + OBJECT_CHECK(VirtIONetCcw, (obj), TYPE_VIRTIO_NET_CCW) + +typedef struct VirtIONetCcw { + VirtioCcwDevice parent_obj; + VirtIONet vdev; +} VirtIONetCcw; + VirtualCssBus *virtual_css_bus_init(void); void virtio_ccw_device_update_status(SubchDev *sch); VirtIODevice *virtio_ccw_get_vdev(SubchDev *sch);