diff options
| author | Markus Armbruster <armbru@redhat.com> | 2010-05-05 16:36:52 +0200 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2010-07-02 13:18:02 +0200 |
| commit | f8b6cc0070aab8b75bd082582c829be1353f395f (patch) | |
| tree | d521575597a421e5dd9c7cdbc65745031fffe149 /hw/scsi-generic.c | |
| parent | 14bafc540774baf316e9ce2474e97d5df6cb8e6c (diff) | |
| download | hqemu-f8b6cc0070aab8b75bd082582c829be1353f395f.zip hqemu-f8b6cc0070aab8b75bd082582c829be1353f395f.tar.gz | |
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>
Diffstat (limited to 'hw/scsi-generic.c')
| -rw-r--r-- | hw/scsi-generic.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/hw/scsi-generic.c b/hw/scsi-generic.c index 1859c94..79347f4 100644 --- a/hw/scsi-generic.c +++ b/hw/scsi-generic.c @@ -453,7 +453,7 @@ static void scsi_destroy(SCSIDevice *d) r = DO_UPCAST(SCSIGenericReq, req, QTAILQ_FIRST(&s->qdev.requests)); scsi_remove_request(r); } - blockdev_mark_auto_del(s->qdev.conf.dinfo->bdrv); + blockdev_mark_auto_del(s->qdev.conf.bs); } static int scsi_generic_initfn(SCSIDevice *dev) @@ -462,11 +462,11 @@ static int scsi_generic_initfn(SCSIDevice *dev) int sg_version; struct sg_scsi_id scsiid; - if (!s->qdev.conf.dinfo || !s->qdev.conf.dinfo->bdrv) { + if (!s->qdev.conf.bs) { error_report("scsi-generic: drive property not set"); return -1; } - s->bs = s->qdev.conf.dinfo->bdrv; + s->bs = s->qdev.conf.bs; /* check we are really using a /dev/sg* file */ if (!bdrv_is_sg(s->bs)) { |
