Received: from eggs.gnu.org ([209.51.188.92]:33395) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h1WSw-0001h4-SQ for qemu-devel@nongnu.org; Wed, 06 Mar 2019 08:20:13 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h1WSw-00023o-0r for qemu-devel@nongnu.org; Wed, 06 Mar 2019 08:20:10 -0500 Received: from mx1.redhat.com ([209.132.183.28]:43386) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h1WSv-00022E-Nr for qemu-devel@nongnu.org; Wed, 06 Mar 2019 08:20:09 -0500 From: Markus Armbruster References: <20190305162829.20079-1-philmd@redhat.com> <20190305162829.20079-2-philmd@redhat.com> Date: Wed, 06 Mar 2019 14:20:04 +0100 In-Reply-To: <20190305162829.20079-2-philmd@redhat.com> ("Philippe =?utf-8?Q?Mathieu-Daud=C3=A9=22's?= message of "Tue, 5 Mar 2019 17:28:25 +0100") Message-ID: <874l8gywaj.fsf@dusky.pond.sub.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Subject: Re: [Qemu-devel] [PATCH 1/5] hw/mips/malta: Fix the DEBUG_BOARD_INIT code List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Philippe =?utf-8?Q?Mathieu-Daud=C3=A9?= Cc: qemu-devel@nongnu.org, Aleksandar Rikalo , Aleksandar Markovic , Aurelien Jarno Philippe Mathieu-Daud=C3=A9 writes: > Commit fa1d36df746 missed to convert this ifdef'ed out code. My fault... > Introduce the pflash_blk variable. > > This fixes: > > hw/mips/mips_malta.c:1273:16: error: implicit declaration of function = =E2=80=98blk_name=E2=80=99; did you mean =E2=80=98basename=E2=80=99? [-Werr= or=3Dimplicit-function-declaration] > blk_name(dinfo->bdrv), fl_sectors); > ^~~~~~~~ > hw/mips/mips_malta.c:1273:16: error: nested extern declaration of =E2= =80=98blk_name=E2=80=99 [-Werror=3Dnested-externs] > hw/mips/mips_malta.c:1273:30: error: =E2=80=98DriveInfo=E2=80=99 {aka = =E2=80=98struct DriveInfo=E2=80=99} has no member named =E2=80=98bdrv=E2=80= =99 > blk_name(dinfo->bdrv), fl_sectors); > ^~ > > Fixes: fa1d36df746 > Signed-off-by: Philippe Mathieu-Daud=C3=A9 > --- > hw/mips/mips_malta.c | 15 +++++++++------ > 1 file changed, 9 insertions(+), 6 deletions(-) > > diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c > index 2827074e9b..b4cd8f02ad 100644 > --- a/hw/mips/mips_malta.c > +++ b/hw/mips/mips_malta.c > @@ -40,6 +40,7 @@ > #include "hw/pci/pci.h" > #include "sysemu/sysemu.h" > #include "sysemu/arch_init.h" > +#include "sysemu/block-backend.h" > #include "qemu/log.h" > #include "hw/mips/bios.h" > #include "hw/ide.h" > @@ -1205,6 +1206,7 @@ void mips_malta_init(MachineState *machine) > qemu_irq cbus_irq, i8259_irq; > int piix4_devfn; > I2CBus *smbus; > + BlockBackend *pflash_blk =3D NULL; > DriveInfo *dinfo; > DriveInfo *hd[MAX_IDE_BUS * MAX_IDE_DEVS]; > int fl_idx =3D 0; > @@ -1265,17 +1267,18 @@ void mips_malta_init(MachineState *machine) >=20=20 > /* Load firmware in flash / BIOS. */ > dinfo =3D drive_get(IF_PFLASH, 0, fl_idx); > -#ifdef DEBUG_BOARD_INIT > if (dinfo) { > + pflash_blk =3D blk_by_legacy_dinfo(dinfo); > +#ifdef DEBUG_BOARD_INIT > 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); > - } > + "addr %08llx '%s'\n", > + fl_idx, blk_getlength(pflash_blk), FLASH_ADDRESS, > + blk_name(pflash_blk)); You stop printing @fl_sectors. Intentional? Would the next patch be a better fit? > #endif > + } > fl =3D pflash_cfi01_register(FLASH_ADDRESS, NULL, "mips_malta.bios", > BIOS_SIZE, > - dinfo ? blk_by_legacy_dinfo(dinfo) : NULL, > + pflash_blk, > 65536, fl_sectors, > 4, 0x0000, 0x0000, 0x0000, 0x0000, be); > bios =3D pflash_cfi01_get_memory(fl); We should probably join lines here.