Failed in applying to current master (
apply log)
block.c | 4 +-
block/nbd.c | 2 -
block/nfs.c | 2 -
block/qapi.c | 1 -
hw/pci/pcie_aer.c | 2 +-
monitor.c | 19 +++---
net/net.c | 44 ++++++------
numa.c | 4 +-
qapi-schema.json | 21 ++++++
qapi/qmp-dispatch.c | 5 +-
qobject/qdict.c | 30 +-------
tests/check-qdict.c | 37 ++++------
tests/check-qjson.c | 113 ++++++------------------------
tests/libqtest.c | 4 +-
tests/test-qmp-event.c | 14 ++--
tests/test-qobject-output-visitor.c | 133 ++++++++++++++----------------------
16 files changed, 158 insertions(+), 277 deletions(-)