On 02/26/2017 03:43 PM, Markus Armbruster wrote: > To enforce capability negotiation before normal operation, > handle_qmp_command() inspects every command before it's handed off to > qmp_dispatch(). This is a bit of a layering violation, and results in > duplicated code. > > Before capability negotiation (!cur_mon->in_command_mode), we fail > commands other than "qmp_capabilities". This is what enforces > capability negotiation. > > Afterwards, we fail command "qmp_capabilities". > > Clean this up as follows. > > The obvious place to fail a command is the command itself, so move the > "afterwards" check to qmp_qmp_capabilities(). > > We do the "before" check in every other command, but that would be > bothersome. Instead, start without all the other commands, by > registering only qmp_qmp_capabilities(). Register the others in > qmp_qmp_capabilities(). > > Additionally, replace the generic human-readable error message for > CommandNotFound by one that reminds the user to run qmp_capabilities. > Without that, we'd regress commit 2d5a834. > > Signed-off-by: Markus Armbruster <arm...@redhat.com> > --- > monitor.c | 70 > ++++++++++++++++++++++++++++++++++++--------------------------- > 1 file changed, 40 insertions(+), 30 deletions(-) >
Reviewed-by: Eric Blake <ebl...@redhat.com> -- Eric Blake eblake redhat com +1-919-301-3266 Libvirt virtualization library http://libvirt.org
signature.asc
Description: OpenPGP digital signature
