Failed in applying to current master (
apply log)
Maintainers: Richard Henderson <richard.henderson@linaro.org>, Paolo Bonzini <pbonzini@redhat.com>, Warner Losh <imp@bsdimp.com>, Kyle Evans <kevans@freebsd.org>, Stefan Hajnoczi <stefanha@redhat.com>, Beniamino Galvani <b.galvani@gmail.com>, Peter Maydell <peter.maydell@linaro.org>, Antony Pavlov <antonynpavlov@gmail.com>, Igor Mitsyanko <i.mitsyanko@gmail.com>, "Philippe Mathieu-Daudé" <f4bug@amsat.org>, Kevin Wolf <kwolf@redhat.com>, Hanna Reitz <hreitz@redhat.com>, Eduardo Habkost <eduardo@habkost.net>, Marcel Apfelbaum <marcel.apfelbaum@gmail.com>, Yanan Wang <wangyanan55@huawei.com>, Markus Armbruster <armbru@redhat.com>, Laurent Vivier <laurent@vivier.eu>, "Dr. David Alan Gilbert" <dgilbert@redhat.com>, Michael Roth <michael.roth@amd.com>, Eric Blake <eblake@redhat.com>, Vladimir Sementsov-Ogievskiy <v.sementsov-og@mail.ru>, Konstantin Kostiuk <kkostiuk@redhat.com>, "Daniel P. Berrangé" <berrange@redhat.com>, Fam Zheng <fam@euphon.net>, Taylor Simpson <tsimpson@quicinc.com>, "Edgar E. Iglesias" <edgar.iglesias@gmail.com>, Aurelien Jarno <aurelien@aurel32.net>, Jiaxun Yang <jiaxun.yang@flygoat.com>, Aleksandar Rikalo <aleksandar.rikalo@syrmia.com>, Chris Wulff <crwulff@gmail.com>, Marek Vasut <marex@denx.de>, Stafford Horne <shorne@gmail.com>, "Cédric Le Goater" <clg@kaod.org>, Daniel Henrique Barboza <danielhb413@gmail.com>, David Gibson <david@gibson.dropbear.id.au>, Greg Kurz <groug@kaod.org>, Palmer Dabbelt <palmer@dabbelt.com>, Alistair Francis <alistair.francis@wdc.com>, Bin Meng <bin.meng@windriver.com>, Yoshinori Sato <ysato@users.sourceforge.jp>, David Hildenbrand <david@redhat.com>, Cornelia Huck <cohuck@redhat.com>, Thomas Huth <thuth@redhat.com>, Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>, Artyom Tarasenko <atar4qemu@gmail.com>, Bastian Koppelmann <kbastian@mail.uni-paderborn.de>, Max Filippov <jcmvbkbc@gmail.com>, "Alex Bennée" <alex.bennee@linaro.org>, Alexander Bulekov <alxndr@bu.edu>, Bandan Das <bsd@redhat.com>, Darren Kenny <darren.kenny@oracle.com>, Qiuhao Li <Qiuhao.Li@outlook.com>, Akihiko Odaki <akihiko.odaki@gmail.com>, Gerd Hoffmann <kraxel@redhat.com>, Stefan Weil <sw@weilnetz.de>
docs/devel/style.rst | 2 +-
docs/devel/tracing.rst | 2 +-
accel/tcg/internal.h | 3 +-
include/block/qdict.h | 3 +
include/exec/exec-all.h | 20 +++---
include/exec/helper-head.h | 2 +-
include/glib-compat.h | 12 +---
include/hw/core/cpu.h | 2 +-
include/hw/core/tcg-cpu-ops.h | 6 +-
include/hw/hw.h | 2 +-
include/monitor/monitor.h | 3 +
include/qapi/qmp/qdict.h | 3 -
include/qemu-main.h | 10 +++
include/qemu/compiler.h | 26 +++-----
include/qemu/cutils.h | 2 -
include/qemu/error-report.h | 2 -
include/{qemu-common.h => qemu/help-texts.h} | 5 --
include/qemu/keyval.h | 14 +++++
include/qemu/option.h | 6 --
include/qemu/osdep.h | 43 +++++++++----
include/qemu/thread.h | 2 +-
include/tcg/tcg-ldst.h | 4 +-
include/tcg/tcg.h | 2 +-
linux-user/user-internals.h | 2 +-
qga/commands-common.h | 11 ++++
scripts/cocci-macro-file.h | 2 +-
target/alpha/cpu.h | 10 +--
target/arm/internals.h | 12 ++--
target/hppa/cpu.h | 2 +-
target/i386/tcg/helper-tcg.h | 24 ++++----
target/microblaze/cpu.h | 6 +-
target/mips/tcg/tcg-internal.h | 17 ++---
target/nios2/cpu.h | 6 +-
target/openrisc/exception.h | 2 +-
target/ppc/cpu.h | 14 ++---
target/ppc/internal.h | 6 +-
target/riscv/cpu.h | 10 +--
target/s390x/s390x-internal.h | 6 +-
target/s390x/tcg/tcg_s390x.h | 12 ++--
target/sh4/cpu.h | 6 +-
target/sparc/cpu.h | 10 +--
target/xtensa/cpu.h | 6 +-
accel/stubs/tcg-stub.c | 4 +-
bsd-user/main.c | 2 +-
bsd-user/signal.c | 3 +-
hw/arm/allwinner-a10.c | 4 +-
hw/arm/digic.c | 5 +-
hw/hyperv/syndbg.c | 1 -
hw/intc/exynos4210_gic.c | 9 +--
hw/misc/mips_itu.c | 3 +-
linux-user/main.c | 2 +-
linux-user/signal.c | 3 +-
monitor/hmp.c | 4 +-
monitor/monitor.c | 10 +++
qapi/qobject-input-visitor.c | 2 +-
qemu-img.c | 14 +++--
qemu-io.c | 2 +-
qemu-nbd.c | 2 +-
qga/commands-posix.c | 35 +++++++++++
qga/commands-win32.c | 13 ++++
qga/commands.c | 14 ++---
qga/main.c | 20 +++---
qom/object_interfaces.c | 1 +
scsi/qemu-pr-helper.c | 8 ++-
softmmu/main.c | 25 +++-----
softmmu/vl.c | 4 +-
storage-daemon/qemu-storage-daemon.c | 2 +-
stubs/error-printf.c | 1 +
target/alpha/helper.c | 10 +--
target/arm/pauth_helper.c | 4 +-
target/arm/tlb_helper.c | 7 ++-
target/hexagon/op_helper.c | 9 +--
target/hppa/cpu.c | 8 +--
target/hppa/op_helper.c | 4 +-
target/i386/tcg/bpt_helper.c | 2 +-
target/i386/tcg/excp_helper.c | 31 +++++-----
target/i386/tcg/misc_helper.c | 6 +-
target/i386/tcg/sysemu/misc_helper.c | 7 ++-
target/openrisc/exception.c | 2 +-
target/openrisc/exception_helper.c | 3 +-
target/riscv/op_helper.c | 4 +-
target/rx/op_helper.c | 22 ++++---
target/s390x/tcg/excp_helper.c | 22 ++++---
target/sh4/op_helper.c | 5 +-
target/sparc/mmu_helper.c | 8 +--
target/tricore/op_helper.c | 6 +-
tcg/tcg.c | 3 +-
tests/fp/fp-bench.c | 3 +-
tests/fp/fp-test.c | 3 +-
tests/qtest/fuzz/generic_fuzz.c | 2 -
tests/qtest/libqtest.c | 16 +----
tests/unit/check-qobject.c | 7 ---
tests/unit/check-qom-proplist.c | 1 +
tests/unit/test-forward-visitor.c | 2 +-
tests/unit/test-keyval.c | 2 +-
tests/unit/test-qga.c | 7 +++
tools/virtiofsd/fuse_virtio.c | 4 +-
tools/virtiofsd/passthrough_ll.c | 2 +-
ui/vnc.c | 1 +
util/compatfd.c | 18 +-----
util/cutils.c | 54 ----------------
util/error-report.c | 17 ++---
util/keyval.c | 2 +-
util/osdep.c | 16 +++++
util/oslib-posix.c | 65 +++++++-------------
util/oslib-win32.c | 28 ++++-----
scripts/analyze-inclusions | 4 --
scripts/checkpatch.pl | 2 +-
tests/unit/meson.build | 2 +-
ui/cocoa.m | 3 +-
110 files changed, 475 insertions(+), 482 deletions(-)
create mode 100644 include/qemu-main.h
rename include/{qemu-common.h => qemu/help-texts.h} (80%)
create mode 100644 include/qemu/keyval.h