On 02/18/19 13:56, Markus Armbruster wrote: > QOMification left parameter @size unused in pflash_cfi01_register() > and pflash_cfi02_register(). register(). Obviously, @size should > match @sector_len and @nb_blocs, i.e. size == sector_len * nb_blocs. > All callers satisfy this. > > Remove @nb_blocs and compute it from @size and @sector_len. > > Signed-off-by: Markus Armbruster <arm...@redhat.com> > --- > hw/arm/collie.c | 5 +++-- > hw/arm/digic_boards.c | 1 - > hw/arm/gumstix.c | 4 ++-- > hw/arm/mainstone.c | 2 +- > hw/arm/musicpal.c | 4 ++-- > hw/arm/omap_sx1.c | 4 ++-- > hw/arm/versatilepb.c | 1 - > hw/arm/xilinx_zynq.c | 3 +-- > hw/arm/z2.c | 2 +- > hw/block/pflash_cfi01.c | 5 +++-- > hw/block/pflash_cfi02.c | 5 +++-- > hw/i386/pc_sysfw.c | 6 +----- > hw/lm32/lm32_boards.c | 4 ++-- > hw/lm32/milkymist.c | 2 +- > hw/microblaze/petalogix_ml605_mmu.c | 2 +- > hw/microblaze/petalogix_s3adsp1800_mmu.c | 2 +- > hw/mips/mips_malta.c | 7 +++---- > hw/mips/mips_r4k.c | 2 +- > hw/ppc/ppc405_boards.c | 6 +++--- > hw/ppc/sam460ex.c | 2 +- > hw/ppc/virtex_ml507.c | 2 +- > hw/sh4/r2d.c | 2 +- > include/hw/block/flash.h | 4 ++-- > 23 files changed, 36 insertions(+), 41 deletions(-)
> @@ -1268,15 +1267,15 @@ void mips_malta_init(MachineState *machine) > #ifdef DEBUG_BOARD_INIT > if (dinfo) { > printf("Register parallel flash %d size " TARGET_FMT_lx " at " > - "addr %08llx '%s' %x\n", > + "addr %08llx '%s'\n", > fl_idx, FLASH_SIZE, FLASH_ADDRESS, > - blk_name(dinfo->bdrv), fl_sectors); > + blk_name(dinfo->bdrv)); > } > #endif This change is somewhat observable, but I guess it's harmless. Reviewed-by: Laszlo Ersek <ler...@redhat.com>