[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 3/7] virtio-blk: Create exit function to unregister
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PATCH 3/7] virtio-blk: Create exit function to unregister savevm |
Date: |
Mon, 26 Jul 2010 16:01:13 +0200 |
From: Alex Williamson <address@hidden>
Otherwise we can't migrate after we've removed a virtio block device.
Signed-off-by: Alex Williamson <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
hw/virtio-blk.c | 8 ++++++++
hw/virtio-pci.c | 1 +
hw/virtio.h | 1 +
3 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/hw/virtio-blk.c b/hw/virtio-blk.c
index f50069d..490cd41 100644
--- a/hw/virtio-blk.c
+++ b/hw/virtio-blk.c
@@ -28,6 +28,7 @@ typedef struct VirtIOBlock
BlockConf *conf;
unsigned short sector_mask;
char sn[BLOCK_SERIAL_STRLEN];
+ DeviceState *qdev;
} VirtIOBlock;
static VirtIOBlock *to_virtio_blk(VirtIODevice *vdev)
@@ -522,9 +523,16 @@ VirtIODevice *virtio_blk_init(DeviceState *dev, BlockConf
*conf)
s->vq = virtio_add_queue(&s->vdev, 128, virtio_blk_handle_output);
qemu_add_vm_change_state_handler(virtio_blk_dma_restart_cb, s);
+ s->qdev = dev;
register_savevm(dev, "virtio-blk", virtio_blk_id++, 2,
virtio_blk_save, virtio_blk_load, s);
bdrv_set_removable(s->bs, 0);
return &s->vdev;
}
+
+void virtio_blk_exit(VirtIODevice *vdev)
+{
+ VirtIOBlock *s = to_virtio_blk(vdev);
+ unregister_savevm(s->qdev, "virtio-blk", s);
+}
diff --git a/hw/virtio-pci.c b/hw/virtio-pci.c
index 31a711e..17c3d15 100644
--- a/hw/virtio-pci.c
+++ b/hw/virtio-pci.c
@@ -569,6 +569,7 @@ static int virtio_blk_exit_pci(PCIDevice *pci_dev)
{
VirtIOPCIProxy *proxy = DO_UPCAST(VirtIOPCIProxy, pci_dev, pci_dev);
+ virtio_blk_exit(proxy->vdev);
blockdev_mark_auto_del(proxy->block.bs);
return virtio_exit_pci(pci_dev);
}
diff --git a/hw/virtio.h b/hw/virtio.h
index e4306cd..30e472a 100644
--- a/hw/virtio.h
+++ b/hw/virtio.h
@@ -194,6 +194,7 @@ VirtIODevice *virtio_9p_init(DeviceState *dev, V9fsConf
*conf);
void virtio_net_exit(VirtIODevice *vdev);
+void virtio_blk_exit(VirtIODevice *vdev);
#define DEFINE_VIRTIO_COMMON_FEATURES(_state, _field) \
DEFINE_PROP_BIT("indirect_desc", _state, _field, \
--
1.7.1.1
- [Qemu-devel] [PULL 0/7] Block patches, Kevin Wolf, 2010/07/26
- [Qemu-devel] [PATCH 1/7] ide/atapi: add support for GET EVENT STATUS NOTIFICATION, Kevin Wolf, 2010/07/26
- [Qemu-devel] [PATCH 2/7] block migration: propagate return value when bdrv_write() returns < 0, Kevin Wolf, 2010/07/26
- [Qemu-devel] [PATCH 3/7] virtio-blk: Create exit function to unregister savevm,
Kevin Wolf <=
- [Qemu-devel] [PATCH 7/7] Fix -snapshot deleting images on disk change, Kevin Wolf, 2010/07/26
- [Qemu-devel] [PATCH 5/7] block: default to 0 minimal / optiomal I/O size, Kevin Wolf, 2010/07/26
- [Qemu-devel] [PATCH 4/7] move 'unsafe' to end of caching modes in help, Kevin Wolf, 2010/07/26
- [Qemu-devel] [PATCH 6/7] block: Use error codes from lower levels for error message, Kevin Wolf, 2010/07/26