diff options
| author | Markus Armbruster <armbru@redhat.com> | 2011-08-03 15:07:40 +0200 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2011-09-06 11:23:51 +0200 |
| commit | fa879d62eb51253d00b6920ce1d1d9d261370a49 (patch) | |
| tree | f83542a0ae74fe8ef0078f90098ae6aa7e02a7d6 /block_int.h | |
| parent | 648fb0ea5e9d7f32c80ec23c3ece4321403dfecd (diff) | |
block: Attach non-qdev devices as well
For now, this just protects against programming errors like having the
same drive back multiple non-qdev devices, or untimely bdrv_delete().
Later commits will add other interesting uses.
While there, rename BlockDriverState member peer to dev, bdrv_attach()
to bdrv_attach_dev(), bdrv_detach() to bdrv_detach_dev(), and
bdrv_get_attached() to bdrv_get_attached_dev().
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'block_int.h')
| -rw-r--r-- | block_int.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/block_int.h b/block_int.h index 8a72b804b2..adc26f8151 100644 --- a/block_int.h +++ b/block_int.h @@ -168,7 +168,8 @@ struct BlockDriverState { BlockDriver *drv; /* NULL means no media */ void *opaque; - DeviceState *peer; + void *dev; /* attached device model, if any */ + /* TODO change to DeviceState when all users are qdevified */ char filename[1024]; char backing_file[1024]; /* if non zero, the image is a diff of |