Failed in applying to current master (
apply log)
Maintainers: "Gonglei (Arei)" <arei.gonglei@huawei.com>, zhenwei pi <zhenwei.pi@linux.dev>, "Michael S. Tsirkin" <mst@redhat.com>, Stefano Garzarella <sgarzare@redhat.com>, Pierrick Bouvier <pierrick.bouvier@oss.qualcomm.com>, Sergio Lopez <slp@redhat.com>, Paolo Bonzini <pbonzini@redhat.com>, Zhao Liu <zhao1.liu@intel.com>, Stefano Stabellini <sstabellini@kernel.org>, Anthony PERARD <anthony@xenproject.org>, "Edgar E. Iglesias" <edgar.iglesias@gmail.com>, Bernhard Beschow <shentey@gmail.com>, Conor Dooley <conor@kernel.org>, Sebastian Huber <sebastian.huber@embedded-brains.de>, Alistair Francis <Alistair.Francis@wdc.com>, Palmer Dabbelt <palmer@dabbelt.com>, Igor Mammedov <imammedo@redhat.com>, Ani Sinha <anisinha@redhat.com>, "Philippe Mathieu-Daudé" <philmd@oss.qualcomm.com>, Aurelien Jarno <aurelien@aurel32.net>, Peter Maydell <peter.maydell@linaro.org>, Raphael Norwitz <rnorwitz@nvidia.com>, Kevin Wolf <kwolf@redhat.com>, Hanna Reitz <hreitz@redhat.com>, Stefan Hajnoczi <stefanha@redhat.com>, Laurent Vivier <lvivier@redhat.com>, Amit Shah <amit@kernel.org>, "Marc-André Lureau" <marcandre.lureau@redhat.com>, "Daniel P. Berrangé" <berrange@redhat.com>, Jonathan Cameron <jic23@kernel.org>, Junjie Cao <junjie.cao@intel.com>, Albert Esteve <aesteve@redhat.com>, Richard Henderson <richard.henderson@linaro.org>, Alejandro Jimenez <alejandro.j.jimenez@oracle.com>, Sairaj Kodilkar <sarunkod@amd.com>, Jason Wang <jasowangio@gmail.com>, Yi Liu <yi.l.liu@intel.com>, "Clément Mathieu--Drif" <clement.mathieu--drif@bull.com>, John Snow <jsnow@redhat.com>, "Denis V. Lunev" <den@openvz.org>, Song Gao <17746591750@163.com>, Bibo Mao <maobibo@loongson.cn>, Xianglai Li <lixianglai@loongson.cn>, Jiaxun Yang <jiaxun.yang@flygoat.com>, Keith Busch <kbusch@kernel.org>, Klaus Jensen <its@irrelevant.dk>, Jesper Devantier <foss@defmacro.it>, Nicholas Piggin <npiggin@gmail.com>, Harsh Prateek Bora <harshpb@linux.ibm.com>, Amit Machhiwal <amachhiw@linux.ibm.com>, Elena Ufimtseva <elena.ufimtseva@oracle.com>, Jagannathan Raman <jag.raman@oracle.com>, Weiwei Li <liwei1518@gmail.com>, Daniel Henrique Barboza <daniel.barboza@oss.qualcomm.com>, Liu Zhiwei <zhiwei_liu@linux.alibaba.com>, Chao Liu <chao.liu@processmission.com>, Halil Pasic <pasic@linux.ibm.com>, Christian Borntraeger <borntraeger@linux.ibm.com>, Eric Farman <farman@linux.ibm.com>, Farhan Ali <alifm@linux.ibm.com>, Cornelia Huck <cohuck@redhat.com>, Matthew Rosato <mjrosato@linux.ibm.com>, Ilya Leoshkevich <iii@linux.ibm.com>, David Hildenbrand <david@kernel.org>, Fam Zheng <fam@euphon.net>, Dmitry Fleytman <dmitry.fleytman@gmail.com>, "Alex Bennée" <alex.bennee@linaro.org>, Milan Zamazal <mzamazal@redhat.com>, Eric Auger <eric.auger@redhat.com>, Kuan-Wei Chiu <visitorckw@gmail.com>, FangSheng Huang <FangSheng.Huang@amd.com>, Peter Xu <peterx@redhat.com>, Fabiano Rosas <farosas@suse.de>, Eric Blake <eblake@redhat.com>, Markus Armbruster <armbru@redhat.com>
MAINTAINERS | 7 +
docs/about/deprecated.rst | 18 +
docs/interop/vhost-user.rst | 44 ++-
docs/system/devices/cxl.rst | 25 +-
docs/system/i386/microvm.rst | 4 +-
docs/system/i386/xenpvh.rst | 2 +-
docs/system/ppc/ppce500.rst | 4 +-
docs/system/riscv/microchip-icicle-kit.rst | 2 +-
docs/system/riscv/sifive_u.rst | 2 +-
meson.build | 4 +
qapi/machine.json | 28 ++
qapi/migration.json | 21 +-
qapi/net.json | 45 ++-
hw/i386/amd_iommu.h | 27 +-
hw/i386/intel_iommu_internal.h | 1 +
hw/s390x/ccw-device.h | 2 +-
include/hw/acpi/cpu.h | 4 +-
include/hw/acpi/cpu_hotplug.h | 2 +-
include/hw/acpi/generic_event_device.h | 3 +-
include/hw/acpi/ich9.h | 10 +-
include/hw/acpi/memory_hotplug.h | 4 +-
include/hw/acpi/pcihp.h | 8 +-
include/hw/core/boards.h | 4 +-
include/hw/core/hotplug.h | 13 +-
include/hw/core/qdev.h | 14 +-
include/hw/cxl/cxl.h | 12 +
include/hw/i386/microvm.h | 4 +-
include/hw/i386/x86.h | 10 +-
include/hw/mem/nvdimm.h | 2 +-
include/hw/pci/pci_bridge.h | 6 +-
include/hw/pci/pcie.h | 8 +-
include/hw/pci/shpc.h | 6 +-
include/hw/ppc/spapr_nvdimm.h | 2 +-
include/hw/virtio/vhost-backend.h | 1 +
include/hw/virtio/vhost-user-media.h | 46 +++
include/hw/virtio/vhost-user.h | 2 +-
include/hw/virtio/vhost.h | 16 +-
include/hw/virtio/virtio-balloon.h | 1 +
include/hw/virtio/virtio-net.h | 1 +
include/hw/virtio/virtio.h | 2 +-
include/migration/misc.h | 2 +
include/migration/vmstate.h | 2 +
include/net/net.h | 9 +
include/net/tap.h | 2 +
include/standard-headers/linux/ethtool.h | 6 +
include/standard-headers/linux/virtio_ids.h | 1 +
linux-headers/linux/iommufd.h | 45 ++-
linux-headers/linux/userfaultfd.h | 54 ++-
linux-headers/linux/vduse.h | 28 ++
linux-headers/linux/vfio.h | 21 ++
linux-headers/linux/vfio_zdev.h | 2 +
backends/cryptodev-vhost.c | 2 +-
backends/vhost-user.c | 2 +-
hw/acpi/acpi-cpu-hotplug-stub.c | 4 +-
hw/acpi/acpi-mem-hotplug-stub.c | 4 +-
hw/acpi/acpi-nvdimm-stub.c | 2 +-
hw/acpi/acpi-pci-hotplug-stub.c | 8 +-
hw/acpi/cpu.c | 6 +-
hw/acpi/cxl.c | 2 +-
hw/acpi/generic_event_device.c | 13 +-
hw/acpi/ich9.c | 10 +-
hw/acpi/memory_hotplug.c | 7 +-
hw/acpi/nvdimm.c | 2 +-
hw/acpi/pcihp.c | 11 +-
hw/acpi/piix4.c | 12 +-
hw/arm/virt.c | 23 +-
hw/block/vhost-user-blk.c | 60 +++-
hw/block/virtio-blk.c | 38 ++-
hw/char/virtio-serial-bus.c | 6 +-
hw/core/hotplug.c | 16 +-
hw/core/qdev-hotplug.c | 10 +-
hw/core/qdev.c | 2 +-
hw/cxl/cxl-host.c | 48 ++-
hw/display/vhost-user-media-pci.c | 115 +++++++
hw/display/vhost-user-media.c | 388 ++++++++++++++++++++++
hw/i386/acpi-build.c | 65 ++--
hw/i386/amd_iommu-stub.c | 2 +-
hw/i386/amd_iommu.c | 2 +-
hw/i386/intel_iommu.c | 118 ++++---
hw/i386/intel_iommu_accel.c | 6 +
hw/i386/microvm.c | 12 +-
hw/i386/pc.c | 28 +-
hw/i386/x86-common.c | 8 +-
hw/ide/core.c | 3 +-
hw/intc/loongarch_dintc.c | 8 +-
hw/intc/loongarch_extioi_common.c | 4 +-
hw/intc/loongarch_ipi.c | 4 +-
hw/loongarch/virt.c | 44 +--
hw/mem/cxl_type3.c | 6 +-
hw/net/vhost_net.c | 9 +-
hw/net/virtio-net.c | 131 +++++++-
hw/nvme/ctrl.c | 78 +++--
hw/pci-bridge/pci_bridge_dev.c | 6 +-
hw/pci/pci.c | 8 +
hw/pci/pcie.c | 10 +-
hw/pci/pcie_port.c | 2 +-
hw/pci/shpc.c | 11 +-
hw/ppc/e500plat.c | 4 +-
hw/ppc/spapr.c | 48 +--
hw/ppc/spapr_nvdimm.c | 2 +-
hw/ppc/spapr_pci.c | 12 +-
hw/remote/machine.c | 2 +-
hw/riscv/virt.c | 6 +-
hw/s390x/css-bridge.c | 2 +-
hw/s390x/s390-pci-bus.c | 12 +-
hw/s390x/s390-virtio-ccw.c | 16 +-
hw/s390x/virtio-ccw-md.c | 10 +-
hw/s390x/virtio-ccw.c | 2 +-
hw/scsi/scsi-disk.c | 7 +
hw/scsi/vhost-scsi-common.c | 2 +-
hw/scsi/virtio-scsi-dataplane.c | 2 +-
hw/scsi/virtio-scsi.c | 10 +-
hw/scsi/vmw_pvscsi.c | 4 +-
hw/virtio/vdpa-dev.c | 2 +-
hw/virtio/vhost-user-base.c | 2 +-
hw/virtio/vhost-user-fs.c | 2 +-
hw/virtio/vhost-user-scmi.c | 2 +-
hw/virtio/vhost-user.c | 47 ++-
hw/virtio/vhost-vsock-common.c | 2 +-
hw/virtio/vhost.c | 44 ++-
hw/virtio/virtio-balloon.c | 19 +-
hw/virtio/virtio-crypto.c | 5 +-
hw/virtio/virtio-iommu.c | 17 +-
hw/virtio/virtio-md-pci.c | 10 +-
hw/virtio/virtio-pci.c | 7 +
hw/virtio/virtio-rtc.c | 3 +-
hw/virtio/virtio.c | 85 ++---
hw/xen/xen-bus.c | 2 +-
migration/fd.c | 28 +-
migration/migration.c | 13 +
migration/options.c | 18 +-
net/net.c | 14 +-
net/tap-solaris.c | 69 ++--
net/tap.c | 448 ++++++++++++++++++++-----
stubs/hotplug-stubs.c | 6 +-
subprojects/libvhost-user/libvhost-user.c | 34 +-
system/qdev-monitor.c | 4 +-
tests/qtest/cxl-test.c | 95 ++++++
hw/display/Kconfig | 5 +
hw/display/meson.build | 3 +
qemu-options.hx | 13 +-
tests/data/acpi/x86/q35/CEDT.cxl | Bin 184 -> 184 bytes
tests/data/acpi/x86/q35/IVRS.ivrs | Bin 176 -> 176 bytes
tests/functional/x86_64/meson.build | 1 +
tests/functional/x86_64/test_tap_migration.py | 461 ++++++++++++++++++++++++++
145 files changed, 2884 insertions(+), 663 deletions(-)
create mode 100644 include/hw/virtio/vhost-user-media.h
create mode 100644 hw/display/vhost-user-media-pci.c
create mode 100644 hw/display/vhost-user-media.c
create mode 100755 tests/functional/x86_64/test_tap_migration.py