From patchwork Tue Jan 15 14:09:21 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: 212202 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 2CB792C00A5 for ; Wed, 16 Jan 2013 01:53:22 +1100 (EST) Received: from localhost ([::1]:54814 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tv7Ff-0004aa-92 for incoming@patchwork.ozlabs.org; Tue, 15 Jan 2013 09:12:31 -0500 Received: from eggs.gnu.org ([208.118.235.92]:45653) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tv7EJ-00015Z-Ky for qemu-devel@nongnu.org; Tue, 15 Jan 2013 09:12:24 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Tv7E1-0000zy-Mu for qemu-devel@nongnu.org; Tue, 15 Jan 2013 09:11:07 -0500 Received: from greensocs.com ([87.106.252.221]:60379 helo=s15328186.onlinehome-server.info) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Tv7E1-0000zC-Dp for qemu-devel@nongnu.org; Tue, 15 Jan 2013 09:10:49 -0500 Received: from localhost (unknown [127.0.0.1]) by s15328186.onlinehome-server.info (Postfix) with ESMTP id 4CEAB440FC2; Tue, 15 Jan 2013 14:10:48 +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 Yji-P7w-UeMu; Tue, 15 Jan 2013 15:10:47 +0100 (CET) Received: by s15328186.onlinehome-server.info (Postfix, from userid 491) id E00FE43EE34; Tue, 15 Jan 2013 15:10:18 +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 44F0443EE2A; Tue, 15 Jan 2013 15:10:17 +0100 (CET) From: fred.konrad@greensocs.com To: qemu-devel@nongnu.org, aliguori@us.ibm.com Date: Tue, 15 Jan 2013 15:09:21 +0100 Message-Id: <1358258998-6504-8-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 07/44] virtio-blk: cleanup: remove qdev field. 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 The qdev field is no longer needed, just drop it. Signed-off-by: KONRAD Frederic --- hw/virtio-blk.c | 3 +-- hw/virtio-blk.h | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/hw/virtio-blk.c b/hw/virtio-blk.c index c19d347..74ba97b 100644 --- a/hw/virtio-blk.c +++ b/hw/virtio-blk.c @@ -671,7 +671,6 @@ static int virtio_blk_device_init(VirtIODevice *vdev) #endif qemu_add_vm_change_state_handler(virtio_blk_dma_restart_cb, s); - s->qdev = qdev; register_savevm(qdev, "virtio-blk", virtio_blk_id++, 2, virtio_blk_save, virtio_blk_load, s); bdrv_set_dev_ops(s->bs, &virtio_block_ops, s); @@ -691,7 +690,7 @@ static int virtio_blk_device_exit(DeviceState *dev) virtio_blk_data_plane_destroy(s->dataplane); s->dataplane = NULL; #endif - unregister_savevm(s->qdev, "virtio-blk", s); + unregister_savevm(dev, "virtio-blk", s); blockdev_mark_auto_del(s->bs); virtio_common_cleanup(vdev); return 0; diff --git a/hw/virtio-blk.h b/hw/virtio-blk.h index 2b3c99a..f281ac3 100644 --- a/hw/virtio-blk.h +++ b/hw/virtio-blk.h @@ -121,7 +121,6 @@ typedef struct VirtIOBlock { BlockConf *conf; VirtIOBlkConf blk; unsigned short sector_mask; - DeviceState *qdev; #ifdef CONFIG_VIRTIO_BLK_DATA_PLANE VirtIOBlockDataPlane *dataplane; #endif