Proxmox-Port/qemu
1
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2025-08-14 11:43:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

memory-device: add and use memory_device_get_region_size()

Browse Source 
We will factor out get_memory_region() from pc-dimm to memory device code
soon. Once that is done, get_region_size() can be implemented
generically and essentially be replaced by
memory_device_get_region_size (and work only on get_memory_region()).

We have some users of get_memory_region() (spapr and pc-dimm code) that are
only interested in the size. So let's rework them to use
memory_device_get_region_size() first, then we can factor out
get_memory_region() and eventually remove get_region_size() without
touching the same code multiple times.

Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: David Hildenbrand <david@redhat.com>
Message-Id: <20181005092024.14344-10-david@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
This commit is contained in:
David Hildenbrand 2018-10-05 11:20:17 +02:00 committed by Eduardo Habkost
parent 5cca020c88
commit 946d6154ab
4 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
hw/mem/memory-device.c
View File

@ -57,10 +57,9 @@ static int memory_device_used_region_size(Object *obj, void *opaque)
if (object_dynamic_cast(obj, TYPE_MEMORY_DEVICE)) { if (object_dynamic_cast(obj, TYPE_MEMORY_DEVICE)) {
const DeviceState *dev = DEVICE(obj); const DeviceState *dev = DEVICE(obj);
const MemoryDeviceState *md = MEMORY_DEVICE(obj); const MemoryDeviceState *md = MEMORY_DEVICE(obj);
const MemoryDeviceClass *mdc = MEMORY_DEVICE_GET_CLASS(obj);
if (dev->realized) { if (dev->realized) {
*size += mdc->get_region_size(md, &error_abort); *size += memory_device_get_region_size(md, &error_abort);
} }
} }
@ -167,7 +166,7 @@ uint64_t memory_device_get_free_addr(MachineState *ms, const uint64_t *hint,
uint64_t md_size, md_addr; uint64_t md_size, md_addr;
md_addr = mdc->get_addr(md); md_addr = mdc->get_addr(md);
md_size = mdc->get_region_size(md, &error_abort); md_size = memory_device_get_region_size(md, &error_abort);
if (ranges_overlap(md_addr, md_size, new_addr, size)) { if (ranges_overlap(md_addr, md_size, new_addr, size)) {
if (hint) { if (hint) {
@ -266,6 +265,14 @@ void memory_device_unplug_region(MachineState *ms, MemoryRegion *mr)
memory_region_del_subregion(&ms->device_memory->mr, mr); memory_region_del_subregion(&ms->device_memory->mr, mr);
} }
uint64_t memory_device_get_region_size(const MemoryDeviceState *md,
Error **errp)
{
MemoryDeviceClass *mdc = MEMORY_DEVICE_GET_CLASS(md);
return mdc->get_region_size(md, errp);
}
static const TypeInfo memory_device_info = { static const TypeInfo memory_device_info = {
.name = TYPE_MEMORY_DEVICE, .name = TYPE_MEMORY_DEVICE,
.parent = TYPE_INTERFACE, .parent = TYPE_INTERFACE,

10
hw/mem/pc-dimm.c
View File

@ -161,16 +161,14 @@ static Property pc_dimm_properties[] = {
static void pc_dimm_get_size(Object *obj, Visitor *v, const char *name, static void pc_dimm_get_size(Object *obj, Visitor *v, const char *name,
void *opaque, Error **errp) void *opaque, Error **errp)
{ {
Error *local_err = NULL;
uint64_t value; uint64_t value;
MemoryRegion *mr;
PCDIMMDevice *dimm = PC_DIMM(obj);
PCDIMMDeviceClass *ddc = PC_DIMM_GET_CLASS(obj);
mr = ddc->get_memory_region(dimm, errp); value = memory_device_get_region_size(MEMORY_DEVICE(obj), &local_err);
if (!mr) { if (local_err) {
error_propagate(errp, local_err);
return; return;
} }
value = memory_region_size(mr);
visit_type_uint64(v, name, &value, errp); visit_type_uint64(v, name, &value, errp);
} }

21
hw/ppc/spapr.c
View File

@ -3128,12 +3128,10 @@ static void spapr_memory_plug(HotplugHandler *hotplug_dev, DeviceState *dev,
Error *local_err = NULL; Error *local_err = NULL;
sPAPRMachineState *ms = SPAPR_MACHINE(hotplug_dev); sPAPRMachineState *ms = SPAPR_MACHINE(hotplug_dev);
PCDIMMDevice *dimm = PC_DIMM(dev); PCDIMMDevice *dimm = PC_DIMM(dev);
PCDIMMDeviceClass *ddc = PC_DIMM_GET_CLASS(dimm);
MemoryRegion *mr = ddc->get_memory_region(dimm, &error_abort);
uint64_t size, addr; uint64_t size, addr;
uint32_t node; uint32_t node;
size = memory_region_size(mr); size = memory_device_get_region_size(MEMORY_DEVICE(dev), &error_abort);
pc_dimm_plug(dimm, MACHINE(ms), &local_err); pc_dimm_plug(dimm, MACHINE(ms), &local_err);
if (local_err) { if (local_err) {
@ -3169,9 +3167,7 @@ static void spapr_memory_pre_plug(HotplugHandler *hotplug_dev, DeviceState *dev,
const sPAPRMachineClass *smc = SPAPR_MACHINE_GET_CLASS(hotplug_dev); const sPAPRMachineClass *smc = SPAPR_MACHINE_GET_CLASS(hotplug_dev);
sPAPRMachineState *spapr = SPAPR_MACHINE(hotplug_dev); sPAPRMachineState *spapr = SPAPR_MACHINE(hotplug_dev);
PCDIMMDevice *dimm = PC_DIMM(dev); PCDIMMDevice *dimm = PC_DIMM(dev);
PCDIMMDeviceClass *ddc = PC_DIMM_GET_CLASS(dimm);
Error *local_err = NULL; Error *local_err = NULL;
MemoryRegion *mr;
uint64_t size; uint64_t size;
Object *memdev; Object *memdev;
hwaddr pagesize; hwaddr pagesize;
@ -3181,11 +3177,11 @@ static void spapr_memory_pre_plug(HotplugHandler *hotplug_dev, DeviceState *dev,
return; return;
} }
mr = ddc->get_memory_region(dimm, errp); size = memory_device_get_region_size(MEMORY_DEVICE(dimm), &local_err);
if (!mr) { if (local_err) {
error_propagate(errp, local_err);
return; return;
} }
size = memory_region_size(mr);
if (size % SPAPR_MEMORY_BLOCK_SIZE) { if (size % SPAPR_MEMORY_BLOCK_SIZE) {
error_setg(errp, "Hotplugged memory size must be a multiple of " error_setg(errp, "Hotplugged memory size must be a multiple of "
@ -3257,9 +3253,8 @@ static sPAPRDIMMState *spapr_recover_pending_dimm_state(sPAPRMachineState *ms,
PCDIMMDevice *dimm) PCDIMMDevice *dimm)
{ {
sPAPRDRConnector *drc; sPAPRDRConnector *drc;
PCDIMMDeviceClass *ddc = PC_DIMM_GET_CLASS(dimm); uint64_t size = memory_device_get_region_size(MEMORY_DEVICE(dimm),
MemoryRegion *mr = ddc->get_memory_region(dimm, &error_abort); &error_abort);
uint64_t size = memory_region_size(mr);
uint32_t nr_lmbs = size / SPAPR_MEMORY_BLOCK_SIZE; uint32_t nr_lmbs = size / SPAPR_MEMORY_BLOCK_SIZE;
uint32_t avail_lmbs = 0; uint32_t avail_lmbs = 0;
uint64_t addr_start, addr; uint64_t addr_start, addr;
@ -3325,14 +3320,12 @@ static void spapr_memory_unplug_request(HotplugHandler *hotplug_dev,
sPAPRMachineState *spapr = SPAPR_MACHINE(hotplug_dev); sPAPRMachineState *spapr = SPAPR_MACHINE(hotplug_dev);
Error *local_err = NULL; Error *local_err = NULL;
PCDIMMDevice *dimm = PC_DIMM(dev); PCDIMMDevice *dimm = PC_DIMM(dev);
PCDIMMDeviceClass *ddc = PC_DIMM_GET_CLASS(dimm);
MemoryRegion *mr = ddc->get_memory_region(dimm, &error_abort);
uint32_t nr_lmbs; uint32_t nr_lmbs;
uint64_t size, addr_start, addr; uint64_t size, addr_start, addr;
int i; int i;
sPAPRDRConnector *drc; sPAPRDRConnector *drc;
size = memory_region_size(mr); size = memory_device_get_region_size(MEMORY_DEVICE(dimm), &error_abort);
nr_lmbs = size / SPAPR_MEMORY_BLOCK_SIZE; nr_lmbs = size / SPAPR_MEMORY_BLOCK_SIZE;
addr_start = object_property_get_uint(OBJECT(dimm), PC_DIMM_ADDR_PROP, addr_start = object_property_get_uint(OBJECT(dimm), PC_DIMM_ADDR_PROP,

2
include/hw/mem/memory-device.h
View File

@ -83,5 +83,7 @@ uint64_t memory_device_get_free_addr(MachineState *ms, const uint64_t *hint,
void memory_device_plug_region(MachineState *ms, MemoryRegion *mr, void memory_device_plug_region(MachineState *ms, MemoryRegion *mr,
uint64_t addr); uint64_t addr);
void memory_device_unplug_region(MachineState *ms, MemoryRegion *mr); void memory_device_unplug_region(MachineState *ms, MemoryRegion *mr);
uint64_t memory_device_get_region_size(const MemoryDeviceState *md,
Error **errp);
#endif #endif