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

target-i386: kvm_cpu_fill_host(): No need to check CPU vendor 



There's no need to check CPU vendor before calling
kvm_arch_get_supported_cpuid(s, 0xC0000000, 0, R_EAX), because:

 * The kernel won't return any entry for 0xC0000000 if host CPU vendor
   is not Centaur (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 7171a393

target-i386/cpu.c

+6 −8
Original line number Diff line number Diff line
@@ -1177,7 +1177,6 @@ static void kvm_cpu_fill_host(x86_def_t *x86_cpu_def) 
    cpu_x86_fill_model_id(x86_cpu_def->model_id);



    /* Call Centaur's CPUID instruction. */

    if (!strcmp(x86_cpu_def->vendor, CPUID_VENDOR_VIA)) {

    eax = kvm_arch_get_supported_cpuid(s, 0xC0000000, 0, R_EAX);

    if (eax >= 0xC0000001) {

        /* Support VIA max extended level */
@@ -1185,7 +1184,6 @@ static void kvm_cpu_fill_host(x86_def_t *x86_cpu_def) 
        x86_cpu_def->features[FEAT_C000_0001_EDX] =

                kvm_arch_get_supported_cpuid(s, 0xC0000001, 0, R_EDX);

    }

    }



    /* Other KVM-specific feature fields: */

    x86_cpu_def->features[FEAT_SVM] =