[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v4 11/24] memory-device: drop get_region_size()
From: |
David Hildenbrand |
Subject: |
[Qemu-devel] [PATCH v4 11/24] memory-device: drop get_region_size() |
Date: |
Wed, 26 Sep 2018 11:42:06 +0200 |
There are no remaining users of get_region_size() except
memory_device_get_region_size() itself. We can make
memory_device_get_region_size() work directly on get_memory_region()
instead and drop get_region_size().
In addition, we can now use memory_device_get_region_size() in pc-dimm
code to implement get_plugged_size()"
Reviewed-by: David Gibson <address@hidden>
Reviewed-by: Igor Mammedov <address@hidden>
Signed-off-by: David Hildenbrand <address@hidden>
---
hw/mem/memory-device.c | 11 +++++++++--
hw/mem/pc-dimm.c | 18 +-----------------
include/hw/mem/memory-device.h | 3 ---
3 files changed, 10 insertions(+), 22 deletions(-)
diff --git a/hw/mem/memory-device.c b/hw/mem/memory-device.c
index 882364b388..9beaad1dba 100644
--- a/hw/mem/memory-device.c
+++ b/hw/mem/memory-device.c
@@ -270,9 +270,16 @@ void memory_device_unplug_region(MachineState *ms,
MemoryRegion *mr)
uint64_t memory_device_get_region_size(const MemoryDeviceState *md,
Error **errp)
{
- MemoryDeviceClass *mdc = MEMORY_DEVICE_GET_CLASS(md);
+ const MemoryDeviceClass *mdc = MEMORY_DEVICE_GET_CLASS(md);
+ MemoryRegion *mr;
- return mdc->get_region_size(md, errp);
+ /* dropping const here is fine as we don't touch the memory region */
+ mr = mdc->get_memory_region((MemoryDeviceState *)md, errp);
+ if (!mr) {
+ return 0;
+ }
+
+ return memory_region_size(mr);
}
static const TypeInfo memory_device_info = {
diff --git a/hw/mem/pc-dimm.c b/hw/mem/pc-dimm.c
index 477f8c8516..4bd8c496bb 100644
--- a/hw/mem/pc-dimm.c
+++ b/hw/mem/pc-dimm.c
@@ -236,21 +236,6 @@ static uint64_t pc_dimm_md_get_addr(const
MemoryDeviceState *md)
return dimm->addr;
}
-static uint64_t pc_dimm_md_get_region_size(const MemoryDeviceState *md,
- Error **errp)
-{
- MemoryDeviceClass *mdc = MEMORY_DEVICE_GET_CLASS(md);
- MemoryRegion *mr;
-
- /* dropping const here is fine as we don't touch the memory region */
- mr = mdc->get_memory_region((MemoryDeviceState *)md, errp);
- if (!mr) {
- return 0;
- }
-
- return memory_region_size(mr);
-}
-
static MemoryRegion *pc_dimm_md_get_memory_region(MemoryDeviceState *md,
Error **errp)
{
@@ -302,8 +287,7 @@ static void pc_dimm_class_init(ObjectClass *oc, void *data)
mdc->get_addr = pc_dimm_md_get_addr;
/* for a dimm plugged_size == region_size */
- mdc->get_plugged_size = pc_dimm_md_get_region_size;
- mdc->get_region_size = pc_dimm_md_get_region_size;
+ mdc->get_plugged_size = memory_device_get_region_size;
mdc->get_memory_region = pc_dimm_md_get_memory_region;
mdc->fill_device_info = pc_dimm_md_fill_device_info;
}
diff --git a/include/hw/mem/memory-device.h b/include/hw/mem/memory-device.h
index 6675c60cc3..642797655f 100644
--- a/include/hw/mem/memory-device.h
+++ b/include/hw/mem/memory-device.h
@@ -39,8 +39,6 @@ typedef struct MemoryDeviceState {
* dynamically manage the amount of memory accessible by the guest via
* the reserved memory region. For most devices, this corresponds to the
* size of the memory region.
- * @get_region_size: The size of the memory region of the @md that's mapped
- * in guest physical memory at @get_addr.
* @get_memory_region: The memory region of the @md that's mapped in guest
* physical memory at @get_addr. If a @md is ever composed of multiple
* successive memory regions, a covering memory region is to be used.
@@ -54,7 +52,6 @@ typedef struct MemoryDeviceClass {
/* public */
uint64_t (*get_addr)(const MemoryDeviceState *md);
uint64_t (*get_plugged_size)(const MemoryDeviceState *md, Error **errp);
- uint64_t (*get_region_size)(const MemoryDeviceState *md, Error **errp);
MemoryRegion *(*get_memory_region)(MemoryDeviceState *md, Error **errp);
void (*fill_device_info)(const MemoryDeviceState *md,
MemoryDeviceInfo *info);
--
2.17.1
- [Qemu-devel] [PATCH v4 06/24] memory-device: introduce separate config option, (continued)
- [Qemu-devel] [PATCH v4 06/24] memory-device: introduce separate config option, David Hildenbrand, 2018/09/26
- [Qemu-devel] [PATCH v4 07/24] memory-device: forward errors in get_region_size()/get_plugged_size(), David Hildenbrand, 2018/09/26
- [Qemu-devel] [PATCH v4 08/24] memory-device: document MemoryDeviceClass, David Hildenbrand, 2018/09/26
- [Qemu-devel] [PATCH v4 09/24] memory-device: add and use memory_device_get_region_size(), David Hildenbrand, 2018/09/26
- [Qemu-devel] [PATCH v4 10/24] memory-device: factor out get_memory_region() from pc-dimm, David Hildenbrand, 2018/09/26
- [Qemu-devel] [PATCH v4 11/24] memory-device: drop get_region_size(),
David Hildenbrand <=
- [Qemu-devel] [PATCH v4 12/24] memory-device: add device class function set_addr(), David Hildenbrand, 2018/09/26
- [Qemu-devel] [PATCH v4 13/24] memory-device: complete factoring out pre_plug handling, David Hildenbrand, 2018/09/26
- [Qemu-devel] [PATCH v4 14/24] memory-device: complete factoring out plug handling, David Hildenbrand, 2018/09/26
- [Qemu-devel] [PATCH v4 15/24] memory-device: complete factoring out unplug handling, David Hildenbrand, 2018/09/26
- [Qemu-devel] [PATCH v4 16/24] memory-device: trace when pre_assigning/assigning/unassigning addresses, David Hildenbrand, 2018/09/26