Blame SOURCES/kvm-mips_malta-Delete-disabled-broken-DEBUG_BOARD_INIT-c.patch

7711c0
From 186549785eab7b0b7ac1063b942a317c80867766 Mon Sep 17 00:00:00 2001
7711c0
From: Markus Armbruster <armbru@redhat.com>
7711c0
Date: Fri, 17 May 2019 06:51:01 +0200
7711c0
Subject: [PATCH 34/53] mips_malta: Delete disabled, broken DEBUG_BOARD_INIT
7711c0
 code
7711c0
MIME-Version: 1.0
7711c0
Content-Type: text/plain; charset=UTF-8
7711c0
Content-Transfer-Encoding: 8bit
7711c0
7711c0
RH-Author: Markus Armbruster <armbru@redhat.com>
7711c0
Message-id: <20190517065120.12028-13-armbru@redhat.com>
7711c0
Patchwork-id: 88001
7711c0
O-Subject: [RHEL-7.7 qemu-kvm-rhev PATCH v3 12/31] mips_malta: Delete disabled, broken DEBUG_BOARD_INIT code
7711c0
Bugzilla: 1624009
7711c0
RH-Acked-by: Philippe Mathieu-Daudé <philmd@redhat.com>
7711c0
RH-Acked-by: Thomas Huth <thuth@redhat.com>
7711c0
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
7711c0
7711c0
The debug code under DEBUG_BOARD_INIT doesn't compile:
7711c0
7711c0
      hw/mips/mips_malta.c:1273:16: error: implicit declaration of function ‘blk_name’; did you mean ‘basename’? [-Werror=implicit-function-declaration]
7711c0
                    blk_name(dinfo->bdrv), fl_sectors);
7711c0
                    ^~~~~~~~
7711c0
      hw/mips/mips_malta.c:1273:16: error: nested extern declaration of ‘blk_name’ [-Werror=nested-externs]
7711c0
      hw/mips/mips_malta.c:1273:30: error: ‘DriveInfo’ {aka ‘struct DriveInfo’} has no member named ‘bdrv’
7711c0
                    blk_name(dinfo->bdrv), fl_sectors);
7711c0
                                    ^~
7711c0
7711c0
Delete it.
7711c0
7711c0
Reported-by: Philippe Mathieu-Daudé <philmd@redhat.com>
7711c0
Signed-off-by: Markus Armbruster <armbru@redhat.com>
7711c0
Reviewed-by: Aleksandar Markovic <amarkovic@wavecomp.com>
7711c0
Message-Id: <20190308094610.21210-11-armbru@redhat.com>
7711c0
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
7711c0
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
7711c0
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
7711c0
(cherry picked from commit 5a4abb197b2ee8e6c545a8ec6e0bf9ca4e470127)
7711c0
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
7711c0
---
7711c0
 hw/mips/mips_malta.c | 10 ----------
7711c0
 1 file changed, 10 deletions(-)
7711c0
7711c0
diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c
7711c0
index 88fd7d6..7f19bdc 100644
7711c0
--- a/hw/mips/mips_malta.c
7711c0
+++ b/hw/mips/mips_malta.c
7711c0
@@ -58,8 +58,6 @@
7711c0
 #include "exec/semihost.h"
7711c0
 #include "hw/mips/cps.h"
7711c0
 
7711c0
-//#define DEBUG_BOARD_INIT
7711c0
-
7711c0
 #define ENVP_ADDR		0x80002000l
7711c0
 #define ENVP_NB_ENTRIES	 	16
7711c0
 #define ENVP_ENTRY_SIZE	 	256
7711c0
@@ -1066,14 +1064,6 @@ void mips_malta_init(MachineState *machine)
7711c0
 
7711c0
     /* Load firmware in flash / BIOS. */
7711c0
     dinfo = drive_get(IF_PFLASH, 0, fl_idx);
7711c0
-#ifdef DEBUG_BOARD_INIT
7711c0
-    if (dinfo) {
7711c0
-        printf("Register parallel flash %d size " TARGET_FMT_lx " at "
7711c0
-               "addr %08llx '%s' %x\n",
7711c0
-               fl_idx, bios_size, FLASH_ADDRESS,
7711c0
-               blk_name(dinfo->bdrv), fl_sectors);
7711c0
-    }
7711c0
-#endif
7711c0
     fl = pflash_cfi01_register(FLASH_ADDRESS, NULL, "mips_malta.bios",
7711c0
                                BIOS_SIZE,
7711c0
                                dinfo ? blk_by_legacy_dinfo(dinfo) : NULL,
7711c0
-- 
7711c0
1.8.3.1
7711c0