fridtjof/qemu-cr16
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

accel: Implement accel_init_ops_interfaces() for both system/user mode

Browse source 
We want to build more common code, moving objects from meson's
specific_ss[] set to common_ss[]. Since the CONFIG_USER_ONLY
definitions isn't applied on the common_ss[] set, it is simpler
to add an empty accel_init_ops_interfaces() stub on user emulation,
removing any CONFIG_USER_ONLY use in accel-target.c.

Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <20250417165430.58213-5-philmd@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2025-03-23 18:17:15 +01:00
parent 2492008d0d
commit 64cbcf1d97
5 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
MAINTAINERS
View file

@ -500,7 +500,7 @@ F: include/qemu/target-info*.h
F: include/system/accel-*.h F: include/system/accel-*.h
F: include/system/cpus.h F: include/system/cpus.h
F: include/accel/accel-cpu-target.h F: include/accel/accel-cpu-target.h
F: accel/accel-*.c F: accel/accel-*.?
F: accel/Makefile.objs F: accel/Makefile.objs
F: accel/stubs/Makefile.objs F: accel/stubs/Makefile.objs
F: cpu-common.c F: cpu-common.c

8
accel/accel-system.h → accel/accel-internal.h
View file

@ -1,5 +1,5 @@
/* /*
* QEMU System Emulation accel internal functions * QEMU accel internal functions
* *
* Copyright 2021 SUSE LLC * Copyright 2021 SUSE LLC
* *
@ -7,9 +7,9 @@
* See the COPYING file in the top-level directory. * See the COPYING file in the top-level directory.
*/ */
#ifndef ACCEL_SYSTEM_H #ifndef ACCEL_INTERNAL_H
#define ACCEL_SYSTEM_H #define ACCEL_INTERNAL_H
void accel_system_init_ops_interfaces(AccelClass *ac); void accel_init_ops_interfaces(AccelClass *ac);
#endif /* ACCEL_SYSTEM_H */ #endif /* ACCEL_SYSTEM_H */

4
accel/accel-system.c
View file

@ -29,7 +29,7 @@
#include "system/accel-ops.h" #include "system/accel-ops.h"
#include "system/cpus.h" #include "system/cpus.h"
#include "qemu/error-report.h" #include "qemu/error-report.h"
#include "accel-system.h" #include "accel-internal.h"
int accel_init_machine(AccelState *accel, MachineState *ms) int accel_init_machine(AccelState *accel, MachineState *ms)
{ {
@ -63,7 +63,7 @@ void accel_setup_post(MachineState *ms)
} }
/* initialize the arch-independent accel operation interfaces */ /* initialize the arch-independent accel operation interfaces */
void accel_system_init_ops_interfaces(AccelClass *ac) void accel_init_ops_interfaces(AccelClass *ac)
{ {
const char *ac_name; const char *ac_name;
char *ops_name; char *ops_name;

10
accel/accel-target.c
View file

@ -29,10 +29,7 @@
#include "cpu.h" #include "cpu.h"
#include "accel/accel-cpu-target.h" #include "accel/accel-cpu-target.h"
#include "accel-internal.h"
#ifndef CONFIG_USER_ONLY
#include "accel-system.h"
#endif /* !CONFIG_USER_ONLY */
static const TypeInfo accel_type = { static const TypeInfo accel_type = {
.name = TYPE_ACCEL, .name = TYPE_ACCEL,
@ -106,10 +103,7 @@ static void accel_init_cpu_interfaces(AccelClass *ac)
void accel_init_interfaces(AccelClass *ac) void accel_init_interfaces(AccelClass *ac)
{ {
#ifndef CONFIG_USER_ONLY accel_init_ops_interfaces(ac);
accel_system_init_ops_interfaces(ac);
#endif /* !CONFIG_USER_ONLY */
accel_init_cpu_interfaces(ac); accel_init_cpu_interfaces(ac);
} }

6
accel/accel-user.c
View file

@ -9,6 +9,12 @@
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "qemu/accel.h" #include "qemu/accel.h"
#include "accel-internal.h"
void accel_init_ops_interfaces(AccelClass *ac)
{
/* nothing */
}
AccelState *current_accel(void) AccelState *current_accel(void)
{ {