diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-03-04 11:30:17 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-03-04 11:30:17 +0000 |
| commit | 0719e71e5297f68b6b4500aa74e1b49d59806342 (patch) | |
| tree | 581331a937b65819f29a92940ebd064c82b33c68 /hw | |
| parent | 71c2768433048990c882d058c8b2f62bc17f46e6 (diff) | |
| download | qemu-0719e71e5297f68b6b4500aa74e1b49d59806342.tar.gz qemu-0719e71e5297f68b6b4500aa74e1b49d59806342.tar.bz2 qemu-0719e71e5297f68b6b4500aa74e1b49d59806342.zip | |
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')
| -rw-r--r-- | hw/sd/sd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/sd/sd.c b/hw/sd/sd.c index edb6b32690..00c320d00b 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -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) |