From: Paolo Bonzini <pbonzini@redhat.com>
Date: Mon, 19 Mar 2012 14:21:57 +0000 (+0100)
Subject: virtio-scsi: call unregister_savevm properly
X-Git-Tag: v1.1-rc0~219^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=eb2fa76418402c8b26e1ab4cb53498ee0f4e52ef;p=thirdparty%2Fqemu.git

virtio-scsi: call unregister_savevm properly

This fixes a use-after-free when migrating after hot-unplug.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---

diff --git a/hw/virtio-scsi.c b/hw/virtio-scsi.c
index e607edc915b..45d54faeb5e 100644
--- a/hw/virtio-scsi.c
+++ b/hw/virtio-scsi.c
@@ -613,5 +613,7 @@ VirtIODevice *virtio_scsi_init(DeviceState *dev, VirtIOSCSIConf *proxyconf)
 
 void virtio_scsi_exit(VirtIODevice *vdev)
 {
+    VirtIOSCSI *s = (VirtIOSCSI *)vdev;
+    unregister_savevm(s->qdev, "virtio-scsi", s);
     virtio_cleanup(vdev);
 }