Failed in applying to current master (
apply log)
Maintainers: "Michael S. Tsirkin" <mst@redhat.com>, Marcel Apfelbaum <marcel.apfelbaum@gmail.com>, Igor Mammedov <imammedo@redhat.com>, Ani Sinha <ani@anisinha.ca>, "Philippe Mathieu-Daudé" <philmd@linaro.org>, Aurelien Jarno <aurelien@aurel32.net>, Eric Auger <eric.auger@redhat.com>, Peter Maydell <peter.maydell@linaro.org>, Eduardo Habkost <eduardo@habkost.net>, Yanan Wang <wangyanan55@huawei.com>, Paolo Bonzini <pbonzini@redhat.com>, Richard Henderson <richard.henderson@linaro.org>, Sergio Lopez <slp@redhat.com>, Gerd Hoffmann <kraxel@redhat.com>, Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>, "Hervé Poussineau" <hpoussin@reactos.org>, Peter Xu <peterx@redhat.com>, David Hildenbrand <david@redhat.com>, Jason Wang <jasowang@redhat.com>, Thomas Huth <thuth@redhat.com>, Laurent Vivier <lvivier@redhat.com>
docs/pcie.txt | 16 +-
include/exec/memory.h | 26 +++
include/hw/acpi/acpi_aml_interface.h | 3 +
include/hw/acpi/acpi_dev_interface.h | 3 +-
include/hw/acpi/pci.h | 4 +
include/hw/i386/intel_iommu.h | 38 +++-
include/hw/i386/microvm.h | 5 +-
include/hw/i386/pc.h | 6 +-
include/hw/isa/isa.h | 1 -
include/hw/nvram/fw_cfg.h | 9 +
include/hw/pci/pci.h | 2 +-
include/hw/pci/pcie_port.h | 3 +-
hw/acpi/acpi-x86-stub.c | 5 +-
hw/acpi/acpi_interface.c | 10 +
hw/acpi/cpu.c | 3 +-
hw/acpi/pci-bridge-stub.c | 20 ++
hw/acpi/pci-bridge.c | 27 +++
hw/acpi/pcihp.c | 35 +--
hw/acpi/piix4.c | 5 +-
hw/arm/smmu-common.c | 3 +-
hw/core/machine.c | 1 +
hw/i2c/smbus_ich9.c | 5 +-
hw/i386/acpi-build.c | 301 +++++++++++++++-----------
hw/i386/acpi-common.c | 7 +-
hw/i386/acpi-microvm.c | 3 +-
hw/i386/microvm.c | 15 +-
hw/i386/pc_q35.c | 5 +-
hw/i386/x86.c | 52 +++--
hw/isa/isa-bus.c | 10 -
hw/isa/lpc_ich9.c | 5 +-
hw/isa/piix3.c | 5 +-
hw/nvram/fw_cfg.c | 9 +
hw/pci-bridge/gen_pcie_root_port.c | 7 +-
hw/pci-bridge/pci_bridge_dev.c | 1 -
hw/pci-host/grackle.c | 2 +-
hw/pci-host/raven.c | 6 +-
hw/pci-host/uninorth.c | 33 +--
hw/pci/pci.c | 2 +-
hw/pci/pci_bridge.c | 14 ++
hw/pci/pcie.c | 6 +-
hw/pci/pcie_port.c | 3 +-
hw/pci/shpc.c | 7 +
hw/virtio/vhost-user.c | 104 +--------
hw/virtio/virtio-iommu.c | 3 +-
tests/qtest/bios-tables-test.c | 161 ++++++++++----
tests/qtest/boot-sector.c | 6 +-
tests/qtest/libqtest.c | 4 +
hw/acpi/Kconfig | 4 +
hw/acpi/meson.build | 4 +-
hw/i386/Kconfig | 1 +
tests/data/acpi/pc/DSDT | Bin 6458 -> 6360 bytes
tests/data/acpi/pc/DSDT.acpierst | Bin 6418 -> 6283 bytes
tests/data/acpi/pc/DSDT.acpihmat | Bin 7783 -> 7685 bytes
tests/data/acpi/pc/DSDT.bridge | Bin 9532 -> 12487 bytes
tests/data/acpi/pc/DSDT.cphp | Bin 6922 -> 6824 bytes
tests/data/acpi/pc/DSDT.dimmpxm | Bin 8112 -> 8014 bytes
tests/data/acpi/pc/DSDT.hpbridge | Bin 6418 -> 6289 bytes
tests/data/acpi/pc/DSDT.hpbrroot | Bin 3064 -> 3081 bytes
tests/data/acpi/pc/DSDT.ipmikcs | Bin 6530 -> 6432 bytes
tests/data/acpi/pc/DSDT.memhp | Bin 7817 -> 7719 bytes
tests/data/acpi/pc/DSDT.nohpet | Bin 6316 -> 6218 bytes
tests/data/acpi/pc/DSDT.numamem | Bin 6464 -> 6366 bytes
tests/data/acpi/pc/DSDT.roothp | Bin 6656 -> 9745 bytes
tests/data/acpi/q35/DSDT | Bin 8310 -> 8252 bytes
tests/data/acpi/q35/DSDT.acpierst | Bin 8327 -> 8269 bytes
tests/data/acpi/q35/DSDT.acpihmat | Bin 9635 -> 9577 bytes
tests/data/acpi/q35/DSDT.acpihmat-noinitiator | Bin 8589 -> 8531 bytes
tests/data/acpi/q35/DSDT.applesmc | Bin 8356 -> 8298 bytes
tests/data/acpi/q35/DSDT.bridge | Bin 11439 -> 11481 bytes
tests/data/acpi/q35/DSDT.core-count2 | Bin 32450 -> 32392 bytes
tests/data/acpi/q35/DSDT.cphp | Bin 8774 -> 8716 bytes
tests/data/acpi/q35/DSDT.cxl | Bin 9636 -> 9578 bytes
tests/data/acpi/q35/DSDT.dimmpxm | Bin 9964 -> 9906 bytes
tests/data/acpi/q35/DSDT.ipmibt | Bin 8385 -> 8327 bytes
tests/data/acpi/q35/DSDT.ipmismbus | Bin 8398 -> 8340 bytes
tests/data/acpi/q35/DSDT.ivrs | Bin 8327 -> 8269 bytes
tests/data/acpi/q35/DSDT.memhp | Bin 9669 -> 9611 bytes
tests/data/acpi/q35/DSDT.mmio64 | Bin 9440 -> 9382 bytes
tests/data/acpi/q35/DSDT.multi-bridge | Bin 8630 -> 12337 bytes
tests/data/acpi/q35/DSDT.nohpet | Bin 8168 -> 8110 bytes
tests/data/acpi/q35/DSDT.numamem | Bin 8316 -> 8258 bytes
tests/data/acpi/q35/DSDT.pvpanic-isa | Bin 8411 -> 8353 bytes
tests/data/acpi/q35/DSDT.tis.tpm12 | Bin 8916 -> 8858 bytes
tests/data/acpi/q35/DSDT.tis.tpm2 | Bin 8942 -> 8884 bytes
tests/data/acpi/q35/DSDT.viot | Bin 9419 -> 9361 bytes
tests/data/acpi/q35/DSDT.xapic | Bin 35673 -> 35615 bytes
86 files changed, 611 insertions(+), 399 deletions(-)
create mode 100644 hw/acpi/pci-bridge-stub.c
create mode 100644 hw/acpi/pci-bridge.c