Failed in applying to current master (
apply log)
Maintainers: Paolo Bonzini <pbonzini@redhat.com>, Peter Maydell <peter.maydell@linaro.org>, Igor Mitsyanko <i.mitsyanko@gmail.com>, Radoslaw Biernacki <rad@semihalf.com>, Leif Lindholm <quic_llindhol@quicinc.com>, Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>, "Daniel P. Berrangé" <berrange@redhat.com>, Eduardo Habkost <eduardo@habkost.net>, Richard Henderson <richard.henderson@linaro.org>, Helge Deller <deller@gmx.de>, "Michael S. Tsirkin" <mst@redhat.com>, Igor Mammedov <imammedo@redhat.com>, Ani Sinha <anisinha@redhat.com>, Marcel Apfelbaum <marcel.apfelbaum@gmail.com>, Jason Wang <jasowang@redhat.com>, David Woodhouse <dwmw2@infradead.org>, Paul Durrant <paul@xen.org>, Sergio Lopez <slp@redhat.com>, John Snow <jsnow@redhat.com>, BALATON Zoltan <balaton@eik.bme.hu>, Huacai Chen <chenhuacai@kernel.org>, Jiaxun Yang <jiaxun.yang@flygoat.com>, "Philippe Mathieu-Daudé" <philmd@linaro.org>, Laurent Vivier <laurent@vivier.eu>, Keith Busch <kbusch@kernel.org>, Klaus Jensen <its@irrelevant.dk>, Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>, Nicholas Piggin <npiggin@gmail.com>, Daniel Henrique Barboza <danielhb413@gmail.com>, "Cédric Le Goater" <clg@kaod.org>, David Gibson <david@gibson.dropbear.id.au>, Harsh Prateek Bora <harshpb@linux.ibm.com>, Yoshinori Sato <ysato@users.sourceforge.jp>, Magnus Damm <magnus.damm@gmail.com>, Gerd Hoffmann <kraxel@redhat.com>
hw/ide/ahci_internal.h | 2 +-
.../ide/internal.h => hw/ide/ide-internal.h | 0
include/hw/i386/pc.h | 3 +-
include/hw/i386/x86.h | 2 +-
include/hw/misc/macio/macio.h | 2 +-
include/hw/nubus/nubus-virtio-mmio.h | 36 +++++++
include/hw/nubus/nubus.h | 2 +-
include/hw/sysbus.h | 1 -
include/hw/usb.h | 1 -
include/qom/object.h | 13 +++
hw/arm/exynos4210.c | 14 ++-
hw/arm/integratorcp.c | 7 +-
hw/arm/realview.c | 7 +-
hw/arm/sbsa-ref.c | 13 +--
hw/arm/versatilepb.c | 8 +-
hw/arm/vexpress.c | 15 ++-
hw/core/sysbus.c | 5 -
hw/display/exynos4210_fimd.c | 19 +++-
hw/display/pl110.c | 20 +++-
hw/hppa/machine.c | 10 +-
hw/i386/acpi-build.c | 22 ++--
hw/i386/amd_iommu.c | 2 +-
hw/i386/intel_iommu.c | 2 +-
hw/i386/kvm/xen_evtchn.c | 2 +-
hw/i386/kvmvapic.c | 11 +-
hw/i386/microvm.c | 2 +-
hw/i386/pc.c | 17 +--
hw/i386/pc_piix.c | 42 ++++----
hw/i386/pc_q35.c | 26 +++--
hw/i386/sgx.c | 14 ++-
hw/i386/x86-iommu.c | 2 +-
hw/i386/x86.c | 7 +-
hw/ide/ahci.c | 2 +-
hw/ide/atapi.c | 2 +-
hw/ide/cmd646.c | 2 +-
hw/ide/core.c | 2 +-
hw/ide/ide-bus.c | 2 +-
hw/ide/ide-dev.c | 2 +-
hw/ide/ioport.c | 2 +-
hw/ide/isa.c | 2 +-
hw/ide/macio.c | 2 +-
hw/ide/microdrive.c | 2 +-
hw/ide/mmio.c | 2 +-
hw/ide/pci.c | 2 +-
hw/ide/piix.c | 2 +-
hw/ide/sii3112.c | 2 +-
hw/ide/via.c | 2 +-
hw/mips/loongson3_virt.c | 8 +-
hw/nubus/nubus-device.c | 18 +++-
hw/nubus/nubus-virtio-mmio.c | 102 ++++++++++++++++++
hw/nvme/ctrl.c | 2 +-
hw/ppc/mac_newworld.c | 4 +-
hw/ppc/sam460ex.c | 7 +-
hw/ppc/spapr.c | 4 +-
hw/sh4/r2d.c | 5 +-
hw/usb/bus.c | 15 +--
hw/usb/hcd-ohci-sysbus.c | 88 +++++++++++++++
hw/usb/hcd-ohci.c | 58 ----------
qom/object.c | 16 +++
hw/arm/Kconfig | 12 ++-
hw/display/Kconfig | 1 +
hw/hppa/Kconfig | 2 +-
hw/nubus/meson.build | 1 +
hw/ppc/Kconfig | 5 +-
hw/sh4/Kconfig | 1 -
hw/usb/Kconfig | 4 +
hw/usb/meson.build | 3 +-
67 files changed, 473 insertions(+), 242 deletions(-)
rename include/hw/ide/internal.h => hw/ide/ide-internal.h (100%)
create mode 100644 include/hw/nubus/nubus-virtio-mmio.h
create mode 100644 hw/nubus/nubus-virtio-mmio.c
create mode 100644 hw/usb/hcd-ohci-sysbus.c