Failed in applying to current master (
apply log)
docs/system/bootindex.rst | 7 +-
docs/system/s390x/bootdevices.rst | 29 +-
pc-bios/s390-ccw/netboot.mak | 62 ----
hw/s390x/ccw-device.h | 2 +
hw/s390x/ipl.h | 123 +-------
include/hw/s390x/ipl/qipl.h | 126 +++++++++
pc-bios/s390-ccw/bootmap.h | 20 +-
pc-bios/s390-ccw/cio.h | 2 +
pc-bios/s390-ccw/dasd-ipl.h | 2 +-
pc-bios/s390-ccw/iplb.h | 108 ++-----
pc-bios/s390-ccw/libc.h | 89 ------
pc-bios/s390-ccw/s390-ccw.h | 36 +--
pc-bios/s390-ccw/virtio.h | 3 +-
hw/s390x/ccw-device.c | 46 +++
hw/s390x/ipl.c | 279 +++++++++---------
hw/s390x/s390-virtio-ccw.c | 28 +-
hw/s390x/sclp.c | 3 +-
pc-bios/s390-ccw/bootmap.c | 456 ++++++++++++++++++++----------
pc-bios/s390-ccw/cio.c | 81 +++---
pc-bios/s390-ccw/dasd-ipl.c | 71 ++---
pc-bios/s390-ccw/jump2ipl.c | 23 +-
pc-bios/s390-ccw/libc.c | 88 ------
pc-bios/s390-ccw/main.c | 97 ++++---
pc-bios/s390-ccw/menu.c | 51 ++--
pc-bios/s390-ccw/netmain.c | 38 ++-
pc-bios/s390-ccw/sclp.c | 7 +-
pc-bios/s390-ccw/virtio-blkdev.c | 14 +-
pc-bios/s390-ccw/virtio-net.c | 7 +-
pc-bios/s390-ccw/virtio-scsi.c | 164 +++++++----
pc-bios/s390-ccw/virtio.c | 67 +++--
target/s390x/diag.c | 9 +-
tests/qtest/cdrom-test.c | 24 ++
pc-bios/meson.build | 1 -
pc-bios/s390-ccw/Makefile | 69 ++++-
pc-bios/s390-netboot.img | Bin 67232 -> 0 bytes
35 files changed, 1160 insertions(+), 1072 deletions(-)
delete mode 100644 pc-bios/s390-ccw/netboot.mak
create mode 100644 include/hw/s390x/ipl/qipl.h
delete mode 100644 pc-bios/s390-ccw/libc.h
delete mode 100644 pc-bios/s390-ccw/libc.c
delete mode 100644 pc-bios/s390-netboot.img