Failed in applying to current master (
apply log)
Maintainers: Warner Losh <imp@bsdimp.com>, Kyle Evans <kevans@freebsd.org>, "Philippe Mathieu-Daudé" <philmd@linaro.org>, "Daniel P. Berrangé" <berrange@redhat.com>, "Michael S. Tsirkin" <mst@redhat.com>, Igor Mammedov <imammedo@redhat.com>, Ani Sinha <ani@anisinha.ca>, Richard Henderson <richard.henderson@linaro.org>, Gerd Hoffmann <kraxel@redhat.com>, Paolo Bonzini <pbonzini@redhat.com>, "Marc-André Lureau" <marcandre.lureau@redhat.com>, Eduardo Habkost <eduardo@habkost.net>, Marcel Apfelbaum <marcel.apfelbaum@gmail.com>, Yanan Wang <wangyanan55@huawei.com>, BALATON Zoltan <balaton@eik.bme.hu>, Stefano Stabellini <sstabellini@kernel.org>, Anthony Perard <anthony.perard@citrix.com>, Paul Durrant <paul@xen.org>, John Snow <jsnow@redhat.com>, Alberto Garcia <berto@igalia.com>, Corey Minyard <minyard@acm.org>, "Hervé Poussineau" <hpoussin@reactos.org>, Aurelien Jarno <aurelien@aurel32.net>, Pavel Pisa <pisa@cmp.felk.cvut.cz>, Vikram Garhwal <fnu.vikram@xilinx.com>, Jason Wang <jasowang@redhat.com>, Dmitry Fleytman <dmitry.fleytman@gmail.com>, Stefan Weil <sw@weilnetz.de>, Jiri Pirko <jiri@resnulli.us>, Sven Schnelle <svens@stackframe.org>, Keith Busch <kbusch@kernel.org>, Klaus Jensen <its@irrelevant.dk>, Huacai Chen <chenhuacai@kernel.org>, Jiaxun Yang <jiaxun.yang@flygoat.com>, Helge Deller <deller@gmx.de>, Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>, Yoshinori Sato <ysato@users.sourceforge.jp>, Magnus Damm <magnus.damm@gmail.com>, Peter Maydell <peter.maydell@linaro.org>, 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>, Yuval Shaia <yuval.shaia.ml@gmail.com>, Matthew Rosato <mjrosato@linux.ibm.com>, Eric Farman <farman@linux.ibm.com>, Thomas Huth <thuth@redhat.com>, Halil Pasic <pasic@linux.ibm.com>, Christian Borntraeger <borntraeger@linux.ibm.com>, David Hildenbrand <david@redhat.com>, Ilya Leoshkevich <iii@linux.ibm.com>, Fam Zheng <fam@euphon.net>, Alex Williamson <alex.williamson@redhat.com>, "Dr. David Alan Gilbert" <dgilbert@redhat.com>, Stefan Hajnoczi <stefanha@redhat.com>, "Alex Bennée" <alex.bennee@linaro.org>, Viresh Kumar <viresh.kumar@linaro.org>, "Gonglei (Arei)" <arei.gonglei@huawei.com>, Beniamino Galvani <b.galvani@gmail.com>, Laurent Vivier <laurent@vivier.eu>, "Edgar E. Iglesias" <edgar.iglesias@gmail.com>, Ben Widawsky <ben.widawsky@intel.com>, Jonathan Cameron <jonathan.cameron@huawei.com>, Alistair Francis <Alistair.Francis@wdc.com>, Bin Meng <bin.meng@windriver.com>, Palmer Dabbelt <palmer@dabbelt.com>, Xiaojuan Yang <yangxiaojuan@loongson.cn>, Song Gao <gaosong@loongson.cn>, Francisco Iglesias <francisco.iglesias@amd.com>, Andrey Smirnov <andrew.smirnov@gmail.com>, Paul Burton <paulburton@kernel.org>, Aleksandar Rikalo <aleksandar.rikalo@syrmia.com>, Elena Ufimtseva <elena.ufimtseva@oracle.com>, Jagannathan Raman <jag.raman@oracle.com>, John G Johnson <john.g.johnson@oracle.com>, Bastian Koppelmann <kbastian@mail.uni-paderborn.de>, Riku Voipio <riku.voipio@iki.fi>, Michael Roth <michael.roth@amd.com>, Konstantin Kostiuk <kkostiuk@redhat.com>, Taylor Simpson <tsimpson@quicinc.com>, Alexander Bulekov <alxndr@bu.edu>, Bandan Das <bsd@redhat.com>, Darren Kenny <darren.kenny@oracle.com>, Qiuhao Li <Qiuhao.Li@outlook.com>
configs/devices/mips-softmmu/common.mak | 3 -
bsd-user/qemu.h | 1 -
crypto/block-luks-priv.h | 1 -
hw/alpha/alpha_sys.h | 1 -
hw/display/ati_int.h | 2 +-
hw/display/qxl.h | 3 +-
hw/ide/ahci_internal.h | 2 +-
hw/net/vmxnet3_defs.h | 2 +-
hw/nvme/nvme.h | 2 +-
hw/rdma/rdma_utils.h | 1 -
hw/rdma/vmw/pvrdma.h | 2 +-
hw/scsi/mptsas.h | 2 +-
hw/usb/hcd-ehci.h | 3 +-
hw/usb/hcd-uhci.h | 2 +-
hw/usb/hcd-xhci-pci.h | 1 +
hw/vfio/pci.h | 2 +-
hw/virtio/virtio-qmp.h | 10 +
hw/xen/xen_pt.h | 1 -
include/exec/plugin-gen.h | 1 +
include/hw/acpi/erst.h | 3 +
include/hw/acpi/piix4.h | 2 +-
include/hw/arm/allwinner-a10.h | 1 +
include/hw/boards.h | 3 +
include/hw/char/cmsdk-apb-uart.h | 1 +
include/hw/char/goldfish_tty.h | 1 +
include/hw/char/xilinx_uartlite.h | 1 +
include/hw/cris/etraxfs.h | 1 +
include/hw/cxl/cxl.h | 5 +-
include/hw/cxl/cxl_cdat.h | 1 +
include/hw/cxl/cxl_component.h | 1 +
include/hw/cxl/cxl_device.h | 2 +
include/hw/cxl/cxl_host.h | 1 -
include/hw/cxl/cxl_pci.h | 3 -
include/hw/display/macfb.h | 3 +-
include/hw/dma/sifive_pdma.h | 2 +
include/hw/i386/ich9.h | 4 -
include/hw/i386/ioapic_internal.h | 1 +
include/hw/i386/sgx-epc.h | 1 +
include/hw/i386/x86-iommu.h | 1 -
include/hw/ide/pci.h | 2 +-
include/hw/input/pl050.h | 1 -
include/hw/intc/goldfish_pic.h | 2 +
include/hw/intc/loongarch_pch_msi.h | 2 +
include/hw/intc/loongarch_pch_pic.h | 2 +
include/hw/intc/nios2_vic.h | 2 +
include/hw/isa/vt82c686.h | 1 -
include/hw/misc/macio/macio.h | 2 +-
include/hw/misc/mchp_pfsoc_dmc.h | 2 +
include/hw/misc/mchp_pfsoc_ioscb.h | 2 +
include/hw/misc/mchp_pfsoc_sysreg.h | 2 +
include/hw/misc/pvpanic.h | 1 +
include/hw/misc/sifive_e_prci.h | 3 +-
include/hw/misc/sifive_u_otp.h | 3 +-
include/hw/misc/sifive_u_prci.h | 3 +-
include/hw/misc/virt_ctrl.h | 2 +
include/hw/misc/xlnx-versal-pmc-iou-slcr.h | 1 +
include/hw/net/lasi_82596.h | 2 +-
include/hw/net/xlnx-zynqmp-can.h | 1 +
include/hw/pci-host/designware.h | 3 -
include/hw/pci-host/gpex.h | 2 +-
include/hw/pci-host/i440fx.h | 2 +-
include/hw/pci-host/ls7a.h | 2 -
include/hw/pci-host/pnv_phb3.h | 2 -
include/hw/pci-host/pnv_phb4.h | 3 +-
include/hw/pci-host/q35.h | 2 +-
include/hw/pci-host/sabre.h | 2 +-
include/hw/pci-host/xilinx-pcie.h | 1 -
include/hw/pci/msi.h | 2 +-
include/hw/pci/pci.h | 341 ---------------------------
include/hw/pci/pci_bridge.h | 3 +-
include/hw/pci/pci_device.h | 350 ++++++++++++++++++++++++++++
include/hw/pci/pcie.h | 1 -
include/hw/pci/pcie_port.h | 1 +
include/hw/pci/pcie_sriov.h | 2 +
include/hw/pci/shpc.h | 2 +-
include/hw/ppc/pnv_psi.h | 2 +-
include/hw/remote/iohub.h | 2 +-
include/hw/remote/proxy.h | 2 +-
include/hw/riscv/boot_opensbi.h | 2 +
include/hw/riscv/microchip_pfsoc.h | 3 +
include/hw/riscv/numa.h | 1 +
include/hw/riscv/sifive_u.h | 2 +
include/hw/riscv/spike.h | 2 +-
include/hw/riscv/virt.h | 2 +-
include/hw/sd/sdhci.h | 2 +-
include/hw/southbridge/piix.h | 3 +-
include/hw/ssi/sifive_spi.h | 3 +
include/hw/timer/sse-timer.h | 1 +
include/hw/tricore/triboard.h | 1 -
include/hw/usb/hcd-dwc3.h | 1 +
include/hw/usb/hcd-musb.h | 2 +
include/hw/usb/xlnx-usb-subsystem.h | 2 +
include/hw/usb/xlnx-versal-usb2-ctrl-regs.h | 3 +
include/hw/virtio/vhost-backend.h | 3 +
include/hw/virtio/vhost-vdpa.h | 2 +
include/hw/virtio/vhost.h | 4 +
include/hw/virtio/virtio-mmio.h | 2 +-
include/hw/virtio/virtio-pci.h | 4 +-
include/hw/virtio/virtio-scsi.h | 1 -
include/hw/virtio/virtio.h | 8 +-
include/hw/xen/xen_common.h | 2 +-
include/net/vhost-user.h | 1 +
include/net/vhost_net.h | 4 +
include/qemu/plugin-memory.h | 3 +
include/qemu/userfaultfd.h | 1 -
include/sysemu/dirtyrate.h | 2 +
include/sysemu/dump.h | 1 +
include/user/syscall-trace.h | 1 +
net/vmnet_int.h | 1 -
qga/cutils.h | 1 -
target/hexagon/hex_arch_types.h | 1 -
target/hexagon/mmvec/macros.h | 1 -
target/riscv/pmu.h | 1 -
hw/acpi/aml-build.c | 2 +-
hw/acpi/cpu_hotplug.c | 3 +
hw/acpi/erst.c | 2 +-
hw/alpha/pci.c | 1 +
hw/alpha/typhoon.c | 2 +-
hw/audio/ac97.c | 2 +-
hw/audio/es1370.c | 2 +-
hw/audio/via-ac97.c | 2 +-
hw/char/serial-pci-multi.c | 2 +-
hw/char/serial-pci.c | 2 +-
hw/core/machine-smp.c | 2 +
hw/core/qdev-properties-system.c | 1 +
hw/display/bochs-display.c | 2 +-
hw/display/cirrus_vga.c | 2 +-
hw/display/sm501.c | 2 +-
hw/display/vga-pci.c | 2 +-
hw/display/vhost-user-gpu.c | 18 ++
hw/display/vmware_vga.c | 2 +-
hw/i386/acpi-build.c | 2 +-
hw/i386/xen/xen_pvdevice.c | 2 +-
hw/ipack/tpci200.c | 2 +-
hw/ipmi/pci_ipmi_bt.c | 2 +-
hw/ipmi/pci_ipmi_kcs.c | 2 +-
hw/isa/i82378.c | 2 +-
hw/mips/gt64xxx_pci.c | 2 +-
hw/misc/pci-testdev.c | 2 +-
hw/misc/pvpanic-pci.c | 2 +-
hw/net/can/can_kvaser_pci.c | 2 +-
hw/net/can/can_mioe3680_pci.c | 2 +-
hw/net/can/can_pcm3680_pci.c | 2 +-
hw/net/can/ctucan_pci.c | 2 +-
hw/net/e1000.c | 2 +-
hw/net/e1000x_common.c | 2 +-
hw/net/eepro100.c | 2 +-
hw/net/ne2000-pci.c | 2 +-
hw/net/net_tx_pkt.c | 2 +-
hw/net/pcnet-pci.c | 2 +-
hw/net/rocker/rocker.c | 2 +-
hw/net/rocker/rocker_desc.c | 2 +-
hw/net/rtl8139.c | 2 +-
hw/net/sungem.c | 2 +-
hw/net/sunhme.c | 2 +-
hw/net/tulip.c | 2 +-
hw/net/vhost_net-stub.c | 14 ++
hw/net/vhost_net.c | 18 ++
hw/net/virtio-net.c | 60 +++--
hw/pci-bridge/i82801b11.c | 2 +-
hw/pci-bridge/pci_expander_bridge.c | 1 -
hw/pci-host/bonito.c | 2 +-
hw/pci-host/dino.c | 2 +-
hw/pci-host/grackle.c | 2 +-
hw/pci-host/mv64361.c | 2 +-
hw/pci-host/ppce500.c | 2 +-
hw/pci-host/raven.c | 2 +-
hw/pci-host/sh_pci.c | 2 +-
hw/pci-host/uninorth.c | 2 +-
hw/pci-host/versatile.c | 2 +-
hw/pci/pci-hmp-cmds.c | 1 +
hw/pci/pcie_host.c | 2 +-
hw/pci/pcie_sriov.c | 2 +-
hw/pci/slotid_cap.c | 2 +-
hw/ppc/ppc440_pcix.c | 2 +-
hw/ppc/ppc4xx_pci.c | 2 +-
hw/ppc/spapr_pci_vfio.c | 1 +
hw/rdma/rdma_utils.c | 1 +
hw/s390x/s390-pci-inst.c | 1 +
hw/scsi/esp-pci.c | 2 +-
hw/scsi/lsi53c895a.c | 2 +-
hw/scsi/vhost-scsi-common.c | 1 +
hw/scsi/virtio-scsi.c | 1 +
hw/smbios/smbios.c | 1 +
hw/usb/hcd-ohci-pci.c | 2 +-
hw/virtio/vdpa-dev.c | 9 +
hw/virtio/vhost-user-fs.c | 18 ++
hw/virtio/vhost-user-gpio.c | 10 +
hw/virtio/vhost-vdpa.c | 40 +++-
hw/virtio/vhost-vsock-common.c | 18 ++
hw/virtio/vhost.c | 122 ++++++++--
hw/virtio/virtio-crypto.c | 18 ++
hw/virtio/virtio-mmio.c | 27 +++
hw/virtio/virtio-pci.c | 305 ++++++++++++++++--------
hw/virtio/virtio-qmp.c | 192 ++++++++++++++-
hw/virtio/virtio.c | 225 +++---------------
hw/watchdog/wdt_i6300esb.c | 2 +-
net/vhost-user.c | 27 ++-
net/vhost-vdpa.c | 32 +--
qga/cutils.c | 3 +-
tests/qtest/bios-tables-test.c | 19 ++
tests/qtest/fuzz/generic_fuzz.c | 1 +
ui/util.c | 2 +-
docs/devel/style.rst | 7 +
hw/acpi/Kconfig | 9 +-
hw/acpi/meson.build | 2 +-
hw/i2c/meson.build | 2 +-
hw/i386/Kconfig | 3 +-
hw/isa/Kconfig | 4 +-
hw/ppc/Kconfig | 2 -
hw/virtio/trace-events | 1 +
qemu-options.hx | 3 +
tests/data/acpi/virt/APIC.topology | Bin 0 -> 732 bytes
tests/data/acpi/virt/DSDT.topology | Bin 0 -> 5398 bytes
tests/data/acpi/virt/PPTT | Bin 96 -> 76 bytes
tests/data/acpi/virt/PPTT.acpihmatvirt | Bin 196 -> 156 bytes
tests/data/acpi/virt/PPTT.topology | Bin 0 -> 336 bytes
217 files changed, 1418 insertions(+), 839 deletions(-)
create mode 100644 include/hw/pci/pci_device.h
create mode 100644 tests/data/acpi/virt/APIC.topology
create mode 100644 tests/data/acpi/virt/DSDT.topology
create mode 100644 tests/data/acpi/virt/PPTT.topology