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: Move ipl-related code from main() into a separate function 

Let's move this part of the code into a separate function to be able
to use it from multiple spots later.

Reviewed-by: Claudio Imbrenda <imbrenda@linux.ibm.com>
Reviewed-by: Cornelia Huck <cohuck@redhat.com>
Reviewed-by: Janosch Frank <frankja@linux.ibm.com>
Message-Id: <20200806105349.632-3-thuth@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
Thomas Huth 2020-07-28 10:35:53 +02:00
parent 4f6a1eb886
commit d1f060a8b5
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pc-bios/s390-ccw/main.c
View File

@ -223,14 +223,8 @@ static void virtio_setup(void)
} }
} }
int main(void) static void ipl_boot_device(void)
{ {
sclp_setup();
css_setup();
boot_setup();
find_boot_device();
enable_subchannel(blk_schid);
switch (cutype) { switch (cutype) {
case CU_TYPE_DASD_3990: case CU_TYPE_DASD_3990:
case CU_TYPE_DASD_2107: case CU_TYPE_DASD_2107:
@ -242,8 +236,18 @@ int main(void)
break; break;
default: default:
print_int("Attempting to boot from unexpected device type", cutype); print_int("Attempting to boot from unexpected device type", cutype);
panic(""); panic("\nBoot failed.\n");
} }
}
int main(void)
{
sclp_setup();
css_setup();
boot_setup();
find_boot_device();
enable_subchannel(blk_schid);
ipl_boot_device();
panic("Failed to load OS from hard disk\n"); panic("Failed to load OS from hard disk\n");
return 0; /* make compiler happy */ return 0; /* make compiler happy */