Failed in applying to current master (
apply log)
Maintainers: Eduardo Habkost <eduardo@habkost.net>, Marcel Apfelbaum <marcel.apfelbaum@gmail.com>, "Philippe Mathieu-Daudé" <philmd@linaro.org>, Yanan Wang <wangyanan55@huawei.com>, Jonathan Cameron <jonathan.cameron@huawei.com>, Fan Ni <fan.ni@samsung.com>, Paolo Bonzini <pbonzini@redhat.com>, Richard Henderson <richard.henderson@linaro.org>, "Michael S. Tsirkin" <mst@redhat.com>, Jason Wang <jasowang@redhat.com>, "Eugenio Pérez" <eperezma@redhat.com>, "Gonglei (Arei)" <arei.gonglei@huawei.com>, David Hildenbrand <david@redhat.com>, Aurelien Jarno <aurelien@aurel32.net>, "Hervé Poussineau" <hpoussin@reactos.org>, Igor Mammedov <imammedo@redhat.com>, Ani Sinha <anisinha@redhat.com>, Thomas Huth <thuth@redhat.com>, Laurent Vivier <lvivier@redhat.com>
hw/virtio/vhost-shadow-virtqueue.h | 3 +
include/hw/cxl/cxl_device.h | 13 +-
include/hw/i386/pc.h | 3 +-
include/hw/pci-host/pam.h | 5 +-
include/hw/pci/pci.h | 2 +
include/hw/southbridge/ich9.h | 2 +
include/hw/southbridge/piix.h | 3 +
include/hw/virtio/vhost-vdpa.h | 11 +
include/hw/virtio/vhost.h | 1 +
include/hw/virtio/virtio.h | 2 +
hw/core/machine.c | 1 +
hw/cxl/cxl-cdat.c | 60 ++---
hw/cxl/cxl-component-utils.c | 14 +-
hw/cxl/cxl-device-utils.c | 15 ++
hw/cxl/cxl-mailbox-utils.c | 107 ++++----
hw/i386/acpi-common.c | 2 +-
hw/i386/pc.c | 22 +-
hw/i386/pc_piix.c | 18 +-
hw/i386/pc_q35.c | 19 +-
hw/isa/lpc_ich9.c | 8 +
hw/isa/piix3.c | 15 ++
hw/mem/cxl_type3.c | 342 +++++++++++++++++++-------
hw/net/virtio-net.c | 1 -
hw/pci-bridge/cxl_upstream.c | 3 +
hw/pci-host/i440fx.c | 15 +-
hw/pci-host/pam.c | 12 +-
hw/pci-host/q35.c | 14 +-
hw/pci/pci.c | 29 +--
hw/pci/pcie_aer.c | 11 +-
hw/virtio/vhost-shadow-virtqueue.c | 5 +-
hw/virtio/vhost-user.c | 28 ++-
hw/virtio/vhost-vdpa.c | 168 ++++++++++++-
hw/virtio/vhost.c | 2 +-
hw/virtio/virtio-crypto.c | 18 +-
hw/virtio/virtio-mem.c | 2 +-
hw/virtio/virtio-pci.c | 36 +++
tests/qtest/bios-tables-test.c | 8 +-
tests/qtest/cxl-test.c | 140 ++++++++---
docs/about/deprecated.rst | 8 +
docs/system/devices/cxl.rst | 63 +++--
hw/isa/Kconfig | 2 +
hw/pci-bridge/Kconfig | 5 +
hw/pci-bridge/meson.build | 3 +-
tests/data/acpi/microvm/APIC | Bin 70 -> 70 bytes
tests/data/acpi/microvm/APIC.ioapic2 | Bin 82 -> 82 bytes
tests/data/acpi/microvm/APIC.pcie | Bin 110 -> 110 bytes
tests/data/acpi/pc/APIC | Bin 120 -> 120 bytes
tests/data/acpi/pc/APIC.acpihmat | Bin 128 -> 128 bytes
tests/data/acpi/pc/APIC.cphp | Bin 160 -> 160 bytes
tests/data/acpi/pc/APIC.dimmpxm | Bin 144 -> 144 bytes
tests/data/acpi/q35/APIC | Bin 120 -> 120 bytes
tests/data/acpi/q35/APIC.acpihmat | Bin 128 -> 128 bytes
tests/data/acpi/q35/APIC.acpihmat-noinitiator | Bin 144 -> 144 bytes
tests/data/acpi/q35/APIC.core-count2 | Bin 2478 -> 2478 bytes
tests/data/acpi/q35/APIC.cphp | Bin 160 -> 160 bytes
tests/data/acpi/q35/APIC.dimmpxm | Bin 144 -> 144 bytes
tests/data/acpi/q35/APIC.xapic | Bin 2686 -> 2686 bytes
57 files changed, 900 insertions(+), 341 deletions(-)