mirror of
https://github.com/qemu/qemu.git
synced 2024-11-27 22:03:35 +08:00
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
This commit is contained in:
parent
71c2768433
commit
0719e71e52
@ -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)
|
||||
|
Loading…
Reference in New Issue
Block a user