From 34818874a3c1e4547e8034d975c16857ecfad301 Mon Sep 17 00:00:00 2001 From: Alex Williamson Date: Wed, 21 Jul 2010 15:52:27 -0300 Subject: [PATCH 24/24] virtio-blk: Create exit function to unregister savevm RH-Author: Alex Williamson Message-id: <20100721155214.11344.15512.stgit@localhost6.localdomain6> Patchwork-id: 10905 O-Subject: [RHEL6.0 qemu-kvm PATCH] virtio-blk: Create exit function to unregister savevm Bugzilla: 580010 RH-Acked-by: Juan Quintela RH-Acked-by: Amit Shah RH-Acked-by: Jes Sorensen Bugzilla: 580010 Upstream status: applied to block branch Note: Merge conflicts make this depend on patch series for bugzilla 596328 Otherwise we can't migrate after we've removed a virtio block device. Signed-off-by: Alex Williamson --- hw/virtio-blk.c | 8 ++++++++ hw/virtio-pci.c | 1 + hw/virtio.h | 1 + 3 files changed, 10 insertions(+), 0 deletions(-) Signed-off-by: Eduardo Habkost --- 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 a23658e..e5a9ed6 100644 --- a/hw/virtio-blk.c +++ b/hw/virtio-blk.c @@ -28,6 +28,7 @@ typedef struct VirtIOBlock QEMUBH *bh; BlockConf *conf; unsigned short sector_mask; + DeviceState *qdev; } VirtIOBlock; static VirtIOBlock *to_virtio_blk(VirtIODevice *vdev) @@ -515,8 +516,15 @@ 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); 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 dba38b6..0c4245b 100644 --- a/hw/virtio-pci.c +++ b/hw/virtio-pci.c @@ -599,6 +599,7 @@ static int virtio_blk_exit_pci(PCIDevice *pci_dev) { VirtIOPCIProxy *proxy = DO_UPCAST(VirtIOPCIProxy, pci_dev, pci_dev); + virtio_blk_exit(proxy->vdev); drive_uninit(proxy->block.dinfo); return virtio_exit_pci(pci_dev); } diff --git a/hw/virtio.h b/hw/virtio.h index f885f1b..5b3aaca 100644 --- a/hw/virtio.h +++ b/hw/virtio.h @@ -187,6 +187,7 @@ VirtIODevice *virtio_serial_init(DeviceState *dev, uint32_t max_nr_ports); VirtIODevice *virtio_balloon_init(DeviceState *dev); 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.0.3