diff options
| author | Jan Kiszka <jan.kiszka@siemens.com> | 2013-03-24 17:01:02 +0100 |
|---|---|---|
| committer | Andreas Färber <afaerber@suse.de> | 2013-04-16 01:19:46 +0200 |
| commit | 21ad77892d321f15325d77f6fab700864af61f49 (patch) | |
| tree | 25b39ebbf2e766e8ea6ba066d63af85c9ce1c27d /target-i386 | |
| parent | 24a6e7f4d91e9ed5f8117ecb083431a23f8609a0 (diff) | |
| download | qemu-21ad77892d321f15325d77f6fab700864af61f49.tar.gz | |
target-i386: Fix including "host" in -cpu ? output
kvm_enabled() cannot be true at this point because accelerators are
initialized much later during init. Also, hiding this makes it very hard
to discover for users. Simply dump unconditionally if CONFIG_KVM is set.
Add explanation for "host" CPU type.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: Andreas Färber <afaerber@suse.de>
Diffstat (limited to 'target-i386')
| -rw-r--r-- | target-i386/cpu.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/target-i386/cpu.c b/target-i386/cpu.c index 6dd993f847..b8690d2c41 100644 --- a/target-i386/cpu.c +++ b/target-i386/cpu.c @@ -1463,9 +1463,12 @@ void x86_cpu_list(FILE *f, fprintf_function cpu_fprintf) snprintf(buf, sizeof(buf), "%s", def->name); (*cpu_fprintf)(f, "x86 %16s %-48s\n", buf, def->model_id); } - if (kvm_enabled()) { - (*cpu_fprintf)(f, "x86 %16s\n", "[host]"); - } +#ifdef CONFIG_KVM + (*cpu_fprintf)(f, "x86 %16s %-48s\n", "host", + "KVM processor with all supported host features " + "(only available in KVM mode)"); +#endif + (*cpu_fprintf)(f, "\nRecognized CPUID flags:\n"); listflags(buf, sizeof(buf), (uint32_t)~0, feature_name, 1); (*cpu_fprintf)(f, " %s\n", buf); |