ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

pc-bios/s390-ccw: Remove panics from Netboot IPL path 

Remove panic-on-error from Netboot specific functions so that error recovery
may be possible in the future.

Functions that would previously panic now provide a return code.

Signed-off-by: Jared Rossi <jrossi@linux.ibm.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-ID: <20241020012953.1380075-12-jrossi@linux.ibm.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
Jared Rossi 2024-10-19 21:29:45 -04:00 committed by Thomas Huth
parent 1d5c7f078e
commit f1a2a6e41e
4 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pc-bios/s390-ccw/bootmap.c
View File

@ -1072,6 +1072,7 @@ void zipl_load(void)
if (virtio_get_device_type() == VIRTIO_ID_NET) { if (virtio_get_device_type() == VIRTIO_ID_NET) {
netmain(); netmain();
panic("\n! Cannot IPL from this network !\n");
} }
if (ipl_scsi()) { if (ipl_scsi()) {

17
pc-bios/s390-ccw/netmain.c
View File

@ -464,7 +464,7 @@ static bool find_net_dev(Schib *schib, int dev_no)
return false; return false;
} }
static void virtio_setup(void) static bool virtio_setup(void)
{ {
Schib schib; Schib schib;
int ssid; int ssid;
@ -495,10 +495,10 @@ static void virtio_setup(void)
} }
} }
IPL_assert(found, "No virtio net device found"); return found;
} }
void netmain(void) int netmain(void)
{ {
filename_ip_t fn_ip; filename_ip_t fn_ip;
int rc, fnlen; int rc, fnlen;
@ -506,11 +506,15 @@ void netmain(void)
sclp_setup(); sclp_setup();
puts("Network boot starting..."); puts("Network boot starting...");
virtio_setup(); if (!virtio_setup()) {
puts("No virtio net device found.");
return -1;
}
rc = net_init(&fn_ip); rc = net_init(&fn_ip);
if (rc) { if (rc) {
panic("Network initialization failed. Halting."); puts("Network initialization failed.");
return -1;
} }
fnlen = strlen(fn_ip.filename); fnlen = strlen(fn_ip.filename);
@ -528,5 +532,6 @@ void netmain(void)
jump_to_low_kernel(); jump_to_low_kernel();
} }
panic("Failed to load OS from network."); puts("Failed to load OS from network.");
return -1;
} }

2
pc-bios/s390-ccw/s390-ccw.h
View File

@ -57,7 +57,7 @@ unsigned int get_loadparm_index(void);
void main(void); void main(void);
/* netmain.c */ /* netmain.c */
void netmain(void); int netmain(void);
/* sclp.c */ /* sclp.c */
void sclp_print(const char *string); void sclp_print(const char *string);

7
pc-bios/s390-ccw/virtio-net.c
View File

@ -54,8 +54,11 @@ int virtio_net_init(void *mac_addr)
vdev->guest_features[0] = VIRTIO_NET_F_MAC_BIT; vdev->guest_features[0] = VIRTIO_NET_F_MAC_BIT;
virtio_setup_ccw(vdev); virtio_setup_ccw(vdev);
IPL_assert(vdev->guest_features[0] & VIRTIO_NET_F_MAC_BIT, if (!(vdev->guest_features[0] & VIRTIO_NET_F_MAC_BIT)) {
"virtio-net device does not support the MAC address feature"); puts("virtio-net device does not support the MAC address feature");
return -1;
}
memcpy(mac_addr, vdev->config.net.mac, ETH_ALEN); memcpy(mac_addr, vdev->config.net.mac, ETH_ALEN);
for (i = 0; i < 64; i++) { for (i = 0; i < 64; i++) {