[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 06/15] i386: kvm: extract try_get_cpuid() loop to ge
From: |
Eduardo Habkost |
Subject: |
[Qemu-devel] [PATCH 06/15] i386: kvm: extract try_get_cpuid() loop to get_supported_cpuid() function |
Date: |
Thu, 4 Oct 2012 17:48:58 -0300 |
No behavior change, just code movement.
Signed-off-by: Eduardo Habkost <address@hidden>
---
target-i386/kvm.c | 19 ++++++++++++++-----
1 file changed, 14 insertions(+), 5 deletions(-)
diff --git a/target-i386/kvm.c b/target-i386/kvm.c
index 3519028..7115921 100644
--- a/target-i386/kvm.c
+++ b/target-i386/kvm.c
@@ -98,6 +98,19 @@ static struct kvm_cpuid2 *try_get_cpuid(KVMState *s, int max)
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 {
int cap;
int feature;
@@ -166,15 +179,11 @@ uint32_t kvm_arch_get_supported_cpuid(KVMState *s,
uint32_t function,
uint32_t index, int reg)
{
struct kvm_cpuid2 *cpuid;
- int max;
uint32_t ret = 0;
uint32_t cpuid_1_edx;
bool found = false;
- max = 1;
- while ((cpuid = try_get_cpuid(s, max)) == NULL) {
- max *= 2;
- }
+ cpuid = get_supported_cpuid(s);
struct kvm_cpuid_entry2 *entry = cpuid_find_entry(cpuid, function, index);
if (entry) {
--
1.7.11.4
- [Qemu-devel] [PATCH 00/15] QEMU KVM_GET_SUPPORTED_CPUID cleanups and fixes, Eduardo Habkost, 2012/10/04
- [Qemu-devel] [PATCH 01/15] i386: kvm: kvm_arch_get_supported_cpuid: move R_EDX hack outside of for loop, Eduardo Habkost, 2012/10/04
- [Qemu-devel] [PATCH 06/15] i386: kvm: extract try_get_cpuid() loop to get_supported_cpuid() function,
Eduardo Habkost <=
- [Qemu-devel] [PATCH 11/15] i386: kvm: mask cpuid_kvm_features earlier, Eduardo Habkost, 2012/10/04
- [Qemu-devel] [PATCH 07/15] i386: kvm: kvm_arch_get_supported_cpuid: replace if+switch with single 'if', Eduardo Habkost, 2012/10/04
- [Qemu-devel] [PATCH 10/15] i386: kvm: x2apic is not supported without in-kernel irqchip, Eduardo Habkost, 2012/10/04
- [Qemu-devel] [PATCH 08/15] i386: kvm: set CPUID_EXT_HYPERVISOR on kvm_arch_get_supported_cpuid(), Eduardo Habkost, 2012/10/04
- [Qemu-devel] [PATCH 14/15] i386: kvm: reformat filter_features_for_kvm() code, Eduardo Habkost, 2012/10/04
- [Qemu-devel] [PATCH 04/15] i386: kvm: extract register switch to cpuid_entry_get_reg() function, Eduardo Habkost, 2012/10/04
- [Qemu-devel] [PATCH 02/15] i386: kvm: kvm_arch_get_supported_cpuid: clean up has_kvm_features check, Eduardo Habkost, 2012/10/04
- [Qemu-devel] [PATCH 15/15] i386: kvm: filter CPUID leaf 7 based on GET_SUPPORTED_CPUID, too, Eduardo Habkost, 2012/10/04
- [Qemu-devel] [PATCH 13/15] i386: kvm: filter CPUID feature words earlier, on cpu.c, Eduardo Habkost, 2012/10/04
- [Qemu-devel] [PATCH 12/15] i386: kvm: mask cpuid_ext4_features bits earlier, Eduardo Habkost, 2012/10/04