From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:59055) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gyL8t-00078L-Ch for qemu-devel@nongnu.org; Mon, 25 Feb 2019 13:38:20 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gyL8r-0005d2-Ng for qemu-devel@nongnu.org; Mon, 25 Feb 2019 13:38:18 -0500 From: Markus Armbruster Date: Mon, 25 Feb 2019 19:37:54 +0100 Message-Id: <20190225183757.27378-4-armbru@redhat.com> In-Reply-To: <20190225183757.27378-1-armbru@redhat.com> References: <20190225183757.27378-1-armbru@redhat.com> Subject: [Qemu-devel] [RFC PATCH 3/6] vl: Fix latent bug with -global and onboard devices List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: pbonzini@redhat.com, lersek@redhat.com, kwolf@redhat.com, mreitz@redhat.com, qemu-block@nongnu.org, pkrempa@redhat.com, mst@redhat.com, marcel.apfelbaum@gmail.com main() registers the user's -global only after we create the machine object, i.e. too late for devices created in the machine's .instance_init(). Fortunately, we know the bug is only latent: the commit before previous fixed a bug that would've crashed any attempt to create a device in an .instance_init(). Signed-off-by: Markus Armbruster --- vl.c | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/vl.c b/vl.c index c50c2d6178..e3fdce410f 100644 --- a/vl.c +++ b/vl.c @@ -2939,17 +2939,6 @@ static void user_register_global_props(void) global_init_func, NULL, NULL); } -/* - * Note: we should see that these properties are actually having a - * priority: accel < machine < user. This means e.g. when user - * specifies something in "-global", it'll always be used with highest - * priority than either machine/accelerator compat properties. - */ -static void register_global_properties(MachineState *ms) -{ - user_register_global_props(); -} - int main(int argc, char **argv, char **envp) { int i; @@ -3943,6 +3932,8 @@ int main(int argc, char **argv, char **envp) */ loc_set_none(); + user_register_global_props(); + replay_configure(icount_opts); if (incoming && !preconfig_exit_requested) { @@ -4248,12 +4239,6 @@ int main(int argc, char **argv, char **envp) machine_class->name, machine_class->deprecation_reason); } - /* - * Register all the global properties, including accel properties, - * machine properties, and user-specified ones. - */ - register_global_properties(current_machine); - /* * Migration object can only be created after global properties * are applied correctly. -- 2.17.2