Re: [Qemu-devel] [PATCH v4 10/15] mips_malta: Delete disabled, broken DEBUG_BOARD_INIT code

[Alex Bennée]

Markus Armbruster <address@hidden> writes:

> The debug code under DEBUG_BOARD_INIT doesn't compile:
>
>       hw/mips/mips_malta.c:1273:16: error: implicit declaration of function 
> ‘blk_name’; did you mean ‘basename’? [-Werror=implicit-function-declaration]
>                     blk_name(dinfo->bdrv), fl_sectors);
>                     ^~~~~~~~
>       hw/mips/mips_malta.c:1273:16: error: nested extern declaration of 
> ‘blk_name’ [-Werror=nested-externs]
>       hw/mips/mips_malta.c:1273:30: error: ‘DriveInfo’ {aka ‘struct 
> DriveInfo’} has no member named ‘bdrv’
>                     blk_name(dinfo->bdrv), fl_sectors);
>                                     ^~
>
> Delete it.
>
> Reported-by: Philippe Mathieu-Daudé <address@hidden>
> Signed-off-by: Markus Armbruster <address@hidden>
> Reviewed-by: Aleksandar Markovic <address@hidden>

Reviewed-by: Alex Bennée <address@hidden>

> ---
>  hw/mips/mips_malta.c | 10 ----------
>  1 file changed, 10 deletions(-)
>
> diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c
> index 2827074e9b..8736d3a00e 100644
> --- a/hw/mips/mips_malta.c
> +++ b/hw/mips/mips_malta.c
> @@ -58,8 +58,6 @@
>  #include "exec/semihost.h"
>  #include "hw/mips/cps.h"
>
> -//#define DEBUG_BOARD_INIT
> -
>  #define ENVP_ADDR            0x80002000l
>  #define ENVP_NB_ENTRIES              16
>  #define ENVP_ENTRY_SIZE              256
> @@ -1265,14 +1263,6 @@ void mips_malta_init(MachineState *machine)
>
>      /* Load firmware in flash / BIOS. */
>      dinfo = drive_get(IF_PFLASH, 0, fl_idx);
> -#ifdef DEBUG_BOARD_INIT
> -    if (dinfo) {
> -        printf("Register parallel flash %d size " TARGET_FMT_lx " at "
> -               "addr %08llx '%s' %x\n",
> -               fl_idx, bios_size, FLASH_ADDRESS,
> -               blk_name(dinfo->bdrv), fl_sectors);
> -    }
> -#endif
>      fl = pflash_cfi01_register(FLASH_ADDRESS, NULL, "mips_malta.bios",
>                                 BIOS_SIZE,
>                                 dinfo ? blk_by_legacy_dinfo(dinfo) : NULL,


--
Alex Bennée