summaryrefslogtreecommitdiffstats
path: root/include/hw/mem
diff options
context:
space:
mode:
authorDavid Hildenbrand2018-10-05 11:20:15 +0200
committerEduardo Habkost2018-10-24 11:44:59 +0200
commite40c5b6b3f5483bd4e1f493853e6a1f12eba1e93 (patch)
tree7edcef1063bb38599fb2d0931973f939faabb51d /include/hw/mem
parentmemory-device: introduce separate config option (diff)
downloadqemu-e40c5b6b3f5483bd4e1f493853e6a1f12eba1e93.tar.gz
qemu-e40c5b6b3f5483bd4e1f493853e6a1f12eba1e93.tar.xz
qemu-e40c5b6b3f5483bd4e1f493853e6a1f12eba1e93.zip
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>
Diffstat (limited to 'include/hw/mem')
-rw-r--r--include/hw/mem/memory-device.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/hw/mem/memory-device.h b/include/hw/mem/memory-device.h
index 2853b084b5..f02b229837 100644
--- a/include/hw/mem/memory-device.h
+++ b/include/hw/mem/memory-device.h
@@ -33,8 +33,8 @@ typedef struct MemoryDeviceClass {
InterfaceClass parent_class;
uint64_t (*get_addr)(const MemoryDeviceState *md);
- uint64_t (*get_plugged_size)(const MemoryDeviceState *md);
- uint64_t (*get_region_size)(const MemoryDeviceState *md);
+ uint64_t (*get_plugged_size)(const MemoryDeviceState *md, Error **errp);
+ uint64_t (*get_region_size)(const MemoryDeviceState *md, Error **errp);
void (*fill_device_info)(const MemoryDeviceState *md,
MemoryDeviceInfo *info);
} MemoryDeviceClass;