From patchwork Mon Jan 7 18:40:48 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: 210035 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 4E7F02C0094 for ; Tue, 8 Jan 2013 05:43:56 +1100 (EST) Received: from localhost ([::1]:50808 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TsHfu-0006ZJ-GB for incoming@patchwork.ozlabs.org; Mon, 07 Jan 2013 13:43:54 -0500 Received: from eggs.gnu.org ([208.118.235.92]:56604) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TsHeX-0005Li-Nh for qemu-devel@nongnu.org; Mon, 07 Jan 2013 13:42:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TsHeV-0005wR-Cs for qemu-devel@nongnu.org; Mon, 07 Jan 2013 13:42:29 -0500 Received: from greensocs.com ([87.106.252.221]:52948 helo=s15328186.onlinehome-server.info) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TsHeV-0005wE-2R for qemu-devel@nongnu.org; Mon, 07 Jan 2013 13:42:27 -0500 Received: from localhost (unknown [127.0.0.1]) by s15328186.onlinehome-server.info (Postfix) with ESMTP id 815AE439E42; Mon, 7 Jan 2013 18:42:26 +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 AmHkQipfzRXH; Mon, 7 Jan 2013 19:42:23 +0100 (CET) Received: by s15328186.onlinehome-server.info (Postfix, from userid 491) id 445ED439E3D; Mon, 7 Jan 2013 19:42:17 +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 CAC4D439E3F; Mon, 7 Jan 2013 19:42:15 +0100 (CET) From: fred.konrad@greensocs.com To: qemu-devel@nongnu.org, aliguori@us.ibm.com Date: Mon, 7 Jan 2013 19:40:48 +0100 Message-Id: <1357584074-10852-36-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 35/61] virtio-balloon : cleanup : init and exit function. 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. This shouldn't been applyied before virtio-balloon-pci refactoring. Signed-off-by: KONRAD Frederic --- hw/virtio-balloon.c | 68 ++++++++++------------------------------------------- 1 file changed, 12 insertions(+), 56 deletions(-) diff --git a/hw/virtio-balloon.c b/hw/virtio-balloon.c index fc94e3e..3990a6b 100644 --- a/hw/virtio-balloon.c +++ b/hw/virtio-balloon.c @@ -224,27 +224,14 @@ static int virtio_balloon_load(QEMUFile *f, void *opaque, int version_id) return 0; } -static VirtIODevice *virtio_balloon_common_init(DeviceState *dev, - VirtIOBalloon **ps) +static int virtio_balloon_device_init(VirtIODevice *vdev) { - VirtIOBalloon *s = *ps; + DeviceState *qdev = DEVICE(vdev); + VirtIOBalloon *s = VIRTIO_BALLOON(vdev); int ret; - /* - * We have two cases here : the old virtio-balloon-x device, and the - * refactored virtio-balloon. - * This will disappear later in the serie. - */ - int old_device = (s == NULL); - if (s == NULL) { - /* old virtio-balloon-pci or virtio-balloon-s390, no memory allocated */ - s = (VirtIOBalloon *)virtio_common_init("virtio-balloon", - VIRTIO_ID_BALLOON, - 8, sizeof(VirtIOBalloon)); - } else { - /* new API virtio-balloon. ( memory allocated by qdev ) */ - virtio_init(VIRTIO_DEVICE(s), "virtio-balloon", VIRTIO_ID_BALLOON, 8); - } + virtio_init(vdev, "virtio-balloon", VIRTIO_ID_BALLOON, 8); + /* * This will disappear later in the serie. * We will use VirtioDeviceClass instead. @@ -255,53 +242,22 @@ static VirtIODevice *virtio_balloon_common_init(DeviceState *dev, ret = qemu_add_balloon_handler(virtio_balloon_to_target, virtio_balloon_stat, s); - if ((ret < 0) && (old_device)) { - virtio_cleanup(&s->vdev); - return NULL; - } + if (ret < 0) { virtio_common_cleanup(VIRTIO_DEVICE(s)); - return NULL; + return -1; } - s->ivq = virtio_add_queue(&s->vdev, 128, virtio_balloon_handle_output); - s->dvq = virtio_add_queue(&s->vdev, 128, virtio_balloon_handle_output); - s->svq = virtio_add_queue(&s->vdev, 128, virtio_balloon_receive_stats); + s->ivq = virtio_add_queue(vdev, 128, virtio_balloon_handle_output); + s->dvq = virtio_add_queue(vdev, 128, virtio_balloon_handle_output); + s->svq = virtio_add_queue(vdev, 128, virtio_balloon_receive_stats); reset_stats(s); - s->qdev = dev; - register_savevm(dev, "virtio-balloon", -1, 1, + s->qdev = qdev; + register_savevm(qdev, "virtio-balloon", -1, 1, virtio_balloon_save, virtio_balloon_load, s); - return &s->vdev; -} - -/* - * This two functions will be removed later in the serie. - */ -VirtIODevice *virtio_balloon_init(DeviceState *dev) -{ - VirtIOBalloon *s = NULL; - return virtio_balloon_common_init(dev, &s); -} - -void virtio_balloon_exit(VirtIODevice *vdev) -{ - VirtIOBalloon *s = DO_UPCAST(VirtIOBalloon, vdev, vdev); - - qemu_remove_balloon_handler(s); - unregister_savevm(s->qdev, "virtio-balloon", s); - virtio_cleanup(vdev); -} - -static int virtio_balloon_device_init(VirtIODevice *vdev) -{ - DeviceState *qdev = DEVICE(vdev); - VirtIOBalloon *s = VIRTIO_BALLOON(vdev); - if (virtio_balloon_common_init(qdev, &s) == NULL) { - return -1; - } return 0; }