Failed in applying to current master (
apply log)
Maintainers: David Woodhouse <dwmw2@infradead.org>, Paul Durrant <paul@xen.org>, "Michael S. Tsirkin" <mst@redhat.com>, Marcel Apfelbaum <marcel.apfelbaum@gmail.com>, Paolo Bonzini <pbonzini@redhat.com>, Richard Henderson <richard.henderson@linaro.org>, Eduardo Habkost <eduardo@habkost.net>, Nina Schoetterl-Glausch <nsg@linux.ibm.com>, David Hildenbrand <david@redhat.com>, Ilya Leoshkevich <iii@linux.ibm.com>, Halil Pasic <pasic@linux.ibm.com>, Christian Borntraeger <borntraeger@linux.ibm.com>, Eric Farman <farman@linux.ibm.com>, Thomas Huth <thuth@redhat.com>, Gerd Hoffmann <kraxel@redhat.com>, "Marc-André Lureau" <marcandre.lureau@redhat.com>, Eric Blake <eblake@redhat.com>, Markus Armbruster <armbru@redhat.com>, Kevin Wolf <kwolf@redhat.com>, Hanna Reitz <hreitz@redhat.com>, "Gonglei (Arei)" <arei.gonglei@huawei.com>, Zhenwei Pi <pizhenwei@bytedance.com>, Ani Sinha <anisinha@redhat.com>, "Philippe Mathieu-Daudé" <philmd@linaro.org>, Yanan Wang <wangyanan55@huawei.com>, Zhao Liu <zhao1.liu@intel.com>, Michael Roth <michael.roth@amd.com>, Peter Xu <peterx@redhat.com>, Fabiano Rosas <farosas@suse.de>, Peter Maydell <peter.maydell@linaro.org>, Marcelo Tosatti <mtosatti@redhat.com>, Song Gao <gaosong@loongson.cn>, Huacai Chen <chenhuacai@kernel.org>, Aurelien Jarno <aurelien@aurel32.net>, Jiaxun Yang <jiaxun.yang@flygoat.com>, Aleksandar Rikalo <arikalo@gmail.com>, Nicholas Piggin <npiggin@gmail.com>, Daniel Henrique Barboza <danielhb413@gmail.com>, Palmer Dabbelt <palmer@dabbelt.com>, Alistair Francis <alistair.francis@wdc.com>, Weiwei Li <liwei1518@gmail.com>, Liu Zhiwei <zhiwei_liu@linux.alibaba.com>, Laurent Vivier <lvivier@redhat.com>
MAINTAINERS | 1 -
qapi/audio.json | 2 +-
qapi/block.json | 2 +-
qapi/char.json | 4 +-
qapi/control.json | 2 +-
qapi/cryptodev.json | 2 +-
qapi/dump.json | 2 +-
qapi/machine-s390x.json | 121 +++++++
qapi/machine-target.json | 523 ------------------------------
qapi/machine.json | 371 ++++++++++++++++++++-
qapi/migration.json | 10 +-
qapi/misc-arm.json | 49 +++
qapi/{misc-target.json => misc-i386.json} | 165 ++++------
qapi/misc.json | 2 +-
qapi/qapi-schema.json | 5 +-
qapi/ui.json | 10 +-
qapi/virtio.json | 2 +-
include/hw/s390x/cpu-topology.h | 2 +-
hw/i386/kvm/xen-stubs.c | 13 -
hw/i386/kvm/xen_evtchn.c | 2 +-
hw/i386/monitor.c | 2 +-
hw/i386/sgx-stub.c | 2 +-
hw/i386/sgx.c | 2 +-
hw/s390x/cpu-topology.c | 4 +-
hw/s390x/s390-skeys.c | 1 -
stubs/monitor-arm-gic.c | 12 +
stubs/monitor-cpu-s390x-kvm.c | 22 ++
stubs/monitor-cpu-s390x.c | 23 ++
stubs/monitor-cpu.c | 21 ++
stubs/monitor-i386-rtc.c | 12 +
stubs/monitor-i386-sev.c | 36 ++
stubs/monitor-i386-sgx.c | 17 +
stubs/monitor-i386-xen.c | 16 +
target/arm/arm-qmp-cmds.c | 4 +-
target/i386/cpu-system.c | 2 +-
target/i386/cpu.c | 2 +-
target/i386/monitor.c | 1 -
target/i386/sev-system-stub.c | 32 --
target/i386/sev.c | 2 +-
target/loongarch/loongarch-qmp-cmds.c | 2 +-
target/mips/system/mips-qmp-cmds.c | 12 +-
target/ppc/ppc-qmp-cmds.c | 12 +-
target/riscv/riscv-qmp-cmds.c | 2 +-
target/s390x/cpu_models_system.c | 2 +-
tests/qtest/qmp-cmd-test.c | 1 +
qapi/meson.build | 33 +-
stubs/meson.build | 8 +
47 files changed, 842 insertions(+), 733 deletions(-)
create mode 100644 qapi/machine-s390x.json
delete mode 100644 qapi/machine-target.json
create mode 100644 qapi/misc-arm.json
rename qapi/{misc-target.json => misc-i386.json} (75%)
create mode 100644 stubs/monitor-arm-gic.c
create mode 100644 stubs/monitor-cpu-s390x-kvm.c
create mode 100644 stubs/monitor-cpu-s390x.c
create mode 100644 stubs/monitor-cpu.c
create mode 100644 stubs/monitor-i386-rtc.c
create mode 100644 stubs/monitor-i386-sev.c
create mode 100644 stubs/monitor-i386-sgx.c
create mode 100644 stubs/monitor-i386-xen.c