From patchwork Mon Feb 18 14:15:49 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [V5,8/8] virtio-blk: cleanup: remove qdev field. From: fred.konrad@greensocs.com X-Patchwork-Id: 221392 Message-Id: <1361196949-4888-9-git-send-email-fred.konrad@greensocs.com> To: qemu-devel@nongnu.org, aliguori@us.ibm.com Cc: Kevin Wolf , peter.maydell@linaro.org, mark.burton@greensocs.com, Stefan Hajnoczi , afaerber@suse.de, fred.konrad@greensocs.com Date: Mon, 18 Feb 2013 15:15:49 +0100 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 6f36d68..50c1670 100644 --- a/hw/virtio-blk.c +++ b/hw/virtio-blk.c @@ -669,7 +669,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); @@ -689,7 +688,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 44354c0..ba653be 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; #ifdef CONFIG_VIRTIO_BLK_DATA_PLANE VirtIOBlockDataPlane *dataplane; #endif