[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v1 09/11] memory-device: complete factoring out plug
From: |
David Hildenbrand |
Subject: |
[Qemu-devel] [PATCH v1 09/11] memory-device: complete factoring out plug handling |
Date: |
Thu, 5 Jul 2018 13:59:41 +0200 |
With the new memory device functions in place, we can factor out
plugging of memory devices completely.
Signed-off-by: David Hildenbrand <address@hidden>
---
hw/mem/memory-device.c | 7 +++++--
hw/mem/pc-dimm.c | 7 +------
include/hw/mem/memory-device.h | 3 +--
3 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/hw/mem/memory-device.c b/hw/mem/memory-device.c
index 3ed067debb..ec81133edf 100644
--- a/hw/mem/memory-device.c
+++ b/hw/mem/memory-device.c
@@ -275,9 +275,12 @@ out:
error_propagate(errp, local_err);
}
-void memory_device_plug_region(MachineState *ms, MemoryRegion *mr,
- uint64_t addr)
+void memory_device_plug(MemoryDeviceState *md, MachineState *ms)
{
+ const MemoryDeviceClass *mdc = MEMORY_DEVICE_GET_CLASS(md);
+ const uint64_t addr = mdc->get_addr(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);
diff --git a/hw/mem/pc-dimm.c b/hw/mem/pc-dimm.c
index 33ab0621cc..4760b17062 100644
--- a/hw/mem/pc-dimm.c
+++ b/hw/mem/pc-dimm.c
@@ -65,13 +65,8 @@ void pc_dimm_plug(DeviceState *dev, MachineState *machine,
Error **errp)
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);
- uint64_t addr;
-
- addr = object_property_get_uint(OBJECT(dev), PC_DIMM_ADDR_PROP,
- &error_abort);
- memory_device_plug_region(machine, mr, addr);
+ memory_device_plug(MEMORY_DEVICE(dev), machine);
vmstate_register_ram(vmstate_mr, dev);
}
diff --git a/include/hw/mem/memory-device.h b/include/hw/mem/memory-device.h
index fb920b9f44..ea9331a778 100644
--- a/include/hw/mem/memory-device.h
+++ b/include/hw/mem/memory-device.h
@@ -59,8 +59,7 @@ MemoryDeviceInfoList *qmp_memory_device_list(void);
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_region(MachineState *ms, MemoryRegion *mr,
- uint64_t addr);
+void memory_device_plug(MemoryDeviceState *md, MachineState *ms);
void memory_device_unplug_region(MachineState *ms, MemoryRegion *mr);
#endif
--
2.17.1
- [Qemu-devel] [PATCH v1 00/11] memory-device: complete refactoring, David Hildenbrand, 2018/07/05
- [Qemu-devel] [PATCH v1 02/11] memory-device: introduce separate config option, David Hildenbrand, 2018/07/05
- [Qemu-devel] [PATCH v1 01/11] memory-device: fix error message when hinted address is too small, David Hildenbrand, 2018/07/05
- [Qemu-devel] [PATCH v1 03/11] memory-device: get_region_size()/get_plugged_size() might fail, David Hildenbrand, 2018/07/05
- [Qemu-devel] [PATCH v1 04/11] memory-device: convert get_region_size() to get_memory_region(), David Hildenbrand, 2018/07/05
- [Qemu-devel] [PATCH v1 05/11] memory-device: document MemoryDeviceClass, David Hildenbrand, 2018/07/05
- [Qemu-devel] [PATCH v1 06/11] memory-device: add device class function set_addr(), David Hildenbrand, 2018/07/05
- [Qemu-devel] [PATCH v1 07/11] pc-dimm: implement memory device class function set_addr(), David Hildenbrand, 2018/07/05
- [Qemu-devel] [PATCH v1 08/11] memory-device: complete factoring out pre_plug handling, David Hildenbrand, 2018/07/05
- [Qemu-devel] [PATCH v1 10/11] memory-device: complete factoring out unplug handling, David Hildenbrand, 2018/07/05
- [Qemu-devel] [PATCH v1 09/11] memory-device: complete factoring out plug handling,
David Hildenbrand <=
- [Qemu-devel] [PATCH v1 11/11] memory-device: trace when pre_assigning/assigning/unassigning addresses, David Hildenbrand, 2018/07/05
- Re: [Qemu-devel] [PATCH v1 00/11] memory-device: complete refactoring, Igor Mammedov, 2018/07/23