virtio-blk: cleanup: remove qdev field.
The qdev field is no longer needed, just drop it. Signed-off-by: KONRAD Frederic <fred.konrad@greensocs.com> Reviewed-by: Peter Maydell <peter.maydell@linaro.org> Message-id: 1363624648-16906-12-git-send-email-fred.konrad@greensocs.com Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
parent
1cc91b7df6
commit
2d62a95766
|
@ -669,7 +669,6 @@ static int virtio_blk_device_init(VirtIODevice *vdev)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
s->change = qemu_add_vm_change_state_handler(virtio_blk_dma_restart_cb, s);
|
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,
|
register_savevm(qdev, "virtio-blk", virtio_blk_id++, 2,
|
||||||
virtio_blk_save, virtio_blk_load, s);
|
virtio_blk_save, virtio_blk_load, s);
|
||||||
bdrv_set_dev_ops(s->bs, &virtio_block_ops, 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;
|
s->dataplane = NULL;
|
||||||
#endif
|
#endif
|
||||||
qemu_del_vm_change_state_handler(s->change);
|
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);
|
blockdev_mark_auto_del(s->bs);
|
||||||
virtio_common_cleanup(vdev);
|
virtio_common_cleanup(vdev);
|
||||||
return 0;
|
return 0;
|
||||||
|
|
|
@ -124,7 +124,6 @@ typedef struct VirtIOBlock {
|
||||||
BlockConf *conf;
|
BlockConf *conf;
|
||||||
VirtIOBlkConf blk;
|
VirtIOBlkConf blk;
|
||||||
unsigned short sector_mask;
|
unsigned short sector_mask;
|
||||||
DeviceState *qdev;
|
|
||||||
VMChangeStateEntry *change;
|
VMChangeStateEntry *change;
|
||||||
#ifdef CONFIG_VIRTIO_BLK_DATA_PLANE
|
#ifdef CONFIG_VIRTIO_BLK_DATA_PLANE
|
||||||
VirtIOBlockDataPlane *dataplane;
|
VirtIOBlockDataPlane *dataplane;
|
||||||
|
|
Loading…
Reference in a new issue