Failed in applying to current master (
apply log)
Maintainers: Coiby Xu <Coiby.Xu@gmail.com>, Kevin Wolf <kwolf@redhat.com>, Hanna Reitz <hreitz@redhat.com>, Ani Sinha <anisinha@redhat.com>, "Michael S. Tsirkin" <mst@redhat.com>, Marcel Apfelbaum <marcel.apfelbaum@gmail.com>, Igor Mammedov <imammedo@redhat.com>, Peter Maydell <peter.maydell@linaro.org>, Paolo Bonzini <pbonzini@redhat.com>, "Marc-André Lureau" <marcandre.lureau@redhat.com>, Eduardo Habkost <eduardo@habkost.net>, "Philippe Mathieu-Daudé" <philmd@linaro.org>, Yanan Wang <wangyanan55@huawei.com>, Jonathan Cameron <jonathan.cameron@huawei.com>, Fan Ni <fan.ni@samsung.com>, Richard Henderson <richard.henderson@linaro.org>, Peter Xu <peterx@redhat.com>, Jason Wang <jasowang@redhat.com>, Laurent Vivier <laurent@vivier.eu>, David Hildenbrand <david@redhat.com>, Xiao Guangrong <xiaoguangrong.eric@gmail.com>, Daniel Henrique Barboza <danielhb413@gmail.com>, "Cédric Le Goater" <clg@kaod.org>, David Gibson <david@gibson.dropbear.id.au>, Greg Kurz <groug@kaod.org>, Thomas Huth <thuth@redhat.com>, Halil Pasic <pasic@linux.ibm.com>, Christian Borntraeger <borntraeger@linux.ibm.com>, Eric Farman <farman@linux.ibm.com>, Ilya Leoshkevich <iii@linux.ibm.com>, Cornelia Huck <cohuck@redhat.com>, Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>, Artyom Tarasenko <atar4qemu@gmail.com>, Stefano Stabellini <sstabellini@kernel.org>, Anthony Perard <anthony.perard@citrix.com>, Paul Durrant <paul@xen.org>, "Daniel P. Berrangé" <berrange@redhat.com>
docs/pcie_sriov.txt | 5 +-
docs/specs/pci-ids.txt | 70 -----------------
docs/specs/pci-serial.txt | 34 ---------
docs/specs/pci-testdev.txt | 31 --------
meson_options.txt | 2 +-
hw/i386/amd_iommu.h | 9 +--
hw/i386/intel_iommu_internal.h | 6 +-
include/hw/boards.h | 5 ++
include/hw/cxl/cxl.h | 4 +-
include/hw/i386/pc.h | 6 ++
include/hw/pci/pci.h | 3 +
include/hw/pci/pci_bridge.h | 30 +++++---
include/hw/virtio/virtio.h | 1 +
subprojects/libvhost-user/libvhost-user.h | 2 +
block/export/vhost-user-blk-server.c | 24 ++++++
hw/acpi/cxl.c | 11 +--
hw/acpi/pcihp.c | 10 +++
hw/arm/virt.c | 11 ++-
hw/char/serial-pci-multi.c | 2 +-
hw/char/serial-pci.c | 2 +-
hw/core/machine.c | 3 +
hw/cxl/cxl-host.c | 4 +-
hw/i386/acpi-build.c | 12 ++-
hw/i386/amd_iommu.c | 74 ++++++++++--------
hw/i386/intel_iommu.c | 9 ++-
hw/i386/pc.c | 4 +
hw/i386/pc_piix.c | 17 ++++-
hw/i386/pc_q35.c | 14 +++-
hw/m68k/virt.c | 11 ++-
hw/mem/pc-dimm.c | 7 ++
hw/pci-bridge/pci_expander_bridge.c | 61 +++++----------
hw/pci/pci.c | 15 ++++
hw/ppc/spapr.c | 17 ++++-
hw/s390x/s390-virtio-ccw.c | 14 +++-
hw/s390x/virtio-ccw.c | 1 +
hw/sparc64/sun4u.c | 7 +-
hw/virtio/vhost-user-i2c.c | 16 ++++
hw/virtio/vhost.c | 14 ----
hw/virtio/virtio-balloon.c | 33 ++------
hw/virtio/virtio-mmio.c | 1 +
hw/virtio/virtio-pci.c | 1 +
hw/virtio/virtio.c | 2 +-
hw/xen/xen_pt.c | 7 +-
net/vhost-vdpa.c | 3 +-
subprojects/libvhost-user/libvhost-user.c | 10 +++
tests/qtest/bios-tables-test.c | 123 +++++++++++-------------------
.mailmap | 1 +
MAINTAINERS | 12 ++-
docs/devel/acpi-bits.rst | 2 +-
docs/interop/vhost-user.rst | 60 ++++++++++-----
docs/specs/index.rst | 3 +
docs/specs/pci-ids.rst | 98 ++++++++++++++++++++++++
docs/specs/pci-serial.rst | 37 +++++++++
docs/specs/pci-testdev.rst | 39 ++++++++++
docs/system/devices/cxl.rst | 2 +-
scripts/meson-buildoptions.sh | 2 +-
56 files changed, 584 insertions(+), 420 deletions(-)
delete mode 100644 docs/specs/pci-ids.txt
delete mode 100644 docs/specs/pci-serial.txt
delete mode 100644 docs/specs/pci-testdev.txt
create mode 100644 docs/specs/pci-ids.rst
create mode 100644 docs/specs/pci-serial.rst
create mode 100644 docs/specs/pci-testdev.rst