Failed in applying to current master (
apply log)
docs/about/deprecated.rst | 12 ----
docs/about/removed-features.rst | 6 ++
hw/s390x/ipl.h | 1 -
include/hw/s390x/css-bridge.h | 1 -
include/hw/s390x/s390-virtio-ccw.h | 6 --
include/hw/s390x/s390_flic.h | 2 -
include/hw/s390x/storage-keys.h | 2 -
hw/intc/s390_flic.c | 9 ---
hw/s390x/css-bridge.c | 16 +----
hw/s390x/ipl.c | 10 ---
hw/s390x/s390-skeys.c | 10 +--
hw/s390x/s390-virtio-ccw.c | 108 +---------------------------
hw/s390x/virtio-ccw.c | 5 +-
system/vl.c | 9 ---
target/s390x/kvm/kvm.c | 16 ++---
qemu-options.hx | 15 +---
tests/functional/test_x86_64_hotplug_cpu.py | 6 +-
tests/tcg/s390x/Makefile.softmmu-target | 3 +-
18 files changed, 24 insertions(+), 213 deletions(-)