[Qemu-devel] [PATCH 4/6] Drop machine_init() and MODULE_INIT_MACHINE

[Andreas Färber]

MODULE_INIT_MACHINE was used to register QEMUMachines. Now that those
have been converted to QOM we no longer need this separate registration.

For registering QemuOpts config_init() has been introduced.

Signed-off-by: Andreas Färber <address@hidden>
---
 include/qemu/module.h | 2 --
 vl.c                  | 1 -
 2 files changed, 3 deletions(-)

diff --git a/include/qemu/module.h b/include/qemu/module.h
index d03f800..127d088 100644
--- a/include/qemu/module.h
+++ b/include/qemu/module.h
@@ -43,7 +43,6 @@ static void __attribute__((constructor)) do_qemu_init_ ## 
function(void)    \
 typedef enum {
     MODULE_INIT_BLOCK,
     MODULE_INIT_CONFIG,
-    MODULE_INIT_MACHINE,
     MODULE_INIT_QAPI,
     MODULE_INIT_QOM,
     MODULE_INIT_MAX
@@ -51,7 +50,6 @@ typedef enum {
 
 #define block_init(function) module_init(function, MODULE_INIT_BLOCK)
 #define config_init(function) module_init(function, MODULE_INIT_CONFIG)
-#define machine_init(function) module_init(function, MODULE_INIT_MACHINE)
 #define qapi_init(function) module_init(function, MODULE_INIT_QAPI)
 #define type_init(function) module_init(function, MODULE_INIT_QOM)
 
diff --git a/vl.c b/vl.c
index dcf0800..d55c3d6 100644
--- a/vl.c
+++ b/vl.c
@@ -3010,7 +3010,6 @@ int main(int argc, char **argv, char **envp)
     QLIST_INIT (&vm_change_state_head);
     os_setup_early_signal_handling();
 
-    module_call_init(MODULE_INIT_MACHINE);
     machine_class = find_default_machine();
     cpu_model = NULL;
     snapshot = 0;
-- 
2.1.4