Failed in applying to current master (
apply log)
qapi/block-core.json | 71 ++++++++++++++++++++++++------------------------
qapi/block-export.json | 8 +++---
qapi/block.json | 12 ++++----
qapi/char.json | 8 +++---
qapi/control.json | 14 +++++-----
qapi/crypto.json | 8 +++---
qapi/cxl.json | 42 ++++++++++++++--------------
qapi/dump.json | 2 +-
qapi/ebpf.json | 2 +-
qapi/introspect.json | 4 +--
qapi/job.json | 8 +++---
qapi/machine-target.json | 54 ++++++++++++++++++------------------
qapi/machine.json | 33 +++++++++++++---------
qapi/migration.json | 68 +++++++++++++++++++++++-----------------------
qapi/misc.json | 31 +++++++++++----------
qapi/net.json | 27 +++++++++++-------
qapi/pci.json | 1 -
qapi/qdev.json | 20 +++++++-------
qapi/qom.json | 38 +++++++++++++-------------
qapi/rocker.json | 4 +--
qapi/run-state.json | 12 ++++----
qapi/sockets.json | 5 ++--
qapi/stats.json | 6 ++--
qapi/transaction.json | 4 +--
qapi/ui.json | 27 +++++++++---------
qapi/vfio.json | 8 +++---
qapi/virtio.json | 6 ++--
system/cpus.c | 12 ++++----
28 files changed, 277 insertions(+), 258 deletions(-)