[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC V9 12/12] virtio-blk : cleanup : remove qdev field.
From: |
fred . konrad |
Subject: |
[Qemu-devel] [RFC V9 12/12] virtio-blk : cleanup : remove qdev field. |
Date: |
Thu, 3 Jan 2013 15:52:24 +0100 |
From: KONRAD Frederic <address@hidden>
The qdev field is no longer needed, just drop it.
Signed-off-by: KONRAD Frederic <address@hidden>
---
hw/virtio-blk.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/hw/virtio-blk.c b/hw/virtio-blk.c
index 67e58da..0363419 100644
--- a/hw/virtio-blk.c
+++ b/hw/virtio-blk.c
@@ -33,7 +33,6 @@ typedef struct VirtIOBlock
BlockConf *conf;
VirtIOBlkConf blk;
unsigned short sector_mask;
- DeviceState *qdev;
} VirtIOBlock;
typedef struct VirtIOBlockReq
@@ -643,7 +642,6 @@ static int virtio_blk_device_init(VirtIODevice *vdev)
s->vq = virtio_add_queue(vdev, 128, virtio_blk_handle_output);
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);
@@ -658,7 +656,7 @@ static int virtio_blk_device_exit(DeviceState *dev)
{
VirtIODevice *vdev = VIRTIO_DEVICE(dev);
VirtIOBlock *s = VIRTIO_BLK(dev);
- 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;
--
1.7.11.7
- [Qemu-devel] [RFC V9 05/12] virtio-device : refactor virtio-device., (continued)
- [Qemu-devel] [RFC V9 05/12] virtio-device : refactor virtio-device., fred . konrad, 2013/01/03
- [Qemu-devel] [RFC V9 02/12] virtio-bus : introduce virtio-bus, fred . konrad, 2013/01/03
- [Qemu-devel] [RFC V9 04/12] virtio-pci : refactor virtio-pci device., fred . konrad, 2013/01/03
- [Qemu-devel] [RFC V9 08/12] virtio-blk : add the virtio-blk device., fred . konrad, 2013/01/03
- [Qemu-devel] [RFC V9 10/12] virtio-blk-s390 : switch to the new API., fred . konrad, 2013/01/03
- [Qemu-devel] [RFC V9 09/12] virtio-blk-pci : switch to new API., fred . konrad, 2013/01/03
- [Qemu-devel] [RFC V9 11/12] virtio-blk : cleanup : use QOM cast., fred . konrad, 2013/01/03
- [Qemu-devel] [RFC V9 12/12] virtio-blk : cleanup : remove qdev field.,
fred . konrad <=