mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-08 02:03:56 -06:00
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>
This commit is contained in:
parent
7f06d47eff
commit
fa1d36df74
44 changed files with 168 additions and 96 deletions
|
@ -32,6 +32,7 @@
|
|||
#include "sysemu/sysemu.h"
|
||||
#include "hw/devices.h"
|
||||
#include "hw/boards.h"
|
||||
#include "sysemu/block-backend.h"
|
||||
#include "sysemu/blockdev.h"
|
||||
#include "hw/char/serial.h"
|
||||
#include "exec/address-spaces.h"
|
||||
|
@ -113,8 +114,8 @@ petalogix_ml605_init(MachineState *machine)
|
|||
* 10th paremeter 0 means little-endian */
|
||||
pflash_cfi01_register(FLASH_BASEADDR,
|
||||
NULL, "petalogix_ml605.flash", FLASH_SIZE,
|
||||
dinfo ? dinfo->bdrv : NULL, (64 * 1024),
|
||||
FLASH_SIZE >> 16,
|
||||
dinfo ? blk_bs(blk_by_legacy_dinfo(dinfo)) : NULL,
|
||||
(64 * 1024), FLASH_SIZE >> 16,
|
||||
2, 0x89, 0x18, 0x0000, 0x0, 0);
|
||||
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue