Fix typo in help output.
List ARM cpus.
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2475 c046a42c-6fe2-441c-8c8c-71466251a162
diff --git a/target-arm/cpu.h b/target-arm/cpu.h
index b3b37eb..891616e 100644
--- a/target-arm/cpu.h
+++ b/target-arm/cpu.h
@@ -209,6 +209,7 @@
return (env->features & (1u << feature)) != 0;
}
+void arm_cpu_list(void);
void cpu_arm_set_model(CPUARMState *env, const char *name);
#define ARM_CPUID_ARM1026 0x4106a262
diff --git a/target-arm/helper.c b/target-arm/helper.c
index 093acc9..36f5fe0 100644
--- a/target-arm/helper.c
+++ b/target-arm/helper.c
@@ -47,6 +47,16 @@
{ 0, NULL}
};
+void arm_cpu_list(void)
+{
+ int i;
+
+ printf ("Available CPUs:\n");
+ for (i = 0; arm_cpu_names[i].name; i++) {
+ printf(" %s\n", arm_cpu_names[i].name);
+ }
+}
+
void cpu_arm_set_model(CPUARMState *env, const char *name)
{
int i;
diff --git a/vl.c b/vl.c
index 09d7baf..e871c8c 100644
--- a/vl.c
+++ b/vl.c
@@ -6355,7 +6355,7 @@
"\n"
"Standard options:\n"
"-M machine select emulated machine (-M ? for list)\n"
- "-cpu cpu select CPU (-C ? for list)\n"
+ "-cpu cpu select CPU (-cpu ? for list)\n"
"-fda/-fdb file use 'file' as floppy disk 0/1 image\n"
"-hda/-hdb file use 'file' as IDE hard disk 0/1 image\n"
"-hdc/-hdd file use 'file' as IDE hard disk 2/3 image\n"
@@ -7004,6 +7004,8 @@
if (optarg[0] == '?') {
#if defined(TARGET_PPC)
ppc_cpu_list(stdout, &fprintf);
+#elif defined(TARGET_ARM)
+ arm_cpu_list();
#endif
exit(1);
} else {
