From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:54546) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UFLX6-0007EZ-MP for qemu-devel@nongnu.org; Tue, 12 Mar 2013 05:30:14 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UFLWz-0001kC-PT for qemu-devel@nongnu.org; Tue, 12 Mar 2013 05:30:08 -0400 Received: from greensocs.com ([87.106.252.221]:33375 helo=s15328186.onlinehome-server.info) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UFLQ5-00078H-FM for qemu-devel@nongnu.org; Tue, 12 Mar 2013 05:22:53 -0400 From: fred.konrad@greensocs.com Date: Tue, 12 Mar 2013 10:22:11 +0100 Message-Id: <1363080131-16427-9-git-send-email-fred.konrad@greensocs.com> In-Reply-To: <1363080131-16427-1-git-send-email-fred.konrad@greensocs.com> References: <1363080131-16427-1-git-send-email-fred.konrad@greensocs.com> Subject: [Qemu-devel] [PATCH v6 8/8] virtio-blk: cleanup: remove qdev field. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, aliguori@us.ibm.com, afaerber@suse.de Cc: Kevin Wolf , peter.maydell@linaro.org, mst@redhat.com, mark.burton@greensocs.com, Stefan Hajnoczi , fred.konrad@greensocs.com 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 556d6d9..fffeeae 100644 --- a/hw/virtio-blk.c +++ b/hw/virtio-blk.c @@ -669,7 +669,6 @@ static int virtio_blk_device_init(VirtIODevice *vdev) #endif s->change = 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); @@ -690,7 +689,7 @@ static int virtio_blk_device_exit(DeviceState *dev) s->dataplane = NULL; #endif qemu_del_vm_change_state_handler(s->change); - 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 aa933ce..efa0ebf 100644 --- a/hw/virtio-blk.h +++ b/hw/virtio-blk.h @@ -124,7 +124,6 @@ typedef struct VirtIOBlock { BlockConf *conf; VirtIOBlkConf blk; unsigned short sector_mask; - DeviceState *qdev; VMChangeStateEntry *change; #ifdef CONFIG_VIRTIO_BLK_DATA_PLANE VirtIOBlockDataPlane *dataplane; -- 1.7.11.7