aboutsummaryrefslogtreecommitdiff
path: root/target/m68k
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2019-04-17 21:17:57 +0200
committerMarkus Armbruster <armbru@redhat.com>2019-04-18 22:18:59 +0200
commit0442428a8976b4f94e04d24b5db9eb1b678d82c4 (patch)
treea4307320a5c4a5e6656c0f7ccf050c3db4edac57 /target/m68k
parentb6b71cb5c674a97a4cd935349ce8a2764f720af4 (diff)
target: Simplify how the TARGET_cpu_list() print
The various TARGET_cpu_list() take an fprintf()-like callback and a FILE * to pass to it. Their callers (vl.c's main() via list_cpus(), bsd-user/main.c's main(), linux-user/main.c's main()) all pass fprintf() and stdout. Thus, the flexibility provided by the (rather tiresome) indirection isn't actually used. Drop the callback, and call qemu_printf() instead. Calling printf() would also work, but would make the code unsuitable for monitor context without making it simpler. Signed-off-by: Markus Armbruster <armbru@redhat.com> Message-Id: <20190417191805.28198-10-armbru@redhat.com> Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Diffstat (limited to 'target/m68k')
-rw-r--r--target/m68k/cpu.h2
-rw-r--r--target/m68k/helper.c14
2 files changed, 5 insertions, 11 deletions
diff --git a/target/m68k/cpu.h b/target/m68k/cpu.h
index f154565117..9c1f0a2458 100644
--- a/target/m68k/cpu.h
+++ b/target/m68k/cpu.h
@@ -499,7 +499,7 @@ static inline int m68k_feature(CPUM68KState *env, int feature)
return (env->features & (1u << feature)) != 0;
}
-void m68k_cpu_list(FILE *f, fprintf_function cpu_fprintf);
+void m68k_cpu_list(void);
void register_m68k_insns (CPUM68KState *env);
diff --git a/target/m68k/helper.c b/target/m68k/helper.c
index 3e26d337bf..bb64cf15c0 100644
--- a/target/m68k/helper.c
+++ b/target/m68k/helper.c
@@ -22,9 +22,9 @@
#include "cpu.h"
#include "exec/exec-all.h"
#include "exec/gdbstub.h"
-
#include "exec/helper-proto.h"
#include "fpu/softfloat.h"
+#include "qemu/qemu-print.h"
#define SIGNBIT (1u << 31)
@@ -49,28 +49,22 @@ static gint m68k_cpu_list_compare(gconstpointer a, gconstpointer b)
static void m68k_cpu_list_entry(gpointer data, gpointer user_data)
{
ObjectClass *c = data;
- CPUListState *s = user_data;
const char *typename;
char *name;
typename = object_class_get_name(c);
name = g_strndup(typename, strlen(typename) - strlen("-" TYPE_M68K_CPU));
- (*s->cpu_fprintf)(s->file, "%s\n",
- name);
+ qemu_printf("%s\n", name);
g_free(name);
}
-void m68k_cpu_list(FILE *f, fprintf_function cpu_fprintf)
+void m68k_cpu_list(void)
{
- CPUListState s = {
- .file = f,
- .cpu_fprintf = cpu_fprintf,
- };
GSList *list;
list = object_class_get_list(TYPE_M68K_CPU, false);
list = g_slist_sort(list, m68k_cpu_list_compare);
- g_slist_foreach(list, m68k_cpu_list_entry, &s);
+ g_slist_foreach(list, m68k_cpu_list_entry, NULL);
g_slist_free(list);
}