[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[qemu-s390x] [PULL 07/15] pc-bios/s390-ccw: rename MAX_TABLE_ENTRIES to
From: |
Cornelia Huck |
Subject: |
[qemu-s390x] [PULL 07/15] pc-bios/s390-ccw: rename MAX_TABLE_ENTRIES to MAX_BOOT_ENTRIES |
Date: |
Fri, 4 May 2018 09:25:06 +0200 |
From: Collin Walling <address@hidden>
The MAX_TABLE_ENTRIES constant has a name that is too generic. As we
want to declare a limit for boot menu entries, let's rename it to a more
fitting MAX_BOOT_ENTRIES and set its value to 31 (30 boot entries and
1 default entry). Also we move it from bootmap.h to s390-ccw.h to make
it available for menu.c in a later patch.
Signed-off-by: Collin Walling <address@hidden>
Reviewed-by: Thomas Huth <address@hidden>
Reviewed-by: Janosch Frank <address@hidden>
Signed-off-by: Thomas Huth <address@hidden>
---
pc-bios/s390-ccw/bootmap.c | 6 +++---
pc-bios/s390-ccw/bootmap.h | 2 --
pc-bios/s390-ccw/s390-ccw.h | 2 ++
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/pc-bios/s390-ccw/bootmap.c b/pc-bios/s390-ccw/bootmap.c
index 9287b7a70f..b767fa2afc 100644
--- a/pc-bios/s390-ccw/bootmap.c
+++ b/pc-bios/s390-ccw/bootmap.c
@@ -297,7 +297,7 @@ static void run_eckd_boot_script(block_number_t
bmt_block_nr,
}
debug_print_int("loadparm", loadparm);
- IPL_assert(loadparm <= MAX_TABLE_ENTRIES, "loadparm value greater than"
+ IPL_assert(loadparm < MAX_BOOT_ENTRIES, "loadparm value greater than"
" maximum number of boot entries allowed");
memset(sec, FREE_SPACE_FILLER, sizeof(sec));
@@ -585,7 +585,7 @@ static void ipl_scsi(void)
read_block(mbr->pt.blockno, sec, "Error reading Program Table");
IPL_assert(magic_match(sec, ZIPL_MAGIC), "No zIPL magic in PT");
- while (program_table_entries <= MAX_TABLE_ENTRIES) {
+ while (program_table_entries < MAX_BOOT_ENTRIES) {
if (!prog_table->entry[program_table_entries].scsi.blockno) {
break;
}
@@ -600,7 +600,7 @@ static void ipl_scsi(void)
}
debug_print_int("loadparm", loadparm);
- IPL_assert(loadparm <= MAX_TABLE_ENTRIES, "loadparm value greater than"
+ IPL_assert(loadparm < MAX_BOOT_ENTRIES, "loadparm value greater than"
" maximum number of boot entries allowed");
zipl_run(&prog_table->entry[loadparm].scsi); /* no return */
diff --git a/pc-bios/s390-ccw/bootmap.h b/pc-bios/s390-ccw/bootmap.h
index 07eb600b00..732c1112ce 100644
--- a/pc-bios/s390-ccw/bootmap.h
+++ b/pc-bios/s390-ccw/bootmap.h
@@ -57,8 +57,6 @@ typedef union BootMapPointer {
ExtEckdBlockPtr xeckd;
} __attribute__ ((packed)) BootMapPointer;
-#define MAX_TABLE_ENTRIES 30
-
/* aka Program Table */
typedef struct BootMapTable {
uint8_t magic[4];
diff --git a/pc-bios/s390-ccw/s390-ccw.h b/pc-bios/s390-ccw/s390-ccw.h
index fd18da22c6..2c9e6017b7 100644
--- a/pc-bios/s390-ccw/s390-ccw.h
+++ b/pc-bios/s390-ccw/s390-ccw.h
@@ -94,6 +94,8 @@ bool menu_is_enabled_zipl(void);
int menu_get_enum_boot_index(int entries);
bool menu_is_enabled_enum(void);
+#define MAX_BOOT_ENTRIES 31
+
static inline void fill_hex(char *out, unsigned char val)
{
const char hex[] = "0123456789abcdef";
--
2.14.3
- [qemu-s390x] [PULL 00/15] first s390x update for 2.13, Cornelia Huck, 2018/05/04
- [qemu-s390x] [PULL 01/15] s390x: introduce 2.13 compat machine, Cornelia Huck, 2018/05/04
- [qemu-s390x] [PULL 03/15] vfio-ccw: introduce vfio_ccw_get_device(), Cornelia Huck, 2018/05/04
- [qemu-s390x] [PULL 02/15] s390x/sclp: extend SCLP event masks to 64 bits, Cornelia Huck, 2018/05/04
- [qemu-s390x] [PULL 04/15] s390x/kvm: cleanup calls to cpu_synchronize_state(), Cornelia Huck, 2018/05/04
- [qemu-s390x] [PULL 06/15] pc-bios/s390-ccw: size_t should be unsigned, Cornelia Huck, 2018/05/04
- [qemu-s390x] [PULL 05/15] hw/s390x: Allow to configure the consoles with the "-serial" parameter, Cornelia Huck, 2018/05/04
- [qemu-s390x] [PULL 07/15] pc-bios/s390-ccw: rename MAX_TABLE_ENTRIES to MAX_BOOT_ENTRIES,
Cornelia Huck <=
- [qemu-s390x] [PULL 08/15] pc-bios/s390-ccw: fix loadparm initialization and int conversion, Cornelia Huck, 2018/05/04
- [qemu-s390x] [PULL 09/15] pc-bios/s390-ccw: fix non-sequential boot entries (eckd), Cornelia Huck, 2018/05/04
- [qemu-s390x] [PULL 10/15] pc-bios/s390-ccw: fix non-sequential boot entries (enum), Cornelia Huck, 2018/05/04
- [qemu-s390x] [PULL 11/15] pc-bios/s390-ccw/net: Split up net_load() into init, load and release parts, Cornelia Huck, 2018/05/04
- [qemu-s390x] [PULL 13/15] pc-bios/s390-ccw/net: Add support for .INS config files, Cornelia Huck, 2018/05/04