73 lines
2.8 KiB
Diff
73 lines
2.8 KiB
Diff
From 77d5de6e13404df1cb5c3beb0e656ee328732457 Mon Sep 17 00:00:00 2001
|
|
From: Thomas Huth <thuth@redhat.com>
|
|
Date: Thu, 16 Jan 2025 12:58:26 +0100
|
|
Subject: [PATCH 4/4] pc-bios/s390-ccw/netmain: Fix error messages with regards
|
|
to the TFTP server
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
RH-Author: Thomas Huth <thuth@redhat.com>
|
|
RH-MergeRequest: 332: Fix boot problems when falling back from network to another boot device on s390x [RHEL9]
|
|
RH-Jira: RHEL-72716
|
|
RH-Acked-by: Cédric Le Goater <clg@redhat.com>
|
|
RH-Acked-by: Jon Maloy <jmaloy@redhat.com>
|
|
RH-Commit: [4/4] a4ce330588044d40b94da46905d1021e7610cbf6 (thuth/qemu-kvm-cs)
|
|
|
|
The code in net_init_ip() currently bails out early if "rc" is less
|
|
than 0, so the if-statements that check for negative "rc" codes to
|
|
print out some specific error messages with regards to the TFTP server
|
|
are never reached. Move them earlier to bring that dead code back to
|
|
life.
|
|
|
|
Reviewed-by: Jared Rossi <jrossi@linux.ibm.com>
|
|
Reviewed-by: Eric Farman <farman@linux.ibm.com>
|
|
Tested-by: Jared Rossi <jrossi@linux.ibm.com>
|
|
Message-ID: <20250116115826.192047-4-thuth@redhat.com>
|
|
Signed-off-by: Thomas Huth <thuth@redhat.com>
|
|
(cherry picked from commit bbfa7f8558d5346b6884108ad50df3517fe17358)
|
|
---
|
|
pc-bios/s390-ccw/netmain.c | 19 ++++++++-----------
|
|
1 file changed, 8 insertions(+), 11 deletions(-)
|
|
|
|
diff --git a/pc-bios/s390-ccw/netmain.c b/pc-bios/s390-ccw/netmain.c
|
|
index 335ea9b63e..719a547ada 100644
|
|
--- a/pc-bios/s390-ccw/netmain.c
|
|
+++ b/pc-bios/s390-ccw/netmain.c
|
|
@@ -168,6 +168,14 @@ static int net_init_ip(filename_ip_t *fn_ip)
|
|
if (fn_ip->ip_version == 4) {
|
|
set_ipv4_address(fn_ip->own_ip);
|
|
}
|
|
+ } else if (rc == -2) {
|
|
+ printf("ARP request to TFTP server (%d.%d.%d.%d) failed\n",
|
|
+ (fn_ip->server_ip >> 24) & 0xFF, (fn_ip->server_ip >> 16) & 0xFF,
|
|
+ (fn_ip->server_ip >> 8) & 0xFF, fn_ip->server_ip & 0xFF);
|
|
+ return -102;
|
|
+ } else if (rc == -4 || rc == -3) {
|
|
+ puts("Can't obtain TFTP server IP address");
|
|
+ return -107;
|
|
} else {
|
|
puts("Could not get IP address");
|
|
return -101;
|
|
@@ -183,17 +191,6 @@ static int net_init_ip(filename_ip_t *fn_ip)
|
|
printf(" Using IPv6 address: %s\n", ip6_str);
|
|
}
|
|
|
|
- if (rc == -2) {
|
|
- printf("ARP request to TFTP server (%d.%d.%d.%d) failed\n",
|
|
- (fn_ip->server_ip >> 24) & 0xFF, (fn_ip->server_ip >> 16) & 0xFF,
|
|
- (fn_ip->server_ip >> 8) & 0xFF, fn_ip->server_ip & 0xFF);
|
|
- return -102;
|
|
- }
|
|
- if (rc == -4 || rc == -3) {
|
|
- puts("Can't obtain TFTP server IP address");
|
|
- return -107;
|
|
- }
|
|
-
|
|
printf(" Using TFTP server: ");
|
|
if (fn_ip->ip_version == 4) {
|
|
printf("%d.%d.%d.%d\n",
|
|
--
|
|
2.48.0
|
|
|