Patchwork [27/28] target-i386: kvm_cpu_fill_host: use GET_SUPPORTED_CPUID

login
register
mail settings
Submitter Andreas Färber
Date Nov. 2, 2012, 3:52 p.m.
Message ID <5093EC51.4000307@suse.de>
Download mbox | patch
Permalink /patch/196582/
State New
Headers show

Comments

Andreas Färber - Nov. 2, 2012, 3:52 p.m.
Am 02.11.2012 16:34, schrieb Andreas Färber:
> Am 31.10.2012 10:40, schrieb Marcelo Tosatti:
>> From: Eduardo Habkost <ehabkost@redhat.com>
>>
>> Change the kvm_cpu_fill_host() function to use
>> kvm_arch_get_supported_cpuid() instead of running the CPUID instruction
>> directly, when checking for supported CPUID features.
>>
>> This should solve two problems at the same time:
>>
>>  * "-cpu host" was not enabling features that don't need support on
>>    the host CPU (e.g. x2apic);
>>  * "check" and "enforce" options were not detecting problems when the
>>    host CPU did support a feature, but the KVM kernel code didn't
>>    support it.
>>
>> Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
>> Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
>> ---
>>  target-i386/cpu.c |   25 +++++++++++++++----------
>>  1 files changed, 15 insertions(+), 10 deletions(-)
>>
>> diff --git a/target-i386/cpu.c b/target-i386/cpu.c
>> index 390ed47..4c84e9f 100644
>> --- a/target-i386/cpu.c
>> +++ b/target-i386/cpu.c
>> @@ -773,13 +773,13 @@ static int cpu_x86_fill_model_id(char *str)
>>   */
>>  static void kvm_cpu_fill_host(x86_def_t *x86_cpu_def)
>>  {
>> +    KVMState *s = kvm_state;
> 
> This broke the linux-user build:
> 
> target-i386/cpu.o: In function `kvm_cpu_fill_host':
> /home/andreas/QEMU/qemu-rcar/target-i386/cpu.c:783: undefined reference
> to `kvm_state'
> collect2: error: ld returned 1 exit status
> make[1]: *** [qemu-i386] Fehler 1
> make: *** [subdir-i386-linux-user] Fehler 2

As a quickfix this would work, but strikes me as ugly:

Signed-off-by: Andreas Färber <afaerber@suse.de>


Andreas

Patch

diff --git a/target-i386/cpu.c b/target-i386/cpu.c
index c46286a..8663623 100644
--- a/target-i386/cpu.c
+++ b/target-i386/cpu.c
@@ -780,7 +780,11 @@  static int cpu_x86_fill_model_id(char *str)
  */
 static void kvm_cpu_fill_host(x86_def_t *x86_cpu_def)
 {
+#ifdef CONFIG_KVM
     KVMState *s = kvm_state;
+#else
+    KVMState *s = NULL;
+#endif
     uint32_t eax = 0, ebx = 0, ecx = 0, edx = 0;

     assert(kvm_enabled());