qdev: Decouple qdev_prop_drive from DriveInfo
commitf8b6cc0070aab8b75bd082582c829be1353f395f
authorMarkus Armbruster <armbru@redhat.com>
Wed, 5 May 2010 14:36:52 +0000 (5 16:36 +0200)
committerKevin Wolf <kwolf@redhat.com>
Fri, 2 Jul 2010 11:18:02 +0000 (2 13:18 +0200)
treed521575597a421e5dd9c7cdbc65745031fffe149
parent14bafc540774baf316e9ce2474e97d5df6cb8e6c
qdev: Decouple qdev_prop_drive from DriveInfo

Make the property point to BlockDriverState, cutting out the DriveInfo
middleman.  This prepares the ground for block devices that don't have
a DriveInfo.

Currently all user-defined ones have a DriveInfo, because the only way
to define one is -drive & friends (they go through drive_init()).
DriveInfo is closely tied to -drive, and like -drive, it mixes
information about host and guest part of the block device.  I'm
working towards a new way to define block devices, with clean
host/guest separation, and I need to get DriveInfo out of the way for
that.

Fortunately, the device models are perfectly happy with
BlockDriverState, except for two places: ide_drive_initfn() and
scsi_disk_initfn() need to check the DriveInfo for a serial number set
with legacy -drive serial=...  Use drive_get_by_blockdev() there.

Device model code should now use DriveInfo only when explicitly
dealing with drives defined the old way, i.e. without -device.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
16 files changed:
block_int.h
hw/fdc.c
hw/ide/core.c
hw/ide/internal.h
hw/ide/qdev.c
hw/pci-hotplug.c
hw/qdev-properties.c
hw/qdev.h
hw/s390-virtio.c
hw/scsi-bus.c
hw/scsi-disk.c
hw/scsi-generic.c
hw/scsi.h
hw/usb-msd.c
hw/virtio-blk.c
hw/virtio-pci.c