@@ -288,8 +288,11 @@ void memory_device_plug(MemoryDeviceState *md, MachineState *ms)
addr - ms->device_memory->base, mr);
}
-void memory_device_unplug_region(MachineState *ms, MemoryRegion *mr)
+void memory_device_unplug(MemoryDeviceState *md, MachineState *ms)
{
+ const MemoryDeviceClass *mdc = MEMORY_DEVICE_GET_CLASS(md);
+ MemoryRegion *mr = mdc->get_memory_region(md, &error_abort);
+
/* we expect a previous call to memory_device_get_free_addr() */
g_assert(ms->device_memory);
@@ -76,9 +76,8 @@ void pc_dimm_unplug(DeviceState *dev, MachineState *machine)
PCDIMMDeviceClass *ddc = PC_DIMM_GET_CLASS(dimm);
MemoryRegion *vmstate_mr = ddc->get_vmstate_memory_region(dimm,
&error_abort);
- MemoryRegion *mr = ddc->get_memory_region(dimm, &error_abort);
- memory_device_unplug_region(machine, mr);
+ memory_device_unplug(MEMORY_DEVICE(dev), machine);
vmstate_unregister_ram(vmstate_mr, dev);
}
@@ -60,6 +60,6 @@ uint64_t get_plugged_memory_size(void);
void memory_device_pre_plug(MemoryDeviceState *md, MachineState *ms,
const uint64_t *legacy_align, Error **errp);
void memory_device_plug(MemoryDeviceState *md, MachineState *ms);
-void memory_device_unplug_region(MachineState *ms, MemoryRegion *mr);
+void memory_device_unplug(MemoryDeviceState *md, MachineState *ms);
#endif
With the new memory device functions in place, we can factor out unplugging of memory devices completely. Signed-off-by: David Hildenbrand <david@redhat.com> --- hw/mem/memory-device.c | 5 ++++- hw/mem/pc-dimm.c | 3 +-- include/hw/mem/memory-device.h | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-)