Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 60cec433 authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

KVM: cpuid: remove has_leaf_count from struct kvm_cpuid_param 



The has_leaf_count member was originally added for KVM's paravirtualization
CPUID leaves.  However, since then the leaf count _has_ been added to those
leaves as well, so we can drop that special case.

Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 50a9e1a4

arch/x86/kvm/cpuid.c

+3 −8
Original line number Diff line number Diff line
@@ -791,7 +791,6 @@ static int do_cpuid_func(struct kvm_cpuid_entry2 *entry, u32 func, 


struct kvm_cpuid_param {

	u32 func;

	bool has_leaf_count;

	bool (*qualifier)(const struct kvm_cpuid_param *param);

};
@@ -835,11 +834,10 @@ int kvm_dev_ioctl_get_cpuid(struct kvm_cpuid2 *cpuid, 
	int limit, nent = 0, r = -E2BIG, i;

	u32 func;

	static const struct kvm_cpuid_param param[] = {

		{ .func = 0, .has_leaf_count = true },

		{ .func = 0x80000000, .has_leaf_count = true },

		{ .func = 0xC0000000, .qualifier = is_centaur_cpu, .has_leaf_count = true },

		{ .func = 0 },

		{ .func = 0x80000000 },

		{ .func = 0xC0000000, .qualifier = is_centaur_cpu },

		{ .func = KVM_CPUID_SIGNATURE },

		{ .func = KVM_CPUID_FEATURES },

	};



	if (cpuid->nent < 1)
@@ -869,9 +867,6 @@ int kvm_dev_ioctl_get_cpuid(struct kvm_cpuid2 *cpuid, 
		if (r)

			goto out_free;



		if (!ent->has_leaf_count)

			continue;



		limit = cpuid_entries[nent - 1].eax;

		for (func = ent->func + 1; func <= limit && nent < cpuid->nent && r == 0; ++func)

			r = do_cpuid_func(&cpuid_entries[nent], func,