[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-ppc] [PATCH v4 08/12] pc-dimm: merge get_(vmstate_)memory_region()
From: |
David Hildenbrand |
Subject: |
[Qemu-ppc] [PATCH v4 08/12] pc-dimm: merge get_(vmstate_)memory_region() |
Date: |
Mon, 18 Jun 2018 16:25:32 +0200 |
Importantly, get_vmstate_memory_region() should also fail with a proper
error if called before the device is realized. For a PCDIMM, both functions
are to return the same thing, so share the implementation.
All current users are called after the device has been realized, so we
can expect the calls to succeed.
Reviewed-by: David Gibson <address@hidden>
Reviewed-by: Igor Mammedov <address@hidden>
Signed-off-by: David Hildenbrand <address@hidden>
---
hw/mem/pc-dimm.c | 13 +++++--------
include/hw/mem/pc-dimm.h | 3 ++-
2 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/hw/mem/pc-dimm.c b/hw/mem/pc-dimm.c
index 73f0eee4c7..4ff39b59ef 100644
--- a/hw/mem/pc-dimm.c
+++ b/hw/mem/pc-dimm.c
@@ -35,7 +35,8 @@ void pc_dimm_plug(DeviceState *dev, MachineState *machine,
uint64_t align,
int slot;
PCDIMMDevice *dimm = PC_DIMM(dev);
PCDIMMDeviceClass *ddc = PC_DIMM_GET_CLASS(dimm);
- MemoryRegion *vmstate_mr = ddc->get_vmstate_memory_region(dimm);
+ MemoryRegion *vmstate_mr = ddc->get_vmstate_memory_region(dimm,
+ &error_abort);
Error *local_err = NULL;
MemoryRegion *mr;
uint64_t addr;
@@ -90,7 +91,8 @@ void pc_dimm_unplug(DeviceState *dev, MachineState *machine)
{
PCDIMMDevice *dimm = PC_DIMM(dev);
PCDIMMDeviceClass *ddc = PC_DIMM_GET_CLASS(dimm);
- MemoryRegion *vmstate_mr = ddc->get_vmstate_memory_region(dimm);
+ MemoryRegion *vmstate_mr = ddc->get_vmstate_memory_region(dimm,
+ &error_abort);
MemoryRegion *mr = ddc->get_memory_region(dimm, &error_abort);
memory_device_unplug_region(machine, mr);
@@ -229,11 +231,6 @@ static MemoryRegion
*pc_dimm_get_memory_region(PCDIMMDevice *dimm, Error **errp)
return host_memory_backend_get_memory(dimm->hostmem);
}
-static MemoryRegion *pc_dimm_get_vmstate_memory_region(PCDIMMDevice *dimm)
-{
- return host_memory_backend_get_memory(dimm->hostmem);
-}
-
static uint64_t pc_dimm_md_get_addr(const MemoryDeviceState *md)
{
const PCDIMMDevice *dimm = PC_DIMM(md);
@@ -298,7 +295,7 @@ static void pc_dimm_class_init(ObjectClass *oc, void *data)
dc->desc = "DIMM memory module";
ddc->get_memory_region = pc_dimm_get_memory_region;
- ddc->get_vmstate_memory_region = pc_dimm_get_vmstate_memory_region;
+ ddc->get_vmstate_memory_region = pc_dimm_get_memory_region;
mdc->get_addr = pc_dimm_md_get_addr;
/* for a dimm plugged_size == region_size */
diff --git a/include/hw/mem/pc-dimm.h b/include/hw/mem/pc-dimm.h
index cf71247630..5679a80465 100644
--- a/include/hw/mem/pc-dimm.h
+++ b/include/hw/mem/pc-dimm.h
@@ -73,7 +73,8 @@ typedef struct PCDIMMDeviceClass {
/* public */
void (*realize)(PCDIMMDevice *dimm, Error **errp);
MemoryRegion *(*get_memory_region)(PCDIMMDevice *dimm, Error **errp);
- MemoryRegion *(*get_vmstate_memory_region)(PCDIMMDevice *dimm);
+ MemoryRegion *(*get_vmstate_memory_region)(PCDIMMDevice *dimm,
+ Error **errp);
} PCDIMMDeviceClass;
void pc_dimm_plug(DeviceState *dev, MachineState *machine, uint64_t align,
--
2.17.1
- [Qemu-ppc] [PATCH v4 01/12] pc-dimm: remove leftover "struct pc_dimms_capacity", (continued)
- [Qemu-ppc] [PATCH v4 01/12] pc-dimm: remove leftover "struct pc_dimms_capacity", David Hildenbrand, 2018/06/18
- [Qemu-ppc] [PATCH v4 03/12] pc-dimm: rename pc_dimm_memory_* to pc_dimm_*, David Hildenbrand, 2018/06/18
- [Qemu-ppc] [PATCH v4 04/12] pc-dimm: remove pc_dimm_get_free_slot() from header, David Hildenbrand, 2018/06/18
- [Qemu-ppc] [PATCH v4 05/12] pc: factor out pc specific dimm checks into pc_memory_pre_plug(), David Hildenbrand, 2018/06/18
- [Qemu-ppc] [PATCH v4 06/12] nvdimm: no need to overwrite get_vmstate_memory_region(), David Hildenbrand, 2018/06/18
- [Qemu-ppc] [PATCH v4 07/12] hostmem: drop error variable from host_memory_backend_get_memory(), David Hildenbrand, 2018/06/18
- [Qemu-ppc] [PATCH v4 11/12] nvdimm: make get_memory_region() perform checks and initialization, David Hildenbrand, 2018/06/18
- [Qemu-ppc] [PATCH v4 09/12] nvdimm: convert "unarmed" into a static property, David Hildenbrand, 2018/06/18
- [Qemu-ppc] [PATCH v4 08/12] pc-dimm: merge get_(vmstate_)memory_region(),
David Hildenbrand <=
- [Qemu-ppc] [PATCH v4 10/12] nvdimm: convert nvdimm_mr into a pointer, David Hildenbrand, 2018/06/18
- [Qemu-ppc] [PATCH v4 12/12] pc-dimm: get_memory_region() will not fail after realize, David Hildenbrand, 2018/06/18