|
@@ -32,10 +32,8 @@ static int pc_dimm_get_free_slot(const int *hint, int max_slots, Error **errp);
|
|
void pc_dimm_pre_plug(PCDIMMDevice *dimm, MachineState *machine,
|
|
void pc_dimm_pre_plug(PCDIMMDevice *dimm, MachineState *machine,
|
|
const uint64_t *legacy_align, Error **errp)
|
|
const uint64_t *legacy_align, Error **errp)
|
|
{
|
|
{
|
|
- MemoryDeviceClass *mdc = MEMORY_DEVICE_GET_CLASS(dimm);
|
|
|
|
Error *local_err = NULL;
|
|
Error *local_err = NULL;
|
|
- MemoryRegion *mr;
|
|
|
|
- uint64_t addr, align;
|
|
|
|
|
|
+ uint64_t addr;
|
|
int slot;
|
|
int slot;
|
|
|
|
|
|
slot = object_property_get_int(OBJECT(dimm), PC_DIMM_SLOT_PROP,
|
|
slot = object_property_get_int(OBJECT(dimm), PC_DIMM_SLOT_PROP,
|
|
@@ -49,22 +47,15 @@ void pc_dimm_pre_plug(PCDIMMDevice *dimm, MachineState *machine,
|
|
&error_abort);
|
|
&error_abort);
|
|
trace_mhp_pc_dimm_assigned_slot(slot);
|
|
trace_mhp_pc_dimm_assigned_slot(slot);
|
|
|
|
|
|
- mr = mdc->get_memory_region(MEMORY_DEVICE(dimm), &local_err);
|
|
|
|
|
|
+ memory_device_pre_plug(MEMORY_DEVICE(dimm), machine, legacy_align,
|
|
|
|
+ &local_err);
|
|
if (local_err) {
|
|
if (local_err) {
|
|
goto out;
|
|
goto out;
|
|
}
|
|
}
|
|
|
|
|
|
- align = legacy_align ? *legacy_align : memory_region_get_alignment(mr);
|
|
|
|
addr = object_property_get_uint(OBJECT(dimm), PC_DIMM_ADDR_PROP,
|
|
addr = object_property_get_uint(OBJECT(dimm), PC_DIMM_ADDR_PROP,
|
|
&error_abort);
|
|
&error_abort);
|
|
- addr = memory_device_get_free_addr(machine, !addr ? NULL : &addr, align,
|
|
|
|
- memory_region_size(mr), &local_err);
|
|
|
|
- if (local_err) {
|
|
|
|
- goto out;
|
|
|
|
- }
|
|
|
|
trace_mhp_pc_dimm_assigned_address(addr);
|
|
trace_mhp_pc_dimm_assigned_address(addr);
|
|
- object_property_set_uint(OBJECT(dimm), addr, PC_DIMM_ADDR_PROP,
|
|
|
|
- &error_abort);
|
|
|
|
out:
|
|
out:
|
|
error_propagate(errp, local_err);
|
|
error_propagate(errp, local_err);
|
|
}
|
|
}
|