diff options
| author | Marc-André Lureau <marcandre.lureau@redhat.com> | 2017-06-07 20:36:14 +0400 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2017-06-20 14:31:32 +0200 |
| commit | b053ef6106dc99c56972fd72a4880571c6fbd669 (patch) | |
| tree | 08e5942afee92d41fddd6b1fbeb80e3eb118968e /hw/mem/pc-dimm.c | |
| parent | 9ed442b8ae9c0641c6735e1753ef554c659f10f1 (diff) | |
| download | qemu-b053ef6106dc99c56972fd72a4880571c6fbd669.tar.gz | |
pc-dimm: make "size" property uint64
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>
Diffstat (limited to 'hw/mem/pc-dimm.c')
| -rw-r--r-- | hw/mem/pc-dimm.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/hw/mem/pc-dimm.c b/hw/mem/pc-dimm.c index f6def8c239..b72258e28f 100644 --- a/hw/mem/pc-dimm.c +++ b/hw/mem/pc-dimm.c @@ -136,7 +136,7 @@ static int pc_existing_dimms_capacity_internal(Object *obj, void *opaque) DeviceState *dev = DEVICE(obj); 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); } @@ -182,8 +182,8 @@ int qmp_pc_dimm_device_list(Object *obj, void *opaque) di->addr = dimm->addr; di->slot = dimm->slot; di->node = dimm->node; - di->size = object_property_get_int(OBJECT(dimm), PC_DIMM_SIZE_PROP, - NULL); + di->size = object_property_get_uint(OBJECT(dimm), PC_DIMM_SIZE_PROP, + NULL); di->memdev = object_get_canonical_path(OBJECT(dimm->hostmem)); 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 */ for (item = list; item; item = g_slist_next(item)) { PCDIMMDevice *dimm = item->data; - uint64_t dimm_size = object_property_get_int(OBJECT(dimm), - PC_DIMM_SIZE_PROP, - errp); + uint64_t dimm_size = object_property_get_uint(OBJECT(dimm), + PC_DIMM_SIZE_PROP, + errp); if (errp && *errp) { goto out; } @@ -356,7 +356,7 @@ static Property pc_dimm_properties[] = { static void pc_dimm_get_size(Object *obj, Visitor *v, const char *name, void *opaque, Error **errp) { - int64_t value; + uint64_t value; MemoryRegion *mr; PCDIMMDevice *dimm = PC_DIMM(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); 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, @@ -387,7 +387,7 @@ static void pc_dimm_init(Object *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); object_property_add_link(obj, PC_DIMM_MEMDEV_PROP, TYPE_MEMORY_BACKEND, (Object **)&dimm->hostmem, |