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