Failed in applying to current master (
apply log)
Maintainers: "Gonglei (Arei)" <arei.gonglei@huawei.com>, Zhenwei Pi <pizhenwei@bytedance.com>, "Michael S. Tsirkin" <mst@redhat.com>, Igor Mammedov <imammedo@redhat.com>, Ani Sinha <anisinha@redhat.com>, Paolo Bonzini <pbonzini@redhat.com>, Richard Henderson <richard.henderson@linaro.org>, Eduardo Habkost <eduardo@habkost.net>, Marcel Apfelbaum <marcel.apfelbaum@gmail.com>, Peter Xu <peterx@redhat.com>, Jason Wang <jasowang@redhat.com>, Eric Auger <eric.auger@redhat.com>
hw/i386/intel_iommu_internal.h | 9 +++++
include/hw/i386/intel_iommu.h | 50 +++++++++++++-------------
include/hw/i386/x86-iommu.h | 50 +++++++++++++-------------
include/hw/virtio/vhost-user-scmi.h | 1 +
backends/cryptodev.c | 10 ++++++
hw/i386/acpi-build.c | 11 +++---
hw/i386/intel_iommu.c | 23 +++++++-----
hw/i386/x86-iommu.c | 2 +-
hw/pci-bridge/cxl_upstream.c | 5 +--
hw/pci/pci_host.c | 15 ++++++--
hw/virtio/vhost-user-scmi.c | 7 ++++
hw/virtio/vhost.c | 2 ++
hw/virtio/virtio-crypto.c | 5 +++
hw/virtio/virtio-iommu.c | 12 ++++---
hw/virtio/virtio-qmp.c | 2 ++
hw/virtio/virtio.c | 2 +-
tests/data/acpi/pc/DSDT | Bin 6488 -> 6830 bytes
tests/data/acpi/pc/DSDT.acpierst | Bin 6411 -> 6741 bytes
tests/data/acpi/pc/DSDT.acpihmat | Bin 7813 -> 8155 bytes
tests/data/acpi/pc/DSDT.bridge | Bin 12615 -> 13701 bytes
tests/data/acpi/pc/DSDT.cphp | Bin 6952 -> 7294 bytes
tests/data/acpi/pc/DSDT.dimmpxm | Bin 8142 -> 8484 bytes
tests/data/acpi/pc/DSDT.hpbridge | Bin 6451 -> 6781 bytes
tests/data/acpi/pc/DSDT.hpbrroot | Bin 3343 -> 3337 bytes
tests/data/acpi/pc/DSDT.ipmikcs | Bin 6560 -> 6902 bytes
tests/data/acpi/pc/DSDT.memhp | Bin 7847 -> 8189 bytes
tests/data/acpi/pc/DSDT.nohpet | Bin 6346 -> 6688 bytes
tests/data/acpi/pc/DSDT.numamem | Bin 6494 -> 6836 bytes
tests/data/acpi/pc/DSDT.roothp | Bin 9873 -> 10623 bytes
tests/data/acpi/q35/DSDT | Bin 8361 -> 8355 bytes
tests/data/acpi/q35/DSDT.acpierst | Bin 8378 -> 8372 bytes
tests/data/acpi/q35/DSDT.acpihmat | Bin 9686 -> 9680 bytes
tests/data/acpi/q35/DSDT.acpihmat-noinitiator | Bin 8640 -> 8634 bytes
tests/data/acpi/q35/DSDT.applesmc | Bin 8407 -> 8401 bytes
tests/data/acpi/q35/DSDT.bridge | Bin 11590 -> 11968 bytes
tests/data/acpi/q35/DSDT.core-count2 | Bin 32501 -> 32495 bytes
tests/data/acpi/q35/DSDT.cphp | Bin 8825 -> 8819 bytes
tests/data/acpi/q35/DSDT.cxl | Bin 9673 -> 9655 bytes
tests/data/acpi/q35/DSDT.dimmpxm | Bin 10015 -> 10009 bytes
tests/data/acpi/q35/DSDT.ipmibt | Bin 8436 -> 8430 bytes
tests/data/acpi/q35/DSDT.ipmismbus | Bin 8449 -> 8443 bytes
tests/data/acpi/q35/DSDT.ivrs | Bin 8378 -> 8372 bytes
tests/data/acpi/q35/DSDT.memhp | Bin 9720 -> 9714 bytes
tests/data/acpi/q35/DSDT.mmio64 | Bin 9491 -> 9485 bytes
tests/data/acpi/q35/DSDT.multi-bridge | Bin 12770 -> 13208 bytes
tests/data/acpi/q35/DSDT.noacpihp | Bin 8241 -> 8235 bytes
tests/data/acpi/q35/DSDT.nohpet | Bin 8219 -> 8213 bytes
tests/data/acpi/q35/DSDT.numamem | Bin 8367 -> 8361 bytes
tests/data/acpi/q35/DSDT.pvpanic-isa | Bin 8462 -> 8456 bytes
tests/data/acpi/q35/DSDT.tis.tpm12 | Bin 8967 -> 8961 bytes
tests/data/acpi/q35/DSDT.tis.tpm2 | Bin 8993 -> 8987 bytes
tests/data/acpi/q35/DSDT.viot | Bin 9470 -> 9464 bytes
tests/data/acpi/q35/DSDT.xapic | Bin 35724 -> 35718 bytes
53 files changed, 132 insertions(+), 74 deletions(-)