[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH V3 07/44] virtio-blk: cleanup: remove qdev field.
From: |
fred . konrad |
Subject: |
[Qemu-devel] [PATCH V3 07/44] virtio-blk: cleanup: remove qdev field. |
Date: |
Tue, 15 Jan 2013 15:09:21 +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 | 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 c19d347..74ba97b 100644
--- a/hw/virtio-blk.c
+++ b/hw/virtio-blk.c
@@ -671,7 +671,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);
@@ -691,7 +690,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 2b3c99a..f281ac3 100644
--- a/hw/virtio-blk.h
+++ b/hw/virtio-blk.h
@@ -121,7 +121,6 @@ typedef struct VirtIOBlock {
BlockConf *conf;
VirtIOBlkConf blk;
unsigned short sector_mask;
- DeviceState *qdev;
#ifdef CONFIG_VIRTIO_BLK_DATA_PLANE
VirtIOBlockDataPlane *dataplane;
#endif
--
1.7.11.7
- [Qemu-devel] [PATCH V3 00/44] Virtio-refactoring part2., fred . konrad, 2013/01/15
- [Qemu-devel] [PATCH V3 01/44] virtio: make virtio device's structures public., fred . konrad, 2013/01/15
- [Qemu-devel] [PATCH V3 05/44] virtio-blk-s390: switch to the new API., fred . konrad, 2013/01/15
- [Qemu-devel] [PATCH V3 02/44] virtio-blk: don't use pointer for configuration., fred . konrad, 2013/01/15
- [Qemu-devel] [PATCH V3 03/44] virtio-blk: add the virtio-blk device., fred . konrad, 2013/01/15
- [Qemu-devel] [PATCH V3 04/44] virtio-blk-pci: switch to new API., fred . konrad, 2013/01/15
- [Qemu-devel] [PATCH V3 07/44] virtio-blk: cleanup: remove qdev field.,
fred . konrad <=
- [Qemu-devel] [PATCH V3 12/44] virtio-net: cleanup: init and exit function., fred . konrad, 2013/01/15
- [Qemu-devel] [PATCH V3 11/44] virtio-net: cleanup: use QOM cast., fred . konrad, 2013/01/15
- [Qemu-devel] [PATCH V3 09/44] virtio-net-pci: switch to the new API., fred . konrad, 2013/01/15
- [Qemu-devel] [PATCH V3 08/44] virtio-net: add the virtio-net device., fred . konrad, 2013/01/15
- [Qemu-devel] [PATCH V3 15/44] virtio-scsi: allocate cmd_vqs array separately., fred . konrad, 2013/01/15
- [Qemu-devel] [PATCH V3 10/44] virtio-net-s390: switch to the new API., fred . konrad, 2013/01/15
- [Qemu-devel] [PATCH V3 44/44] virtio-9p: cleanup: QOM casts., fred . konrad, 2013/01/15
- [Qemu-devel] [PATCH V3 14/44] virtio-scsi: don't use pointer for configuration., fred . konrad, 2013/01/15
- [Qemu-devel] [PATCH V3 39/44] virtio-serial: cleanup: use QOM casts., fred . konrad, 2013/01/15