hmp: Fix definition of command quit
authorMarkus Armbruster <armbru@redhat.com>
Fri, 6 Mar 2015 09:09:57 +0000 (10:09 +0100)
committerMichael Tokarev <mjt@tls.msk.ru>
Thu, 19 Mar 2015 08:11:55 +0000 (11:11 +0300)
The command handler is a union of two function types.  If
cmd->user_print is set, handle_user_command() calls
cmd->mhandler.cmd_new(), else cmd->mhandler.cmd().

Command definitions must therefore either set both user_print() and
mhandler.cmd_new(), or only mhandler.cmd().

quit's sets user_print and mhandler.cmd().  handle_user_command()
calls hmp_quit() through mhandler.cmd_new() rather than
mhandler.cmd(), i.e. through a function pointer with a different type.
Broken in commit 7a7f325, v1.0.

Works in practice because hmp_quit() doesn't use its arguments, and
handle_user_command() ignores its function value.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
hmp-commands.hx

index 328709dc8d8ac00d341a52dbd88da456805cc6b7..6fd53366787b4585fe74ad7f8d388945a04b456e 100644 (file)
@@ -47,7 +47,6 @@ ETEXI
         .args_type  = "",
         .params     = "",
         .help       = "quit the emulator",
-        .user_print = monitor_user_noop,
         .mhandler.cmd = hmp_quit,
     },