target/loongarch: Restrict 'qapi-commands-machine.h' to system emulation
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 'loongarch-qmp-cmds.c' unit (which is only compiled when system emulation is selected). Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> Message-Id: <20230223155540.30370-4-philmd@linaro.org> Signed-off-by: Markus Armbruster <armbru@redhat.com>
This commit is contained in:
parent
390dbc6e2e
commit
381b43f855
@ -12,7 +12,6 @@
|
|||||||
#include "qemu/module.h"
|
#include "qemu/module.h"
|
||||||
#include "sysemu/qtest.h"
|
#include "sysemu/qtest.h"
|
||||||
#include "exec/exec-all.h"
|
#include "exec/exec-all.h"
|
||||||
#include "qapi/qapi-commands-machine-target.h"
|
|
||||||
#include "cpu.h"
|
#include "cpu.h"
|
||||||
#include "internals.h"
|
#include "internals.h"
|
||||||
#include "fpu/softfloat-helpers.h"
|
#include "fpu/softfloat-helpers.h"
|
||||||
@ -748,29 +747,3 @@ static const TypeInfo loongarch_cpu_type_infos[] = {
|
|||||||
};
|
};
|
||||||
|
|
||||||
DEFINE_TYPES(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;
|
|
||||||
}
|
|
||||||
|
37
target/loongarch/loongarch-qmp-cmds.c
Normal file
37
target/loongarch/loongarch-qmp-cmds.c
Normal file
@ -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;
|
||||||
|
}
|
@ -16,6 +16,7 @@ loongarch_tcg_ss.add(zlib)
|
|||||||
|
|
||||||
loongarch_softmmu_ss = ss.source_set()
|
loongarch_softmmu_ss = ss.source_set()
|
||||||
loongarch_softmmu_ss.add(files(
|
loongarch_softmmu_ss.add(files(
|
||||||
|
'loongarch-qmp-cmds.c',
|
||||||
'machine.c',
|
'machine.c',
|
||||||
'tlb_helper.c',
|
'tlb_helper.c',
|
||||||
'constant_timer.c',
|
'constant_timer.c',
|
||||||
|
Loading…
x
Reference in New Issue
Block a user