Treat a missing RAMBlock as nothing to unregister. qemu_ram_unset_idstr() already accepts a NULL block.
Signed-off-by: Marc-André Lureau <[email protected]> --- migration/savevm.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/migration/savevm.c b/migration/savevm.c index 4b590ea672d2..fe94ba96e432 100644 --- a/migration/savevm.c +++ b/migration/savevm.c @@ -3610,6 +3610,9 @@ void vmstate_register_ram(MemoryRegion *mr, DeviceState *dev) void vmstate_unregister_ram(MemoryRegion *mr, DeviceState *dev) { + if (!mr->ram_block) { + return; + } qemu_ram_unset_idstr(mr->ram_block); qemu_ram_unset_migratable(mr->ram_block); ram_block_del_cpr_blocker(mr->ram_block); -- 2.56.0.116.g6de20f6092dc
