From patchwork Tue Jan 15 14:09:46 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: 212167 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 2DA772C008D for ; Wed, 16 Jan 2013 01:22:18 +1100 (EST) Received: from localhost ([::1]:39311 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tv7P6-0003gw-7N for incoming@patchwork.ozlabs.org; Tue, 15 Jan 2013 09:22:16 -0500 Received: from eggs.gnu.org ([208.118.235.92]:49476) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tv7Oq-0003bU-2W for qemu-devel@nongnu.org; Tue, 15 Jan 2013 09:22:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Tv7EO-0001Nn-Qd for qemu-devel@nongnu.org; Tue, 15 Jan 2013 09:12:22 -0500 Received: from greensocs.com ([87.106.252.221]:60555 helo=s15328186.onlinehome-server.info) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tv7EO-0001NU-5a for qemu-devel@nongnu.org; Tue, 15 Jan 2013 09:11:12 -0500 Received: from localhost (unknown [127.0.0.1]) by s15328186.onlinehome-server.info (Postfix) with ESMTP id 9C15643EE3E; Tue, 15 Jan 2013 14:11:10 +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 wNpCWySHiOkJ; Tue, 15 Jan 2013 15:11:10 +0100 (CET) Received: by s15328186.onlinehome-server.info (Postfix, from userid 491) id 286EE440FC4; Tue, 15 Jan 2013 15:10:59 +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 B9C0043EE3D; Tue, 15 Jan 2013 15:10:57 +0100 (CET) From: fred.konrad@greensocs.com To: qemu-devel@nongnu.org, aliguori@us.ibm.com Date: Tue, 15 Jan 2013 15:09:46 +0100 Message-Id: <1358258998-6504-33-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 32/44] virtio-rng.c: cleanup: init and exit functions. 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 remove old init and exit function as they are no longer needed. Signed-off-by: KONRAD Frederic --- hw/virtio-rng.c | 87 ++++++++++++++------------------------------------------- 1 file changed, 21 insertions(+), 66 deletions(-) diff --git a/hw/virtio-rng.c b/hw/virtio-rng.c index 7332517..c4a323d 100644 --- a/hw/virtio-rng.c +++ b/hw/virtio-rng.c @@ -135,47 +135,45 @@ void virtio_rng_set_conf(DeviceState *dev, VirtIORNGConf *conf) memcpy(&(vrng->conf), conf, sizeof(struct VirtIORNGConf)); } -static VirtIODevice *virtio_rng_common_init(DeviceState *dev, - VirtIORNGConf *conf, - VirtIORNG **pvrng) +static int virtio_rng_device_init(VirtIODevice *vdev) { - VirtIORNG *vrng = *pvrng; - VirtIODevice *vdev; + DeviceState *qdev = DEVICE(vdev); + VirtIORNG *vrng = VIRTIO_RNG(vdev); Error *local_err = NULL; - /* - * We have two cases here: the old virtio-rng-x device, and the - * refactored virtio-rng. - * This will disappear later in the serie. - */ - if (vrng == NULL) { - vdev = virtio_common_init("virtio-rng", VIRTIO_ID_RNG, 0, - sizeof(VirtIORNG)); - vrng = DO_UPCAST(VirtIORNG, vdev, vdev); - } else { - vdev = VIRTIO_DEVICE(vrng); - virtio_init(vdev, "virtio-rng", VIRTIO_ID_RNG, 0); + if (vrng->conf.rng == NULL) { + vrng->conf.default_backend = RNG_RANDOM(object_new(TYPE_RNG_RANDOM)); + + object_property_add_child(OBJECT(qdev), + "default-backend", + OBJECT(vrng->conf.default_backend), + NULL); + + object_property_set_link(OBJECT(qdev), + OBJECT(vrng->conf.default_backend), + "rng", NULL); } - vrng->rng = conf->rng; + virtio_init(vdev, "virtio-rng", VIRTIO_ID_RNG, 0); + + vrng->rng = vrng->conf.rng; if (vrng->rng == NULL) { qerror_report(QERR_INVALID_PARAMETER_VALUE, "rng", "a valid object"); - return NULL; + return -1; } rng_backend_open(vrng->rng, &local_err); if (local_err) { qerror_report_err(local_err); error_free(local_err); - return NULL; + return -1; } vrng->vq = virtio_add_queue(vdev, 8, handle_input); vrng->vdev.get_features = get_features; - vrng->qdev = dev; - memcpy(&(vrng->conf), conf, sizeof(struct VirtIORNGConf)); + vrng->qdev = qdev; assert(vrng->conf.max_bytes <= INT64_MAX); vrng->quota_remaining = vrng->conf.max_bytes; @@ -186,52 +184,9 @@ static VirtIODevice *virtio_rng_common_init(DeviceState *dev, qemu_mod_timer(vrng->rate_limit_timer, qemu_get_clock_ms(vm_clock) + vrng->conf.period_ms); - register_savevm(dev, "virtio-rng", -1, 1, virtio_rng_save, + register_savevm(qdev, "virtio-rng", -1, 1, virtio_rng_save, virtio_rng_load, vrng); - return vdev; -} - -/* - * This two functions will be removed later in the serie. - */ -VirtIODevice *virtio_rng_init(DeviceState *dev, VirtIORNGConf *conf) -{ - VirtIORNG *vdev = NULL; - return virtio_rng_common_init(dev, conf, &vdev); -} - -void virtio_rng_exit(VirtIODevice *vdev) -{ - VirtIORNG *vrng = DO_UPCAST(VirtIORNG, vdev, vdev); - - qemu_del_timer(vrng->rate_limit_timer); - qemu_free_timer(vrng->rate_limit_timer); - unregister_savevm(vrng->qdev, "virtio-rng", vrng); - virtio_cleanup(vdev); -} - -static int virtio_rng_device_init(VirtIODevice *vdev) -{ - DeviceState *qdev = DEVICE(vdev); - VirtIORNG *vrng = VIRTIO_RNG(vdev); - - if (vrng->conf.rng == NULL) { - vrng->conf.default_backend = RNG_RANDOM(object_new(TYPE_RNG_RANDOM)); - - object_property_add_child(OBJECT(qdev), - "default-backend", - OBJECT(vrng->conf.default_backend), - NULL); - - object_property_set_link(OBJECT(qdev), - OBJECT(vrng->conf.default_backend), - "rng", NULL); - } - - if (virtio_rng_common_init(qdev, &(vrng->conf), &vrng) == NULL) { - return -1; - } return 0; }