From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57627) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZdKC2-0007pV-N7 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-000602-P5 for qemu-devel@nongnu.org; Sat, 19 Sep 2015 11:36:50 -0400 Received: from mx2.suse.de ([195.135.220.15]:42787) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZdKC1-0005zf-Jb 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:41 +0200 Message-Id: <1442677004-4482-5-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 4/6] Drop machine_init() and MODULE_INIT_MACHINE List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Paolo Bonzini , =?UTF-8?q?Andreas=20F=C3=A4rber?= MODULE_INIT_MACHINE was used to register QEMUMachines. Now that those have been converted to QOM we no longer need this separate registration. For registering QemuOpts config_init() has been introduced. Signed-off-by: Andreas F=C3=A4rber --- include/qemu/module.h | 2 -- vl.c | 1 - 2 files changed, 3 deletions(-) diff --git a/include/qemu/module.h b/include/qemu/module.h index d03f800..127d088 100644 --- a/include/qemu/module.h +++ b/include/qemu/module.h @@ -43,7 +43,6 @@ static void __attribute__((constructor)) do_qemu_init_ = ## function(void) \ typedef enum { MODULE_INIT_BLOCK, MODULE_INIT_CONFIG, - MODULE_INIT_MACHINE, MODULE_INIT_QAPI, MODULE_INIT_QOM, MODULE_INIT_MAX @@ -51,7 +50,6 @@ typedef enum { =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) =20 diff --git a/vl.c b/vl.c index dcf0800..d55c3d6 100644 --- a/vl.c +++ b/vl.c @@ -3010,7 +3010,6 @@ int main(int argc, char **argv, char **envp) QLIST_INIT (&vm_change_state_head); os_setup_early_signal_handling(); =20 - module_call_init(MODULE_INIT_MACHINE); machine_class =3D find_default_machine(); cpu_model =3D NULL; snapshot =3D 0; --=20 2.1.4