[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-ppc] [PATCH v5 12/16] memory-device: add device class function set
From: |
David Hildenbrand |
Subject: |
[Qemu-ppc] [PATCH v5 12/16] memory-device: add device class function set_addr() |
Date: |
Fri, 5 Oct 2018 11:20:20 +0200 |
To be able to factor out address assignment of memory devices, we will
have to read (get_addr()) and write (set_addr()) the address.
We can't use properties for this purpose, as properties are device
specific. E.g. while the address property for a DIMM is called "addr", it
might be called differently (e.g. "memaddr") for other devices.
Especially virtio based memory devices cannot use "addr" as that is already
reserved and used for the address on the bus (for the proxy device).
Also, it might be possible to have memory devices without address
properties (e.g. internal DIMM-like thingies).
In contrast to get_addr(), we expect that set_addr() can fail.
Keep it simple for now for pc-dimm and simply set the static property, that
will fail once realized.
Reviewed-by: David Gibson <address@hidden>
Reviewed-by: Igor Mammedov <address@hidden>
Reviewed-by: Eric Auger <address@hidden>
Signed-off-by: David Hildenbrand <address@hidden>
---
hw/mem/pc-dimm.c | 7 +++++++
include/hw/mem/memory-device.h | 8 ++++++++
2 files changed, 15 insertions(+)
diff --git a/hw/mem/pc-dimm.c b/hw/mem/pc-dimm.c
index 47b2e83389..4a15091734 100644
--- a/hw/mem/pc-dimm.c
+++ b/hw/mem/pc-dimm.c
@@ -236,6 +236,12 @@ static uint64_t pc_dimm_md_get_addr(const
MemoryDeviceState *md)
return dimm->addr;
}
+static void pc_dimm_md_set_addr(MemoryDeviceState *md, uint64_t addr,
+ Error **errp)
+{
+ object_property_set_uint(OBJECT(md), addr, PC_DIMM_ADDR_PROP, errp);
+}
+
static MemoryRegion *pc_dimm_md_get_memory_region(MemoryDeviceState *md,
Error **errp)
{
@@ -286,6 +292,7 @@ static void pc_dimm_class_init(ObjectClass *oc, void *data)
ddc->get_vmstate_memory_region = pc_dimm_get_memory_region;
mdc->get_addr = pc_dimm_md_get_addr;
+ mdc->set_addr = pc_dimm_md_set_addr;
/* for a dimm plugged_size == region_size */
mdc->get_plugged_size = memory_device_get_region_size;
mdc->get_memory_region = pc_dimm_md_get_memory_region;
diff --git a/include/hw/mem/memory-device.h b/include/hw/mem/memory-device.h
index 9c3398bc4a..ed7cf5bf4b 100644
--- a/include/hw/mem/memory-device.h
+++ b/include/hw/mem/memory-device.h
@@ -59,6 +59,14 @@ typedef struct MemoryDeviceClass {
*/
uint64_t (*get_addr)(const MemoryDeviceState *md);
+ /*
+ * Set the address of the memory device in guest physical memory.
+ *
+ * Called when plugging the memory device to configure the determined
+ * address in guest physical memory.
+ */
+ void (*set_addr)(MemoryDeviceState *md, uint64_t addr, Error **errp);
+
/*
* Return the amount of memory provided by the memory device currently
* usable ("plugged") by the VM.
--
2.17.1
- [Qemu-ppc] [PATCH v5 00/16] memory-device: complete refactoring, David Hildenbrand, 2018/10/05
- [Qemu-ppc] [PATCH v5 16/16] memory-device: trace when pre_plugging/plugging/unplugging, David Hildenbrand, 2018/10/05
- [Qemu-ppc] [PATCH v5 15/16] memory-device: complete factoring out unplug handling, David Hildenbrand, 2018/10/05
- [Qemu-ppc] [PATCH v5 14/16] memory-device: complete factoring out plug handling, David Hildenbrand, 2018/10/05
- [Qemu-ppc] [PATCH v5 12/16] memory-device: add device class function set_addr(),
David Hildenbrand <=
- [Qemu-ppc] [PATCH v5 10/16] memory-device: factor out get_memory_region() from pc-dimm, David Hildenbrand, 2018/10/05
- [Qemu-ppc] [PATCH v5 11/16] memory-device: drop get_region_size(), David Hildenbrand, 2018/10/05
- [Qemu-ppc] [PATCH v5 13/16] memory-device: complete factoring out pre_plug handling, David Hildenbrand, 2018/10/05
- [Qemu-ppc] [PATCH v5 08/16] memory-device: document MemoryDeviceClass, David Hildenbrand, 2018/10/05
- [Qemu-ppc] [PATCH v5 09/16] memory-device: add and use memory_device_get_region_size(), David Hildenbrand, 2018/10/05
- [Qemu-ppc] [PATCH v5 04/16] pc-dimm: pass PCDIMMDevice to pc_dimm_.*plug, David Hildenbrand, 2018/10/05
- [Qemu-ppc] [PATCH v5 02/16] memory-device: fix error message when hinted address is too small, David Hildenbrand, 2018/10/05
- [Qemu-ppc] [PATCH v5 03/16] memory-device: improve "range conflicts" error message, David Hildenbrand, 2018/10/05