OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

pc-dimm: make "size" property uint64

Browse Source 
This carries the memory_region_size() value without implicit cast.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20170607163635.17635-23-marcandre.lureau@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
This commit is contained in:
Marc-André Lureau 2017-06-07 20:36:14 +04:00 committed by Markus Armbruster
parent 9ed442b8ae
commit b053ef6106
3 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hw/acpi/memory_hotplug.c
View File

@ -92,11 +92,12 @@ static uint64_t acpi_memory_hotplug_read(void *opaque, hwaddr addr,
trace_mhp_acpi_read_addr_hi(mem_st->selector, val); trace_mhp_acpi_read_addr_hi(mem_st->selector, val);
break; break;
case 0x8: /* Lo part of DIMM size */ case 0x8: /* Lo part of DIMM size */
val = o ? object_property_get_int(o, PC_DIMM_SIZE_PROP, NULL) : 0; val = o ? object_property_get_uint(o, PC_DIMM_SIZE_PROP, NULL) : 0;
trace_mhp_acpi_read_size_lo(mem_st->selector, val); trace_mhp_acpi_read_size_lo(mem_st->selector, val);
break; break;
case 0xc: /* Hi part of DIMM size */ case 0xc: /* Hi part of DIMM size */
val = o ? object_property_get_int(o, PC_DIMM_SIZE_PROP, NULL) >> 32 : 0; val =
o ? object_property_get_uint(o, PC_DIMM_SIZE_PROP, NULL) >> 32 : 0;
trace_mhp_acpi_read_size_hi(mem_st->selector, val); trace_mhp_acpi_read_size_hi(mem_st->selector, val);
break; break;
case 0x10: /* node proximity for _PXM method */ case 0x10: /* node proximity for _PXM method */

8
hw/acpi/nvdimm.c
View File

@ -238,8 +238,8 @@ nvdimm_build_structure_spa(GArray *structures, DeviceState *dev)
NvdimmNfitSpa *nfit_spa; NvdimmNfitSpa *nfit_spa;
uint64_t addr = object_property_get_uint(OBJECT(dev), PC_DIMM_ADDR_PROP, uint64_t addr = object_property_get_uint(OBJECT(dev), PC_DIMM_ADDR_PROP,
NULL); NULL);
uint64_t size = object_property_get_int(OBJECT(dev), PC_DIMM_SIZE_PROP, uint64_t size = object_property_get_uint(OBJECT(dev), PC_DIMM_SIZE_PROP,
NULL); NULL);
uint32_t node = object_property_get_uint(OBJECT(dev), PC_DIMM_NODE_PROP, uint32_t node = object_property_get_uint(OBJECT(dev), PC_DIMM_NODE_PROP,
NULL); NULL);
int slot = object_property_get_int(OBJECT(dev), PC_DIMM_SLOT_PROP, int slot = object_property_get_int(OBJECT(dev), PC_DIMM_SLOT_PROP,
@ -284,8 +284,8 @@ static void
nvdimm_build_structure_memdev(GArray *structures, DeviceState *dev) nvdimm_build_structure_memdev(GArray *structures, DeviceState *dev)
{ {
NvdimmNfitMemDev *nfit_memdev; NvdimmNfitMemDev *nfit_memdev;
uint64_t size = object_property_get_int(OBJECT(dev), PC_DIMM_SIZE_PROP, uint64_t size = object_property_get_uint(OBJECT(dev), PC_DIMM_SIZE_PROP,
NULL); NULL);
int slot = object_property_get_int(OBJECT(dev), PC_DIMM_SLOT_PROP, int slot = object_property_get_int(OBJECT(dev), PC_DIMM_SLOT_PROP,
NULL); NULL);
uint32_t handle = nvdimm_slot_to_handle(slot); uint32_t handle = nvdimm_slot_to_handle(slot);

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

@ -136,7 +136,7 @@ static int pc_existing_dimms_capacity_internal(Object *obj, void *opaque)
DeviceState *dev = DEVICE(obj); DeviceState *dev = DEVICE(obj);
if (dev->realized) { if (dev->realized) {
(*size) += object_property_get_int(obj, PC_DIMM_SIZE_PROP, (*size) += object_property_get_uint(obj, PC_DIMM_SIZE_PROP,
cap->errp); cap->errp);
} }
@ -182,8 +182,8 @@ int qmp_pc_dimm_device_list(Object *obj, void *opaque)
di->addr = dimm->addr; di->addr = dimm->addr;
di->slot = dimm->slot; di->slot = dimm->slot;
di->node = dimm->node; di->node = dimm->node;
di->size = object_property_get_int(OBJECT(dimm), PC_DIMM_SIZE_PROP, di->size = object_property_get_uint(OBJECT(dimm), PC_DIMM_SIZE_PROP,
NULL); NULL);
di->memdev = object_get_canonical_path(OBJECT(dimm->hostmem)); di->memdev = object_get_canonical_path(OBJECT(dimm->hostmem));
info->u.dimm.data = di; info->u.dimm.data = di;
@ -314,9 +314,9 @@ uint64_t pc_dimm_get_free_addr(uint64_t address_space_start,
/* find address range that will fit new DIMM */ /* find address range that will fit new DIMM */
for (item = list; item; item = g_slist_next(item)) { for (item = list; item; item = g_slist_next(item)) {
PCDIMMDevice *dimm = item->data; PCDIMMDevice *dimm = item->data;
uint64_t dimm_size = object_property_get_int(OBJECT(dimm), uint64_t dimm_size = object_property_get_uint(OBJECT(dimm),
PC_DIMM_SIZE_PROP, PC_DIMM_SIZE_PROP,
errp); errp);
if (errp && *errp) { if (errp && *errp) {
goto out; goto out;
} }
@ -356,7 +356,7 @@ 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)
{ {
int64_t value; uint64_t value;
MemoryRegion *mr; MemoryRegion *mr;
PCDIMMDevice *dimm = PC_DIMM(obj); PCDIMMDevice *dimm = PC_DIMM(obj);
PCDIMMDeviceClass *ddc = PC_DIMM_GET_CLASS(obj); PCDIMMDeviceClass *ddc = PC_DIMM_GET_CLASS(obj);
@ -364,7 +364,7 @@ static void pc_dimm_get_size(Object *obj, Visitor *v, const char *name,
mr = ddc->get_memory_region(dimm); mr = ddc->get_memory_region(dimm);
value = memory_region_size(mr); value = memory_region_size(mr);
visit_type_int(v, name, &value, errp); visit_type_uint64(v, name, &value, errp);
} }
static void pc_dimm_check_memdev_is_busy(Object *obj, const char *name, static void pc_dimm_check_memdev_is_busy(Object *obj, const char *name,
@ -387,7 +387,7 @@ static void pc_dimm_init(Object *obj)
{ {
PCDIMMDevice *dimm = PC_DIMM(obj); PCDIMMDevice *dimm = PC_DIMM(obj);
object_property_add(obj, PC_DIMM_SIZE_PROP, "int", pc_dimm_get_size, object_property_add(obj, PC_DIMM_SIZE_PROP, "uint64", pc_dimm_get_size,
NULL, NULL, NULL, &error_abort); NULL, NULL, NULL, &error_abort);
object_property_add_link(obj, PC_DIMM_MEMDEV_PROP, TYPE_MEMORY_BACKEND, object_property_add_link(obj, PC_DIMM_MEMDEV_PROP, TYPE_MEMORY_BACKEND,
(Object **)&dimm->hostmem, (Object **)&dimm->hostmem,