move the call for sysemu specifically in machine_run_board_init, mirror the calling sequence for user mode too.
Suggested-by: Paolo Bonzini <pbonz...@redhat.com> Signed-off-by: Claudio Fontana <cfont...@suse.de> --- bsd-user/main.c | 2 +- hw/core/machine.c | 1 + linux-user/main.c | 2 +- softmmu/vl.c | 1 - 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bsd-user/main.c b/bsd-user/main.c index 798aba512c..ae0fd75aa1 100644 --- a/bsd-user/main.c +++ b/bsd-user/main.c @@ -914,8 +914,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; diff --git a/hw/core/machine.c b/hw/core/machine.c index 257a664ea2..678558b9ac 100644 --- a/hw/core/machine.c +++ b/hw/core/machine.c @@ -1216,6 +1216,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); } diff --git a/linux-user/main.c b/linux-user/main.c index f956afccab..3ad442b82e 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -730,8 +730,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; diff --git a/softmmu/vl.c b/softmmu/vl.c index aadb526138..584d100205 100644 --- a/softmmu/vl.c +++ b/softmmu/vl.c @@ -3596,7 +3596,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); -- 2.26.2