From: "Philippe Mathieu-Daudé" <f4bug@amsat.org>
To: qemu-devel@nongnu.org
Cc: "Aleksandar Rikalo" <aleksandar.rikalo@syrmia.com>,
"Paul Burton" <paulburton@kernel.org>,
kvm@vger.kernel.org, "Huacai Chen" <chenhuacai@kernel.org>,
"Richard Henderson" <richard.henderson@linaro.org>,
"Philippe Mathieu-Daudé" <f4bug@amsat.org>,
"Jiaxun Yang" <jiaxun.yang@flygoat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Aurelien Jarno" <aurelien@aurel32.net>
Subject: [PULL 22/26] target/mips: Move mips_cpu_add_definition() from helper.c to cpu.c
Date: Sun, 13 Dec 2020 21:19:42 +0100 [thread overview]
Message-ID: <20201213201946.236123-23-f4bug@amsat.org> (raw)
In-Reply-To: <20201213201946.236123-1-f4bug@amsat.org>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20201206233949.3783184-10-f4bug@amsat.org>
---
target/mips/cpu.c | 33 +++++++++++++++++++++++++++++++++
target/mips/helper.c | 33 ---------------------------------
2 files changed, 33 insertions(+), 33 deletions(-)
diff --git a/target/mips/cpu.c b/target/mips/cpu.c
index 3024c51a211..c29fef29d00 100644
--- a/target/mips/cpu.c
+++ b/target/mips/cpu.c
@@ -30,6 +30,7 @@
#include "exec/exec-all.h"
#include "hw/qdev-properties.h"
#include "hw/qdev-clock.h"
+#include "qapi/qapi-commands-machine-target.h"
static void mips_cpu_set_pc(CPUState *cs, vaddr value)
{
@@ -299,6 +300,38 @@ static void mips_cpu_register_types(void)
type_init(mips_cpu_register_types)
+static void mips_cpu_add_definition(gpointer data, gpointer user_data)
+{
+ ObjectClass *oc = data;
+ CpuDefinitionInfoList **cpu_list = user_data;
+ CpuDefinitionInfoList *entry;
+ CpuDefinitionInfo *info;
+ const char *typename;
+
+ typename = object_class_get_name(oc);
+ info = g_malloc0(sizeof(*info));
+ info->name = g_strndup(typename,
+ strlen(typename) - strlen("-" TYPE_MIPS_CPU));
+ info->q_typename = g_strdup(typename);
+
+ entry = g_malloc0(sizeof(*entry));
+ entry->value = info;
+ entry->next = *cpu_list;
+ *cpu_list = entry;
+}
+
+CpuDefinitionInfoList *qmp_query_cpu_definitions(Error **errp)
+{
+ CpuDefinitionInfoList *cpu_list = NULL;
+ GSList *list;
+
+ list = object_class_get_list(TYPE_MIPS_CPU, false);
+ g_slist_foreach(list, mips_cpu_add_definition, &cpu_list);
+ g_slist_free(list);
+
+ return cpu_list;
+}
+
/* Could be used by generic CPU object */
MIPSCPU *mips_cpu_create_with_clock(const char *cpu_type, Clock *cpu_refclk)
{
diff --git a/target/mips/helper.c b/target/mips/helper.c
index 0c657865793..87296fbad69 100644
--- a/target/mips/helper.c
+++ b/target/mips/helper.c
@@ -24,7 +24,6 @@
#include "exec/cpu_ldst.h"
#include "exec/log.h"
#include "hw/mips/cpudevs.h"
-#include "qapi/qapi-commands-machine-target.h"
enum {
TLBRET_XI = -6,
@@ -1500,35 +1499,3 @@ void QEMU_NORETURN do_raise_exception_err(CPUMIPSState *env,
cpu_loop_exit_restore(cs, pc);
}
-
-static void mips_cpu_add_definition(gpointer data, gpointer user_data)
-{
- ObjectClass *oc = data;
- CpuDefinitionInfoList **cpu_list = user_data;
- CpuDefinitionInfoList *entry;
- CpuDefinitionInfo *info;
- const char *typename;
-
- typename = object_class_get_name(oc);
- info = g_malloc0(sizeof(*info));
- info->name = g_strndup(typename,
- strlen(typename) - strlen("-" TYPE_MIPS_CPU));
- info->q_typename = g_strdup(typename);
-
- entry = g_malloc0(sizeof(*entry));
- entry->value = info;
- entry->next = *cpu_list;
- *cpu_list = entry;
-}
-
-CpuDefinitionInfoList *qmp_query_cpu_definitions(Error **errp)
-{
- CpuDefinitionInfoList *cpu_list = NULL;
- GSList *list;
-
- list = object_class_get_list(TYPE_MIPS_CPU, false);
- g_slist_foreach(list, mips_cpu_add_definition, &cpu_list);
- g_slist_free(list);
-
- return cpu_list;
-}
--
2.26.2
next prev parent reply other threads:[~2020-12-13 20:33 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-13 20:19 [PULL 00/26] MIPS patches for 2020-12-13 Philippe Mathieu-Daudé
2020-12-13 20:19 ` [PULL 01/26] MAINTAINERS: chenhc@lemote.com -> chenhuacai@kernel.org Philippe Mathieu-Daudé
2020-12-13 20:19 ` [PULL 02/26] target/mips/kvm: Assert unreachable code is not used Philippe Mathieu-Daudé
2020-12-13 20:19 ` [PULL 03/26] target/mips/kvm: Remove unused headers Philippe Mathieu-Daudé
2020-12-13 20:19 ` [PULL 04/26] target/mips: Include "exec/memattrs.h" in 'internal.h' Philippe Mathieu-Daudé
2020-12-13 20:19 ` [PULL 05/26] target/mips: Replace magic values by CP0PM_MASK or TARGET_PAGE_BITS_MIN Philippe Mathieu-Daudé
2020-12-13 20:19 ` [PULL 06/26] target/mips: Do not include CP0 helpers in user-mode emulation Philippe Mathieu-Daudé
2020-12-13 20:19 ` [PULL 07/26] target/mips: Remove unused headers from cp0_helper.c Philippe Mathieu-Daudé
2020-12-13 20:19 ` [PULL 08/26] target/mips: Also display exception names in user-mode Philippe Mathieu-Daudé
2020-12-13 20:19 ` [PULL 09/26] target/mips: Allow executing MSA instructions on Loongson-3A4000 Philippe Mathieu-Daudé
2020-12-13 20:19 ` [PULL 10/26] target/mips: Explicit Release 6 MMU types Philippe Mathieu-Daudé
2020-12-13 20:19 ` [PULL 11/26] target/mips: Rename cpu_supports_FEAT() as cpu_type_supports_FEAT() Philippe Mathieu-Daudé
2020-12-13 20:19 ` [PULL 12/26] target/mips: Introduce cpu_supports_isa() taking CPUMIPSState argument Philippe Mathieu-Daudé
2020-12-13 20:19 ` [PULL 13/26] hw/mips: Move address translation helpers to target/mips/ Philippe Mathieu-Daudé
2020-12-13 20:19 ` [PULL 14/26] target/mips: Remove unused headers from translate.c Philippe Mathieu-Daudé
2020-12-13 20:19 ` [PULL 15/26] target/mips: Remove unused headers from op_helper.c Philippe Mathieu-Daudé
2020-12-13 20:19 ` [PULL 16/26] target/mips: Remove mips_def_t unused argument from mvp_init() Philippe Mathieu-Daudé
2020-12-13 20:19 ` [PULL 17/26] target/mips: Introduce ase_mt_available() helper Philippe Mathieu-Daudé
2020-12-13 20:19 ` [PULL 18/26] target/mips: Do not initialize MT registers if MT ASE absent Philippe Mathieu-Daudé
2020-12-13 20:19 ` [PULL 19/26] hw/mips/malta: " Philippe Mathieu-Daudé
2020-12-13 20:19 ` [PULL 20/26] hw/mips/malta: Rewrite CP0_MVPConf0 access using deposit() Philippe Mathieu-Daudé
2020-12-13 20:19 ` [PULL 21/26] target/mips: Extract cpu_supports*/cpu_set* translate.c Philippe Mathieu-Daudé
2020-12-13 20:19 ` Philippe Mathieu-Daudé [this message]
2020-12-13 20:19 ` [PULL 23/26] target/mips: Move cpu definitions, reset() and realize() to cpu.c Philippe Mathieu-Daudé
2020-12-13 20:19 ` [PULL 24/26] target/mips: Inline cpu_mips_realize_env() in mips_cpu_realizefn() Philippe Mathieu-Daudé
2020-12-13 20:19 ` [PULL 25/26] target/mips: Remove unused headers from fpu_helper.c Philippe Mathieu-Daudé
2020-12-13 20:19 ` [PULL 26/26] target/mips: Use FloatRoundMode enum for FCR31 modes conversion Philippe Mathieu-Daudé
2020-12-14 20:32 ` [PULL 00/26] MIPS patches for 2020-12-13 Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201213201946.236123-23-f4bug@amsat.org \
--to=f4bug@amsat.org \
--cc=aleksandar.rikalo@syrmia.com \
--cc=aurelien@aurel32.net \
--cc=chenhuacai@kernel.org \
--cc=jiaxun.yang@flygoat.com \
--cc=kvm@vger.kernel.org \
--cc=paulburton@kernel.org \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).