From patchwork Wed Dec 19 09:53:41 2012 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: 207310 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 931562C0094 for ; Wed, 19 Dec 2012 21:42:41 +1100 (EST) Received: from localhost ([::1]:57247 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TlGMZ-0006f8-7x for incoming@patchwork.ozlabs.org; Wed, 19 Dec 2012 04:54:55 -0500 Received: from eggs.gnu.org ([208.118.235.92]:36617) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TlGLl-0005Fv-Ss for qemu-devel@nongnu.org; Wed, 19 Dec 2012 04:54:06 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TlGLj-0001oP-RY for qemu-devel@nongnu.org; Wed, 19 Dec 2012 04:54:05 -0500 Received: from greensocs.com ([87.106.252.221]:54876 helo=s15328186.onlinehome-server.info) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TlGLj-0001oE-KS for qemu-devel@nongnu.org; Wed, 19 Dec 2012 04:54:03 -0500 Received: from localhost (unknown [127.0.0.1]) by s15328186.onlinehome-server.info (Postfix) with ESMTP id CCDCD439E41; Wed, 19 Dec 2012 09:54:02 +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 DGYzmBu6E8AT; Wed, 19 Dec 2012 10:54:02 +0100 (CET) Received: by s15328186.onlinehome-server.info (Postfix, from userid 491) id 97E69439E3E; Wed, 19 Dec 2012 10:54:02 +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 A18B4439E45; Wed, 19 Dec 2012 10:54:01 +0100 (CET) From: fred.konrad@greensocs.com To: qemu-devel@nongnu.org Date: Wed, 19 Dec 2012 10:53:41 +0100 Message-Id: <1355910821-21302-16-git-send-email-fred.konrad@greensocs.com> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1355910821-21302-1-git-send-email-fred.konrad@greensocs.com> References: <1355910821-21302-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: peter.maydell@linaro.org, aliguori@us.ibm.com, e.voevodin@samsung.com, mark.burton@greensocs.com, agraf@suse.de, stefanha@redhat.com, cornelia.huck@de.ibm.com, afaerber@suse.de, fred.konrad@greensocs.com Subject: [Qemu-devel] [RFC PATCH V8 15/15] virtio : 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 Clean the init and the exit function. It should be applied when all the device have been refactored. Signed-off-by: KONRAD Frederic --- hw/virtio.c | 15 --------------- hw/virtio.h | 4 ---- 2 files changed, 19 deletions(-) diff --git a/hw/virtio.c b/hw/virtio.c index d124ca0..39cdebe 100644 --- a/hw/virtio.c +++ b/hw/virtio.c @@ -908,12 +908,6 @@ void virtio_common_cleanup(VirtIODevice *vdev) g_free(vdev->vq); } -void virtio_cleanup(VirtIODevice *vdev) -{ - virtio_common_cleanup(vdev); - g_free(vdev); -} - static void virtio_vmstate_change(void *opaque, int running, RunState state) { VirtIODevice *vdev = opaque; @@ -963,15 +957,6 @@ void virtio_init(VirtIODevice *vdev, const char *name, vdev); } -VirtIODevice *virtio_common_init(const char *name, uint16_t device_id, - size_t config_size, size_t struct_size) -{ - VirtIODevice *vdev; - vdev = g_malloc0(struct_size); - virtio_init(vdev, name, device_id, config_size); - return vdev; -} - hwaddr virtio_queue_get_desc_addr(VirtIODevice *vdev, int n) { return vdev->vq[n].vring.desc; diff --git a/hw/virtio.h b/hw/virtio.h index 82726a3..de46098 100644 --- a/hw/virtio.h +++ b/hw/virtio.h @@ -162,8 +162,6 @@ void virtio_save(VirtIODevice *vdev, QEMUFile *f); int virtio_load(VirtIODevice *vdev, QEMUFile *f); -void virtio_cleanup(VirtIODevice *vdev); - void virtio_notify_config(VirtIODevice *vdev); void virtio_queue_set_notification(VirtQueue *vq, int enable); @@ -174,8 +172,6 @@ int virtio_queue_empty(VirtQueue *vq); /* Host binding interface. */ -VirtIODevice *virtio_common_init(const char *name, uint16_t device_id, - size_t config_size, size_t struct_size); uint32_t virtio_config_readb(VirtIODevice *vdev, uint32_t addr); uint32_t virtio_config_readw(VirtIODevice *vdev, uint32_t addr); uint32_t virtio_config_readl(VirtIODevice *vdev, uint32_t addr);