[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 22/41] pc-dimm: make "size" property uint64
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PULL 22/41] pc-dimm: make "size" property uint64 |
Date: |
Fri, 9 Jun 2017 15:47:06 +0200 |
From: Marc-André Lureau <address@hidden>
This carries the memory_region_size() value without implicit cast.
Signed-off-by: Marc-André Lureau <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
---
hw/acpi/memory_hotplug.c | 5 +++--
hw/acpi/nvdimm.c | 8 ++++----
hw/mem/pc-dimm.c | 18 +++++++++---------
3 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/hw/acpi/memory_hotplug.c b/hw/acpi/memory_hotplug.c
index d2a9656..cda2c9d 100644
--- a/hw/acpi/memory_hotplug.c
+++ b/hw/acpi/memory_hotplug.c
@@ -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);
break;
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);
break;
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);
break;
case 0x10: /* node proximity for _PXM method */
diff --git a/hw/acpi/nvdimm.c b/hw/acpi/nvdimm.c
index e570271..4e4cf14 100644
--- a/hw/acpi/nvdimm.c
+++ b/hw/acpi/nvdimm.c
@@ -238,8 +238,8 @@ nvdimm_build_structure_spa(GArray *structures, DeviceState
*dev)
NvdimmNfitSpa *nfit_spa;
uint64_t addr = object_property_get_uint(OBJECT(dev), PC_DIMM_ADDR_PROP,
NULL);
- uint64_t size = object_property_get_int(OBJECT(dev), PC_DIMM_SIZE_PROP,
- NULL);
+ uint64_t size = object_property_get_uint(OBJECT(dev), PC_DIMM_SIZE_PROP,
+ NULL);
uint32_t node = object_property_get_uint(OBJECT(dev), PC_DIMM_NODE_PROP,
NULL);
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)
{
NvdimmNfitMemDev *nfit_memdev;
- uint64_t size = object_property_get_int(OBJECT(dev), PC_DIMM_SIZE_PROP,
- NULL);
+ uint64_t size = object_property_get_uint(OBJECT(dev), PC_DIMM_SIZE_PROP,
+ NULL);
int slot = object_property_get_int(OBJECT(dev), PC_DIMM_SLOT_PROP,
NULL);
uint32_t handle = nvdimm_slot_to_handle(slot);
diff --git a/hw/mem/pc-dimm.c b/hw/mem/pc-dimm.c
index f6def8c..b72258e 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,
--
2.7.5
- [Qemu-devel] [PULL 18/41] apic-common: make "id" property a uint32, (continued)
- [Qemu-devel] [PULL 18/41] apic-common: make "id" property a uint32, Markus Armbruster, 2017/06/09
- [Qemu-devel] [PULL 13/41] q35: fix get_mmcfg_size to use uint64 visitor, Markus Armbruster, 2017/06/09
- [Qemu-devel] [PULL 25/41] bcm2835_fb: use {get, set}_uint() for "vcram-size" and "vcram-base", Markus Armbruster, 2017/06/09
- [Qemu-devel] [PULL 31/41] pc: use get_uint() for "apic-id" property, Markus Armbruster, 2017/06/09
- [Qemu-devel] [PULL 17/41] qdev: avoid type casts between signed and unsigned, Markus Armbruster, 2017/06/09
- [Qemu-devel] [PULL 07/41] qapi: Remove visit_start_alternate() parameter promote_int, Markus Armbruster, 2017/06/09
- [Qemu-devel] [PULL 08/41] tests: remove /{qnum, qlist, dict}/destroy test, Markus Armbruster, 2017/06/09
- [Qemu-devel] [PULL 37/41] pnv-core: use get_uint() for "core-pir" property, Markus Armbruster, 2017/06/09
- [Qemu-devel] [PULL 34/41] arm: use get_uint() for "mp-affinity" property, Markus Armbruster, 2017/06/09
- [Qemu-devel] [PULL 28/41] acpi: use get_uint() for various acpi properties, Markus Armbruster, 2017/06/09
- [Qemu-devel] [PULL 22/41] pc-dimm: make "size" property uint64,
Markus Armbruster <=
- [Qemu-devel] [PULL 21/41] pc-dimm: use get_uint() for dimm properties, Markus Armbruster, 2017/06/09
- [Qemu-devel] [PULL 39/41] i386/cpu: use get_uint() for "min-level"/"min-xlevel" properties, Markus Armbruster, 2017/06/09
- [Qemu-devel] [PULL 19/41] qdev: Use appropriate getter/setters type, Markus Armbruster, 2017/06/09
- [Qemu-devel] [PULL 06/41] qapi: merge QInt and QFloat in QNum, Markus Armbruster, 2017/06/09
- Re: [Qemu-devel] [PULL 00/41] QAPI patches for 2017-06-09, no-reply, 2017/06/09
- Re: [Qemu-devel] [PULL 00/41] QAPI patches for 2017-06-09, no-reply, 2017/06/09
- Re: [Qemu-devel] [PULL 00/41] QAPI patches for 2017-06-09, Peter Maydell, 2017/06/12