diff options
| author | Anthony Liguori <aliguori@us.ibm.com> | 2012-09-25 16:06:16 -0500 |
|---|---|---|
| committer | Anthony Liguori <aliguori@us.ibm.com> | 2012-09-25 16:06:16 -0500 |
| commit | 97fe81d3e8613be13754ff096c16b73010fd60ad (patch) | |
| tree | ba81dd99c4b379c58b3aa362bef351a319075281 /linux-user | |
| parent | d352210aede32743c6e7a8987c99196d84ab5471 (diff) | |
| parent | 2b85cf0efd81a6190320e7b488a0a4bad9743cc3 (diff) | |
Merge remote-tracking branch 'afaerber/qom-cpu' into staging
* afaerber/qom-cpu:
target-alpha: Initialize env->cpu_model_str
target-i386: Drop unused setscalar() macro
target-i386: Kill cpudef config section support
target-i386: x86_cpudef_setup() coding style change
Eliminate cpus-x86_64.conf file
target-i386: Move CPU models from cpus-x86_64.conf to C
target-i386: Add missing CPUID_* constants
Drop cpu_list_id macro
target-i386: Fold -cpu ?cpuid, ?model output into -cpu help, drop ?dump
MAINTAINERS: Add entry for QOM CPU
Diffstat (limited to 'linux-user')
| -rw-r--r-- | linux-user/main.c | 6 |
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); } |