The following changes since commit e609fa71e89c81fbe2670411be62da95dfb093e0:
Merge remote-tracking branch 'remotes/edgar/tags/edgar/xilinx-next-2018-05-29-v1.for-upstream' into staging (2018-05-29 13:01:11 +0100) are available in the Git repository at: git://github.com/ehabkost/qemu.git tags/numa-next-pull-request for you to fetch changes up to c35665e1ee3d4344cd5156430ebc92310635f9bd: tests: functional tests for QMP command set-numa-node (2018-05-30 13:19:14 -0300) ---------------------------------------------------------------- NUMA queue, 2018-05-30 * New command-line option: --preconfig This option allows pausing QEMU and allow the configuration using QMP commands before running board initialization code. * New QMP set-numa-node, now made possible because of --preconfig * Small update on -numa error messages ---------------------------------------------------------------- Igor Mammedov (12): numa: clarify error message when node index is out of range in -numa dist, ... numa: postpone options post-processing till machine_run_board_init() numa: split out NumaOptions parsing into set_numa_options() qapi: introduce preconfig runstate hmp: disable monitor in preconfig state qapi: introduce new cmd option "allow-preconfig" tests: qapi-schema tests for allow-preconfig cli: add --preconfig option tests: extend qmp test with preconfig checks qmp: permit query-hotpluggable-cpus in preconfig state qmp: add set-numa-node command tests: functional tests for QMP command set-numa-node docs/devel/qapi-code-gen.txt | 11 ++- qapi/introspect.json | 5 +- qapi/misc.json | 49 ++++++++++++-- qapi/run-state.json | 8 ++- scripts/qapi/commands.py | 11 +-- scripts/qapi/common.py | 18 +++-- scripts/qapi/doc.py | 4 +- scripts/qapi/introspect.py | 7 +- include/qapi/qmp/dispatch.h | 1 + include/sysemu/numa.h | 2 + include/sysemu/sysemu.h | 1 + tests/libqtest.h | 9 +++ hw/core/machine.c | 5 +- monitor.c | 11 ++- numa.c | 75 +++++++++++++-------- qapi/qmp-dispatch.c | 8 +++ qmp.c | 10 +++ tests/libqtest.c | 7 ++ tests/numa-test.c | 61 +++++++++++++++++ tests/qmp-test.c | 40 +++++++++++ tests/test-qmp-cmds.c | 2 +- vl.c | 35 +++++++++- qemu-options.hx | 13 ++++ qemu-tech.texi | 40 +++++++++++ tests/Makefile.include | 1 + tests/qapi-schema/allow-preconfig-test.err | 1 + tests/qapi-schema/allow-preconfig-test.exit | 1 + tests/qapi-schema/allow-preconfig-test.json | 2 + tests/qapi-schema/allow-preconfig-test.out | 0 tests/qapi-schema/doc-good.out | 4 +- tests/qapi-schema/ident-with-escape.out | 2 +- tests/qapi-schema/indented-expr.out | 4 +- tests/qapi-schema/qapi-schema-test.json | 4 +- tests/qapi-schema/qapi-schema-test.out | 22 +++--- tests/qapi-schema/test-qapi.py | 8 +-- 35 files changed, 402 insertions(+), 80 deletions(-) create mode 100644 tests/qapi-schema/allow-preconfig-test.err create mode 100644 tests/qapi-schema/allow-preconfig-test.exit create mode 100644 tests/qapi-schema/allow-preconfig-test.json create mode 100644 tests/qapi-schema/allow-preconfig-test.out -- 2.17.1