Failed in applying to current master (
apply log)
docs/about/build-platforms.rst | 2 +-
docs/devel/qapi-code-gen.rst | 3 +-
include/hw/qdev-properties.h | 3 +-
backends/tpm/tpm_util.c | 2 +-
hw/block/xen-block.c | 4 +-
hw/core/qdev-properties-system.c | 80 +++++++++++++++++++---------------------
hw/core/qdev-properties.c | 44 ++++++++++------------
hw/misc/xlnx-versal-trng.c | 2 +-
hw/nvme/nguid.c | 2 +-
hw/nvram/xlnx-bbram.c | 2 +-
hw/nvram/xlnx-efuse.c | 2 +-
hw/pci/pci.c | 2 +-
hw/s390x/ccw-device.c | 6 +--
hw/s390x/css.c | 4 +-
hw/s390x/s390-pci-bus.c | 3 +-
hw/vfio/pci-quirks.c | 2 +-
target/riscv/cpu.c | 44 +++++++++++++++-------
target/sparc/cpu.c | 3 +-
hw/display/apple-gfx.m | 2 +-
scripts/qapi/introspect.py | 12 +++---
scripts/qapi/parser.py | 5 +--
scripts/qapi/schema.py | 11 +++---
tests/qapi-schema/test-qapi.py | 11 +-----
23 files changed, 123 insertions(+), 128 deletions(-)