| Message ID | 20221219211034.70491-3-philmd@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | target: Restrict 'qapi-commands-machine.h' to system emulation | expand |
On 12/19/22 13:10, Philippe Mathieu-Daudé wrote: > Since commit a0e61807a3 ("qapi: Remove QMP events and commands from > user-mode builds") we don't generate the "qapi-commands-machine.h" > header in a user-emulation-only build. > > Extract the QMP functions from cpu.c (which is always compiled) to > the new 'cpu-monitor.c' unit (which is only compiled when system > emulation is selected). > > Signed-off-by: Philippe Mathieu-Daudé<philmd@linaro.org> > --- > target/loongarch/cpu-monitor.c | 37 ++++++++++++++++++++++++++++++++++ > target/loongarch/cpu.c | 27 ------------------------- > target/loongarch/meson.build | 1 + > 3 files changed, 38 insertions(+), 27 deletions(-) > create mode 100644 target/loongarch/cpu-monitor.c Why cpu-monitor.c and not monitor.c like for target/arm/? Otherwise, Reviewed-by: Richard Henderson <richard.henderson@linaro.org> r~
On 20/12/22 00:58, Richard Henderson wrote: > On 12/19/22 13:10, Philippe Mathieu-Daudé wrote: >> Since commit a0e61807a3 ("qapi: Remove QMP events and commands from >> user-mode builds") we don't generate the "qapi-commands-machine.h" >> header in a user-emulation-only build. >> >> Extract the QMP functions from cpu.c (which is always compiled) to >> the new 'cpu-monitor.c' unit (which is only compiled when system >> emulation is selected). >> >> Signed-off-by: Philippe Mathieu-Daudé<philmd@linaro.org> >> --- >> target/loongarch/cpu-monitor.c | 37 ++++++++++++++++++++++++++++++++++ >> target/loongarch/cpu.c | 27 ------------------------- >> target/loongarch/meson.build | 1 + >> 3 files changed, 38 insertions(+), 27 deletions(-) >> create mode 100644 target/loongarch/cpu-monitor.c > > Why cpu-monitor.c and not monitor.c like for target/arm/? I figured later 'monitor.c' was simpler and renamed the other targets but forgot to rename this one :/ > Otherwise, > Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Thanks!
diff --git a/target/loongarch/cpu-monitor.c b/target/loongarch/cpu-monitor.c new file mode 100644 index 0000000000..6c25957881 --- /dev/null +++ b/target/loongarch/cpu-monitor.c @@ -0,0 +1,37 @@ +/* + * QEMU LoongArch CPU (monitor definitions) + * + * SPDX-FileCopyrightText: 2021 Loongson Technology Corporation Limited + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include "qemu/osdep.h" +#include "qapi/qapi-commands-machine-target.h" +#include "cpu.h" + +static void loongarch_cpu_add_definition(gpointer data, gpointer user_data) +{ + ObjectClass *oc = data; + CpuDefinitionInfoList **cpu_list = user_data; + CpuDefinitionInfo *info = g_new0(CpuDefinitionInfo, 1); + const char *typename = object_class_get_name(oc); + + info->name = g_strndup(typename, + strlen(typename) - strlen("-" TYPE_LOONGARCH_CPU)); + info->q_typename = g_strdup(typename); + + QAPI_LIST_PREPEND(*cpu_list, info); +} + +CpuDefinitionInfoList *qmp_query_cpu_definitions(Error **errp) +{ + CpuDefinitionInfoList *cpu_list = NULL; + GSList *list; + + list = object_class_get_list(TYPE_LOONGARCH_CPU, false); + g_slist_foreach(list, loongarch_cpu_add_definition, &cpu_list); + g_slist_free(list); + + return cpu_list; +} diff --git a/target/loongarch/cpu.c b/target/loongarch/cpu.c index e7b0e12be6..0fb853d915 100644 --- a/target/loongarch/cpu.c +++ b/target/loongarch/cpu.c @@ -12,7 +12,6 @@ #include "qemu/module.h" #include "sysemu/qtest.h" #include "exec/exec-all.h" -#include "qapi/qapi-commands-machine-target.h" #include "cpu.h" #include "internals.h" #include "fpu/softfloat-helpers.h" @@ -744,29 +743,3 @@ static const TypeInfo loongarch_cpu_type_infos[] = { }; DEFINE_TYPES(loongarch_cpu_type_infos) - -static void loongarch_cpu_add_definition(gpointer data, gpointer user_data) -{ - ObjectClass *oc = data; - CpuDefinitionInfoList **cpu_list = user_data; - CpuDefinitionInfo *info = g_new0(CpuDefinitionInfo, 1); - const char *typename = object_class_get_name(oc); - - info->name = g_strndup(typename, - strlen(typename) - strlen("-" TYPE_LOONGARCH_CPU)); - info->q_typename = g_strdup(typename); - - QAPI_LIST_PREPEND(*cpu_list, info); -} - -CpuDefinitionInfoList *qmp_query_cpu_definitions(Error **errp) -{ - CpuDefinitionInfoList *cpu_list = NULL; - GSList *list; - - list = object_class_get_list(TYPE_LOONGARCH_CPU, false); - g_slist_foreach(list, loongarch_cpu_add_definition, &cpu_list); - g_slist_free(list); - - return cpu_list; -} diff --git a/target/loongarch/meson.build b/target/loongarch/meson.build index 6376f9e84b..dfd65ae742 100644 --- a/target/loongarch/meson.build +++ b/target/loongarch/meson.build @@ -17,6 +17,7 @@ loongarch_tcg_ss.add(zlib) loongarch_softmmu_ss = ss.source_set() loongarch_softmmu_ss.add(files( + 'cpu-monitor.c', 'machine.c', 'tlb_helper.c', 'constant_timer.c',
Since commit a0e61807a3 ("qapi: Remove QMP events and commands from user-mode builds") we don't generate the "qapi-commands-machine.h" header in a user-emulation-only build. Extract the QMP functions from cpu.c (which is always compiled) to the new 'cpu-monitor.c' unit (which is only compiled when system emulation is selected). Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> --- target/loongarch/cpu-monitor.c | 37 ++++++++++++++++++++++++++++++++++ target/loongarch/cpu.c | 27 ------------------------- target/loongarch/meson.build | 1 + 3 files changed, 38 insertions(+), 27 deletions(-) create mode 100644 target/loongarch/cpu-monitor.c