diff options
| author | Greg Kurz <groug@kaod.org> | 2018-07-02 18:56:06 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2018-07-06 18:39:19 +0200 |
| commit | 02693cc4f4aacf82cb73559dfa9af76ce4b13d11 (patch) | |
| tree | a84675ee01579284a8bb24d063853f84806e371c | |
| parent | 70da30483e78b501ff4b3a090f26c08abd0f7a7f (diff) | |
| download | focaccia-qemu-02693cc4f4aacf82cb73559dfa9af76ce4b13d11.tar.gz focaccia-qemu-02693cc4f4aacf82cb73559dfa9af76ce4b13d11.zip | |
i386: fix '-cpu ?' output for host cpu type
Since commit d6dcc5583e7, '-cpu ?' shows the description of the
X86_CPU_TYPE_NAME("max") for the host CPU model:
Enables all features supported by the accelerator in the current host
instead of the expected:
KVM processor with all supported host features
or
HVF processor with all supported host features
This is caused by the early use of kvm_enabled() and hvf_enabled() in
a class_init function. Since the accelerator isn't configured yet, both
helpers return false unconditionally.
A QEMU binary will only be compiled with one of these accelerators, not
both. The appropriate description can thus be decided at build time.
Signed-off-by: Greg Kurz <groug@kaod.org>
Message-Id: <153055056654.212317.4697363278304826913.stgit@bahia.lan>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
| -rw-r--r-- | target/i386/cpu.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/target/i386/cpu.c b/target/i386/cpu.c index b0b87c3d81..e0e2f2eea1 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -2836,13 +2836,13 @@ static void host_x86_cpu_class_init(ObjectClass *oc, void *data) xcc->host_cpuid_required = true; xcc->ordering = 8; - if (kvm_enabled()) { - xcc->model_description = - "KVM processor with all supported host features "; - } else if (hvf_enabled()) { - xcc->model_description = - "HVF processor with all supported host features "; - } +#if defined(CONFIG_KVM) + xcc->model_description = + "KVM processor with all supported host features "; +#elif defined(CONFIG_HVF) + xcc->model_description = + "HVF processor with all supported host features "; +#endif } static const TypeInfo host_x86_cpu_type_info = { |