Blame SOURCES/0027-pc-bios-s390-ccw-rename-MAX_TABLE_ENTRIES-to-MAX_BOO.patch

26ba25
From f21a07e653b25bf6d99c28f709a88ed1dfe6170f Mon Sep 17 00:00:00 2001
26ba25
From: Collin Walling <walling@linux.ibm.com>
26ba25
Date: Tue, 8 May 2018 09:01:13 +0000
26ba25
Subject: pc-bios/s390-ccw: rename MAX_TABLE_ENTRIES to MAX_BOOT_ENTRIES
26ba25
26ba25
The MAX_TABLE_ENTRIES constant has a name that is too generic. As we
26ba25
want to declare a limit for boot menu entries, let's rename it to a more
26ba25
fitting MAX_BOOT_ENTRIES and set its value to 31 (30 boot entries and
26ba25
1 default entry). Also we move it from bootmap.h to s390-ccw.h to make
26ba25
it available for menu.c in a later patch.
26ba25
26ba25
Signed-off-by: Collin Walling <walling@linux.ibm.com>
26ba25
Reviewed-by: Thomas Huth <thuth@redhat.com>
26ba25
Reviewed-by: Janosch Frank <frankja@linux.ibm.com>
26ba25
Signed-off-by: Thomas Huth <thuth@redhat.com>
26ba25
(cherry picked from commit 6df2a829dfacfbf10a78199ad4b023a7ea65d9cd)
26ba25
---
26ba25
 pc-bios/s390-ccw/bootmap.c  | 6 +++---
26ba25
 pc-bios/s390-ccw/bootmap.h  | 2 --
26ba25
 pc-bios/s390-ccw/s390-ccw.h | 2 ++
26ba25
 3 files changed, 5 insertions(+), 5 deletions(-)
26ba25
26ba25
diff --git a/pc-bios/s390-ccw/bootmap.c b/pc-bios/s390-ccw/bootmap.c
26ba25
index 9287b7a..b767fa2 100644
26ba25
--- a/pc-bios/s390-ccw/bootmap.c
26ba25
+++ b/pc-bios/s390-ccw/bootmap.c
26ba25
@@ -297,7 +297,7 @@ static void run_eckd_boot_script(block_number_t bmt_block_nr,
26ba25
     }
26ba25
 
26ba25
     debug_print_int("loadparm", loadparm);
26ba25
-    IPL_assert(loadparm <= MAX_TABLE_ENTRIES, "loadparm value greater than"
26ba25
+    IPL_assert(loadparm < MAX_BOOT_ENTRIES, "loadparm value greater than"
26ba25
                " maximum number of boot entries allowed");
26ba25
 
26ba25
     memset(sec, FREE_SPACE_FILLER, sizeof(sec));
26ba25
@@ -585,7 +585,7 @@ static void ipl_scsi(void)
26ba25
     read_block(mbr->pt.blockno, sec, "Error reading Program Table");
26ba25
     IPL_assert(magic_match(sec, ZIPL_MAGIC), "No zIPL magic in PT");
26ba25
 
26ba25
-    while (program_table_entries <= MAX_TABLE_ENTRIES) {
26ba25
+    while (program_table_entries < MAX_BOOT_ENTRIES) {
26ba25
         if (!prog_table->entry[program_table_entries].scsi.blockno) {
26ba25
             break;
26ba25
         }
26ba25
@@ -600,7 +600,7 @@ static void ipl_scsi(void)
26ba25
     }
26ba25
 
26ba25
     debug_print_int("loadparm", loadparm);
26ba25
-    IPL_assert(loadparm <= MAX_TABLE_ENTRIES, "loadparm value greater than"
26ba25
+    IPL_assert(loadparm < MAX_BOOT_ENTRIES, "loadparm value greater than"
26ba25
                " maximum number of boot entries allowed");
26ba25
 
26ba25
     zipl_run(&prog_table->entry[loadparm].scsi); /* no return */
26ba25
diff --git a/pc-bios/s390-ccw/bootmap.h b/pc-bios/s390-ccw/bootmap.h
26ba25
index 07eb600..732c111 100644
26ba25
--- a/pc-bios/s390-ccw/bootmap.h
26ba25
+++ b/pc-bios/s390-ccw/bootmap.h
26ba25
@@ -57,8 +57,6 @@ typedef union BootMapPointer {
26ba25
     ExtEckdBlockPtr xeckd;
26ba25
 } __attribute__ ((packed)) BootMapPointer;
26ba25
 
26ba25
-#define MAX_TABLE_ENTRIES  30
26ba25
-
26ba25
 /* aka Program Table */
26ba25
 typedef struct BootMapTable {
26ba25
     uint8_t magic[4];
26ba25
diff --git a/pc-bios/s390-ccw/s390-ccw.h b/pc-bios/s390-ccw/s390-ccw.h
26ba25
index fd18da2..2c9e601 100644
26ba25
--- a/pc-bios/s390-ccw/s390-ccw.h
26ba25
+++ b/pc-bios/s390-ccw/s390-ccw.h
26ba25
@@ -94,6 +94,8 @@ bool menu_is_enabled_zipl(void);
26ba25
 int menu_get_enum_boot_index(int entries);
26ba25
 bool menu_is_enabled_enum(void);
26ba25
 
26ba25
+#define MAX_BOOT_ENTRIES  31
26ba25
+
26ba25
 static inline void fill_hex(char *out, unsigned char val)
26ba25
 {
26ba25
     const char hex[] = "0123456789abcdef";
26ba25
-- 
26ba25
1.8.3.1
26ba25