0587568780
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>
64 lines
2.1 KiB
C
64 lines
2.1 KiB
C
/*
|
|
* QEMU Module Infrastructure
|
|
*
|
|
* Copyright IBM, Corp. 2009
|
|
*
|
|
* Authors:
|
|
* Anthony Liguori <aliguori@us.ibm.com>
|
|
*
|
|
* This work is licensed under the terms of the GNU GPL, version 2. See
|
|
* the COPYING file in the top-level directory.
|
|
*
|
|
*/
|
|
|
|
#ifndef QEMU_MODULE_H
|
|
#define QEMU_MODULE_H
|
|
|
|
|
|
#define DSO_STAMP_FUN glue(qemu_stamp, CONFIG_STAMP)
|
|
#define DSO_STAMP_FUN_STR stringify(DSO_STAMP_FUN)
|
|
|
|
#ifdef BUILD_DSO
|
|
void DSO_STAMP_FUN(void);
|
|
/* This is a dummy symbol to identify a loaded DSO as a QEMU module, so we can
|
|
* distinguish "version mismatch" from "not a QEMU module", when the stamp
|
|
* check fails during module loading */
|
|
void qemu_module_dummy(void);
|
|
|
|
#define module_init(function, type) \
|
|
static void __attribute__((constructor)) do_qemu_init_ ## function(void) \
|
|
{ \
|
|
register_dso_module_init(function, type); \
|
|
}
|
|
#else
|
|
/* This should not be used directly. Use block_init etc. instead. */
|
|
#define module_init(function, type) \
|
|
static void __attribute__((constructor)) do_qemu_init_ ## function(void) \
|
|
{ \
|
|
register_module_init(function, type); \
|
|
}
|
|
#endif
|
|
|
|
typedef enum {
|
|
MODULE_INIT_BLOCK,
|
|
MODULE_INIT_OPTS,
|
|
MODULE_INIT_QOM,
|
|
MODULE_INIT_TRACE,
|
|
MODULE_INIT_MAX
|
|
} module_init_type;
|
|
|
|
#define block_init(function) module_init(function, MODULE_INIT_BLOCK)
|
|
#define opts_init(function) module_init(function, MODULE_INIT_OPTS)
|
|
#define type_init(function) module_init(function, MODULE_INIT_QOM)
|
|
#define trace_init(function) module_init(function, MODULE_INIT_TRACE)
|
|
|
|
#define block_module_load_one(lib) module_load_one("block-", lib)
|
|
|
|
void register_module_init(void (*fn)(void), module_init_type type);
|
|
void register_dso_module_init(void (*fn)(void), module_init_type type);
|
|
|
|
void module_call_init(module_init_type type);
|
|
void module_load_one(const char *prefix, const char *lib_name);
|
|
|
|
#endif
|