Failed in applying to current master (
apply log)
Maintainers: "Philippe Mathieu-Daudé" <philmd@linaro.org>, Paolo Bonzini <pbonzini@redhat.com>, "Daniel P. Berrangé" <berrange@redhat.com>, Eduardo Habkost <eduardo@habkost.net>, "Michael S. Tsirkin" <mst@redhat.com>, Marcel Apfelbaum <marcel.apfelbaum@gmail.com>, Richard Henderson <richard.henderson@linaro.org>, "Hervé Poussineau" <hpoussin@reactos.org>, Aurelien Jarno <aurelien@aurel32.net>, Paul Burton <paulburton@kernel.org>, Aleksandar Rikalo <aleksandar.rikalo@syrmia.com>, Huacai Chen <chenhuacai@kernel.org>, Jiaxun Yang <jiaxun.yang@flygoat.com>, Peter Maydell <peter.maydell@linaro.org>, Elena Ufimtseva <elena.ufimtseva@oracle.com>, Jagannathan Raman <jag.raman@oracle.com>, John G Johnson <john.g.johnson@oracle.com>, Gerd Hoffmann <kraxel@redhat.com>, "Marc-André Lureau" <marcandre.lureau@redhat.com>, Thomas Huth <thuth@redhat.com>, Cleber Rosa <crosa@redhat.com>, Wainer dos Santos Moschetta <wainersm@redhat.com>, Beraldo Leal <bleal@redhat.com>
MAINTAINERS | 3 +-
configs/devices/mips-softmmu/common.mak | 3 -
disas/meson.build | 3 +-
docs/about/deprecated.rst | 9 -
docs/about/removed-features.rst | 9 +
hw/core/qdev-properties-system.c | 28 +-
hw/i386/kvm/i8259.c | 4 +-
hw/i386/kvm/ioapic.c | 4 +-
hw/i386/pc_piix.c | 18 +-
hw/i386/pc_q35.c | 17 +-
hw/intc/apic.c | 3 +-
hw/intc/apic_common.c | 30 +-
hw/intc/i8259.c | 11 +-
hw/intc/kvm_irqcount.c | 49 +++
hw/intc/meson.build | 6 +
hw/intc/trace-events | 9 +-
hw/isa/piix3.c | 17 +-
hw/isa/piix4.c | 37 +-
hw/mips/Kconfig | 2 +
hw/mips/bootloader.c | 141 ++++--
hw/mips/boston.c | 6 +-
hw/mips/fuloong2e.c | 2 +-
hw/mips/malta.c | 403 ++++++------------
hw/mips/meson.build | 2 +-
hw/mips/trace-events | 9 +-
hw/pci-host/Kconfig | 6 +
hw/pci-host/bonito.c | 37 +-
hw/{mips/gt64xxx_pci.c => pci-host/gt64120.c} | 130 ++++--
hw/pci-host/meson.build | 1 +
hw/pci-host/raven.c | 3 +-
hw/pci-host/trace-events | 7 +
hw/pci-host/versatile.c | 3 +-
hw/pci/pci.c | 12 +-
hw/pci/pci_host.c | 6 +
hw/remote/machine.c | 3 +-
hw/remote/vfio-user-obj.c | 4 +-
hw/rtc/mc146818rtc.c | 20 +-
hw/rtc/meson.build | 3 +-
hw/usb/hcd-uhci.c | 16 +-
hw/usb/hcd-uhci.h | 4 +
include/exec/poison.h | 1 -
include/hw/i386/apic.h | 2 -
include/hw/i386/apic_internal.h | 1 -
include/hw/intc/i8259.h | 6 +-
include/hw/intc/kvm_irqcount.h | 10 +
include/hw/mips/bootloader.h | 10 +-
include/hw/pci-host/bonito.h | 18 +
include/hw/pci/pci.h | 3 +-
include/hw/rtc/mc146818rtc.h | 1 +
include/qemu/typedefs.h | 1 +
meson.build | 5 -
scripts/git.orderfile | 2 +
softmmu/rtc.c | 6 +-
target/mips/cpu.c | 38 +-
target/mips/cpu.h | 3 -
target/mips/internal.h | 3 -
target/mips/kvm.c | 11 +-
target/mips/sysemu/addr.c | 17 -
target/mips/sysemu/meson.build | 1 +
target/mips/sysemu/mips-qmp-cmds.c | 39 ++
target/mips/sysemu/physaddr.c | 13 -
tests/avocado/machine_mips_malta.py | 47 +-
62 files changed, 693 insertions(+), 625 deletions(-)
create mode 100644 hw/intc/kvm_irqcount.c
rename hw/{mips/gt64xxx_pci.c => pci-host/gt64120.c} (91%)
create mode 100644 include/hw/intc/kvm_irqcount.h
create mode 100644 include/hw/pci-host/bonito.h
create mode 100644 target/mips/sysemu/mips-qmp-cmds.c