mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-06 01:03:55 -06:00
memory-device: forward errors in get_region_size()/get_plugged_size()
Let's properly forward the errors, so errors from get_region_size() / get_plugged_size() can be handled. Users right now call both functions after the device has been realized, which is will never fail, so it is fine to continue using error_abort. While at it, remove a leftover error check (suggested by Igor). Reviewed-by: David Gibson <david@gibson.dropbear.id.au> Reviewed-by: Igor Mammedov <imammedo@redhat.com> Reviewed-by: Eric Auger <eric.auger@redhat.com> Signed-off-by: David Hildenbrand <david@redhat.com> Message-Id: <20181005092024.14344-8-david@redhat.com> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
This commit is contained in:
parent
15cea5ae81
commit
e40c5b6b3f
3 changed files with 8 additions and 10 deletions
|
@ -234,14 +234,15 @@ static uint64_t pc_dimm_md_get_addr(const MemoryDeviceState *md)
|
|||
return dimm->addr;
|
||||
}
|
||||
|
||||
static uint64_t pc_dimm_md_get_region_size(const MemoryDeviceState *md)
|
||||
static uint64_t pc_dimm_md_get_region_size(const MemoryDeviceState *md,
|
||||
Error **errp)
|
||||
{
|
||||
/* 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, &error_abort);
|
||||
mr = ddc->get_memory_region(dimm, errp);
|
||||
if (!mr) {
|
||||
return 0;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue