| Message ID | 20250403234914.9154-15-philmd@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | qemu: Introduce TargetInfo API (for single binary) | expand |
On 4/3/25 16:49, Philippe Mathieu-Daudé wrote: > Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> > --- > accel/{accel-system.h => accel-internal.h} | 8 ++++---- > accel/accel-system.c | 4 ++-- > accel/accel-target.c | 10 ++-------- > accel/accel-user.c | 6 ++++++ > 4 files changed, 14 insertions(+), 14 deletions(-) > rename accel/{accel-system.h => accel-internal.h} (56%) > > diff --git a/accel/accel-system.h b/accel/accel-internal.h > similarity index 56% > rename from accel/accel-system.h > rename to accel/accel-internal.h > index 2d37c73c97b..03426aa21ee 100644 > --- a/accel/accel-system.h > +++ b/accel/accel-internal.h > @@ -1,5 +1,5 @@ > /* > - * QEMU System Emulation accel internal functions > + * QEMU accel internal functions > * > * Copyright 2021 SUSE LLC > * > @@ -7,9 +7,9 @@ > * See the COPYING file in the top-level directory. > */ > > -#ifndef ACCEL_SYSTEM_H > -#define ACCEL_SYSTEM_H > +#ifndef ACCEL_INTERNAL_H > +#define ACCEL_INTERNAL_H > > -void accel_system_init_ops_interfaces(AccelClass *ac); > +void accel_init_ops_interfaces(AccelClass *ac); > > #endif /* ACCEL_SYSTEM_H */ > diff --git a/accel/accel-system.c b/accel/accel-system.c > index 5df49fbe831..a0f562ae9ff 100644 > --- a/accel/accel-system.c > +++ b/accel/accel-system.c > @@ -29,7 +29,7 @@ > #include "system/accel-ops.h" > #include "system/cpus.h" > #include "qemu/error-report.h" > -#include "accel-system.h" > +#include "accel-internal.h" > > 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 */ > -void accel_system_init_ops_interfaces(AccelClass *ac) > +void accel_init_ops_interfaces(AccelClass *ac) > { > const char *ac_name; > char *ops_name; > diff --git a/accel/accel-target.c b/accel/accel-target.c > index 9e9e70be876..6fa5c3ef04e 100644 > --- a/accel/accel-target.c > +++ b/accel/accel-target.c > @@ -29,10 +29,7 @@ > > #include "cpu.h" > #include "accel/accel-cpu-target.h" > - > -#ifndef CONFIG_USER_ONLY > -#include "accel-system.h" > -#endif /* !CONFIG_USER_ONLY */ > +#include "accel-internal.h" > > static const TypeInfo accel_type = { > .name = TYPE_ACCEL, > @@ -106,10 +103,7 @@ static void accel_init_cpu_interfaces(AccelClass *ac) > > void accel_init_interfaces(AccelClass *ac) > { > -#ifndef CONFIG_USER_ONLY > - accel_system_init_ops_interfaces(ac); > -#endif /* !CONFIG_USER_ONLY */ > - > + accel_init_ops_interfaces(ac); > accel_init_cpu_interfaces(ac); > } > > diff --git a/accel/accel-user.c b/accel/accel-user.c > index 22b6a1a1a89..7d192306a65 100644 > --- a/accel/accel-user.c > +++ b/accel/accel-user.c > @@ -9,6 +9,12 @@ > > #include "qemu/osdep.h" > #include "qemu/accel.h" > +#include "accel-internal.h" > + > +void accel_init_ops_interfaces(AccelClass *ac) > +{ > + /* nothing */ > +} > > AccelState *current_accel(void) > { That's good, and it's how we want to get rid of user/system conditionals. Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
diff --git a/accel/accel-system.h b/accel/accel-internal.h similarity index 56% rename from accel/accel-system.h rename to accel/accel-internal.h index 2d37c73c97b..03426aa21ee 100644 --- a/accel/accel-system.h +++ b/accel/accel-internal.h @@ -1,5 +1,5 @@ /* - * QEMU System Emulation accel internal functions + * QEMU accel internal functions * * Copyright 2021 SUSE LLC * @@ -7,9 +7,9 @@ * See the COPYING file in the top-level directory. */ -#ifndef ACCEL_SYSTEM_H -#define ACCEL_SYSTEM_H +#ifndef ACCEL_INTERNAL_H +#define ACCEL_INTERNAL_H -void accel_system_init_ops_interfaces(AccelClass *ac); +void accel_init_ops_interfaces(AccelClass *ac); #endif /* ACCEL_SYSTEM_H */ diff --git a/accel/accel-system.c b/accel/accel-system.c index 5df49fbe831..a0f562ae9ff 100644 --- a/accel/accel-system.c +++ b/accel/accel-system.c @@ -29,7 +29,7 @@ #include "system/accel-ops.h" #include "system/cpus.h" #include "qemu/error-report.h" -#include "accel-system.h" +#include "accel-internal.h" 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 */ -void accel_system_init_ops_interfaces(AccelClass *ac) +void accel_init_ops_interfaces(AccelClass *ac) { const char *ac_name; char *ops_name; diff --git a/accel/accel-target.c b/accel/accel-target.c index 9e9e70be876..6fa5c3ef04e 100644 --- a/accel/accel-target.c +++ b/accel/accel-target.c @@ -29,10 +29,7 @@ #include "cpu.h" #include "accel/accel-cpu-target.h" - -#ifndef CONFIG_USER_ONLY -#include "accel-system.h" -#endif /* !CONFIG_USER_ONLY */ +#include "accel-internal.h" static const TypeInfo accel_type = { .name = TYPE_ACCEL, @@ -106,10 +103,7 @@ static void accel_init_cpu_interfaces(AccelClass *ac) void accel_init_interfaces(AccelClass *ac) { -#ifndef CONFIG_USER_ONLY - accel_system_init_ops_interfaces(ac); -#endif /* !CONFIG_USER_ONLY */ - + accel_init_ops_interfaces(ac); accel_init_cpu_interfaces(ac); } diff --git a/accel/accel-user.c b/accel/accel-user.c index 22b6a1a1a89..7d192306a65 100644 --- a/accel/accel-user.c +++ b/accel/accel-user.c @@ -9,6 +9,12 @@ #include "qemu/osdep.h" #include "qemu/accel.h" +#include "accel-internal.h" + +void accel_init_ops_interfaces(AccelClass *ac) +{ + /* nothing */ +} AccelState *current_accel(void) {
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> --- accel/{accel-system.h => accel-internal.h} | 8 ++++---- accel/accel-system.c | 4 ++-- accel/accel-target.c | 10 ++-------- accel/accel-user.c | 6 ++++++ 4 files changed, 14 insertions(+), 14 deletions(-) rename accel/{accel-system.h => accel-internal.h} (56%)