qemu-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [Qemu-devel] [PATCH 1/1] scsi-hd: fix property unset case


From: Markus Armbruster
Subject: Re: [Qemu-devel] [PATCH 1/1] scsi-hd: fix property unset case
Date: Mon, 02 Mar 2015 09:46:09 +0100
User-agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (gnu/linux)

Ekaterina Tumanova <address@hidden> writes:

> 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);
> +    }

Looks suspicious on first glance, because block device model realize()
methods are supposed to fail when the backend is missing.  But...

>      s->qdev.blocksize = s->qdev.conf.logical_block_size;
>      s->qdev.type = TYPE_DISK;
>      if (!s->product) {
           s->product = g_strdup("QEMU HARDDISK");
       }
       scsi_realize(&s->qdev, errp);

... scsi_realize() errors out then.  Worth a comment.  Or maybe call
blkconf_blocksizes() only after scsi_realize().  Your choice.



reply via email to

[Prev in Thread] Current Thread [Next in Thread]