The bios is in dire need for a cleanup as there are still a lot of magic constants being used throughout as well as duplicated code.
In the first part of this series we consolidate constants and functions, as well as doing some minor cleanups and fixes. The patches are available here: https://github.com/frankjaa/qemu/pull/new/cleanup_bios v5: * Fixed whitespace damage * Removed reset PSW mask changes in dasd-ipl.c * Added jump2ipl.c cleanup patches v4: * Renamed time.h to s390-time.h * Fixed function names in sleep() * Changed order of sense_id_ccw initialization * Added missing include before sleep() v3: * Dropped 0x00 to 0x0/0 patch * Moved some timing functions into helper.h instead of time.h * Fixed IPL psw manipulation in dasd-ipl.c * Minor cosmetic fixes found by review v2: * Included cio fixup to get rid of compile errors... * Minor cosmetic fixes found by review Janosch Frank (12): pc-bios: s390x: cio.c cleanup and compile fix pc-bios: s390x: Consolidate timing functions into time.h pc-bios: s390x: Move sleep and yield to helper.h pc-bios: s390x: Get rid of magic offsets into the lowcore pc-bios: s390x: Remove unneeded dasd-ipl.c reset psw mask changes pc-bios: s390x: Rename PSW_MASK_ZMODE to PSW_MASK_64 pc-bios: s390x: Use PSW masks where possible and introduce PSW_MASK_SHORT_ADDR pc-bios: s390x: Move panic() into header and add infinite loop pc-bios: s390x: Use ebcdic2ascii table pc-bios: s390x: Make u32 ptr check explicit pc-bios: s390x: Fix bootmap.c passing PSWs as addresses pc-bios: s390x: Cleanup jump to ipl code pc-bios/s390-ccw/bootmap.c | 9 ++++---- pc-bios/s390-ccw/bootmap.h | 2 +- pc-bios/s390-ccw/cio.c | 40 +++++++++++++++++++--------------- pc-bios/s390-ccw/cio.h | 17 ++++++++++----- pc-bios/s390-ccw/dasd-ipl.c | 3 --- pc-bios/s390-ccw/helper.h | 19 +++++++++++++++- pc-bios/s390-ccw/jump2ipl.c | 35 ++++++++++++----------------- pc-bios/s390-ccw/main.c | 15 +++---------- pc-bios/s390-ccw/menu.c | 1 + pc-bios/s390-ccw/netmain.c | 23 +++---------------- pc-bios/s390-ccw/s390-arch.h | 4 +++- pc-bios/s390-ccw/s390-ccw.h | 27 ++++++----------------- pc-bios/s390-ccw/s390-time.h | 23 +++++++++++++++++++ pc-bios/s390-ccw/start.S | 5 +++-- pc-bios/s390-ccw/virtio-net.c | 2 ++ pc-bios/s390-ccw/virtio-scsi.c | 2 ++ pc-bios/s390-ccw/virtio.c | 18 +++------------ 17 files changed, 120 insertions(+), 125 deletions(-) create mode 100644 pc-bios/s390-ccw/s390-time.h -- 2.25.1
