Failed in applying to current master (
apply log)
Maintainers: "Michael S. Tsirkin" <mst@redhat.com>, "Marc-André Lureau" <marcandre.lureau@redhat.com>, Paolo Bonzini <pbonzini@redhat.com>, Eric Auger <eric.auger@redhat.com>, Peter Maydell <peter.maydell@linaro.org>, Eduardo Habkost <eduardo@habkost.net>, Marcel Apfelbaum <marcel.apfelbaum@gmail.com>, "Philippe Mathieu-Daudé" <philmd@linaro.org>, Yanan Wang <wangyanan55@huawei.com>, Ben Widawsky <ben.widawsky@intel.com>, Jonathan Cameron <jonathan.cameron@huawei.com>, Fan Ni <fan.ni@samsung.com>, Igor Mammedov <imammedo@redhat.com>, Ani Sinha <ani@anisinha.ca>, Richard Henderson <richard.henderson@linaro.org>, Peter Xu <peterx@redhat.com>, Jason Wang <jasowang@redhat.com>, Sergio Lopez <slp@redhat.com>, Gerd Hoffmann <kraxel@redhat.com>, "Alex Bennée" <alex.bennee@linaro.org>, Viresh Kumar <viresh.kumar@linaro.org>, Mathieu Poirier <mathieu.poirier@linaro.org>, David Hildenbrand <david@redhat.com>, Fam Zheng <fam@euphon.net>
include/exec/memory.h | 10 +++
include/hw/cxl/cxl_device.h | 2 +-
include/hw/i386/microvm.h | 5 +-
include/hw/i386/pc.h | 3 -
include/hw/i386/x86.h | 3 +-
include/hw/nvram/fw_cfg.h | 31 --------
include/hw/pci/pcie.h | 8 --
include/hw/pci/pcie_regs.h | 14 ----
include/hw/virtio/vhost-user-gpio.h | 2 +-
include/qemu/bswap.h | 12 ++-
include/qemu/uuid.h | 12 +++
subprojects/libvhost-user/libvhost-user.h | 20 ++---
backends/vhost-user.c | 11 ---
chardev/char-socket.c | 1 +
hw/arm/smmu-common.c | 16 +---
hw/core/machine.c | 2 +
hw/cxl/cxl-device-utils.c | 2 +-
hw/cxl/cxl-mailbox-utils.c | 28 +++----
hw/i386/acpi-build.c | 1 -
hw/i386/intel_iommu.c | 31 ++++++--
hw/i386/microvm.c | 17 ++---
hw/i386/pc.c | 4 +-
hw/i386/pc_piix.c | 2 -
hw/i386/pc_q35.c | 2 -
hw/i386/x86.c | 122 ++++++++----------------------
hw/mem/cxl_type3.c | 15 +++-
hw/net/virtio-net.c | 15 ++++
hw/nvram/fw_cfg.c | 21 ++---
hw/pci-bridge/cxl_downstream.c | 2 +-
hw/pci/pci.c | 8 ++
hw/pci/pcie.c | 30 +++++---
hw/pci/shpc.c | 107 ++++++++++++++------------
hw/smbios/smbios.c | 8 +-
hw/timer/hpet.c | 19 +++--
hw/virtio/vhost-shadow-virtqueue.c | 2 +-
hw/virtio/vhost-user-gpio.c | 10 ++-
hw/virtio/vhost-user-i2c.c | 5 +-
hw/virtio/vhost-user-rng.c | 5 +-
hw/virtio/vhost-user.c | 30 ++++----
hw/virtio/vhost-vdpa.c | 17 +----
hw/virtio/virtio-qmp.c | 12 +--
softmmu/memory.c | 17 ++++-
subprojects/libvhost-user/libvhost-user.c | 27 ++++---
MAINTAINERS | 1 +
docs/interop/vhost-user.rst | 40 +++++-----
hw/pci/trace-events | 1 +
tests/data/acpi/q35/DSDT.cxl | Bin 9578 -> 9564 bytes
tests/data/acpi/virt/APIC.memhp | Bin 172 -> 0 bytes
tests/data/acpi/virt/APIC.numamem | Bin 172 -> 0 bytes
tests/data/acpi/virt/DSDT.numamem | Bin 5196 -> 0 bytes
tests/data/acpi/virt/FACP.memhp | Bin 276 -> 0 bytes
tests/data/acpi/virt/FACP.numamem | Bin 276 -> 0 bytes
tests/data/acpi/virt/GTDT.memhp | Bin 96 -> 0 bytes
tests/data/acpi/virt/GTDT.numamem | Bin 96 -> 0 bytes
tests/data/acpi/virt/IORT.memhp | Bin 128 -> 0 bytes
tests/data/acpi/virt/IORT.numamem | Bin 128 -> 0 bytes
tests/data/acpi/virt/IORT.pxb | Bin 128 -> 0 bytes
tests/data/acpi/virt/MCFG.memhp | Bin 60 -> 0 bytes
tests/data/acpi/virt/MCFG.numamem | Bin 60 -> 0 bytes
tests/data/acpi/virt/SPCR.memhp | Bin 80 -> 0 bytes
tests/data/acpi/virt/SPCR.numamem | Bin 80 -> 0 bytes
61 files changed, 357 insertions(+), 396 deletions(-)
delete mode 100644 tests/data/acpi/virt/APIC.memhp
delete mode 100644 tests/data/acpi/virt/APIC.numamem
delete mode 100644 tests/data/acpi/virt/DSDT.numamem
delete mode 100644 tests/data/acpi/virt/FACP.memhp
delete mode 100644 tests/data/acpi/virt/FACP.numamem
delete mode 100644 tests/data/acpi/virt/GTDT.memhp
delete mode 100644 tests/data/acpi/virt/GTDT.numamem
delete mode 100644 tests/data/acpi/virt/IORT.memhp
delete mode 100644 tests/data/acpi/virt/IORT.numamem
delete mode 100644 tests/data/acpi/virt/IORT.pxb
delete mode 100644 tests/data/acpi/virt/MCFG.memhp
delete mode 100644 tests/data/acpi/virt/MCFG.numamem
delete mode 100644 tests/data/acpi/virt/SPCR.memhp
delete mode 100644 tests/data/acpi/virt/SPCR.numamem