virtio-blk: Create exit function to unregister savevm
Otherwise we can't migrate after we've removed a virtio block device. Signed-off-by: Alex Williamson <alex.williamson@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
parent
b02bea3a85
commit
9d0d313859
|
@ -28,6 +28,7 @@ typedef struct VirtIOBlock
|
||||||
BlockConf *conf;
|
BlockConf *conf;
|
||||||
unsigned short sector_mask;
|
unsigned short sector_mask;
|
||||||
char sn[BLOCK_SERIAL_STRLEN];
|
char sn[BLOCK_SERIAL_STRLEN];
|
||||||
|
DeviceState *qdev;
|
||||||
} VirtIOBlock;
|
} VirtIOBlock;
|
||||||
|
|
||||||
static VirtIOBlock *to_virtio_blk(VirtIODevice *vdev)
|
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);
|
s->vq = virtio_add_queue(&s->vdev, 128, virtio_blk_handle_output);
|
||||||
|
|
||||||
qemu_add_vm_change_state_handler(virtio_blk_dma_restart_cb, s);
|
qemu_add_vm_change_state_handler(virtio_blk_dma_restart_cb, s);
|
||||||
|
s->qdev = dev;
|
||||||
register_savevm(dev, "virtio-blk", virtio_blk_id++, 2,
|
register_savevm(dev, "virtio-blk", virtio_blk_id++, 2,
|
||||||
virtio_blk_save, virtio_blk_load, s);
|
virtio_blk_save, virtio_blk_load, s);
|
||||||
bdrv_set_removable(s->bs, 0);
|
bdrv_set_removable(s->bs, 0);
|
||||||
|
|
||||||
return &s->vdev;
|
return &s->vdev;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void virtio_blk_exit(VirtIODevice *vdev)
|
||||||
|
{
|
||||||
|
VirtIOBlock *s = to_virtio_blk(vdev);
|
||||||
|
unregister_savevm(s->qdev, "virtio-blk", s);
|
||||||
|
}
|
||||||
|
|
|
@ -569,6 +569,7 @@ static int virtio_blk_exit_pci(PCIDevice *pci_dev)
|
||||||
{
|
{
|
||||||
VirtIOPCIProxy *proxy = DO_UPCAST(VirtIOPCIProxy, pci_dev, pci_dev);
|
VirtIOPCIProxy *proxy = DO_UPCAST(VirtIOPCIProxy, pci_dev, pci_dev);
|
||||||
|
|
||||||
|
virtio_blk_exit(proxy->vdev);
|
||||||
blockdev_mark_auto_del(proxy->block.bs);
|
blockdev_mark_auto_del(proxy->block.bs);
|
||||||
return virtio_exit_pci(pci_dev);
|
return virtio_exit_pci(pci_dev);
|
||||||
}
|
}
|
||||||
|
|
|
@ -194,6 +194,7 @@ VirtIODevice *virtio_9p_init(DeviceState *dev, V9fsConf *conf);
|
||||||
|
|
||||||
|
|
||||||
void virtio_net_exit(VirtIODevice *vdev);
|
void virtio_net_exit(VirtIODevice *vdev);
|
||||||
|
void virtio_blk_exit(VirtIODevice *vdev);
|
||||||
|
|
||||||
#define DEFINE_VIRTIO_COMMON_FEATURES(_state, _field) \
|
#define DEFINE_VIRTIO_COMMON_FEATURES(_state, _field) \
|
||||||
DEFINE_PROP_BIT("indirect_desc", _state, _field, \
|
DEFINE_PROP_BIT("indirect_desc", _state, _field, \
|
||||||
|
|
Loading…
Reference in New Issue