david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

module: Rename machine_init() to opts_init()

Browse Source 
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>
This commit is contained in:
Eduardo Habkost 2016-02-16 18:59:07 -02:00
parent 0e6aac87fd
commit 34294e2f54
8 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fsdev/qemu-fsdev-opts.c
View File

@ -83,4 +83,4 @@ static void fsdev_register_config(void)
qemu_add_opts(&qemu_fsdev_opts); qemu_add_opts(&qemu_fsdev_opts);
qemu_add_opts(&qemu_virtfs_opts); qemu_add_opts(&qemu_virtfs_opts);
} }
machine_init(fsdev_register_config); opts_init(fsdev_register_config);

2
hw/acpi/core.c
View File

@ -67,7 +67,7 @@ static void acpi_register_config(void)
qemu_add_opts(&qemu_acpi_opts); 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) static int acpi_checksum(const uint8_t *data, int len)
{ {

2
hw/smbios/smbios.c
View File

@ -320,7 +320,7 @@ static void smbios_register_config(void)
qemu_add_opts(&qemu_smbios_opts); qemu_add_opts(&qemu_smbios_opts);
} }
machine_init(smbios_register_config); opts_init(smbios_register_config);
static void smbios_validate_table(void) static void smbios_validate_table(void)
{ {

4
include/qemu/module.h
View File

@ -41,14 +41,14 @@ static void __attribute__((constructor)) do_qemu_init_ ## function(void) \
typedef enum { typedef enum {
MODULE_INIT_BLOCK, MODULE_INIT_BLOCK,
MODULE_INIT_MACHINE, MODULE_INIT_OPTS,
MODULE_INIT_QAPI, MODULE_INIT_QAPI,
MODULE_INIT_QOM, MODULE_INIT_QOM,
MODULE_INIT_MAX MODULE_INIT_MAX
} module_init_type; } module_init_type;
#define block_init(function) module_init(function, MODULE_INIT_BLOCK) #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 qapi_init(function) module_init(function, MODULE_INIT_QAPI)
#define type_init(function) module_init(function, MODULE_INIT_QOM) #define type_init(function) module_init(function, MODULE_INIT_QOM)

2
ui/input-linux.c
View File

@ -388,4 +388,4 @@ static void input_linux_register_config(void)
{ {
qemu_add_opts(&qemu_input_linux_opts); qemu_add_opts(&qemu_input_linux_opts);
} }
machine_init(input_linux_register_config); opts_init(input_linux_register_config);

2
ui/spice-core.c
View File

@ -945,4 +945,4 @@ static void spice_register_config(void)
{ {
qemu_add_opts(&qemu_spice_opts); qemu_add_opts(&qemu_spice_opts);
} }
machine_init(spice_register_config); opts_init(spice_register_config);

2
ui/vnc.c
View File

@ -3875,4 +3875,4 @@ static void vnc_register_config(void)
{ {
qemu_add_opts(&qemu_vnc_opts); qemu_add_opts(&qemu_vnc_opts);
} }
machine_init(vnc_register_config); opts_init(vnc_register_config);

2
vl.c
View File

@ -3021,6 +3021,7 @@ int main(int argc, char **argv, char **envp)
qemu_add_opts(&qemu_icount_opts); qemu_add_opts(&qemu_icount_opts);
qemu_add_opts(&qemu_semihosting_config_opts); qemu_add_opts(&qemu_semihosting_config_opts);
qemu_add_opts(&qemu_fw_cfg_opts); qemu_add_opts(&qemu_fw_cfg_opts);
module_call_init(MODULE_INIT_OPTS);
runstate_init(); runstate_init();
@ -3033,7 +3034,6 @@ int main(int argc, char **argv, char **envp)
QLIST_INIT (&vm_change_state_head); QLIST_INIT (&vm_change_state_head);
os_setup_early_signal_handling(); os_setup_early_signal_handling();
module_call_init(MODULE_INIT_MACHINE);
cpu_model = NULL; cpu_model = NULL;
snapshot = 0; snapshot = 0;
cyls = heads = secs = 0; cyls = heads = secs = 0;