hw/mem/pc-dimm: Remove legacy_align argument from pc_dimm_pre_plug()

'legacy_align' is always NULL, remove it.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: David Hildenbrand <david@redhat.com>
Reviewed-by: Zhao Liu <zhao1.liu@intel.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Message-Id: <20240617071118.60464-15-philmd@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2024-02-28 10:26:33 +01:00
parent 516871f002
commit d4fdb05b0e
6 changed files with 7 additions and 10 deletions

View file

@ -2763,7 +2763,7 @@ static void virt_memory_pre_plug(HotplugHandler *hotplug_dev, DeviceState *dev,
return; return;
} }
pc_dimm_pre_plug(PC_DIMM(dev), MACHINE(hotplug_dev), NULL, errp); pc_dimm_pre_plug(PC_DIMM(dev), MACHINE(hotplug_dev), errp);
} }
static void virt_memory_plug(HotplugHandler *hotplug_dev, static void virt_memory_plug(HotplugHandler *hotplug_dev,

View file

@ -1327,7 +1327,7 @@ static void pc_memory_pre_plug(HotplugHandler *hotplug_dev, DeviceState *dev,
return; return;
} }
pc_dimm_pre_plug(PC_DIMM(dev), MACHINE(hotplug_dev), NULL, errp); pc_dimm_pre_plug(PC_DIMM(dev), MACHINE(hotplug_dev), errp);
} }
static void pc_memory_plug(HotplugHandler *hotplug_dev, static void pc_memory_plug(HotplugHandler *hotplug_dev,

View file

@ -1245,7 +1245,7 @@ static bool memhp_type_supported(DeviceState *dev)
static void virt_mem_pre_plug(HotplugHandler *hotplug_dev, DeviceState *dev, static void virt_mem_pre_plug(HotplugHandler *hotplug_dev, DeviceState *dev,
Error **errp) Error **errp)
{ {
pc_dimm_pre_plug(PC_DIMM(dev), MACHINE(hotplug_dev), NULL, errp); pc_dimm_pre_plug(PC_DIMM(dev), MACHINE(hotplug_dev), errp);
} }
static void virt_device_pre_plug(HotplugHandler *hotplug_dev, static void virt_device_pre_plug(HotplugHandler *hotplug_dev,

View file

@ -44,8 +44,7 @@ static MemoryRegion *pc_dimm_get_memory_region(PCDIMMDevice *dimm, Error **errp)
return host_memory_backend_get_memory(dimm->hostmem); return host_memory_backend_get_memory(dimm->hostmem);
} }
void pc_dimm_pre_plug(PCDIMMDevice *dimm, MachineState *machine, void pc_dimm_pre_plug(PCDIMMDevice *dimm, MachineState *machine, Error **errp)
const uint64_t *legacy_align, Error **errp)
{ {
Error *local_err = NULL; Error *local_err = NULL;
int slot; int slot;
@ -70,8 +69,7 @@ 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);
memory_device_pre_plug(MEMORY_DEVICE(dimm), machine, legacy_align, memory_device_pre_plug(MEMORY_DEVICE(dimm), machine, NULL, errp);
errp);
} }
void pc_dimm_plug(PCDIMMDevice *dimm, MachineState *machine) void pc_dimm_plug(PCDIMMDevice *dimm, MachineState *machine)

View file

@ -3700,7 +3700,7 @@ static void spapr_memory_pre_plug(HotplugHandler *hotplug_dev, DeviceState *dev,
return; return;
} }
pc_dimm_pre_plug(dimm, MACHINE(hotplug_dev), NULL, errp); pc_dimm_pre_plug(dimm, MACHINE(hotplug_dev), errp);
} }
struct SpaprDimmState { struct SpaprDimmState {

View file

@ -66,8 +66,7 @@ struct PCDIMMDeviceClass {
void (*unrealize)(PCDIMMDevice *dimm); void (*unrealize)(PCDIMMDevice *dimm);
}; };
void pc_dimm_pre_plug(PCDIMMDevice *dimm, MachineState *machine, void pc_dimm_pre_plug(PCDIMMDevice *dimm, MachineState *machine, Error **errp);
const uint64_t *legacy_align, Error **errp);
void pc_dimm_plug(PCDIMMDevice *dimm, MachineState *machine); void pc_dimm_plug(PCDIMMDevice *dimm, MachineState *machine);
void pc_dimm_unplug(PCDIMMDevice *dimm, MachineState *machine); void pc_dimm_unplug(PCDIMMDevice *dimm, MachineState *machine);
#endif #endif