On 09/07/2015 04:16 AM, Markus Armbruster wrote: > These functions marshal both input and output. > > Signed-off-by: Markus Armbruster > Reviewed-by: Eric Blake > --- > docs/qapi-code-gen.txt | 4 +- > docs/writing-qmp-commands.txt | 8 +- > monitor.c | 2 +- > qmp-commands.hx | 240 +++++++++++++++++++++--------------------- > qmp.c | 6 +- > scripts/qapi-commands.py | 4 +- > 6 files changed, 132 insertions(+), 132 deletions(-) Potential merge conflicts to any pending series that add new QMP commands; and therefore another argument to get this merged sooner rather than later. :) -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org