mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-07-27 04:13:53 -06:00
qmp: Dumb down how we run QMP command registration
The way we get QMP commands registered is high tech:
* qapi-commands.py generates qmp_init_marshal() that does the actual work
* it also generates the magic to register it as a MODULE_INIT_QAPI
function, so it runs when someone calls
module_call_init(MODULE_INIT_QAPI)
* main() calls module_call_init()
QEMU needs to register a few non-qapified commands. Same high tech
works: monitor.c has its own qmp_init_marshal() along with the magic
to make it run in module_call_init(MODULE_INIT_QAPI).
QEMU also needs to unregister commands that are not wanted in this
build's configuration (commit 5032a16
). Simple enough:
qmp_unregister_commands_hack(). The difficulty is to make it run
after the generated qmp_init_marshal(). We can't simply run it in
monitor.c's qmp_init_marshal(), because the order in which the
registered functions run is indeterminate. So qmp_init_marshal()
registers qmp_unregister_commands_hack() separately. Since
registering *appends* to the list of registered functions, this will
make it run after all the functions that have been registered already.
I suspect it takes a long and expensive computer science education to
not find this silly.
Dumb it down as follows:
* Drop MODULE_INIT_QAPI entirely
* Give the generated qmp_init_marshal() external linkage.
* Call it instead of module_call_init(MODULE_INIT_QAPI)
* Except in QEMU proper, call new monitor_init_qmp_commands() that in
turn calls the generated qmp_init_marshal(), registers the
additional commands and unregisters the unwanted ones.
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Message-Id: <1488544368-30622-5-git-send-email-armbru@redhat.com>
This commit is contained in:
parent
f66e7ac88c
commit
0587568780
7 changed files with 10 additions and 13 deletions
|
@ -208,14 +208,12 @@ def gen_register_command(name, success_response):
|
|||
def gen_registry(registry):
|
||||
ret = mcgen('''
|
||||
|
||||
static void qmp_init_marshal(void)
|
||||
void qmp_init_marshal(void)
|
||||
{
|
||||
''')
|
||||
ret += registry
|
||||
ret += mcgen('''
|
||||
}
|
||||
|
||||
qapi_init(qmp_init_marshal);
|
||||
''')
|
||||
return ret
|
||||
|
||||
|
@ -308,6 +306,7 @@ fdecl.write(mcgen('''
|
|||
#include "qapi/qmp/qdict.h"
|
||||
#include "qapi/error.h"
|
||||
|
||||
void qmp_init_marshal(void);
|
||||
''',
|
||||
prefix=prefix))
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue