Re: [Qemu-devel] [PATCH] sd: Avoid access to NULL BlockDriverState

2013-10-17 Thread Stefan Hajnoczi 
On Wed, Oct 16, 2013 at 03:24:01PM +0200, Andreas Färber wrote:
 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 kw...@redhat.com
 Signed-off-by: Andreas Färber afaer...@suse.de
 ---
  hw/sd/sd.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

Thanks, applied to my block tree:
https://github.com/stefanha/qemu/commits/block

Stefan

[Qemu-devel] [PATCH] sd: Avoid access to NULL BlockDriverState

2013-10-16 Thread Andreas Färber 
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 kw...@redhat.com
Signed-off-by: Andreas Färber afaer...@suse.de
---
 hw/sd/sd.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/sd/sd.c b/hw/sd/sd.c
index 7380f06..4502ad1 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;
 }
-- 
1.8.1.4