Failed in applying to current master (
apply log)
Maintainers: "Alex Bennée" <alex.bennee@linaro.org>, "Philippe Mathieu-Daudé" <f4bug@amsat.org>, Thomas Huth <thuth@redhat.com>, Wainer dos Santos Moschetta <wainersm@redhat.com>, Beraldo Leal <bleal@redhat.com>, Richard Henderson <richard.henderson@linaro.org>, David Hildenbrand <david@redhat.com>, Halil Pasic <pasic@linux.ibm.com>, Christian Borntraeger <borntraeger@linux.ibm.com>, Eric Farman <farman@linux.ibm.com>, Cornelia Huck <cohuck@redhat.com>, Matthew Rosato <mjrosato@linux.ibm.com>, "Michael S. Tsirkin" <mst@redhat.com>, Paolo Bonzini <pbonzini@redhat.com>, Laurent Vivier <laurent@vivier.eu>, Cleber Rosa <crosa@redhat.com>
configure | 25 +--
meson.build | 121 +++---------
include/hw/s390x/s390-pci-bus.h | 8 +-
include/hw/s390x/s390-pci-kvm.h | 38 ++++
include/hw/s390x/s390-pci-vfio.h | 5 +
include/hw/s390x/s390-virtio-ccw.h | 1 +
include/standard-headers/asm-x86/bootparam.h | 7 +-
include/standard-headers/drm/drm_fourcc.h | 73 ++++++-
include/standard-headers/linux/ethtool.h | 29 +--
include/standard-headers/linux/input.h | 12 +-
include/standard-headers/linux/pci_regs.h | 30 ++-
include/standard-headers/linux/vhost_types.h | 17 +-
include/standard-headers/linux/virtio_9p.h | 2 +-
include/standard-headers/linux/virtio_config.h | 7 +-
include/standard-headers/linux/virtio_ids.h | 14 +-
include/standard-headers/linux/virtio_net.h | 34 +++-
include/standard-headers/linux/virtio_pci.h | 2 +
include/standard-headers/linux/virtio_ring.h | 16 +-
linux-headers/asm-arm64/kvm.h | 33 +++-
linux-headers/asm-generic/unistd.h | 4 +-
linux-headers/asm-riscv/kvm.h | 22 +++
linux-headers/asm-riscv/unistd.h | 3 +-
linux-headers/asm-s390/kvm.h | 1 +
linux-headers/asm-x86/kvm.h | 33 ++--
linux-headers/asm-x86/mman.h | 14 --
linux-headers/linux/kvm.h | 172 +++++++++++++++-
linux-headers/linux/userfaultfd.h | 10 +-
linux-headers/linux/vduse.h | 47 +++++
linux-headers/linux/vfio.h | 4 +-
linux-headers/linux/vfio_zdev.h | 7 +
linux-headers/linux/vhost.h | 35 +++-
linux-user/include/host/s390/host-signal.h | 25 +++
target/s390x/kvm/kvm_s390x.h | 1 +
hw/s390x/s390-pci-bus.c | 111 ++++++++++-
hw/s390x/s390-pci-inst.c | 56 +++++-
hw/s390x/s390-pci-kvm.c | 54 ++++++
hw/s390x/s390-pci-vfio.c | 129 ++++++++++--
hw/s390x/s390-virtio-ccw.c | 27 +++
target/s390x/gen-features.c | 10 +-
target/s390x/kvm/kvm.c | 7 +
target/s390x/tcg/crypto_helper.c | 259 +++++++++++++++++++++++++
util/qemu-config.c | 4 +
.gitlab-ci.d/buildtest.yml | 20 +-
.gitmodules | 3 -
MAINTAINERS | 1 -
hw/s390x/meson.build | 1 +
meson_options.txt | 5 +-
qemu-options.hx | 8 +-
scripts/archive-source.sh | 2 +-
scripts/meson-buildoptions.sh | 4 +-
slirp | 1 -
target/s390x/tcg/insn-data.def | 2 +-
tests/avocado/machine_s390_ccw_virtio.py | 1 +
53 files changed, 1287 insertions(+), 270 deletions(-)
create mode 100644 include/hw/s390x/s390-pci-kvm.h
create mode 100644 hw/s390x/s390-pci-kvm.c
delete mode 160000 slirp