diff options
| author | Thomas Huth | 2017-08-21 08:30:29 +0200 |
|---|---|---|
| committer | David Gibson | 2017-08-22 13:26:46 +0200 |
| commit | 0479097859372a760843ad1b9c6ed3705c6423ca (patch) | |
| tree | 172d1576e30d1fb2f592751b6f5b946e16826965 /include/hw/mem | |
| parent | spapr: Allow configure-connector to be called multiple times (diff) | |
| download | qemu-0479097859372a760843ad1b9c6ed3705c6423ca.tar.gz qemu-0479097859372a760843ad1b9c6ed3705c6423ca.tar.xz qemu-0479097859372a760843ad1b9c6ed3705c6423ca.zip | |
hw/ppc/spapr: Fix segfault when instantiating a 'pc-dimm' without 'memdev'
QEMU currently crashes when trying to use a 'pc-dimm' on the pseries
machine without specifying its 'memdev' property. This happens because
pc_dimm_get_memory_region() does not check whether the 'memdev' property
has properly been set by the user. Looking closer at this function, it's
also obvious that it is using &error_abort to call another function - and
this is bad in a function that is used in the hot-plugging calling chain
since this can also cause QEMU to exit unexpectedly.
So let's fix these issues in a proper way now: Add a "Error **errp"
parameter to pc_dimm_get_memory_region() which we use in case the 'memdev'
property has not been set by the user, and which we can use instead of
the &error_abort, and change the callers of get_memory_region() to make
use of this "errp" parameter for proper error checking.
Signed-off-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Diffstat (limited to 'include/hw/mem')
| -rw-r--r-- | include/hw/mem/pc-dimm.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/hw/mem/pc-dimm.h b/include/hw/mem/pc-dimm.h index 1e483f2670..6f8c3eb1b3 100644 --- a/include/hw/mem/pc-dimm.h +++ b/include/hw/mem/pc-dimm.h @@ -71,7 +71,7 @@ typedef struct PCDIMMDeviceClass { /* public */ void (*realize)(PCDIMMDevice *dimm, Error **errp); - MemoryRegion *(*get_memory_region)(PCDIMMDevice *dimm); + MemoryRegion *(*get_memory_region)(PCDIMMDevice *dimm, Error **errp); MemoryRegion *(*get_vmstate_memory_region)(PCDIMMDevice *dimm); } PCDIMMDeviceClass; |
