mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

i386: kvm: extract try_get_cpuid() loop to get_supported_cpuid() function

Browse Source 
No behavior change, just code movement.

Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
This commit is contained in:
Eduardo Habkost 2012-10-04 17:48:58 -03:00 committed by Marcelo Tosatti
parent 4fb73f1d3b
commit dd87f8a690
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
target-i386/kvm.c
View File

@ -98,6 +98,19 @@ static struct kvm_cpuid2 *try_get_cpuid(KVMState *s, int max)
return cpuid; return cpuid;
} }
/* Run KVM_GET_SUPPORTED_CPUID ioctl(), allocating a buffer large enough
* for all entries.
*/
static struct kvm_cpuid2 *get_supported_cpuid(KVMState *s)
{
struct kvm_cpuid2 *cpuid;
int max = 1;
while ((cpuid = try_get_cpuid(s, max)) == NULL) {
max *= 2;
}
return cpuid;
}
struct kvm_para_features { struct kvm_para_features {
int cap; int cap;
int feature; int feature;
@ -166,15 +179,11 @@ uint32_t kvm_arch_get_supported_cpuid(KVMState *s, uint32_t function,
uint32_t index, int reg) uint32_t index, int reg)
{ {
struct kvm_cpuid2 *cpuid; struct kvm_cpuid2 *cpuid;
int max;
uint32_t ret = 0; uint32_t ret = 0;
uint32_t cpuid_1_edx; uint32_t cpuid_1_edx;
bool found = false; bool found = false;
max = 1; cpuid = get_supported_cpuid(s);
while ((cpuid = try_get_cpuid(s, max)) == NULL) {
max *= 2;
}
struct kvm_cpuid_entry2 *entry = cpuid_find_entry(cpuid, function, index); struct kvm_cpuid_entry2 *entry = cpuid_find_entry(cpuid, function, index);
if (entry) { if (entry) {