From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47000) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YT68U-0004Pz-TO for qemu-devel@nongnu.org; Wed, 04 Mar 2015 05:02:42 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YT68R-0006h2-14 for qemu-devel@nongnu.org; Wed, 04 Mar 2015 05:02:38 -0500 Received: from e06smtp11.uk.ibm.com ([195.75.94.107]:60629) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YT68Q-0006gn-Na for qemu-devel@nongnu.org; Wed, 04 Mar 2015 05:02:34 -0500 Received: from /spool/local by e06smtp11.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Wed, 4 Mar 2015 10:02:31 -0000 Received: from b06cxnps4076.portsmouth.uk.ibm.com (d06relay13.portsmouth.uk.ibm.com [9.149.109.198]) by d06dlp02.portsmouth.uk.ibm.com (Postfix) with ESMTP id 8ADD22190056 for ; Wed, 4 Mar 2015 10:02:19 +0000 (GMT) Received: from d06av01.portsmouth.uk.ibm.com (d06av01.portsmouth.uk.ibm.com [9.149.37.212]) by b06cxnps4076.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id t24A2Rk765929416 for ; Wed, 4 Mar 2015 10:02:27 GMT Received: from d06av01.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av01.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id t24A2OAx006695 for ; Wed, 4 Mar 2015 03:02:26 -0700 From: Ekaterina Tumanova Date: Wed, 4 Mar 2015 11:02:16 +0100 Message-Id: <1425463336-20660-1-git-send-email-tumanova@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH] scsi-hd: fix property unset case List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: peter.maydell@linaro.org Cc: kwolf@redhat.com, Ekaterina Tumanova , qemu-devel@nongnu.org, armbru@redhat.com, borntraeger@de.ibm.com, stefanha@redhat.com, mreitz@redhat.com commit "BlockConf: Call backend functions to detect geometry and blocksizes" causes a segmentation fault on the invalid configuration of a scsi device without a drive. Lets check for conf.blk before calling blkconf_blocksizes. The error will be handled later on in scsi_realize anyway. Reported-by: Max Reitz Reviewed-by: Stefan Hajnoczi Reviewed-by: Max Reitz Signed-off-by: Ekaterina Tumanova --- hw/scsi/scsi-disk.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c index 2921728..54d71f4 100644 --- a/hw/scsi/scsi-disk.c +++ b/hw/scsi/scsi-disk.c @@ -2291,7 +2291,12 @@ static void scsi_realize(SCSIDevice *dev, Error **errp) static void scsi_hd_realize(SCSIDevice *dev, Error **errp) { SCSIDiskState *s = DO_UPCAST(SCSIDiskState, qdev, dev); - blkconf_blocksizes(&s->qdev.conf); + /* can happen for devices without drive. The error message for missing + * backend will be issued in scsi_realize + */ + if (s->qdev.conf.blk) { + blkconf_blocksizes(&s->qdev.conf); + } s->qdev.blocksize = s->qdev.conf.logical_block_size; s->qdev.type = TYPE_DISK; if (!s->product) { -- 2.1.4