Failed in applying to current master (
apply log)
MAINTAINERS | 6 +-
docs/conf.py | 2 +-
include/hw/boards.h | 3 +
include/hw/i386/pc.h | 7 +-
include/standard-headers/drm/drm_fourcc.h | 1 +
include/standard-headers/linux/ethtool.h | 5 +
include/standard-headers/linux/pci_regs.h | 38 +++-
include/standard-headers/linux/virtio_crypto.h | 1 +
include/standard-headers/linux/virtio_pci.h | 131 ++++++++++++
linux-headers/asm-arm64/kvm.h | 6 +
linux-headers/asm-arm64/unistd_64.h | 4 +
linux-headers/asm-generic/mman-common.h | 3 +
linux-headers/asm-generic/mman.h | 4 +
linux-headers/asm-generic/unistd.h | 11 +-
linux-headers/asm-loongarch/kvm.h | 20 ++
linux-headers/asm-loongarch/unistd_64.h | 4 +
linux-headers/asm-mips/mman.h | 3 +
linux-headers/asm-mips/unistd_n32.h | 4 +
linux-headers/asm-mips/unistd_n64.h | 4 +
linux-headers/asm-mips/unistd_o32.h | 4 +
linux-headers/asm-powerpc/unistd_32.h | 4 +
linux-headers/asm-powerpc/unistd_64.h | 4 +
linux-headers/asm-riscv/kvm.h | 4 +
linux-headers/asm-riscv/unistd_32.h | 4 +
linux-headers/asm-riscv/unistd_64.h | 4 +
linux-headers/asm-s390/kvm.h | 3 +-
linux-headers/asm-s390/unistd_32.h | 4 +
linux-headers/asm-s390/unistd_64.h | 4 +
linux-headers/asm-x86/kvm.h | 1 +
linux-headers/asm-x86/mman.h | 3 -
linux-headers/asm-x86/unistd_32.h | 4 +
linux-headers/asm-x86/unistd_64.h | 4 +
linux-headers/asm-x86/unistd_x32.h | 4 +
linux-headers/linux/iommufd.h | 224 +++++++++++++++++++-
linux-headers/linux/kvm.h | 8 +
linux-headers/linux/psci.h | 5 +
linux-headers/linux/vfio.h | 2 +-
target/s390x/cpu_features.h | 1 +
target/s390x/cpu_features_def.h.inc | 94 ++++++++-
hw/arm/virt.c | 9 +-
hw/core/machine.c | 3 +
hw/i386/pc.c | 3 +
hw/i386/pc_piix.c | 20 +-
hw/i386/pc_q35.c | 20 +-
hw/m68k/virt.c | 9 +-
hw/ppc/spapr.c | 15 +-
hw/s390x/s390-virtio-ccw.c | 14 +-
target/s390x/cpu_features.c | 11 +
target/s390x/cpu_models.c | 61 ++++++
target/s390x/gen-features.c | 178 ++++++++++++++++
target/s390x/kvm/kvm.c | 6 +
tests/avocado/boot_linux_console.py | 269 -------------------------
tests/functional/meson.build | 6 +
tests/functional/test_aarch64_sbsaref.py | 1 -
tests/functional/test_aarch64_xlnx_versal.py | 37 ++++
tests/functional/test_acpi_bits.py | 1 -
tests/functional/test_arm_cubieboard.py | 150 ++++++++++++++
tests/functional/test_arm_emcraft_sf2.py | 52 +++++
tests/functional/test_arm_smdkc210.py | 57 ++++++
tests/functional/test_m68k_mcf5208evb.py | 2 -
tests/functional/test_microblaze_s3adsp1800.py | 1 -
tests/functional/test_mips64el_loongson3v.py | 1 -
tests/functional/test_or1k_sim.py | 2 -
tests/functional/test_ppc64_hv.py | 7 +-
tests/functional/test_s390x_topology.py | 1 -
tests/functional/test_sh4_tuxrun.py | 4 -
tests/functional/test_sh4eb_r2d.py | 1 -
tests/functional/test_virtio_version.py | 2 -
68 files changed, 1248 insertions(+), 337 deletions(-)
create mode 100755 tests/functional/test_aarch64_xlnx_versal.py
create mode 100755 tests/functional/test_arm_cubieboard.py
create mode 100755 tests/functional/test_arm_emcraft_sf2.py
create mode 100755 tests/functional/test_arm_smdkc210.py