openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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:
Claudio Fontana 2021-03-22 14:27:58 +01:00 committed by Paolo Bonzini
parent 6308728907
commit 92242f34ab
4 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bsd-user/main.c
View File

@ -913,8 +913,8 @@ int main(int argc, char **argv)
{ {
AccelClass *ac = ACCEL_GET_CLASS(current_accel()); AccelClass *ac = ACCEL_GET_CLASS(current_accel());
ac->init_machine(NULL);
accel_init_interfaces(ac); accel_init_interfaces(ac);
ac->init_machine(NULL);
} }
cpu = cpu_create(cpu_type); cpu = cpu_create(cpu_type);
env = cpu->env_ptr; env = cpu->env_ptr;

1
hw/core/machine.c
View File

@ -1234,6 +1234,7 @@ void machine_run_board_init(MachineState *machine)
"on", false); "on", false);
} }
accel_init_interfaces(ACCEL_GET_CLASS(machine->accelerator));
machine_class->init(machine); machine_class->init(machine);
phase_advance(PHASE_MACHINE_INITIALIZED); phase_advance(PHASE_MACHINE_INITIALIZED);
} }

2
linux-user/main.c
View File

@ -729,8 +729,8 @@ int main(int argc, char **argv, char **envp)
{ {
AccelClass *ac = ACCEL_GET_CLASS(current_accel()); AccelClass *ac = ACCEL_GET_CLASS(current_accel());
ac->init_machine(NULL);
accel_init_interfaces(ac); accel_init_interfaces(ac);
ac->init_machine(NULL);
} }
cpu = cpu_create(cpu_type); cpu = cpu_create(cpu_type);
env = cpu->env_ptr; env = cpu->env_ptr;

1
softmmu/vl.c
View File

@ -3595,7 +3595,6 @@ void qemu_init(int argc, char **argv, char **envp)
current_machine->cpu_type = parse_cpu_option(cpu_option); current_machine->cpu_type = parse_cpu_option(cpu_option);
} }
/* NB: for machine none cpu_type could STILL be NULL here! */ /* NB: for machine none cpu_type could STILL be NULL here! */
accel_init_interfaces(ACCEL_GET_CLASS(current_machine->accelerator));
qemu_resolve_machine_memdev(); qemu_resolve_machine_memdev();
parse_numa_opts(current_machine); parse_numa_opts(current_machine);