| Message ID | 1341835899-3127-4-git-send-email-agraf@suse.de |
|---|---|
| State | New |
| Headers | show |
diff --git a/target-i386/cpu.c b/target-i386/cpu.c index a5d9468..0000c77 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -1190,9 +1190,10 @@ void x86_cpu_list(FILE *f, fprintf_function cpu_fprintf, const char *optarg) (*cpu_fprintf)(f, "\n"); } } - if (kvm_enabled()) { - (*cpu_fprintf)(f, "x86 %16s\n", "[host]"); - } +#ifdef CONFIG_KVM + (*cpu_fprintf)(f, "x86 %16s\n", "KVM only: [host]"); + (*cpu_fprintf)(f, "x86 %16s\n", "KVM only: [best]"); +#endif } int cpu_x86_register(X86CPU *cpu, const char *cpu_model)
The kvm_enabled() helper doesn't work in a function as early as -cpu ? yet. It also doesn't make sense to list the -cpu ? output conditional on the -enable-kvm parameter. So let's always mention -cpu host in the CPU list when KVM is supported on that configuration. In addition, this patch also adds listing of -cpu best in the -cpu ? list, so that people know that this option exists. Signed-off-by: Alexander Graf <agraf@suse.de> --- target-i386/cpu.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-)