mii/qemu
1
0
Fork 0
mirror of https://github.com/mii443/qemu.git synced 2025-12-16 17:18:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

qdev: Decouple qdev_prop_drive from DriveInfo

Browse Source 
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>
This commit is contained in:
Markus Armbruster
2010-05-05 16:36:52 +02:00
committed by Kevin Wolf
parent 14bafc5407
commit f8b6cc0070
16 changed files with 73 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
hw/qdev-properties.c
View File

@@ -305,33 +305,36 @@ PropertyInfo qdev_prop_string = {
static int parse_drive(DeviceState *dev, Property *prop, const char *str)
{
DriveInfo **ptr = qdev_get_prop_ptr(dev, prop);
BlockDriverState **ptr = qdev_get_prop_ptr(dev, prop);
BlockDriverState *bs;
*ptr = drive_get_by_id(str);
if (*ptr == NULL)
bs = bdrv_find(str);
if (bs == NULL)
return -ENOENT;
*ptr = bs;
return 0;
}
static void free_drive(DeviceState *dev, Property *prop)
{
DriveInfo **ptr = qdev_get_prop_ptr(dev, prop);
BlockDriverState **ptr = qdev_get_prop_ptr(dev, prop);
if (*ptr) {
blockdev_auto_del((*ptr)->bdrv);
blockdev_auto_del(*ptr);
}
}
static int print_drive(DeviceState *dev, Property *prop, char *dest, size_t len)
{
DriveInfo **ptr = qdev_get_prop_ptr(dev, prop);
return snprintf(dest, len, "%s", (*ptr) ? (*ptr)->id : "<null>");
BlockDriverState **ptr = qdev_get_prop_ptr(dev, prop);
return snprintf(dest, len, "%s",
*ptr ? bdrv_get_device_name(*ptr) : "<null>");
}
PropertyInfo qdev_prop_drive = {
.name = "drive",
.type = PROP_TYPE_DRIVE,
.size = sizeof(DriveInfo*),
.size = sizeof(BlockDriverState *),
.parse = parse_drive,
.print = print_drive,
.free = free_drive,
@@ -657,7 +660,7 @@ void qdev_prop_set_string(DeviceState *dev, const char *name, char *value)
qdev_prop_set(dev, name, &value, PROP_TYPE_STRING);
}
void qdev_prop_set_drive(DeviceState *dev, const char *name, DriveInfo *value)
void qdev_prop_set_drive(DeviceState *dev, const char *name, BlockDriverState *value)
{
qdev_prop_set(dev, name, &value, PROP_TYPE_DRIVE);
}