Commit fc4a4734 authored by Markus Armbruster's avatar Markus Armbruster
Browse files

vl: Fix latent bug with -global and onboard devices 



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: default avatarMarkus Armbruster <armbru@redhat.com>
Reviewed-by: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
Message-Id: <20190308131445.17502-4-armbru@redhat.com>
Reviewed-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent 617902af

vl.c

+2 −17
Original line number Diff line number Diff line
@@ -2937,17 +2937,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;
@@ -3942,6 +3931,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) {
@@ -4250,12 +4241,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.