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/acpi | |
| parent | 9ed442b8ae9c0641c6735e1753ef554c659f10f1 (diff) | |
| download | focaccia-qemu-b053ef6106dc99c56972fd72a4880571c6fbd669.tar.gz focaccia-qemu-b053ef6106dc99c56972fd72a4880571c6fbd669.zip | |
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/acpi')
| -rw-r--r-- | hw/acpi/memory_hotplug.c | 5 | ||||
| -rw-r--r-- | hw/acpi/nvdimm.c | 8 |
2 files changed, 7 insertions, 6 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 f507b492c3..6ceea196e7 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); |