Failed in applying to current master (
apply log)
Maintainers: "Michael S. Tsirkin" <mst@redhat.com>, Igor Mammedov <imammedo@redhat.com>, Ani Sinha <anisinha@redhat.com>, Raphael Norwitz <raphael.norwitz@nutanix.com>, Kevin Wolf <kwolf@redhat.com>, Hanna Reitz <hreitz@redhat.com>, Albert Esteve <aesteve@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>, "Philippe Mathieu-Daudé" <philmd@linaro.org>, Aurelien Jarno <aurelien@aurel32.net>, "Hervé Poussineau" <hpoussin@reactos.org>, Fam Zheng <fam@euphon.net>, "Eugenio Pérez" <eperezma@redhat.com>, "Alex Bennée" <alex.bennee@linaro.org>, Viresh Kumar <viresh.kumar@linaro.org>, David Hildenbrand <david@redhat.com>, "Marc-André Lureau" <marcandre.lureau@redhat.com>, "Daniel P. Berrangé" <berrange@redhat.com>, Thomas Huth <thuth@redhat.com>
hw/i386/intel_iommu_internal.h | 1 +
hw/virtio/vhost-shadow-virtqueue.h | 1 +
include/exec/memory.h | 2 +
include/hw/acpi/cxl.h | 1 +
include/hw/i386/pc.h | 2 +
include/hw/southbridge/piix.h | 30 ++-
include/hw/virtio/vhost-scsi-common.h | 2 +-
include/hw/virtio/vhost-user-scsi.h | 6 +
include/hw/virtio/vhost-user.h | 6 +-
include/hw/virtio/vhost.h | 12 +
subprojects/libvhost-user/libvhost-user.h | 3 +-
hw/acpi/cxl.c | 69 ++++++
hw/block/vhost-user-blk.c | 6 +-
hw/display/virtio-dmabuf.c | 12 +-
hw/i386/acpi-build.c | 6 +-
hw/i386/intel_iommu.c | 150 ++++++++----
hw/i386/pc.c | 19 +-
hw/i386/pc_piix.c | 123 +++++++---
hw/i386/pc_q35.c | 14 +-
hw/isa/lpc_ich9.c | 9 +-
hw/isa/{piix3.c => piix.c} | 281 ++++++++++++++++------
hw/isa/piix4.c | 302 ------------------------
hw/mips/malta.c | 5 +-
hw/scsi/vhost-scsi-common.c | 47 ++--
hw/scsi/vhost-scsi.c | 6 +-
hw/scsi/vhost-user-scsi.c | 254 +++++++++++++++++---
hw/timer/i8254_common.c | 4 +-
hw/virtio/vhost-backend.c | 6 -
hw/virtio/vhost-shadow-virtqueue.c | 2 +-
hw/virtio/vhost-user-gpio.c | 5 +-
hw/virtio/vhost-user.c | 239 ++++++++++---------
hw/virtio/vhost.c | 9 +
hw/virtio/virtio.c | 4 +
net/vhost-vdpa.c | 374 +++++++++++++++++++-----------
MAINTAINERS | 7 +-
docs/interop/vhost-user.rst | 11 +
docs/system/target-i386-desc.rst.inc | 8 +
hw/i386/Kconfig | 3 +-
hw/isa/Kconfig | 8 +-
hw/isa/meson.build | 3 +-
hw/mips/Kconfig | 2 +-
meson.build | 1 +
tests/data/acpi/q35/DSDT.cxl | Bin 9655 -> 9713 bytes
43 files changed, 1219 insertions(+), 836 deletions(-)
rename hw/isa/{piix3.c => piix.c} (52%)
delete mode 100644 hw/isa/piix4.c