From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57622) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZdKC2-0007pS-Kb for qemu-devel@nongnu.org; Sat, 19 Sep 2015 11:36:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZdKC1-0005zl-Hs for qemu-devel@nongnu.org; Sat, 19 Sep 2015 11:36:50 -0400 Received: from mx2.suse.de ([195.135.220.15]:42781) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZdKC1-0005zE-7h for qemu-devel@nongnu.org; Sat, 19 Sep 2015 11:36:49 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Sat, 19 Sep 2015 17:36:40 +0200 Message-Id: <1442677004-4482-4-git-send-email-afaerber@suse.de> In-Reply-To: <1442677004-4482-1-git-send-email-afaerber@suse.de> References: <1442677004-4482-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH 3/6] Introduce config_init() for QemuOpts List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: "Michael S. Tsirkin" , Gerd Hoffmann , Paolo Bonzini , Igor Mammedov , =?UTF-8?q?Andreas=20F=C3=A4rber?= , "Aneesh Kumar K.V" This untangles QemuOpts from machine_init(), which is to be dropped. Signed-off-by: Andreas F=C3=A4rber --- fsdev/qemu-fsdev-opts.c | 2 +- hw/acpi/core.c | 2 +- hw/smbios/smbios.c | 2 +- include/qemu/module.h | 2 ++ ui/spice-core.c | 2 +- ui/vnc.c | 2 +- vl.c | 2 ++ 7 files changed, 9 insertions(+), 5 deletions(-) diff --git a/fsdev/qemu-fsdev-opts.c b/fsdev/qemu-fsdev-opts.c index 6311c7a..d53ef97 100644 --- a/fsdev/qemu-fsdev-opts.c +++ b/fsdev/qemu-fsdev-opts.c @@ -82,4 +82,4 @@ static void fsdev_register_config(void) qemu_add_opts(&qemu_fsdev_opts); qemu_add_opts(&qemu_virtfs_opts); } -machine_init(fsdev_register_config); +config_init(fsdev_register_config) diff --git a/hw/acpi/core.c b/hw/acpi/core.c index fe6215a..aef9c7f 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); } =20 -machine_init(acpi_register_config); +config_init(acpi_register_config) =20 static int acpi_checksum(const uint8_t *data, int len) { diff --git a/hw/smbios/smbios.c b/hw/smbios/smbios.c index b81a1d3..ea64171 100644 --- a/hw/smbios/smbios.c +++ b/hw/smbios/smbios.c @@ -319,7 +319,7 @@ static void smbios_register_config(void) qemu_add_opts(&qemu_smbios_opts); } =20 -machine_init(smbios_register_config); +config_init(smbios_register_config) =20 static void smbios_validate_table(void) { diff --git a/include/qemu/module.h b/include/qemu/module.h index 72d9498..d03f800 100644 --- a/include/qemu/module.h +++ b/include/qemu/module.h @@ -42,6 +42,7 @@ static void __attribute__((constructor)) do_qemu_init_ = ## function(void) \ =20 typedef enum { MODULE_INIT_BLOCK, + MODULE_INIT_CONFIG, MODULE_INIT_MACHINE, MODULE_INIT_QAPI, MODULE_INIT_QOM, @@ -49,6 +50,7 @@ typedef enum { } module_init_type; =20 #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/ui/spice-core.c b/ui/spice-core.c index bf4fd07..db5ff33 100644 --- a/ui/spice-core.c +++ b/ui/spice-core.c @@ -927,4 +927,4 @@ static void spice_register_config(void) { qemu_add_opts(&qemu_spice_opts); } -machine_init(spice_register_config); +config_init(spice_register_config) diff --git a/ui/vnc.c b/ui/vnc.c index d73966a..8c31fe5 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -3883,4 +3883,4 @@ static void vnc_register_config(void) { qemu_add_opts(&qemu_vnc_opts); } -machine_init(vnc_register_config); +config_init(vnc_register_config) diff --git a/vl.c b/vl.c index e211f6a..dcf0800 100644 --- a/vl.c +++ b/vl.c @@ -2996,6 +2996,8 @@ int main(int argc, char **argv, char **envp) qemu_add_opts(&qemu_semihosting_config_opts); qemu_add_opts(&qemu_fw_cfg_opts); =20 + module_call_init(MODULE_INIT_CONFIG); + runstate_init(); =20 if (qcrypto_init(&err) < 0) { --=20 2.1.4