mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vl: Fix latent bug with -global and onboard devices

Browse Source 
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 <armbru@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20190308131445.17502-4-armbru@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Markus Armbruster 2019-03-08 14:14:36 +01:00
parent 617902af2c
commit fc4a473482
1 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
vl.c
View File

@ -2937,17 +2937,6 @@ static void user_register_global_props(void)
global_init_func, NULL, NULL); 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 main(int argc, char **argv, char **envp)
{ {
int i; int i;
@ -3942,6 +3931,8 @@ int main(int argc, char **argv, char **envp)
*/ */
loc_set_none(); loc_set_none();
user_register_global_props();
replay_configure(icount_opts); replay_configure(icount_opts);
if (incoming && !preconfig_exit_requested) { if (incoming && !preconfig_exit_requested) {
@ -4250,12 +4241,6 @@ int main(int argc, char **argv, char **envp)
machine_class->name, machine_class->deprecation_reason); 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 * Migration object can only be created after global properties
* are applied correctly. * are applied correctly.