diff options
| author | Alexander Bulekov | 2020-02-20 05:10:59 +0100 |
|---|---|---|
| committer | Stefan Hajnoczi | 2020-02-22 09:26:47 +0100 |
| commit | 46a07579ebb081493618bfa00ef8e241cd0dcc4f (patch) | |
| tree | 4463bf3d28a2698a05a66083f033463edfb24d9d /util | |
| parent | softmmu: split off vl.c:main() into main.c (diff) | |
| download | qemu-46a07579ebb081493618bfa00ef8e241cd0dcc4f.tar.gz qemu-46a07579ebb081493618bfa00ef8e241cd0dcc4f.tar.xz qemu-46a07579ebb081493618bfa00ef8e241cd0dcc4f.zip | |
module: check module wasn't already initialized
The virtual-device fuzzer must initialize QOM, prior to running
vl:qemu_init, so that it can use the qos_graph to identify the arguments
required to initialize a guest for libqos-assisted fuzzing. This change
prevents errors when vl:qemu_init tries to (re)initialize the previously
initialized QOM module.
Signed-off-by: Alexander Bulekov <alxndr@bu.edu>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Darren Kenny <darren.kenny@oracle.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Message-id: 20200220041118.23264-4-alxndr@bu.edu
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Diffstat (limited to 'util')
| -rw-r--r-- | util/module.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/util/module.c b/util/module.c index 8c5315a7a3..236a7bb52a 100644 --- a/util/module.c +++ b/util/module.c @@ -30,6 +30,7 @@ typedef struct ModuleEntry typedef QTAILQ_HEAD(, ModuleEntry) ModuleTypeList; static ModuleTypeList init_type_list[MODULE_INIT_MAX]; +static bool modules_init_done[MODULE_INIT_MAX]; static ModuleTypeList dso_init_list; @@ -91,11 +92,17 @@ void module_call_init(module_init_type type) ModuleTypeList *l; ModuleEntry *e; + if (modules_init_done[type]) { + return; + } + l = find_type(type); QTAILQ_FOREACH(e, l, node) { e->init(); } + + modules_init_done[type] = true; } #ifdef CONFIG_MODULES |