Failed in applying to current master (
apply log)
Maintainers: "Michael S. Tsirkin" <mst@redhat.com>, Stefano Garzarella <sgarzare@redhat.com>, Pierrick Bouvier <pierrick.bouvier@oss.qualcomm.com>, Peter Maydell <peter.maydell@linaro.org>, Igor Mammedov <imammedo@redhat.com>, Ani Sinha <anisinha@redhat.com>, Paolo Bonzini <pbonzini@redhat.com>, Raphael Norwitz <rnorwitz@nvidia.com>, Kevin Wolf <kwolf@redhat.com>, Hanna Reitz <hreitz@redhat.com>, Laurent Vivier <lvivier@redhat.com>, Amit Shah <amit@kernel.org>, "Marc-André Lureau" <marcandre.lureau@redhat.com>, Richard Henderson <richard.henderson@linaro.org>, Alejandro Jimenez <alejandro.j.jimenez@oracle.com>, Sairaj Kodilkar <sarunkod@amd.com>, Jason Wang <jasowangio@gmail.com>, Yi Liu <yi.l.liu@intel.com>, "Clément Mathieu--Drif" <clement.mathieu--drif@bull.com>, David Hildenbrand <david@kernel.org>, FangSheng Huang <FangSheng.Huang@amd.com>, "Alex Bennée" <alex.bennee@linaro.org>, Milan Zamazal <mzamazal@redhat.com>, "Gonglei (Arei)" <arei.gonglei@huawei.com>, Leif Lindholm <leif.lindholm@oss.qualcomm.com>, "Philippe Mathieu-Daudé" <philmd@mailo.com>, Zhao Liu <zhao1.liu@intel.com>, Eric Blake <eblake@redhat.com>, Markus Armbruster <armbru@redhat.com>, Fabiano Rosas <farosas@suse.de>, Tao Tang <tangtao1634@phytium.com.cn>
MAINTAINERS | 4 +
docs/interop/vhost-user.rst | 47 +++-
docs/system/arm/virt.rst | 24 +++
qapi/machine.json | 43 +++-
hw/i386/amd_iommu.h | 63 ------
hw/i386/e820_memory_layout.h | 11 +-
include/hw/acpi/wdat-gwdt.h | 19 ++
include/hw/arm/virt.h | 3 +
include/hw/mem/sp-mem.h | 33 +++
include/hw/virtio/vhost-user-blk.h | 1 +
include/hw/watchdog/sbsa_gwdt.h | 3 +-
tests/qtest/libqos/qos-intel-iommu.h | 74 +++++++
hw/acpi/wdat-gwdt-stub.c | 16 ++
hw/acpi/wdat-gwdt.c | 99 +++++++++
hw/arm/virt-acpi-build.c | 51 ++++-
hw/arm/virt.c | 48 +++++
hw/block/vhost-user-blk.c | 12 ++
hw/char/virtio-serial-bus.c | 34 +--
hw/core/machine-hmp-cmds.c | 11 +
hw/core/sysbus-fdt.c | 2 +
hw/i386/acpi-build.c | 96 ++++++++-
hw/i386/amd_iommu.c | 168 ++++++++++-----
hw/i386/intel_iommu.c | 4 +-
hw/i386/pc.c | 36 ++++
hw/mem/sp-mem.c | 128 +++++++++++
hw/net/virtio-net.c | 21 +-
hw/virtio/vdpa-dev.c | 3 +-
hw/virtio/vhost-user-base.c | 21 +-
hw/virtio/vhost-user-scmi.c | 12 +-
hw/virtio/vhost-user.c | 24 ++-
hw/virtio/virtio-crypto.c | 6 +
hw/watchdog/sbsa_gwdt.c | 24 ++-
subprojects/libvhost-user/libvhost-user.c | 19 +-
tests/qtest/bios-tables-test.c | 62 ++++++
tests/qtest/e820-test.c | 129 +++++++++++
tests/qtest/iommu-intel-inv-test.c | 346 ++++++++++++++++++++++++++++++
tests/qtest/iommu-intel-test.c | 78 +------
tests/qtest/libqos/qos-intel-iommu.c | 185 ++++++++++++++++
hw/acpi/meson.build | 2 +
hw/arm/Kconfig | 1 +
hw/i386/Kconfig | 2 +
hw/mem/Kconfig | 4 +
hw/mem/meson.build | 1 +
hw/watchdog/trace-events | 9 +
tests/data/acpi/aarch64/virt/GTDT.gwdt | Bin 0 -> 132 bytes
tests/data/acpi/aarch64/virt/WDAT.wdat | Bin 0 -> 260 bytes
tests/data/acpi/x86/q35/DSDT.spmem | Bin 0 -> 9910 bytes
tests/data/acpi/x86/q35/SRAT.spmem | Bin 0 -> 384 bytes
tests/qtest/meson.build | 3 +-
49 files changed, 1715 insertions(+), 267 deletions(-)
create mode 100644 include/hw/acpi/wdat-gwdt.h
create mode 100644 include/hw/mem/sp-mem.h
create mode 100644 hw/acpi/wdat-gwdt-stub.c
create mode 100644 hw/acpi/wdat-gwdt.c
create mode 100644 hw/mem/sp-mem.c
create mode 100644 tests/qtest/e820-test.c
create mode 100644 tests/qtest/iommu-intel-inv-test.c
create mode 100644 tests/data/acpi/aarch64/virt/GTDT.gwdt
create mode 100644 tests/data/acpi/aarch64/virt/WDAT.wdat
create mode 100644 tests/data/acpi/x86/q35/DSDT.spmem
create mode 100644 tests/data/acpi/x86/q35/SRAT.spmem