b7456aa7c8
- kvm-pci-ensure-valid-link-status-bits-for-downstream-por.patch [RHEL-65618] - kvm-pc-bios-s390-ccw-Abort-IPL-on-invalid-loadparm.patch [RHEL-72717] - kvm-pc-bios-s390-ccw-virtio-Add-a-function-to-reset-a-vi.patch [RHEL-72717] - kvm-pc-bios-s390-ccw-Fix-boot-problem-with-virtio-net-de.patch [RHEL-72717] - kvm-pc-bios-s390-ccw-netmain-Fix-error-messages-with-reg.patch [RHEL-72717] - kvm-arm-disable-pauth-for-virt-rhel9-in-RHEL10.patch [RHEL-71761] - Resolves: RHEL-65618 ([RHEL10] Failed to hot add PCIe device behind xio3130 downstream) - Resolves: RHEL-72717 (Boot fall back to cdrom from network not always working) - Resolves: RHEL-71761 ([Nvidia "Grace"] Lack of "PAuth" CPU feature results in live migration failure from RHEL 9.6 to 10)
73 lines
2.8 KiB
Diff
73 lines
2.8 KiB
Diff
From 3f7951b9a46772a1c942aed1fe87fc7461acb197 Mon Sep 17 00:00:00 2001
|
|
From: Thomas Huth <thuth@redhat.com>
|
|
Date: Thu, 16 Jan 2025 12:58:26 +0100
|
|
Subject: [PATCH 5/6] 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: 331: Fix boot problems when falling back from network to another boot device on s390x [RHEL10]
|
|
RH-Jira: RHEL-72717
|
|
RH-Acked-by: Cédric Le Goater <clg@redhat.com>
|
|
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
RH-Commit: [4/4] 5b87d859a69ff0f399ba516a87c847a0f3942666 (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.39.3
|
|
|