Commit 2d62a957 authored by KONRAD Frederic's avatar KONRAD Frederic Committed by Anthony Liguori
Browse files

virtio-blk: cleanup: remove qdev field. 



The qdev field is no longer needed, just drop it.

Signed-off-by: default avatarKONRAD Frederic <fred.konrad@greensocs.com>
Reviewed-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Message-id: 1363624648-16906-12-git-send-email-fred.konrad@greensocs.com
Signed-off-by: default avatarAnthony Liguori <aliguori@us.ibm.com>
parent 1cc91b7d

hw/virtio-blk.c

+1 −2
Original line number Diff line number Diff line
@@ -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;

hw/virtio-blk.h

+0 −1
Original line number Diff line number Diff line
@@ -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;