yeahuh / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone

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

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