qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Markus Armbruster <armbru@redhat.com>
To: qemu-devel@nongnu.org
Cc: alex.bennee@linaro.org, lersek@redhat.com, kwolf@redhat.com,
	mreitz@redhat.com, qemu-block@nongnu.org, qemu-ppc@nongnu.org,
	philmd@redhat.com, balaton@eik.bme.hu
Subject: [Qemu-devel] [PATCH v4 10/15] mips_malta: Delete disabled, broken DEBUG_BOARD_INIT code
Date: Fri,  8 Mar 2019 10:46:05 +0100	[thread overview]
Message-ID: <20190308094610.21210-11-armbru@redhat.com> (raw)
In-Reply-To: <20190308094610.21210-1-armbru@redhat.com>

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é <philmd@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Aleksandar Markovic <amarkovic@wavecomp.com>
---
 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,
-- 
2.17.2

  parent reply	other threads:[~2019-03-08  9:46 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-03-08  9:45 [Qemu-devel] [PATCH v4 00/15] pflash: Fixes and cleanups Markus Armbruster
2019-03-08  9:45 ` [Qemu-devel] [PATCH v4 01/15] pflash: Rename pflash_t to PFlashCFI01, PFlashCFI02 Markus Armbruster
2019-03-08  9:45 ` [Qemu-devel] [PATCH v4 02/15] pflash_cfi01: Do not exit() on guest aborting "write to buffer" Markus Armbruster
2019-03-08  9:45 ` [Qemu-devel] [PATCH v4 03/15] pflash_cfi01: Log use of flawed " Markus Armbruster
2019-03-08  9:45 ` [Qemu-devel] [PATCH v4 04/15] pflash: Rename *CFI_PFLASH* to *PFLASH_CFI* Markus Armbruster
2019-03-08  9:46 ` [Qemu-devel] [PATCH v4 05/15] hw: Use PFLASH_CFI0{1, 2} and TYPE_PFLASH_CFI0{1, 2} Markus Armbruster
2019-03-08  9:46 ` [Qemu-devel] [PATCH v4 06/15] sam460ex: Don't size flash memory to match backing image Markus Armbruster
2019-03-08  9:46 ` [Qemu-devel] [PATCH v4 07/15] ppc405_boards: Delete stale, disabled DEBUG_BOARD_INIT code Markus Armbruster
2019-03-08 10:45   ` Alex Bennée
2019-03-08  9:46 ` [Qemu-devel] [PATCH v4 08/15] ppc405_boards: Don't size flash memory to match backing image Markus Armbruster
2019-03-08  9:46 ` [Qemu-devel] [PATCH v4 09/15] r2d: Fix flash memory size, sector size, width, device ID Markus Armbruster
2019-03-08 13:01   ` Philippe Mathieu-Daudé
2019-03-08  9:46 ` Markus Armbruster [this message]
2019-03-08 10:47   ` [Qemu-devel] [PATCH v4 10/15] mips_malta: Delete disabled, broken DEBUG_BOARD_INIT code Alex Bennée
2019-03-08 13:03   ` Philippe Mathieu-Daudé
2019-03-08  9:46 ` [Qemu-devel] [PATCH v4 11/15] hw/mips/malta: Remove fl_sectors variable Markus Armbruster
2019-03-08  9:46 ` [Qemu-devel] [PATCH v4 12/15] hw/mips/malta: Restrict 'bios_size' variable scope Markus Armbruster
2019-03-08  9:46 ` [Qemu-devel] [PATCH v4 13/15] mips_malta: Clean up definition of flash memory size somewhat Markus Armbruster
2019-03-08 12:32   ` Philippe Mathieu-Daudé
2019-03-08 13:04     ` Philippe Mathieu-Daudé
2019-03-08  9:46 ` [Qemu-devel] [PATCH v4 14/15] pflash: Clean up after commit 368a354f02b, part 1 Markus Armbruster
2019-03-08  9:46 ` [Qemu-devel] [PATCH v4 15/15] pflash: Clean up after commit 368a354f02b, part 2 Markus Armbruster

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190308094610.21210-11-armbru@redhat.com \
    --to=armbru@redhat.com \
    --cc=alex.bennee@linaro.org \
    --cc=balaton@eik.bme.hu \
    --cc=kwolf@redhat.com \
    --cc=lersek@redhat.com \
    --cc=mreitz@redhat.com \
    --cc=philmd@redhat.com \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    --cc=qemu-ppc@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).