diff options
| author | Andreas Färber <afaerber@suse.de> | 2013-10-16 15:24:01 +0200 |
|---|---|---|
| committer | Stefan Hajnoczi <stefanha@redhat.com> | 2013-10-17 10:15:18 +0200 |
| commit | 794cbc26eb94ce13c75d105eea9ff0afff56e2c2 (patch) | |
| tree | 46a00decc448cffacacacc712db62e3485035426 /hw | |
| parent | 684b25447c10b9171e5aa9305075b830885fe6e3 (diff) | |
| download | focaccia-qemu-794cbc26eb94ce13c75d105eea9ff0afff56e2c2.tar.gz focaccia-qemu-794cbc26eb94ce13c75d105eea9ff0afff56e2c2.zip | |
sd: Avoid access to NULL BlockDriverState
Commit 4f8a066b5fc254eeaabbbde56ba4f5b29cc68fdf (blockdev: Remove IF_* check for read-only blockdev_init) added a usage of bdrv_is_read_only() to sd_init(), which is called for versatilepb, versatileab and xilinx-zynq-a9 machines among others with NULL argument by default, causing the new qom-test to fail. Add a check to prevent this. Suggested-by: Kevin Wolf <kwolf@redhat.com> Signed-off-by: Andreas Färber <afaerber@suse.de> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
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 7380f063f7..4502ad143d 100644 --- a/hw/sd/sd.c +++ b/hw/sd/sd.c @@ -494,7 +494,7 @@ SDState *sd_init(BlockDriverState *bs, bool is_spi) { SDState *sd; - if (bdrv_is_read_only(bs)) { + if (bs && bdrv_is_read_only(bs)) { fprintf(stderr, "sd_init: Cannot use read-only drive\n"); return NULL; } |