Commit 34294e2f authored by Eduardo Habkost's avatar Eduardo Habkost
Browse files

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: default avatarMarcel Apfelbaum <marcel@redhat.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Signed-off-by: default avatarEduardo Habkost <ehabkost@redhat.com>
parent 0e6aac87

fsdev/qemu-fsdev-opts.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

hw/acpi/core.c

+1 −1
Original line number Diff line number Diff line
@@ -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)

{

hw/smbios/smbios.c

+1 −1
Original line number Diff line number Diff line
@@ -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)

{

include/qemu/module.h

+2 −2
Original line number Diff line number Diff line
@@ -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)

ui/input-linux.c

+1 −1
Original line number Diff line number Diff line
@@ -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);