diff options
author | Peter Maydell <peter.maydell@linaro.org> | 2016-03-04 11:30:17 +0000 |
---|---|---|
committer | Timothy Pearson <tpearson@raptorengineering.com> | 2019-11-29 19:49:12 -0600 |
commit | fa9286418bc86ee0e01d521272b1b67097eef207 (patch) | |
tree | 69ec9f0928fdcc02395da3394837bcbba777f97e /hw/sd | |
parent | f7c68957b821d95dbe67d5547ab17a98b3f63f13 (diff) | |
download | hqemu-fa9286418bc86ee0e01d521272b1b67097eef207.zip hqemu-fa9286418bc86ee0e01d521272b1b67097eef207.tar.gz |
sd.c: Handle NULL block backend in sd_get_inserted()
The sd.c SD card emulation code can be in a state where the
SDState BlockBackend pointer is NULL; this is treated as
"card not present". Add a missing check to sd_get_inserted()
so that we don't segfault in this situation.
(This could be provoked by the guest writing to the SDHCI
register to do a reset on a xilinx-zynq-a9 board; it will
also happen at startup when sdhci implements its DeviceClass
reset method.)
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Alistair Francis <alistair.francis@xilinx.com>
Message-id: 1456493044-10025-2-git-send-email-peter.maydell@linaro.org
Diffstat (limited to 'hw/sd')
-rw-r--r-- | hw/sd/sd.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -449,7 +449,7 @@ static void sd_reset(DeviceState *dev) static bool sd_get_inserted(SDState *sd) { - return blk_is_inserted(sd->blk); + return sd->blk && blk_is_inserted(sd->blk); } static bool sd_get_readonly(SDState *sd) |