From patchwork Mon Jan 7 18:41:12 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: 210042 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 872132C0080 for ; Tue, 8 Jan 2013 05:51:07 +1100 (EST) Received: from localhost ([::1]:35831 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TsHmr-0005Vg-OZ for incoming@patchwork.ozlabs.org; Mon, 07 Jan 2013 13:51:05 -0500 Received: from eggs.gnu.org ([208.118.235.92]:58804) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TsHmW-0005JV-83 for qemu-devel@nongnu.org; Mon, 07 Jan 2013 13:50:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TsHf7-0006Er-GR for qemu-devel@nongnu.org; Mon, 07 Jan 2013 13:43:27 -0500 Received: from greensocs.com ([87.106.252.221]:53196 helo=s15328186.onlinehome-server.info) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TsHf7-0006Eh-4V for qemu-devel@nongnu.org; Mon, 07 Jan 2013 13:43:05 -0500 Received: from localhost (unknown [127.0.0.1]) by s15328186.onlinehome-server.info (Postfix) with ESMTP id 85312439E37; Mon, 7 Jan 2013 18:43:04 +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 4RQg63d0ZfnN; Mon, 7 Jan 2013 19:43:02 +0100 (CET) Received: by s15328186.onlinehome-server.info (Postfix, from userid 491) id 5F408439E3D; Mon, 7 Jan 2013 19:42:53 +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 02EB8439E3B; Mon, 7 Jan 2013 19:42:51 +0100 (CET) From: fred.konrad@greensocs.com To: qemu-devel@nongnu.org, aliguori@us.ibm.com Date: Mon, 7 Jan 2013 19:41:12 +0100 Message-Id: <1357584074-10852-60-git-send-email-fred.konrad@greensocs.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1357584074-10852-1-git-send-email-fred.konrad@greensocs.com> References: <1357584074-10852-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, cornelia.huck@de.ibm.com, pbonzini@redhat.com, afaerber@suse.de, fred.konrad@greensocs.com Subject: [Qemu-devel] [PATCH 59/61] s390-virtio-bus : cleanup 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 This is a cleanup for s390-virtio-bus : the init function is called by virtio-bus just after the device is plugged. Signed-off-by: KONRAD Frederic --- hw/s390-virtio-bus.c | 38 ++++++++++++++++---------------------- 1 file changed, 16 insertions(+), 22 deletions(-) diff --git a/hw/s390-virtio-bus.c b/hw/s390-virtio-bus.c index 52978b3..017fc0d 100644 --- a/hw/s390-virtio-bus.c +++ b/hw/s390-virtio-bus.c @@ -122,33 +122,34 @@ static void s390_virtio_irq(S390CPU *cpu, int config_change, uint64_t token) } } -static int s390_virtio_device_init(VirtIOS390Device *dev, VirtIODevice *vdev) +/* This is called by virtio-bus just after the device is plugged. */ +static void s390_virtio_device_plugged(DeviceState *d) { VirtIOS390Bus *bus; + VirtIOS390Device *dev = VIRTIO_S390_DEVICE(d); int dev_len; bus = DO_UPCAST(VirtIOS390Bus, bus, dev->qdev.parent_bus); - dev->vdev = vdev; + dev->vdev = dev->bus->vdev; dev->dev_offs = bus->dev_offs; dev->feat_len = sizeof(uint32_t); /* always keep 32 bits features */ dev_len = VIRTIO_DEV_OFFS_CONFIG; dev_len += s390_virtio_device_num_vq(dev) * VIRTIO_VQCONFIG_LEN; dev_len += dev->feat_len * 2; - dev_len += vdev->config_len; + dev_len += virtio_device_get_config_len(dev->bus); bus->dev_offs += dev_len; - virtio_bind_device(vdev, &virtio_s390_bindings, DEVICE(dev)); - dev->host_features = vdev->get_features(vdev, dev->host_features); + dev->host_features = virtio_device_get_features(dev->bus, + dev->host_features); + s390_virtio_device_sync(dev); s390_virtio_reset_idx(dev); if (dev->qdev.hotplugged) { S390CPU *cpu = s390_cpu_addr2state(0); s390_virtio_irq(cpu, VIRTIO_PARAM_DEV_ADD, dev->dev_offs); } - - return 0; } static int s390_virtio_net_init(VirtIOS390Device *s390_dev) @@ -160,7 +161,7 @@ static int s390_virtio_net_init(VirtIOS390Device *s390_dev) if (qdev_init(vdev) < 0) { return -1; } - return s390_virtio_device_init(s390_dev, VIRTIO_DEVICE(vdev)); + return 0; } static void s390_virtio_net_instance_init(Object *obj) @@ -179,7 +180,7 @@ static int s390_virtio_blk_init(VirtIOS390Device *s390_dev) if (qdev_init(vdev) < 0) { return -1; } - return s390_virtio_device_init(s390_dev, VIRTIO_DEVICE(vdev)); + return 0; } static void s390_virtio_blk_instance_init(Object *obj) @@ -195,7 +196,6 @@ static int s390_virtio_serial_init(VirtIOS390Device *s390_dev) DeviceState *vdev = DEVICE(&dev->vdev); DeviceState *qdev = DEVICE(s390_dev); VirtIOS390Bus *bus; - int r; bus = DO_UPCAST(VirtIOS390Bus, bus, qdev->parent_bus); @@ -204,13 +204,8 @@ static int s390_virtio_serial_init(VirtIOS390Device *s390_dev) if (qdev_init(vdev) < 0) { return -1; } - - r = s390_virtio_device_init(s390_dev, VIRTIO_DEVICE(vdev)); - if (!r) { - bus->console = s390_dev; - } - - return r; + bus->console = s390_dev; + return 0; } static void s390_virtio_serial_instance_init(Object *obj) @@ -229,7 +224,7 @@ static int s390_virtio_scsi_init(VirtIOS390Device *s390_dev) if (qdev_init(vdev) < 0) { return -1; } - return s390_virtio_device_init(s390_dev, VIRTIO_DEVICE(vdev)); + return 0; } static void s390_virtio_scsi_instance_init(Object *obj) @@ -248,7 +243,7 @@ static int s390_virtio_rng_init(VirtIOS390Device *s390_dev) if (qdev_init(vdev) < 0) { return -1; } - return s390_virtio_device_init(s390_dev, VIRTIO_DEVICE(vdev)); + return 0; } static void s390_virtio_rng_instance_init(Object *obj) @@ -337,9 +332,7 @@ void s390_virtio_device_sync(VirtIOS390Device *dev) cur_offs += dev->feat_len * 2; /* Sync config space */ - if (dev->vdev->get_config) { - dev->vdev->get_config(dev->vdev, dev->vdev->config); - } + virtio_device_get_config(dev->bus, dev->vdev->config); cpu_physical_memory_write(cur_offs, dev->vdev->config, dev->vdev->config_len); @@ -631,6 +624,7 @@ static void virtio_s390_bus_class_init(ObjectClass *klass, void *data) bus_class->max_dev = 1; k->notify = virtio_s390_notify; k->get_features = virtio_s390_get_features; + k->device_plugged = s390_virtio_device_plugged; } static const TypeInfo virtio_s390_bus_info = {