summaryrefslogtreecommitdiff
path: root/linux-user
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2012-09-05 17:41:08 -0300
committerAndreas Färber <afaerber@suse.de>2012-09-21 15:12:58 +0200
commite916cbf80328d46b288f6c82a12cb3b8fc4fbd4a (patch)
tree3ad651a817dad3faf1ed4d930779247b085c20e7 /linux-user
parent6cdf8854203e51a222c9ce94a8c8c568da834cf6 (diff)
Drop cpu_list_id macro
Since the only user of the extended cpu_list_id() format was the x86 ?model/?dump/?cpuid output, we can drop it completely. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Eduardo Habkost <ehabkost@redhat.com> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com> Reviewed-by: Igor Mammedov <imammedo@redhat.com> Signed-off-by: Andreas Färber <afaerber@suse.de>
Diffstat (limited to 'linux-user')
-rw-r--r--linux-user/main.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/linux-user/main.c b/linux-user/main.c
index e84a18c33c..9f3476ba57 100644
--- a/linux-user/main.c
+++ b/linux-user/main.c
@@ -3130,10 +3130,8 @@ static void handle_arg_cpu(const char *arg)
cpu_model = strdup(arg);
if (cpu_model == NULL || is_help_option(cpu_model)) {
/* XXX: implement xxx_cpu_list for targets that still miss it */
-#if defined(cpu_list_id)
- cpu_list_id(stdout, &fprintf, "");
-#elif defined(cpu_list)
- cpu_list(stdout, &fprintf); /* deprecated */
+#if defined(cpu_list)
+ cpu_list(stdout, &fprintf);
#endif
exit(1);
}