Failed in applying to current master (
apply log)
Maintainers: "Michael S. Tsirkin" <mst@redhat.com>, Raphael Norwitz <raphael.norwitz@nutanix.com>, Ani Sinha <ani@anisinha.ca>, Marcel Apfelbaum <marcel.apfelbaum@gmail.com>, Igor Mammedov <imammedo@redhat.com>, Peter Maydell <peter.maydell@linaro.org>, Eduardo Habkost <eduardo@habkost.net>, "Philippe Mathieu-Daudé" <philmd@linaro.org>, Yanan Wang <wangyanan55@huawei.com>, Paolo Bonzini <pbonzini@redhat.com>, Richard Henderson <richard.henderson@linaro.org>, Laurent Vivier <laurent@vivier.eu>, Ben Widawsky <ben.widawsky@intel.com>, Jonathan Cameron <jonathan.cameron@huawei.com>, Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>, Andrey Smirnov <andrew.smirnov@gmail.com>, Paul Burton <paulburton@kernel.org>, Aleksandar Rikalo <aleksandar.rikalo@syrmia.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>, Halil Pasic <pasic@linux.ibm.com>, Christian Borntraeger <borntraeger@linux.ibm.com>, Eric Farman <farman@linux.ibm.com>, Thomas Huth <thuth@redhat.com>, David Hildenbrand <david@redhat.com>, Ilya Leoshkevich <iii@linux.ibm.com>, Jason Wang <jasowang@redhat.com>, Cleber Rosa <crosa@redhat.com>, Wainer dos Santos Moschetta <wainersm@redhat.com>, Beraldo Leal <bleal@redhat.com>
hw/pci-bridge/dec.h | 9 -
hw/virtio/vhost-shadow-virtqueue.h | 5 +-
hw/virtio/virtio-qmp.h | 20 +
include/hw/acpi/ich9.h | 2 +-
include/hw/acpi/{tco.h => ich9_tco.h} | 2 +-
include/hw/boards.h | 3 +
include/hw/i386/pc.h | 3 +
include/hw/pci/pci.h | 10 +-
include/hw/pci/pci_bridge.h | 1 +
include/hw/pci/pci_ids.h | 1 -
include/hw/virtio/vdpa-dev.h | 43 ++
include/hw/virtio/vhost-vdpa.h | 16 +-
include/hw/virtio/vhost.h | 25 +-
include/hw/virtio/virtio-pci.h | 5 +
include/hw/virtio/virtio.h | 19 +-
subprojects/libvhost-user/libvhost-user.h | 2 +-
contrib/vhost-user-blk/vhost-user-blk.c | 4 +-
hw/acpi/ich9.c | 8 +-
hw/acpi/{tco.c => ich9_tco.c} | 43 +-
hw/acpi/pcihp.c | 3 +-
hw/arm/virt.c | 11 +-
hw/core/machine.c | 3 +
hw/i386/acpi-build.c | 5 +-
hw/i386/pc.c | 5 +
hw/i386/pc_piix.c | 41 +-
hw/i386/pc_q35.c | 29 +-
hw/isa/lpc_ich9.c | 5 +-
hw/m68k/virt.c | 11 +-
hw/mem/cxl_type3.c | 11 +
hw/pci-bridge/cxl_downstream.c | 1 -
hw/pci-bridge/cxl_upstream.c | 1 -
hw/pci-bridge/dec.c | 164 -----
hw/pci-bridge/i82801b11.c | 1 -
hw/pci-bridge/pci_bridge_dev.c | 1 -
hw/pci-bridge/pcie_pci_bridge.c | 1 -
hw/pci-bridge/pcie_root_port.c | 1 -
hw/pci-bridge/simba.c | 1 -
hw/pci-bridge/xio3130_downstream.c | 1 -
hw/pci-bridge/xio3130_upstream.c | 1 -
hw/pci-host/designware.c | 1 -
hw/pci-host/uninorth.c | 9 +-
hw/pci-host/xilinx-pcie.c | 1 -
hw/pci/pci.c | 20 +-
hw/ppc/spapr.c | 17 +-
hw/ppc/spapr_pci.c | 15 +-
hw/s390x/s390-virtio-ccw.c | 14 +-
hw/virtio/vdpa-dev-pci.c | 102 +++
hw/virtio/vdpa-dev.c | 377 +++++++++++
hw/virtio/vhost-shadow-virtqueue.c | 44 +-
hw/virtio/vhost-user.c | 5 +
hw/virtio/vhost-vdpa.c | 140 ++--
hw/virtio/vhost.c | 84 ++-
hw/virtio/virtio-config-io.c | 204 ++++++
hw/virtio/virtio-pci.c | 88 +++
hw/virtio/virtio-qmp.c | 659 +++++++++++++++++++
hw/virtio/virtio.c | 798 +----------------------
hw/watchdog/watchdog.c | 4 +
net/vhost-vdpa.c | 174 ++++-
tests/qtest/tco-test.c | 4 +-
MAINTAINERS | 4 +-
docs/devel/acpi-bits.rst | 3 +
hw/acpi/meson.build | 2 +-
hw/acpi/trace-events | 2 +
hw/isa/trace-events | 4 +
hw/pci-bridge/meson.build | 2 -
hw/virtio/Kconfig | 5 +
hw/virtio/meson.build | 44 +-
hw/virtio/trace-events | 4 +-
hw/watchdog/trace-events | 4 +
tests/avocado/acpi-bits.py | 2 +-
tests/avocado/acpi-bits/bits-tests/smbios.py2 | 4 +
tests/avocado/acpi-bits/bits-tests/testacpi.py2 | 4 +
tests/avocado/acpi-bits/bits-tests/testcpuid.py2 | 4 +
73 files changed, 2074 insertions(+), 1292 deletions(-)
delete mode 100644 hw/pci-bridge/dec.h
create mode 100644 hw/virtio/virtio-qmp.h
rename include/hw/acpi/{tco.h => ich9_tco.h} (97%)
create mode 100644 include/hw/virtio/vdpa-dev.h
rename hw/acpi/{tco.c => ich9_tco.c} (91%)
delete mode 100644 hw/pci-bridge/dec.c
create mode 100644 hw/virtio/vdpa-dev-pci.c
create mode 100644 hw/virtio/vdpa-dev.c
create mode 100644 hw/virtio/virtio-config-io.c
create mode 100644 hw/virtio/virtio-qmp.c