qemu/vdpa-correct-param-passed-in-when-unregister-save.patch

31 lines
1.1 KiB
Diff
Raw Normal View History

From 9f0b9d2d71b9fa21789981d68335ee417e18b025 Mon Sep 17 00:00:00 2001
From: jiangdongxu <jiangdongxu1@huawei.com>
Date: Thu, 14 Dec 2023 11:22:54 +0800
Subject: [PATCH] vdpa: correct param passed in when unregister save
The idstr passed in the unregister_savevm function is inconsisten
with the idstr passed in when register_savevm_live registration.
Needs to be modified, otherwise migration will fail after hotunplug
all vdpa devices.
Signed-off-by: jiangdongxu <jiangdongxu1@huawei.com>
---
hw/virtio/vdpa-dev-mig.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hw/virtio/vdpa-dev-mig.c b/hw/virtio/vdpa-dev-mig.c
index ee3e27f2bb..c71e71fd64 100644
--- a/hw/virtio/vdpa-dev-mig.c
+++ b/hw/virtio/vdpa-dev-mig.c
@@ -400,6 +400,6 @@ void vdpa_migration_register(VhostVdpaDevice *vdev)
void vdpa_migration_unregister(VhostVdpaDevice *vdev)
{
remove_migration_state_change_notifier(&vdev->migration_state);
- unregister_savevm(VMSTATE_IF(&vdev->parent_obj.parent_obj), "vdpa", DEVICE(vdev));
+ unregister_savevm(NULL, "vdpa", DEVICE(vdev));
qemu_del_vm_change_state_handler(vdev->vmstate);
}
--
2.27.0