Re: [PATCH v5 15/23] hw/mem/memory-device: Remove legacy_align from memory_device_pre_plug()
On Wed, 29 May 2024 07:15:31 +0200
Philippe Mathieu-Daudé wrote:
> 'legacy_align' is always NULL, remove it, simplifying
> memory_device_pre_plug().
>
> Signed-off-by: Philippe Mathieu-Daudé
> Reviewed-by: Thomas Huth
> Reviewed-by: David Hildenbrand
> Reviewed-by: Zhao Liu
Reviewed-by: Igor Mammedov
> ---
> include/hw/mem/memory-device.h | 2 +-
> hw/i386/pc.c | 3 +--
> hw/mem/memory-device.c | 12
> hw/mem/pc-dimm.c | 2 +-
> hw/virtio/virtio-md-pci.c | 2 +-
> 5 files changed, 8 insertions(+), 13 deletions(-)
>
> diff --git a/include/hw/mem/memory-device.h b/include/hw/mem/memory-device.h
> index e0571c8a31..c0a58087cc 100644
> --- a/include/hw/mem/memory-device.h
> +++ b/include/hw/mem/memory-device.h
> @@ -169,7 +169,7 @@ uint64_t get_plugged_memory_size(void);
> unsigned int memory_devices_get_reserved_memslots(void);
> bool memory_devices_memslot_auto_decision_active(void);
> void memory_device_pre_plug(MemoryDeviceState *md, MachineState *ms,
> -const uint64_t *legacy_align, Error **errp);
> +Error **errp);
> void memory_device_plug(MemoryDeviceState *md, MachineState *ms);
> void memory_device_unplug(MemoryDeviceState *md, MachineState *ms);
> uint64_t memory_device_get_region_size(const MemoryDeviceState *md,
> diff --git a/hw/i386/pc.c b/hw/i386/pc.c
> index 08d38a1dcc..c7d44420a5 100644
> --- a/hw/i386/pc.c
> +++ b/hw/i386/pc.c
> @@ -1389,8 +1389,7 @@ static void pc_hv_balloon_pre_plug(HotplugHandler
> *hotplug_dev,
> {
> /* The vmbus handler has no hotplug handler; we should never end up
> here. */
> g_assert(!dev->hotplugged);
> -memory_device_pre_plug(MEMORY_DEVICE(dev), MACHINE(hotplug_dev), NULL,
> - errp);
> +memory_device_pre_plug(MEMORY_DEVICE(dev), MACHINE(hotplug_dev), errp);
> }
>
> static void pc_hv_balloon_plug(HotplugHandler *hotplug_dev,
> diff --git a/hw/mem/memory-device.c b/hw/mem/memory-device.c
> index e098585cda..a5f279adcc 100644
> --- a/hw/mem/memory-device.c
> +++ b/hw/mem/memory-device.c
> @@ -345,7 +345,7 @@ uint64_t get_plugged_memory_size(void)
> }
>
> void memory_device_pre_plug(MemoryDeviceState *md, MachineState *ms,
> -const uint64_t *legacy_align, Error **errp)
> +Error **errp)
> {
> const MemoryDeviceClass *mdc = MEMORY_DEVICE_GET_CLASS(md);
> Error *local_err = NULL;
> @@ -388,14 +388,10 @@ void memory_device_pre_plug(MemoryDeviceState *md,
> MachineState *ms,
> return;
> }
>
> -if (legacy_align) {
> -align = *legacy_align;
> -} else {
> -if (mdc->get_min_alignment) {
> -align = mdc->get_min_alignment(md);
> -}
> -align = MAX(align, memory_region_get_alignment(mr));
> +if (mdc->get_min_alignment) {
> +align = mdc->get_min_alignment(md);
> }
> +align = MAX(align, memory_region_get_alignment(mr));
> addr = mdc->get_addr(md);
> addr = memory_device_get_free_addr(ms, !addr ? NULL : , align,
> memory_region_size(mr), _err);
> diff --git a/hw/mem/pc-dimm.c b/hw/mem/pc-dimm.c
> index 836384a90f..27919ca45d 100644
> --- a/hw/mem/pc-dimm.c
> +++ b/hw/mem/pc-dimm.c
> @@ -69,7 +69,7 @@ void pc_dimm_pre_plug(PCDIMMDevice *dimm, MachineState
> *machine, Error **errp)
> _abort);
> trace_mhp_pc_dimm_assigned_slot(slot);
>
> -memory_device_pre_plug(MEMORY_DEVICE(dimm), machine, NULL, errp);
> +memory_device_pre_plug(MEMORY_DEVICE(dimm), machine, errp);
> }
>
> void pc_dimm_plug(PCDIMMDevice *dimm, MachineState *machine)
> diff --git a/hw/virtio/virtio-md-pci.c b/hw/virtio/virtio-md-pci.c
> index 62bfb7920b..9ec5067662 100644
> --- a/hw/virtio/virtio-md-pci.c
> +++ b/hw/virtio/virtio-md-pci.c
> @@ -37,7 +37,7 @@ void virtio_md_pci_pre_plug(VirtIOMDPCI *vmd, MachineState
> *ms, Error **errp)
> * First, see if we can plug this memory device at all. If that
> * succeeds, branch of to the actual hotplug handler.
> */
> -memory_device_pre_plug(md, ms, NULL, _err);
> +memory_device_pre_plug(md, ms, _err);
> if (!local_err && bus_handler) {
> hotplug_handler_pre_plug(bus_handler, dev, _err);
> }
[PATCH v5 15/23] hw/mem/memory-device: Remove legacy_align from memory_device_pre_plug()
'legacy_align' is always NULL, remove it, simplifying
memory_device_pre_plug().
Signed-off-by: Philippe Mathieu-Daudé
Reviewed-by: Thomas Huth
Reviewed-by: David Hildenbrand
Reviewed-by: Zhao Liu
---
include/hw/mem/memory-device.h | 2 +-
hw/i386/pc.c | 3 +--
hw/mem/memory-device.c | 12
hw/mem/pc-dimm.c | 2 +-
hw/virtio/virtio-md-pci.c | 2 +-
5 files changed, 8 insertions(+), 13 deletions(-)
diff --git a/include/hw/mem/memory-device.h b/include/hw/mem/memory-device.h
index e0571c8a31..c0a58087cc 100644
--- a/include/hw/mem/memory-device.h
+++ b/include/hw/mem/memory-device.h
@@ -169,7 +169,7 @@ uint64_t get_plugged_memory_size(void);
unsigned int memory_devices_get_reserved_memslots(void);
bool memory_devices_memslot_auto_decision_active(void);
void memory_device_pre_plug(MemoryDeviceState *md, MachineState *ms,
-const uint64_t *legacy_align, Error **errp);
+Error **errp);
void memory_device_plug(MemoryDeviceState *md, MachineState *ms);
void memory_device_unplug(MemoryDeviceState *md, MachineState *ms);
uint64_t memory_device_get_region_size(const MemoryDeviceState *md,
diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index 08d38a1dcc..c7d44420a5 100644
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -1389,8 +1389,7 @@ static void pc_hv_balloon_pre_plug(HotplugHandler
*hotplug_dev,
{
/* The vmbus handler has no hotplug handler; we should never end up here.
*/
g_assert(!dev->hotplugged);
-memory_device_pre_plug(MEMORY_DEVICE(dev), MACHINE(hotplug_dev), NULL,
- errp);
+memory_device_pre_plug(MEMORY_DEVICE(dev), MACHINE(hotplug_dev), errp);
}
static void pc_hv_balloon_plug(HotplugHandler *hotplug_dev,
diff --git a/hw/mem/memory-device.c b/hw/mem/memory-device.c
index e098585cda..a5f279adcc 100644
--- a/hw/mem/memory-device.c
+++ b/hw/mem/memory-device.c
@@ -345,7 +345,7 @@ uint64_t get_plugged_memory_size(void)
}
void memory_device_pre_plug(MemoryDeviceState *md, MachineState *ms,
-const uint64_t *legacy_align, Error **errp)
+Error **errp)
{
const MemoryDeviceClass *mdc = MEMORY_DEVICE_GET_CLASS(md);
Error *local_err = NULL;
@@ -388,14 +388,10 @@ void memory_device_pre_plug(MemoryDeviceState *md,
MachineState *ms,
return;
}
-if (legacy_align) {
-align = *legacy_align;
-} else {
-if (mdc->get_min_alignment) {
-align = mdc->get_min_alignment(md);
-}
-align = MAX(align, memory_region_get_alignment(mr));
+if (mdc->get_min_alignment) {
+align = mdc->get_min_alignment(md);
}
+align = MAX(align, memory_region_get_alignment(mr));
addr = mdc->get_addr(md);
addr = memory_device_get_free_addr(ms, !addr ? NULL : , align,
memory_region_size(mr), _err);
diff --git a/hw/mem/pc-dimm.c b/hw/mem/pc-dimm.c
index 836384a90f..27919ca45d 100644
--- a/hw/mem/pc-dimm.c
+++ b/hw/mem/pc-dimm.c
@@ -69,7 +69,7 @@ void pc_dimm_pre_plug(PCDIMMDevice *dimm, MachineState
*machine, Error **errp)
_abort);
trace_mhp_pc_dimm_assigned_slot(slot);
-memory_device_pre_plug(MEMORY_DEVICE(dimm), machine, NULL, errp);
+memory_device_pre_plug(MEMORY_DEVICE(dimm), machine, errp);
}
void pc_dimm_plug(PCDIMMDevice *dimm, MachineState *machine)
diff --git a/hw/virtio/virtio-md-pci.c b/hw/virtio/virtio-md-pci.c
index 62bfb7920b..9ec5067662 100644
--- a/hw/virtio/virtio-md-pci.c
+++ b/hw/virtio/virtio-md-pci.c
@@ -37,7 +37,7 @@ void virtio_md_pci_pre_plug(VirtIOMDPCI *vmd, MachineState
*ms, Error **errp)
* First, see if we can plug this memory device at all. If that
* succeeds, branch of to the actual hotplug handler.
*/
-memory_device_pre_plug(md, ms, NULL, _err);
+memory_device_pre_plug(md, ms, _err);
if (!local_err && bus_handler) {
hotplug_handler_pre_plug(bus_handler, dev, _err);
}
--
2.41.0
