pc-dimm: move actual plug/unplug of a memory region to MemoryDevice
Registering the memory region for migration has do be done by the owner. There could be cases, where we don't want to migrate the memory. Signed-off-by: David Hildenbrand <david@redhat.com> Message-Id: <20180423165126.15441-8-david@redhat.com> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
This commit is contained in:
parent
1b6d6af21b
commit
18d11dc910
|
@ -243,6 +243,24 @@ uint64_t get_plugged_memory_size(void)
|
|||
return size;
|
||||
}
|
||||
|
||||
void memory_device_plug_region(MachineState *ms, MemoryRegion *mr,
|
||||
uint64_t addr)
|
||||
{
|
||||
/* we expect a previous call to memory_device_get_free_addr() */
|
||||
g_assert(ms->device_memory);
|
||||
|
||||
memory_region_add_subregion(&ms->device_memory->mr,
|
||||
addr - ms->device_memory->base, mr);
|
||||
}
|
||||
|
||||
void memory_device_unplug_region(MachineState *ms, MemoryRegion *mr)
|
||||
{
|
||||
/* we expect a previous call to memory_device_get_free_addr() */
|
||||
g_assert(ms->device_memory);
|
||||
|
||||
memory_region_del_subregion(&ms->device_memory->mr, mr);
|
||||
}
|
||||
|
||||
static const TypeInfo memory_device_info = {
|
||||
.name = TYPE_MEMORY_DEVICE,
|
||||
.parent = TYPE_INTERFACE,
|
||||
|
|
|
@ -36,7 +36,6 @@ void pc_dimm_memory_plug(DeviceState *dev, MachineState *machine,
|
|||
uint64_t align, Error **errp)
|
||||
{
|
||||
int slot;
|
||||
MemoryHotplugState *hpms = machine->device_memory;
|
||||
PCDIMMDevice *dimm = PC_DIMM(dev);
|
||||
PCDIMMDeviceClass *ddc = PC_DIMM_GET_CLASS(dimm);
|
||||
MemoryRegion *vmstate_mr = ddc->get_vmstate_memory_region(dimm);
|
||||
|
@ -83,7 +82,7 @@ void pc_dimm_memory_plug(DeviceState *dev, MachineState *machine,
|
|||
}
|
||||
trace_mhp_pc_dimm_assigned_slot(slot);
|
||||
|
||||
memory_region_add_subregion(&hpms->mr, addr - hpms->base, mr);
|
||||
memory_device_plug_region(machine, mr, addr);
|
||||
vmstate_register_ram(vmstate_mr, dev);
|
||||
|
||||
out:
|
||||
|
@ -97,7 +96,7 @@ void pc_dimm_memory_unplug(DeviceState *dev, MachineState *machine)
|
|||
MemoryRegion *vmstate_mr = ddc->get_vmstate_memory_region(dimm);
|
||||
MemoryRegion *mr = ddc->get_memory_region(dimm, &error_abort);
|
||||
|
||||
memory_region_del_subregion(&machine->device_memory->mr, mr);
|
||||
memory_device_unplug_region(machine, mr);
|
||||
vmstate_unregister_ram(vmstate_mr, dev);
|
||||
}
|
||||
|
||||
|
|
|
@ -44,5 +44,8 @@ uint64_t get_plugged_memory_size(void);
|
|||
uint64_t memory_device_get_free_addr(MachineState *ms, const uint64_t *hint,
|
||||
uint64_t align, uint64_t size,
|
||||
Error **errp);
|
||||
void memory_device_plug_region(MachineState *ms, MemoryRegion *mr,
|
||||
uint64_t addr);
|
||||
void memory_device_unplug_region(MachineState *ms, MemoryRegion *mr);
|
||||
|
||||
#endif
|
||||
|
|
Loading…
Reference in a new issue