Re: [Qemu-devel] [PATCH v4 19/23] blockdev: Fix blockdev-add not to create DriveInfo

[Max Reitz <mreitz@redhat.com>]

On 30.09.2014 21:25, Markus Armbruster wrote:
> blockdev_init() always creates a DriveInfo, but only drive_new() fills
> it in.  qmp_blockdev_add() leaves it blank.  This results in a drive
> with type = IF_IDE, bus = 0, unit = 0.  Screwed up in commit ee13ed1c.
>
> Board initialization code looking for IDE drive (0,0) can pick up one
> of these bogus drives.  The QMP command has to execute really early to
> be visible.  Not sure how likely that is in practice.
>
> Fix by creating DriveInfo in drive_new().  Block backends created by
> blockdev-add don't get one.
>
> Breaks the test for "has been created by qmp_blockdev_add()" in
> blockdev_mark_auto_del() and do_drive_del(), because it changes the
> value of dinfo && !dinfo->enable_auto_del from true to false.  Simply
> test !dinfo instead.
>
> Leaves DriveInfo member enable_auto_del unused.  Drop it.
>
> A few places assume a block backend always has a DriveInfo.  Fix them
> up.
>
> Signed-off-by: Markus Armbruster <armbru@redhat.com>
> ---
>   block/block-backend.c     |  2 +-
>   blockdev.c                | 22 +++++++---------------
>   hw/block/block.c          | 16 ++++++++++------
>   hw/ide/qdev.c             |  2 +-
>   hw/scsi/scsi-disk.c       |  2 +-
>   include/sysemu/blockdev.h |  1 -
>   6 files changed, 20 insertions(+), 25 deletions(-)

Reviewed-by: Max Reitz <mreitz@redhat.com>