accel: move call to accel_init_interfaces
move the call for sysemu specifically in machine_run_board_init, mirror the calling sequence for user mode too. Suggested-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Claudio Fontana <cfontana@suse.de> Message-Id: <20210322132800.7470-23-cfontana@suse.de> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
6308728907
commit
92242f34ab
@ -913,8 +913,8 @@ int main(int argc, char **argv)
|
||||
{
|
||||
AccelClass *ac = ACCEL_GET_CLASS(current_accel());
|
||||
|
||||
ac->init_machine(NULL);
|
||||
accel_init_interfaces(ac);
|
||||
ac->init_machine(NULL);
|
||||
}
|
||||
cpu = cpu_create(cpu_type);
|
||||
env = cpu->env_ptr;
|
||||
|
@ -1234,6 +1234,7 @@ void machine_run_board_init(MachineState *machine)
|
||||
"on", false);
|
||||
}
|
||||
|
||||
accel_init_interfaces(ACCEL_GET_CLASS(machine->accelerator));
|
||||
machine_class->init(machine);
|
||||
phase_advance(PHASE_MACHINE_INITIALIZED);
|
||||
}
|
||||
|
@ -729,8 +729,8 @@ int main(int argc, char **argv, char **envp)
|
||||
{
|
||||
AccelClass *ac = ACCEL_GET_CLASS(current_accel());
|
||||
|
||||
ac->init_machine(NULL);
|
||||
accel_init_interfaces(ac);
|
||||
ac->init_machine(NULL);
|
||||
}
|
||||
cpu = cpu_create(cpu_type);
|
||||
env = cpu->env_ptr;
|
||||
|
@ -3595,7 +3595,6 @@ void qemu_init(int argc, char **argv, char **envp)
|
||||
current_machine->cpu_type = parse_cpu_option(cpu_option);
|
||||
}
|
||||
/* NB: for machine none cpu_type could STILL be NULL here! */
|
||||
accel_init_interfaces(ACCEL_GET_CLASS(current_machine->accelerator));
|
||||
|
||||
qemu_resolve_machine_memdev();
|
||||
parse_numa_opts(current_machine);
|
||||
|
Loading…
Reference in New Issue
Block a user