From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43040) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YRPcm-0008Cl-Mx for qemu-devel@nongnu.org; Fri, 27 Feb 2015 13:27:00 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YRPci-00046H-MT for qemu-devel@nongnu.org; Fri, 27 Feb 2015 13:26:56 -0500 Received: from e06smtp13.uk.ibm.com ([195.75.94.109]:38719) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YRPci-00043X-D9 for qemu-devel@nongnu.org; Fri, 27 Feb 2015 13:26:52 -0500 Received: from /spool/local by e06smtp13.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Fri, 27 Feb 2015 18:26:39 -0000 Received: from b06cxnps4075.portsmouth.uk.ibm.com (d06relay12.portsmouth.uk.ibm.com [9.149.109.197]) by d06dlp01.portsmouth.uk.ibm.com (Postfix) with ESMTP id 3219A17D8056 for ; Fri, 27 Feb 2015 18:26:55 +0000 (GMT) Received: from d06av05.portsmouth.uk.ibm.com (d06av05.portsmouth.uk.ibm.com [9.149.37.229]) by b06cxnps4075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id t1RIQbRh7471426 for ; Fri, 27 Feb 2015 18:26:37 GMT Received: from d06av05.portsmouth.uk.ibm.com (localhost [127.0.0.1]) by d06av05.portsmouth.uk.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id t1RIQbmV026014 for ; Fri, 27 Feb 2015 11:26:37 -0700 From: Ekaterina Tumanova Date: Fri, 27 Feb 2015 19:26:33 +0100 Message-Id: <1425061593-4411-2-git-send-email-tumanova@linux.vnet.ibm.com> In-Reply-To: <1425061593-4411-1-git-send-email-tumanova@linux.vnet.ibm.com> References: <54F099D7.7010206@redhat.com> <1425061593-4411-1-git-send-email-tumanova@linux.vnet.ibm.com> Subject: [Qemu-devel] [PATCH 1/1] scsi-hd: fix property unset case List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, mreitz@redhat.com, kwolf@redhat.com, thuth@linux.vnet.ibm.com, borntraeger@de.ibm.com, armbru@redhat.com, mihajlov@linux.vnet.ibm.com, dahi@linux.vnet.ibm.com, stefanha@redhat.com, cornelia.huck@de.ibm.com Cc: Ekaterina Tumanova check conf.blk before calling blkconf_blocksizes Signed-off-by: Ekaterina Tumanova --- hw/scsi/scsi-disk.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c index 2921728..df5140e 100644 --- a/hw/scsi/scsi-disk.c +++ b/hw/scsi/scsi-disk.c @@ -2291,7 +2291,9 @@ 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); + 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