[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v3 09/14] hw/mips/malta: Fix the DEBUG_BOARD_INIT co
From: |
Markus Armbruster |
Subject: |
[Qemu-block] [PATCH v3 09/14] hw/mips/malta: Fix the DEBUG_BOARD_INIT code |
Date: |
Thu, 7 Mar 2019 14:03:18 +0100 |
From: Philippe Mathieu-Daudé <address@hidden>
Commit fa1d36df746 missed to convert this ifdef'ed out code.
Introduce the pflash_blk variable.
This fixes:
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);
^~
Fixes: fa1d36df746
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
Reviewed-by: Richard Henderson <address@hidden>
Signed-off-by: Markus Armbruster <address@hidden>
---
hw/mips/mips_malta.c | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c
index 2827074e9b..639ccefa98 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 = NULL;
DriveInfo *dinfo;
DriveInfo *hd[MAX_IDE_BUS * MAX_IDE_DEVS];
int fl_idx = 0;
@@ -1265,17 +1267,18 @@ 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) {
+ pflash_blk = 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);
- }
+ fl_idx, blk_getlength(pflash_blk), FLASH_ADDRESS,
+ blk_name(pflash_blk), fl_sectors);
#endif
+ }
fl = 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 = pflash_cfi01_get_memory(fl);
--
2.17.2
- [Qemu-block] [PATCH v3 00/14] pflash: Fixes and cleanups, Markus Armbruster, 2019/03/07
- [Qemu-block] [PATCH v3 10/14] hw/mips/malta: Remove fl_sectors variable, Markus Armbruster, 2019/03/07
- [Qemu-block] [PATCH v3 04/14] pflash: Rename *CFI_PFLASH* to *PFLASH_CFI*, Markus Armbruster, 2019/03/07
- [Qemu-block] [PATCH v3 12/14] mips_malta: Clean up definition of flash memory size somewhat, Markus Armbruster, 2019/03/07
- [Qemu-block] [PATCH v3 13/14] pflash: Clean up after commit 368a354f02b, part 1, Markus Armbruster, 2019/03/07
- [Qemu-block] [PATCH v3 03/14] pflash_cfi01: Log use of flawed "write to buffer", Markus Armbruster, 2019/03/07
- [Qemu-block] [PATCH v3 09/14] hw/mips/malta: Fix the DEBUG_BOARD_INIT code,
Markus Armbruster <=
- [Qemu-block] [PATCH v3 01/14] pflash: Rename pflash_t to PFlashCFI01, PFlashCFI02, Markus Armbruster, 2019/03/07
- [Qemu-block] [PATCH v3 14/14] pflash: Clean up after commit 368a354f02b, part 2, Markus Armbruster, 2019/03/07
- [Qemu-block] [PATCH v3 11/14] hw/mips/malta: Restrict 'bios_size' variable scope, Markus Armbruster, 2019/03/07
- [Qemu-block] [PATCH v3 06/14] sam460ex: Don't size flash memory to match backing image, Markus Armbruster, 2019/03/07
- [Qemu-block] [PATCH v3 07/14] ppc405_boards: Don't size flash memory to match backing image, Markus Armbruster, 2019/03/07