| Message ID | 20180611121655.19616-10-david@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | pc-dimm: next bunch of cleanups | expand |
On Mon, Jun 11, 2018 at 02:16:53PM +0200, David Hildenbrand wrote: > We can reuse pc_dimm_get_memory_region() now, as both functions are > (besides the assert which is also correct), equal. > > Signed-off-by: David Hildenbrand <david@redhat.com> Reviewed-by: David Gibson <david@gibson.dropbear.id.au> > --- > hw/mem/pc-dimm.c | 7 +------ > 1 file changed, 1 insertion(+), 6 deletions(-) > > diff --git a/hw/mem/pc-dimm.c b/hw/mem/pc-dimm.c > index 9a0da5d441..bc79dd04d8 100644 > --- a/hw/mem/pc-dimm.c > +++ b/hw/mem/pc-dimm.c > @@ -219,11 +219,6 @@ static MemoryRegion *pc_dimm_get_memory_region(PCDIMMDevice *dimm) > 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); > @@ -282,7 +277,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/hw/mem/pc-dimm.c b/hw/mem/pc-dimm.c index 9a0da5d441..bc79dd04d8 100644 --- a/hw/mem/pc-dimm.c +++ b/hw/mem/pc-dimm.c @@ -219,11 +219,6 @@ static MemoryRegion *pc_dimm_get_memory_region(PCDIMMDevice *dimm) 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); @@ -282,7 +277,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 */
We can reuse pc_dimm_get_memory_region() now, as both functions are (besides the assert which is also correct), equal. Signed-off-by: David Hildenbrand <david@redhat.com> --- hw/mem/pc-dimm.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)