Eric Blake <ebl...@redhat.com> writes: > On 07/01/2015 02:22 PM, Markus Armbruster wrote: >> These functions marshal both input and output. >> >> Signed-off-by: Markus Armbruster <arm...@redhat.com> >> --- >> docs/qapi-code-gen.txt | 4 +- >> docs/writing-qmp-commands.txt | 8 +- >> monitor.c | 2 +- >> qmp-commands.hx | 240 +++++++++++++++++++++--------------------- >> scripts/qapi-commands.py | 4 +- >> 5 files changed, 129 insertions(+), 129 deletions(-) > > Diffstat here says it is a straight rename; likewise the diff on the > generated code: > > qga/qapi-generated/qga-qmp-marshal.c | 116 ++++++++-------- > qmp-commands.h | 240 > +++++++++++++++++------------------ > qmp-marshal.c | 240 > +++++++++++++++++------------------ > 3 files changed, 298 insertions(+), 298 deletions(-) > > Missing: you overlooked a comment in qmp.c line 154: > > #ifndef CONFIG_SPICE > /* > * qmp-commands.hx ensures that QMP command query-spice exists only > * #ifdef CONFIG_SPICE. Necessary for an accurate query-commands > * result. However, the QAPI schema is blissfully unaware of that, > * and the QAPI code generator happily generates a dead > * qmp_marshal_input_query_spice() that calls qmp_query_spice(). > * Provide it one, or else linking fails. > * FIXME Educate the QAPI schema on CONFIG_SPICE. > */
Will fix. > With that fixed, > Reviewed-by: Eric Blake <ebl...@redhat.com> Thanks!