mirror of
https://github.com/ibm-s390-linux/s390-tools.git
synced 2026-08-05 02:14:52 +00:00
ipl_tools/chreipl: Rename BOOTPARMS_FCP_MAX to BOOTPARMS_SCPDATA_MAX
chreipl passes additional boot parameters via the firmware scp_data sysfs attribute. This mechanism is shared by multiple re-IPL types (FCP, NVMe, and ECKD) and they all have the same scp_data size limit. The BOOTPARMS_FCP_MAX name is therefore misleading. Rename BOOTPARMS_FCP_MAX to BOOTPARMS_SCPDATA_MAX and update all callers to make the intent clear and avoid implying this limit is FCP-only. Reviewed-by: Jan Polensky <japo@linux.ibm.com> Signed-off-by: Vasily Gorbik <gor@linux.ibm.com> Signed-off-by: Jan Höppner <hoeppner@linux.ibm.com>
This commit is contained in:
committed by
Jan Höppner
parent
65a891fa35
commit
28815d3928
@@ -26,7 +26,7 @@
|
||||
|
||||
#define BOOTPARMS_NSS_MAX 56
|
||||
#define BOOTPARMS_CCW_MAX 64
|
||||
#define BOOTPARMS_FCP_MAX 3452
|
||||
#define BOOTPARMS_SCPDATA_MAX 3452
|
||||
|
||||
#define OPT_BRCHR 0x80
|
||||
|
||||
@@ -836,9 +836,9 @@ static void chreipl_eckd(void)
|
||||
}
|
||||
|
||||
check_exists("reipl/eckd/device", "\"eckd\" re-IPL target");
|
||||
if (l.bootparms_set && strlen(l.bootparms) > BOOTPARMS_FCP_MAX) {
|
||||
if (l.bootparms_set && strlen(l.bootparms) > BOOTPARMS_SCPDATA_MAX) {
|
||||
ERR_EXIT("Maximum boot parameter length exceeded (%zu/%u)",
|
||||
strlen(l.bootparms), BOOTPARMS_FCP_MAX);
|
||||
strlen(l.bootparms), BOOTPARMS_SCPDATA_MAX);
|
||||
}
|
||||
|
||||
if (l.reipl_clear >= 0) {
|
||||
@@ -870,9 +870,9 @@ static void chreipl_fcp(void)
|
||||
ERR_EXIT("Could not find FCP device \"%s\"", l.busid);
|
||||
}
|
||||
check_exists("reipl/fcp/device", "\"fcp\" re-IPL target");
|
||||
if (l.bootparms_set && strlen(l.bootparms) > BOOTPARMS_FCP_MAX) {
|
||||
if (l.bootparms_set && strlen(l.bootparms) > BOOTPARMS_SCPDATA_MAX) {
|
||||
ERR_EXIT("Maximum boot parameter length exceeded (%zu/%u)",
|
||||
strlen(l.bootparms), BOOTPARMS_FCP_MAX);
|
||||
strlen(l.bootparms), BOOTPARMS_SCPDATA_MAX);
|
||||
}
|
||||
|
||||
if (l.reipl_clear >= 0) {
|
||||
@@ -913,9 +913,9 @@ static void chreipl_nvme(void)
|
||||
}
|
||||
check_exists("reipl/nvme/fid", "\"nvme\" re-IPL target");
|
||||
|
||||
if (l.bootparms_set && strlen(l.bootparms) > BOOTPARMS_FCP_MAX) {
|
||||
if (l.bootparms_set && strlen(l.bootparms) > BOOTPARMS_SCPDATA_MAX) {
|
||||
ERR_EXIT("Maximum boot parameter length exceeded (%zu/%u)",
|
||||
strlen(l.bootparms), BOOTPARMS_FCP_MAX);
|
||||
strlen(l.bootparms), BOOTPARMS_SCPDATA_MAX);
|
||||
}
|
||||
|
||||
if (l.reipl_clear >= 0) {
|
||||
|
||||
Reference in New Issue
Block a user