[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 22/43] pc-dimm: make "size" property uint64
From: |
Marc-André Lureau |
Subject: |
[Qemu-devel] [PATCH v3 22/43] pc-dimm: make "size" property uint64 |
Date: |
Wed, 7 Jun 2017 20:36:14 +0400 |
This carries the memory_region_size() value without implicit cast.
Signed-off-by: Marc-André Lureau <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 d2a96569ba..cda2c9dd06 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 e57027149d..4e4cf1472f 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 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,
--
2.13.0.91.g00982b8dd
- [Qemu-devel] [PATCH v3 12/43] object: add uint property setter/getter, (continued)
- [Qemu-devel] [PATCH v3 12/43] object: add uint property setter/getter, Marc-André Lureau, 2017/06/07
- [Qemu-devel] [PATCH v3 13/43] q35: fix get_mmcfg_size to use uint64 visitor, Marc-André Lureau, 2017/06/07
- [Qemu-devel] [PATCH v3 14/43] object: use more specific property type names, Marc-André Lureau, 2017/06/07
- [Qemu-devel] [PATCH v3 15/43] qdev: rename DEFINE_PROP_DEFAULT() to DEFINE_PROP_SIGNED(), Marc-André Lureau, 2017/06/07
- [Qemu-devel] [PATCH v3 16/43] qdev: wrap default property value in an union, Marc-André Lureau, 2017/06/07
- [Qemu-devel] [PATCH v3 17/43] qdev: avoid type casts between signed and unsigned, Marc-André Lureau, 2017/06/07
- [Qemu-devel] [PATCH v3 18/43] apic-common: make "id" property a uint32, Marc-André Lureau, 2017/06/07
- [Qemu-devel] [PATCH v3 19/43] qdev: use appropriate getter/setters type, Marc-André Lureau, 2017/06/07
- [Qemu-devel] [PATCH v3 20/43] isa: use get_uint() for "io-base", Marc-André Lureau, 2017/06/07
- [Qemu-devel] [PATCH v3 21/43] pc-dimm: use get_uint() for dimm properties, Marc-André Lureau, 2017/06/07
- [Qemu-devel] [PATCH v3 22/43] pc-dimm: make "size" property uint64,
Marc-André Lureau <=
- [Qemu-devel] [PATCH v3 23/43] pcihp: use get_uint() for "bsel" property, Marc-André Lureau, 2017/06/07
- [Qemu-devel] [PATCH v3 24/43] aspeed: use {set, get}_uint() for "ram-size" property, Marc-André Lureau, 2017/06/07
- [Qemu-devel] [PATCH v3 25/43] bcm2835_fb: use {get, set}_uint() for "vcram-size" and "vcram-base", Marc-André Lureau, 2017/06/07
- [Qemu-devel] [PATCH v3 26/43] platform-bus: use get_uint() for "addr" property, Marc-André Lureau, 2017/06/07
- [Qemu-devel] [PATCH v3 27/43] acpi: use get_uint() for "acpi-pcihp-io*" properties, Marc-André Lureau, 2017/06/07
- [Qemu-devel] [PATCH v3 28/43] acpi: use get_uint() for various acpi properties, Marc-André Lureau, 2017/06/07
- [Qemu-devel] [PATCH v3 29/43] acpi: use get_uint() for "pci-hole*" properties, Marc-André Lureau, 2017/06/07
- [Qemu-devel] [PATCH v3 30/43] pc: use get_uint() for "iobase" property, Marc-André Lureau, 2017/06/07
- [Qemu-devel] [PATCH v3 31/43] pc: use get_uint() for "apic-id" property, Marc-André Lureau, 2017/06/07
- [Qemu-devel] [PATCH v3 32/43] pc: use get_uint() for "hpet-intcap" property, Marc-André Lureau, 2017/06/07