[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 1/1] scsi-hd: fix property unset case
From: |
Ekaterina Tumanova |
Subject: |
[Qemu-devel] [PATCH 1/1] scsi-hd: fix property unset case |
Date: |
Fri, 27 Feb 2015 19:26:33 +0100 |
check conf.blk before calling blkconf_blocksizes
Signed-off-by: Ekaterina Tumanova <address@hidden>
---
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
[Qemu-devel] [PATCH v7 3/5] block: Add driver methods to probe blocksizes and geometry, Ekaterina Tumanova, 2015/02/16
Re: [Qemu-devel] [PATCH v7 0/5] Geometry and blocksize detection for backing devices., Christian Borntraeger, 2015/02/24
Re: [Qemu-devel] [PATCH v7 0/5] Geometry and blocksize detection for backing devices., Stefan Hajnoczi, 2015/02/24