Commit 7171a393 authored by Eduardo Habkost's avatar Eduardo Habkost Committed by Paolo Bonzini
Browse files

target-i386: kvm_cpu_fill_host(): No need to check level 



There's no need to check level (CPUID[0].EAX) before calling
kvm_arch_get_supported_cpuid(s, 0x7, 0, R_EBX), because:

 * The kernel won't return any entry for CPUID 7 if CPUID[0].EAX is < 7
   on the host (See kvm_dev_ioctl_get_cpuid() on the kernel code);
 * kvm_arch_get_supported_cpuid() will return 0 if no entry is returned
   by the kernel for the requested leaf.

This will simplify the kvm_cpu_fill_host() code a little.

Signed-off-by: default avatarEduardo Habkost <ehabkost@redhat.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 81e20770

target-i386/cpu.c

+2 −6
Original line number Diff line number Diff line
@@ -1165,12 +1165,8 @@ static void kvm_cpu_fill_host(x86_def_t *x86_cpu_def) 
    x86_cpu_def->features[FEAT_1_ECX] =

        kvm_arch_get_supported_cpuid(s, 0x1, 0, R_ECX);



    if (x86_cpu_def->level >= 7) {

    x86_cpu_def->features[FEAT_7_0_EBX] =

                kvm_arch_get_supported_cpuid(s, 0x7, 0, R_EBX);

    } else {

        x86_cpu_def->features[FEAT_7_0_EBX] = 0;

    }



    x86_cpu_def->xlevel = kvm_arch_get_supported_cpuid(s, 0x80000000, 0, R_EAX);

    x86_cpu_def->features[FEAT_8000_0001_EDX] =