[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 26/60] nvdimm: convert nvdimm_mr into a pointer
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PULL 26/60] nvdimm: convert nvdimm_mr into a pointer |
Date: |
Thu, 28 Jun 2018 22:04:36 +0200 |
From: David Hildenbrand <address@hidden>
This way we can easily check if the region has already been inititalized
without having to rely on the size of an uninitialized region being 0.
Free the region in nvdimm_finalize() and not in unrealize() as we will
allow to create the region before realization in following patches.
Reviewed-by: David Gibson <address@hidden>
Reviewed-by: Igor Mammedov <address@hidden>
Signed-off-by: David Hildenbrand <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
hw/mem/nvdimm.c | 17 +++++++++++++----
include/hw/mem/nvdimm.h | 2 +-
2 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/hw/mem/nvdimm.c b/hw/mem/nvdimm.c
index 7260c9c..afd3912 100644
--- a/hw/mem/nvdimm.c
+++ b/hw/mem/nvdimm.c
@@ -43,7 +43,7 @@ static void nvdimm_set_label_size(Object *obj, Visitor *v,
const char *name,
Error *local_err = NULL;
uint64_t value;
- if (memory_region_size(&nvdimm->nvdimm_mr)) {
+ if (nvdimm->nvdimm_mr) {
error_setg(&local_err, "cannot change property value");
goto out;
}
@@ -71,11 +71,18 @@ static void nvdimm_init(Object *obj)
NULL, NULL);
}
+static void nvdimm_finalize(Object *obj)
+{
+ NVDIMMDevice *nvdimm = NVDIMM(obj);
+
+ g_free(nvdimm->nvdimm_mr);
+}
+
static MemoryRegion *nvdimm_get_memory_region(PCDIMMDevice *dimm, Error **errp)
{
NVDIMMDevice *nvdimm = NVDIMM(dimm);
- return &nvdimm->nvdimm_mr;
+ return nvdimm->nvdimm_mr;
}
static void nvdimm_realize(PCDIMMDevice *dimm, Error **errp)
@@ -102,9 +109,10 @@ static void nvdimm_realize(PCDIMMDevice *dimm, Error
**errp)
return;
}
- memory_region_init_alias(&nvdimm->nvdimm_mr, OBJECT(dimm),
+ nvdimm->nvdimm_mr = g_new(MemoryRegion, 1);
+ memory_region_init_alias(nvdimm->nvdimm_mr, OBJECT(dimm),
"nvdimm-memory", mr, 0, pmem_size);
- nvdimm->nvdimm_mr.align = align;
+ nvdimm->nvdimm_mr->align = align;
}
/*
@@ -167,6 +175,7 @@ static TypeInfo nvdimm_info = {
.class_init = nvdimm_class_init,
.instance_size = sizeof(NVDIMMDevice),
.instance_init = nvdimm_init,
+ .instance_finalize = nvdimm_finalize,
};
static void nvdimm_register_types(void)
diff --git a/include/hw/mem/nvdimm.h b/include/hw/mem/nvdimm.h
index 9340631..c5c9b3c 100644
--- a/include/hw/mem/nvdimm.h
+++ b/include/hw/mem/nvdimm.h
@@ -74,7 +74,7 @@ struct NVDIMMDevice {
* it's the PMEM region in NVDIMM device, which is presented to
* guest via ACPI NFIT and _FIT method if NVDIMM hotplug is supported.
*/
- MemoryRegion nvdimm_mr;
+ MemoryRegion *nvdimm_mr;
/*
* The 'on' value results in the unarmed flag set in ACPI NFIT,
--
1.8.3.1
- [Qemu-devel] [PULL 18/60] pc: rename pc_dimm_(plug|unplug|...)* into pc_memory_(plug|unplug|...)*, (continued)
- [Qemu-devel] [PULL 18/60] pc: rename pc_dimm_(plug|unplug|...)* into pc_memory_(plug|unplug|...)*, Paolo Bonzini, 2018/06/28
- [Qemu-devel] [PULL 21/60] pc: factor out pc specific dimm checks into pc_memory_pre_plug(), Paolo Bonzini, 2018/06/28
- [Qemu-devel] [PULL 14/60] configure: enable debug-mutex if debug enabled, Paolo Bonzini, 2018/06/28
- [Qemu-devel] [PULL 19/60] pc-dimm: rename pc_dimm_memory_* to pc_dimm_*, Paolo Bonzini, 2018/06/28
- [Qemu-devel] [PULL 22/60] nvdimm: no need to overwrite get_vmstate_memory_region(), Paolo Bonzini, 2018/06/28
- [Qemu-devel] [PULL 23/60] hostmem: drop error variable from host_memory_backend_get_memory(), Paolo Bonzini, 2018/06/28
- [Qemu-devel] [PULL 25/60] nvdimm: convert "unarmed" into a static property, Paolo Bonzini, 2018/06/28
- [Qemu-devel] [PULL 16/60] qemu-options: Add missing newline to -accel help text, Paolo Bonzini, 2018/06/28
- [Qemu-devel] [PULL 20/60] pc-dimm: remove pc_dimm_get_free_slot() from header, Paolo Bonzini, 2018/06/28
- [Qemu-devel] [PULL 24/60] pc-dimm: merge get_(vmstate_)memory_region(), Paolo Bonzini, 2018/06/28
- [Qemu-devel] [PULL 26/60] nvdimm: convert nvdimm_mr into a pointer,
Paolo Bonzini <=
- [Qemu-devel] [PULL 27/60] nvdimm: make get_memory_region() perform checks and initialization, Paolo Bonzini, 2018/06/28
- [Qemu-devel] [PULL 28/60] pc-dimm: get_memory_region() will not fail after realize, Paolo Bonzini, 2018/06/28
- [Qemu-devel] [PULL 29/60] numa: report all DIMM/NVDIMMs as plugged memory, Paolo Bonzini, 2018/06/28
- [Qemu-devel] [PULL 31/60] Deprecate the -enable-hax option, Paolo Bonzini, 2018/06/28
- [Qemu-devel] [PULL 30/60] osdep: work around Coverity parsing errors, Paolo Bonzini, 2018/06/28
- [Qemu-devel] [PULL 32/60] pr-helper: fix --socket-path default in help, Paolo Bonzini, 2018/06/28
- [Qemu-devel] [PULL 33/60] pr-helper: fix assertion failure on failed multipath PERSISTENT RESERVE IN, Paolo Bonzini, 2018/06/28
- [Qemu-devel] [PULL 34/60] pr-manager-helper: avoid SIGSEGV when writing to the socket fail, Paolo Bonzini, 2018/06/28
- [Qemu-devel] [PULL 35/60] pr-manager: put stubs in .c file, Paolo Bonzini, 2018/06/28