summaryrefslogtreecommitdiffstats
path: root/hw
diff options
context:
space:
mode:
authorEduardo Habkost2016-02-16 21:59:07 +0100
committerEduardo Habkost2016-03-16 19:54:23 +0100
commit34294e2f545dae9f020b6d52e3929f4c4e45800c (patch)
tree93554d0af7120bb50751f0c86e191e6b05debced /hw
parentmachine: Use type_init() to register machine classes (diff)
downloadqemu-34294e2f545dae9f020b6d52e3929f4c4e45800c.tar.gz
qemu-34294e2f545dae9f020b6d52e3929f4c4e45800c.tar.xz
qemu-34294e2f545dae9f020b6d52e3929f4c4e45800c.zip
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>
Diffstat (limited to 'hw')
-rw-r--r--hw/acpi/core.c2
-rw-r--r--hw/smbios/smbios.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/hw/acpi/core.c b/hw/acpi/core.c
index 3d9e5c4a02..31ead6490f 100644
--- 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 3b5f9bd534..1362e79b9b 100644
--- 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)
{