module: Rename machine_init() to opts_init()

The only remaining users of machine_init() only call
qemu_add_opts(). Rename machine_init() to opts_init() and move it
closer to the qemu_add_opts() calls on vl.c.

Cc: "Michael S. Tsirkin" <mst@redhat.com>
Cc: Igor Mammedov <imammedo@redhat.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Marcel Apfelbaum <marcel@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>

diff --git a/fsdev/qemu-fsdev-opts.c b/fsdev/qemu-fsdev-opts.c
index 0b4619f44f49bafb9aa38e9741b065cde0a9c624..88a4ac3251a4267b35b5264ef5d60612e2d1023f 100644 (file)
--- a/fsdev/qemu-fsdev-opts.c
+++ b/fsdev/qemu-fsdev-opts.c
@@ -83,4 +83,4 @@ static void fsdev_register_config(void)
     qemu_add_opts(&qemu_fsdev_opts);
     qemu_add_opts(&qemu_virtfs_opts);
 }
-machine_init(fsdev_register_config);
+opts_init(fsdev_register_config);

diff --git a/hw/acpi/core.c b/hw/acpi/core.c
index 3d9e5c4a02a8a7b8e62803ea9c871e9a273ed965..31ead6490fd296362011a212a57572d12d961d2d 100644 (file)
--- a/hw/acpi/core.c
+++ b/hw/acpi/core.c
@@ -67,7 +67,7 @@ static void acpi_register_config(void)
     qemu_add_opts(&qemu_acpi_opts);
 }
 
-machine_init(acpi_register_config);
+opts_init(acpi_register_config);
 
 static int acpi_checksum(const uint8_t *data, int len)
 {

diff --git a/hw/smbios/smbios.c b/hw/smbios/smbios.c
index 3b5f9bd534e7658e3284c052ad37fc01699c45c5..1362e79b9b22ca67f719ebfe0062ab5f609c3e21 100644 (file)
--- a/hw/smbios/smbios.c
+++ b/hw/smbios/smbios.c
@@ -320,7 +320,7 @@ static void smbios_register_config(void)
     qemu_add_opts(&qemu_smbios_opts);
 }
 
-machine_init(smbios_register_config);
+opts_init(smbios_register_config);
 
 static void smbios_validate_table(void)
 {

diff --git a/include/qemu/module.h b/include/qemu/module.h
index 85fafa2e790b4de2afe63e9aa02b1149189be05f..2370708445af94a4f4638e001409d68b46f4662e 100644 (file)
--- a/include/qemu/module.h
+++ b/include/qemu/module.h
@@ -41,14 +41,14 @@ static void __attribute__((constructor)) do_qemu_init_ ## function(void)    \
 
 typedef enum {
     MODULE_INIT_BLOCK,
-    MODULE_INIT_MACHINE,
+    MODULE_INIT_OPTS,
     MODULE_INIT_QAPI,
     MODULE_INIT_QOM,
     MODULE_INIT_MAX
 } module_init_type;
 
 #define block_init(function) module_init(function, MODULE_INIT_BLOCK)
-#define machine_init(function) module_init(function, MODULE_INIT_MACHINE)
+#define opts_init(function) module_init(function, MODULE_INIT_OPTS)
 #define qapi_init(function) module_init(function, MODULE_INIT_QAPI)
 #define type_init(function) module_init(function, MODULE_INIT_QOM)
 

diff --git a/ui/input-linux.c b/ui/input-linux.c
index 0bc0405ec6d922c16765b35cba5d29d874cec1fe..2cf5d4990cb1303adb3cdefedadb28b6bd474be1 100644 (file)
--- a/ui/input-linux.c
+++ b/ui/input-linux.c
@@ -388,4 +388,4 @@ static void input_linux_register_config(void)
 {
     qemu_add_opts(&qemu_input_linux_opts);
 }
-machine_init(input_linux_register_config);
+opts_init(input_linux_register_config);

diff --git a/ui/spice-core.c b/ui/spice-core.c
index a68a665a9ad15fe8b836155b472af0e6448d96f1..e1179258d0f67db909e547f630c98d7414c9f12c 100644 (file)
--- a/ui/spice-core.c
+++ b/ui/spice-core.c
@@ -945,4 +945,4 @@ static void spice_register_config(void)
 {
     qemu_add_opts(&qemu_spice_opts);
 }
-machine_init(spice_register_config);
+opts_init(spice_register_config);

diff --git a/ui/vnc.c b/ui/vnc.c
index 729f630e3a89f3a8f55e89ea718a2146d65a54ab..9494a19ecf833170ecf8eca68a59a0c8a1a078fa 100644 (file)
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -3875,4 +3875,4 @@ static void vnc_register_config(void)
 {
     qemu_add_opts(&qemu_vnc_opts);
 }
-machine_init(vnc_register_config);
+opts_init(vnc_register_config);

diff --git a/vl.c b/vl.c
index 7a28982eaa5c3ce2ee644e92e861147313605b6b..40ed4d0cb9c05491869a3584366a7adc0123aacd 100644 (file)
--- a/vl.c
+++ b/vl.c
@@ -3021,6 +3021,7 @@ int main(int argc, char **argv, char **envp)
     qemu_add_opts(&qemu_icount_opts);
     qemu_add_opts(&qemu_semihosting_config_opts);
     qemu_add_opts(&qemu_fw_cfg_opts);
+    module_call_init(MODULE_INIT_OPTS);
 
     runstate_init();
 
@@ -3033,7 +3034,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);
     cpu_model = NULL;
     snapshot = 0;
     cyls = heads = secs = 0;