KVM: x86: minor size optimization (326d07cb) · Commits · 戴 / test

arch/x86/kvm/cpuid.c

+6 −6

Original line number	Diff line number	Diff line
		@@ -397,8 +397,8 @@ static int do_cpuid_ent(struct kvm_cpuid_entry2 *entry, u32 function,
		break;
		}
		case KVM_CPUID_SIGNATURE: {
		char signature[12] = "KVMKVMKVM\0\0";
		u32 sigptr = (u32 )signature;
		static const char signature[12] = "KVMKVMKVM\0\0";
		const u32 sigptr = (const u32 )signature;
		entry->eax = KVM_CPUID_FEATURES;
		entry->ebx = sigptr[0];
		entry->ecx = sigptr[1];
		@@ -484,10 +484,10 @@ struct kvm_cpuid_param {
		u32 func;
		u32 idx;
		bool has_leaf_count;
		bool (qualifier)(struct kvm_cpuid_param param);
		bool (qualifier)(const struct kvm_cpuid_param param);
		};

		static bool is_centaur_cpu(struct kvm_cpuid_param *param)
		static bool is_centaur_cpu(const struct kvm_cpuid_param *param)
		{
		return boot_cpu_data.x86_vendor == X86_VENDOR_CENTAUR;
		}
		@@ -498,7 +498,7 @@ int kvm_dev_ioctl_get_supported_cpuid(struct kvm_cpuid2 *cpuid,
		struct kvm_cpuid_entry2 *cpuid_entries;
		int limit, nent = 0, r = -E2BIG, i;
		u32 func;
		static struct kvm_cpuid_param param[] = {
		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 },
		@@ -517,7 +517,7 @@ int kvm_dev_ioctl_get_supported_cpuid(struct kvm_cpuid2 *cpuid,

		r = 0;
		for (i = 0; i < ARRAY_SIZE(param); i++) {
		struct kvm_cpuid_param *ent = &param[i];
		const struct kvm_cpuid_param *ent = &param[i];

		if (ent->qualifier && !ent->qualifier(ent))
		continue;