Commit 50a9e1a4 authored by Paolo Bonzini's avatar Paolo Bonzini

KVM: cpuid: rename do_cpuid_1_ent

do_cpuid_1_ent does not do the entire processing for a CPUID entry, it
only retrieves the host's values.  Rename it to match reality.
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent d9aadaf6
...@@ -289,7 +289,7 @@ static void cpuid_mask(u32 *word, int wordnum) ...@@ -289,7 +289,7 @@ static void cpuid_mask(u32 *word, int wordnum)
*word &= boot_cpu_data.x86_capability[wordnum]; *word &= boot_cpu_data.x86_capability[wordnum];
} }
static void do_cpuid_1_ent(struct kvm_cpuid_entry2 *entry, u32 function, static void do_host_cpuid(struct kvm_cpuid_entry2 *entry, u32 function,
u32 index) u32 index)
{ {
entry->function = function; entry->function = function;
...@@ -487,7 +487,7 @@ static inline int __do_cpuid_func(struct kvm_cpuid_entry2 *entry, u32 function, ...@@ -487,7 +487,7 @@ static inline int __do_cpuid_func(struct kvm_cpuid_entry2 *entry, u32 function,
if (*nent >= maxnent) if (*nent >= maxnent)
goto out; goto out;
do_cpuid_1_ent(entry, function, 0); do_host_cpuid(entry, function, 0);
++*nent; ++*nent;
switch (function) { switch (function) {
...@@ -516,7 +516,7 @@ static inline int __do_cpuid_func(struct kvm_cpuid_entry2 *entry, u32 function, ...@@ -516,7 +516,7 @@ static inline int __do_cpuid_func(struct kvm_cpuid_entry2 *entry, u32 function,
if (*nent >= maxnent) if (*nent >= maxnent)
goto out; goto out;
do_cpuid_1_ent(&entry[t], function, 0); do_host_cpuid(&entry[t], function, 0);
++*nent; ++*nent;
} }
break; break;
...@@ -534,7 +534,7 @@ static inline int __do_cpuid_func(struct kvm_cpuid_entry2 *entry, u32 function, ...@@ -534,7 +534,7 @@ static inline int __do_cpuid_func(struct kvm_cpuid_entry2 *entry, u32 function,
cache_type = entry[i - 1].eax & 0x1f; cache_type = entry[i - 1].eax & 0x1f;
if (!cache_type) if (!cache_type)
break; break;
do_cpuid_1_ent(&entry[i], function, i); do_host_cpuid(&entry[i], function, i);
++*nent; ++*nent;
} }
break; break;
...@@ -557,7 +557,7 @@ static inline int __do_cpuid_func(struct kvm_cpuid_entry2 *entry, u32 function, ...@@ -557,7 +557,7 @@ static inline int __do_cpuid_func(struct kvm_cpuid_entry2 *entry, u32 function,
goto out; goto out;
++i; ++i;
do_cpuid_1_ent(&entry[i], function, i); do_host_cpuid(&entry[i], function, i);
++*nent; ++*nent;
} }
break; break;
...@@ -609,7 +609,7 @@ static inline int __do_cpuid_func(struct kvm_cpuid_entry2 *entry, u32 function, ...@@ -609,7 +609,7 @@ static inline int __do_cpuid_func(struct kvm_cpuid_entry2 *entry, u32 function,
level_type = entry[i - 1].ecx & 0xff00; level_type = entry[i - 1].ecx & 0xff00;
if (!level_type) if (!level_type)
break; break;
do_cpuid_1_ent(&entry[i], function, i); do_host_cpuid(&entry[i], function, i);
++*nent; ++*nent;
} }
break; break;
...@@ -630,7 +630,7 @@ static inline int __do_cpuid_func(struct kvm_cpuid_entry2 *entry, u32 function, ...@@ -630,7 +630,7 @@ static inline int __do_cpuid_func(struct kvm_cpuid_entry2 *entry, u32 function,
if (*nent >= maxnent) if (*nent >= maxnent)
goto out; goto out;
do_cpuid_1_ent(&entry[i], function, idx); do_host_cpuid(&entry[i], function, idx);
if (idx == 1) { if (idx == 1) {
entry[i].eax &= kvm_cpuid_D_1_eax_x86_features; entry[i].eax &= kvm_cpuid_D_1_eax_x86_features;
cpuid_mask(&entry[i].eax, CPUID_D_1_EAX); cpuid_mask(&entry[i].eax, CPUID_D_1_EAX);
...@@ -662,7 +662,7 @@ static inline int __do_cpuid_func(struct kvm_cpuid_entry2 *entry, u32 function, ...@@ -662,7 +662,7 @@ static inline int __do_cpuid_func(struct kvm_cpuid_entry2 *entry, u32 function,
for (t = 1; t <= times; ++t) { for (t = 1; t <= times; ++t) {
if (*nent >= maxnent) if (*nent >= maxnent)
goto out; goto out;
do_cpuid_1_ent(&entry[t], function, t); do_host_cpuid(&entry[t], function, t);
++*nent; ++*nent;
} }
break; break;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment