Failed in applying to current master (
apply log)
Maintainers: Richard Henderson <richard.henderson@linaro.org>, Paolo Bonzini <pbonzini@redhat.com>, "Philippe Mathieu-Daudé" <philmd@linaro.org>, Cameron Esfahani <dirty@apple.com>, Roman Bolshakov <rbolshakov@ddn.com>, Phil Dennis-Jordan <phil@philjordan.eu>, Mads Ynddal <mads@ynddal.dk>, Fabiano Rosas <farosas@suse.de>, Laurent Vivier <lvivier@redhat.com>, Stefano Stabellini <sstabellini@kernel.org>, Anthony PERARD <anthony@xenproject.org>, Paul Durrant <paul@xen.org>, "Edgar E. Iglesias" <edgar.iglesias@gmail.com>, Warner Losh <imp@bsdimp.com>, Kyle Evans <kevans@freebsd.org>, "Alex Bennée" <alex.bennee@linaro.org>, "Dr. David Alan Gilbert" <dave@treblig.org>, Peter Maydell <peter.maydell@linaro.org>, Eduardo Habkost <eduardo@habkost.net>, Marcel Apfelbaum <marcel.apfelbaum@gmail.com>, Yanan Wang <wangyanan55@huawei.com>, Zhao Liu <zhao1.liu@intel.com>, Eric Blake <eblake@redhat.com>, Markus Armbruster <armbru@redhat.com>, Michael Roth <michael.roth@amd.com>, Peter Xu <peterx@redhat.com>, David Hildenbrand <david@redhat.com>, Reinoud Zandijk <reinoud@netbsd.org>, Sunil Muthuswamy <sunilmut@microsoft.com>
MAINTAINERS | 3 +-
qapi/accelerator.json | 56 +++++
qapi/machine.json | 32 +--
qapi/qapi-schema.json | 1 +
accel/tcg/internal-common.h | 2 +-
.../accel-ops.h => accel/accel-cpu-ops.h} | 11 +-
include/accel/accel-ops.h | 51 ++++
include/hw/arm/xen_arch_hvm.h | 9 -
include/hw/i386/xen_arch_hvm.h | 11 -
include/hw/xen/arch_hvm.h | 14 +-
include/qemu/accel.h | 39 +---
include/system/hvf_int.h | 3 +-
include/system/kvm_int.h | 1 +
include/system/runstate.h | 40 ++++
include/tcg/tcg.h | 2 +
accel/accel-common.c | 2 +
accel/accel-qmp.c | 35 +++
accel/accel-system.c | 12 +-
accel/hvf/hvf-accel-ops.c | 27 ++-
accel/hvf/hvf-all.c | 1 +
accel/kvm/kvm-accel-ops.c | 2 +-
accel/kvm/kvm-all.c | 1 +
accel/qtest/qtest.c | 3 +-
accel/tcg/monitor.c | 192 ---------------
accel/tcg/tcg-accel-ops-rr.c | 2 -
accel/tcg/tcg-accel-ops.c | 3 +-
accel/tcg/tcg-all.c | 3 +
accel/tcg/tcg-stats.c | 219 ++++++++++++++++++
accel/xen/xen-all.c | 3 +-
bsd-user/main.c | 1 +
cpu-target.c | 2 +-
gdbstub/system.c | 3 +-
hw/arm/xen-pvh.c | 1 -
hw/core/machine-hmp-cmds.c | 5 +-
hw/core/machine-qmp-cmds.c | 2 +
linux-user/main.c | 1 +
system/cpus.c | 2 +-
system/memory.c | 1 +
system/runstate.c | 30 ---
target/i386/nvmm/nvmm-accel-ops.c | 2 +-
target/i386/nvmm/nvmm-all.c | 1 +
target/i386/whpx/whpx-accel-ops.c | 2 +-
target/i386/whpx/whpx-all.c | 1 +
accel/meson.build | 2 +-
accel/tcg/meson.build | 1 +
hmp-commands-info.hx | 12 +
qapi/meson.build | 1 +
47 files changed, 515 insertions(+), 335 deletions(-)
create mode 100644 qapi/accelerator.json
rename include/{system/accel-ops.h => accel/accel-cpu-ops.h} (91%)
create mode 100644 include/accel/accel-ops.h
delete mode 100644 include/hw/arm/xen_arch_hvm.h
delete mode 100644 include/hw/i386/xen_arch_hvm.h
create mode 100644 accel/accel-qmp.c
create mode 100644 accel/tcg/tcg-stats.c