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

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