diff options
| author | Markus Armbruster <armbru@redhat.com> | 2014-10-07 13:59:13 +0200 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2014-10-20 13:41:27 +0200 |
| commit | fa1d36df7466ebbef0331b79d0ce3c5e140695c9 (patch) | |
| tree | 09c705b3c00506d246b712a330deef215f483e2a /hw/arm/vexpress.c | |
| parent | 7f06d47eff9d26cca87855273f20786502f8c57e (diff) | |
| download | qemu-fa1d36df7466ebbef0331b79d0ce3c5e140695c9.zip qemu-fa1d36df7466ebbef0331b79d0ce3c5e140695c9.tar.gz qemu-fa1d36df7466ebbef0331b79d0ce3c5e140695c9.tar.bz2 | |
block: Eliminate DriveInfo member bdrv, use blk_by_legacy_dinfo()
The patch is big, but all it really does is replacing
dinfo->bdrv
by
blk_bs(blk_by_legacy_dinfo(dinfo))
The replacement is repetitive, but the conversion of device models to
BlockBackend is imminent, and will shorten it to just
blk_legacy_dinfo(dinfo).
Line wrapping muddies the waters a bit. I also omit tests whether
dinfo->bdrv is null, because it never is.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Benoît Canet <benoit.canet@nodalink.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'hw/arm/vexpress.c')
| -rw-r--r-- | hw/arm/vexpress.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/hw/arm/vexpress.c b/hw/arm/vexpress.c index aed218f..828228c 100644 --- a/hw/arm/vexpress.c +++ b/hw/arm/vexpress.c @@ -30,6 +30,7 @@ #include "hw/boards.h" #include "hw/loader.h" #include "exec/address-spaces.h" +#include "sysemu/block-backend.h" #include "sysemu/blockdev.h" #include "hw/block/flash.h" #include "sysemu/device_tree.h" @@ -491,7 +492,8 @@ static pflash_t *ve_pflash_cfi01_register(hwaddr base, const char *name, { DeviceState *dev = qdev_create(NULL, "cfi.pflash01"); - if (di && qdev_prop_set_drive(dev, "drive", di->bdrv)) { + if (di && qdev_prop_set_drive(dev, "drive", + blk_bs(blk_by_legacy_dinfo(di)))) { abort(); } |