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/block/m25p80.c | |
| parent | 7f06d47eff9d26cca87855273f20786502f8c57e (diff) | |
| download | hqemu-fa1d36df7466ebbef0331b79d0ce3c5e140695c9.zip hqemu-fa1d36df7466ebbef0331b79d0ce3c5e140695c9.tar.gz | |
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/block/m25p80.c')
| -rw-r--r-- | hw/block/m25p80.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/hw/block/m25p80.c b/hw/block/m25p80.c index 5893773..78280a8 100644 --- a/hw/block/m25p80.c +++ b/hw/block/m25p80.c @@ -22,6 +22,7 @@ */ #include "hw/hw.h" +#include "sysemu/block-backend.h" #include "sysemu/blockdev.h" #include "hw/ssi.h" @@ -624,9 +625,9 @@ static int m25p80_init(SSISlave *ss) dinfo = drive_get_next(IF_MTD); - if (dinfo && dinfo->bdrv) { + if (dinfo) { DB_PRINT_L(0, "Binding to IF_MTD drive\n"); - s->bdrv = dinfo->bdrv; + s->bdrv = blk_bs(blk_by_legacy_dinfo(dinfo)); /* FIXME: Move to late init */ if (bdrv_read(s->bdrv, 0, s->storage, DIV_ROUND_UP(s->size, |
