aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClaudio Fontana <cfontana@suse.de>2021-03-22 14:27:58 +0100
committerPaolo Bonzini <pbonzini@redhat.com>2021-05-10 15:41:52 -0400
commit92242f34ab08ecc68750dd118bdad6ed66e3b00e (patch)
tree9034ab8667e197885c49919e29e8ab5f4947bca2
parent6308728907386a6419447e90ead3c6ee4f0fd2f2 (diff)
downloadqemu-92242f34ab08ecc68750dd118bdad6ed66e3b00e.zip
qemu-92242f34ab08ecc68750dd118bdad6ed66e3b00e.tar.gz
qemu-92242f34ab08ecc68750dd118bdad6ed66e3b00e.tar.bz2
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>
-rw-r--r--bsd-user/main.c2
-rw-r--r--hw/core/machine.c1
-rw-r--r--linux-user/main.c2
-rw-r--r--softmmu/vl.c1
4 files changed, 3 insertions, 3 deletions
diff --git a/bsd-user/main.c b/bsd-user/main.c
index 36a889d..715129e 100644
--- a/bsd-user/main.c
+++ b/bsd-user/main.c
@@ -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;
diff --git a/hw/core/machine.c b/hw/core/machine.c
index 0f5ce43..1bf0e68 100644
--- a/hw/core/machine.c
+++ b/hw/core/machine.c
@@ -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);
}
diff --git a/linux-user/main.c b/linux-user/main.c
index 57ba1b4..7995b6e 100644
--- a/linux-user/main.c
+++ b/linux-user/main.c
@@ -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;
diff --git a/softmmu/vl.c b/softmmu/vl.c
index 307944a..93e7846 100644
--- a/softmmu/vl.c
+++ b/softmmu/vl.c
@@ -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);