[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v10 11/11] virtio-blk: cleanup: remove qdev field.
From: |
fred . konrad |
Subject: |
[Qemu-devel] [PATCH v10 11/11] virtio-blk: cleanup: remove qdev field. |
Date: |
Mon, 18 Mar 2013 17:37:28 +0100 |
From: KONRAD Frederic <address@hidden>
The qdev field is no longer needed, just drop it.
Signed-off-by: KONRAD Frederic <address@hidden>
Reviewed-by: Peter Maydell <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 663edcd..e6f8875 100644
--- a/hw/virtio-blk.c
+++ b/hw/virtio-blk.c
@@ -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;
diff --git a/hw/virtio-blk.h b/hw/virtio-blk.h
index 51ac010..8c6c78b 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;
VMChangeStateEntry *change;
#ifdef CONFIG_VIRTIO_BLK_DATA_PLANE
VirtIOBlockDataPlane *dataplane;
--
1.7.11.7
- [Qemu-devel] [PATCH v10 06/11] virtio-blk-pci: switch to new API., (continued)
- [Qemu-devel] [PATCH v10 06/11] virtio-blk-pci: switch to new API., fred . konrad, 2013/03/18
- [Qemu-devel] [PATCH v10 08/11] virtio-blk-ccw switch to new API., fred . konrad, 2013/03/18
- [Qemu-devel] [PATCH v10 05/11] virtio-blk: add the virtio-blk device., fred . konrad, 2013/03/18
- [Qemu-devel] [PATCH v10 09/11] virtio-blk: cleanup: init and exit functions., fred . konrad, 2013/03/18
- [Qemu-devel] [PATCH v10 07/11] virtio-blk-s390: switch to the new API., fred . konrad, 2013/03/18
- [Qemu-devel] [PATCH v10 04/11] virtio-blk: don't use pointer for configuration., fred . konrad, 2013/03/18
- [Qemu-devel] [PATCH v10 03/11] virtio-pci: fix hot unplug., fred . konrad, 2013/03/18
- [Qemu-devel] [PATCH v10 10/11] virtio-blk: cleanup: QOM cast, fred . konrad, 2013/03/18
- Re: [Qemu-devel] [PATCH v10 00/11] virtio-blk refactoring., Cornelia Huck, 2013/03/18
- [Qemu-devel] [PATCH v10 11/11] virtio-blk: cleanup: remove qdev field.,
fred . konrad <=
- Re: [Qemu-devel] [PATCH v10 00/11] virtio-blk refactoring., Anthony Liguori, 2013/03/18