[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v1 08/11] memory-device: complete factoring out pre_
From: |
David Hildenbrand |
Subject: |
[Qemu-devel] [PATCH v1 08/11] memory-device: complete factoring out pre_plug handling |
Date: |
Thu, 5 Jul 2018 13:59:40 +0200 |
With all required memory device class functions in place, we can factor
out pre_plug handling of memory devices. Take proper care of errors. We
still have to carry along legacy_align required for pc compatibility
handling.
Signed-off-by: David Hildenbrand <address@hidden>
---
hw/mem/memory-device.c | 29 ++++++++++++++++++++++++++---
hw/mem/pc-dimm.c | 16 +++-------------
include/hw/mem/memory-device.h | 5 ++---
3 files changed, 31 insertions(+), 19 deletions(-)
diff --git a/hw/mem/memory-device.c b/hw/mem/memory-device.c
index a69ae343f8..3ed067debb 100644
--- a/hw/mem/memory-device.c
+++ b/hw/mem/memory-device.c
@@ -96,9 +96,10 @@ static void memory_device_check_addable(MachineState *ms,
uint64_t size,
}
-uint64_t memory_device_get_free_addr(MachineState *ms, const uint64_t *hint,
- uint64_t align, uint64_t size,
- Error **errp)
+static uint64_t memory_device_get_free_addr(MachineState *ms,
+ const uint64_t *hint,
+ uint64_t align, uint64_t size,
+ Error **errp)
{
uint64_t address_space_start, address_space_end;
GSList *list = NULL, *item;
@@ -252,6 +253,28 @@ uint64_t get_plugged_memory_size(void)
return size;
}
+void memory_device_pre_plug(MemoryDeviceState *md, MachineState *ms,
+ const uint64_t *legacy_align, Error **errp)
+{
+ const MemoryDeviceClass *mdc = MEMORY_DEVICE_GET_CLASS(md);
+ Error *local_err = NULL;
+ uint64_t addr, align;
+ MemoryRegion *mr;
+
+ mr = mdc->get_memory_region(md, &local_err);
+ if (local_err) {
+ goto out;
+ }
+
+ align = legacy_align ? *legacy_align : memory_region_get_alignment(mr);
+ addr = mdc->get_addr(md);
+ addr = memory_device_get_free_addr(ms, !addr ? NULL : &addr, align,
+ memory_region_size(mr), &local_err);
+ mdc->set_addr(md, addr, &local_err);
+out:
+ error_propagate(errp, local_err);
+}
+
void memory_device_plug_region(MachineState *ms, MemoryRegion *mr,
uint64_t addr)
{
diff --git a/hw/mem/pc-dimm.c b/hw/mem/pc-dimm.c
index bb8e10903f..33ab0621cc 100644
--- a/hw/mem/pc-dimm.c
+++ b/hw/mem/pc-dimm.c
@@ -32,11 +32,8 @@ static int pc_dimm_get_free_slot(const int *hint, int
max_slots, Error **errp);
void pc_dimm_pre_plug(DeviceState *dev, MachineState *machine,
const uint64_t *legacy_align, Error **errp)
{
- PCDIMMDevice *dimm = PC_DIMM(dev);
- PCDIMMDeviceClass *ddc = PC_DIMM_GET_CLASS(dimm);
Error *local_err = NULL;
- MemoryRegion *mr;
- uint64_t addr, align;
+ uint64_t addr;
int slot;
slot = object_property_get_int(OBJECT(dev), PC_DIMM_SLOT_PROP,
@@ -49,22 +46,15 @@ void pc_dimm_pre_plug(DeviceState *dev, MachineState
*machine,
object_property_set_int(OBJECT(dev), slot, PC_DIMM_SLOT_PROP,
&error_abort);
trace_mhp_pc_dimm_assigned_slot(slot);
- mr = ddc->get_memory_region(dimm, &local_err);
+ memory_device_pre_plug(MEMORY_DEVICE(dev), machine, legacy_align,
+ &local_err);
if (local_err) {
goto out;
}
- align = legacy_align ? *legacy_align : memory_region_get_alignment(mr);
addr = object_property_get_uint(OBJECT(dev), PC_DIMM_ADDR_PROP,
&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);
- object_property_set_uint(OBJECT(dev), addr, PC_DIMM_ADDR_PROP,
- &error_abort);
out:
error_propagate(errp, local_err);
}
diff --git a/include/hw/mem/memory-device.h b/include/hw/mem/memory-device.h
index cf5d182ac2..fb920b9f44 100644
--- a/include/hw/mem/memory-device.h
+++ b/include/hw/mem/memory-device.h
@@ -57,9 +57,8 @@ typedef struct MemoryDeviceClass {
MemoryDeviceInfoList *qmp_memory_device_list(void);
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_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_unplug_region(MachineState *ms, MemoryRegion *mr);
--
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 <=
- [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, 2018/07/05
- [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