proxmox-mirrors/qemu
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu synced 2025-08-09 05:05:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix typo in help output.

Browse Source 
List ARM cpus.


git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2475 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
pbrook 2007-03-08 03:15:18 +00:00
parent 3371d27293
commit 5adb4839e3
3 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
target-arm/cpu.h
View File

@ -209,6 +209,7 @@ static inline int arm_feature(CPUARMState *env, int feature)
return (env->features & (1u << feature)) != 0; return (env->features & (1u << feature)) != 0;
} }
void arm_cpu_list(void);
void cpu_arm_set_model(CPUARMState *env, const char *name); void cpu_arm_set_model(CPUARMState *env, const char *name);
#define ARM_CPUID_ARM1026 0x4106a262 #define ARM_CPUID_ARM1026 0x4106a262

10
target-arm/helper.c
View File

@ -47,6 +47,16 @@ static const struct arm_cpu_t arm_cpu_names[] = {
{ 0, NULL} { 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) void cpu_arm_set_model(CPUARMState *env, const char *name)
{ {
int i; int i;

4
vl.c
View File

@ -6355,7 +6355,7 @@ void help(void)
"\n" "\n"
"Standard options:\n" "Standard options:\n"
"-M machine select emulated machine (-M ? for list)\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" "-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" "-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" "-hdc/-hdd file use 'file' as IDE hard disk 2/3 image\n"
@ -7004,6 +7004,8 @@ int main(int argc, char **argv)
if (optarg[0] == '?') { if (optarg[0] == '?') {
#if defined(TARGET_PPC) #if defined(TARGET_PPC)
ppc_cpu_list(stdout, &fprintf); ppc_cpu_list(stdout, &fprintf);
#elif defined(TARGET_ARM)
arm_cpu_list();
#endif #endif
exit(1); exit(1);
} else { } else {