| Message ID | 20180611121655.19616-9-david@redhat.com |
|---|---|
| State | New |
| Headers | show |
| Series | pc-dimm: next bunch of cleanups | expand |
On Mon, Jun 11, 2018 at 02:16:52PM +0200, David Hildenbrand wrote: > This is guaranteed by passing into host_memory_backend_get_memory() a > value that is not NULL - which is what we always do. > > Signed-off-by: David Hildenbrand <david@redhat.com> Reviewed-by: David Gibson <david@gibson.dropbear.id.au> > --- > hw/mem/pc-dimm.c | 15 ++------------- > 1 file changed, 2 insertions(+), 13 deletions(-) > > diff --git a/hw/mem/pc-dimm.c b/hw/mem/pc-dimm.c > index 7bb6ce509c..9a0da5d441 100644 > --- a/hw/mem/pc-dimm.c > +++ b/hw/mem/pc-dimm.c > @@ -157,7 +157,6 @@ static void pc_dimm_get_size(Object *obj, Visitor *v, const char *name, > void *opaque, Error **errp) > { > uint64_t value; > - MemoryRegion *mr; > PCDIMMDevice *dimm = PC_DIMM(obj); > PCDIMMDeviceClass *ddc = PC_DIMM_GET_CLASS(obj); > > @@ -167,11 +166,7 @@ static void pc_dimm_get_size(Object *obj, Visitor *v, const char *name, > return; > } > > - mr = ddc->get_memory_region(dimm); > - if (!mr) { > - return; > - } > - value = memory_region_size(mr); > + value = memory_region_size(ddc->get_memory_region(dimm)); > > visit_type_uint64(v, name, &value, errp); > } > @@ -241,14 +236,8 @@ static uint64_t pc_dimm_md_get_region_size(const MemoryDeviceState *md) > /* dropping const here is fine as we don't touch the memory region */ > PCDIMMDevice *dimm = PC_DIMM(md); > const PCDIMMDeviceClass *ddc = PC_DIMM_GET_CLASS(md); > - MemoryRegion *mr; > - > - mr = ddc->get_memory_region(dimm); > - if (!mr) { > - return 0; > - } > > - return memory_region_size(mr); > + return memory_region_size(ddc->get_memory_region(dimm)); > } > > static void pc_dimm_md_fill_device_info(const MemoryDeviceState *md,
diff --git a/hw/mem/pc-dimm.c b/hw/mem/pc-dimm.c index 7bb6ce509c..9a0da5d441 100644 --- a/hw/mem/pc-dimm.c +++ b/hw/mem/pc-dimm.c @@ -157,7 +157,6 @@ static void pc_dimm_get_size(Object *obj, Visitor *v, const char *name, void *opaque, Error **errp) { uint64_t value; - MemoryRegion *mr; PCDIMMDevice *dimm = PC_DIMM(obj); PCDIMMDeviceClass *ddc = PC_DIMM_GET_CLASS(obj); @@ -167,11 +166,7 @@ static void pc_dimm_get_size(Object *obj, Visitor *v, const char *name, return; } - mr = ddc->get_memory_region(dimm); - if (!mr) { - return; - } - value = memory_region_size(mr); + value = memory_region_size(ddc->get_memory_region(dimm)); visit_type_uint64(v, name, &value, errp); } @@ -241,14 +236,8 @@ static uint64_t pc_dimm_md_get_region_size(const MemoryDeviceState *md) /* dropping const here is fine as we don't touch the memory region */ PCDIMMDevice *dimm = PC_DIMM(md); const PCDIMMDeviceClass *ddc = PC_DIMM_GET_CLASS(md); - MemoryRegion *mr; - - mr = ddc->get_memory_region(dimm); - if (!mr) { - return 0; - } - return memory_region_size(mr); + return memory_region_size(ddc->get_memory_region(dimm)); } static void pc_dimm_md_fill_device_info(const MemoryDeviceState *md,
This is guaranteed by passing into host_memory_backend_get_memory() a value that is not NULL - which is what we always do. Signed-off-by: David Hildenbrand <david@redhat.com> --- hw/mem/pc-dimm.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-)