Commit 398f9240 authored by Jim Mattson's avatar Jim Mattson Committed by Paolo Bonzini
Browse files

selftests: kvm/x86: Export x86_family() for use outside of processor.c 



Move this static inline function to processor.h, so that it can be
used in individual tests, as needed.

Opportunistically replace the bare 'unsigned' with 'unsigned int.'

Signed-off-by: default avatarJim Mattson <jmattson@google.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Message-Id: <20220115052431.447232-5-jmattson@google.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 21066101

tools/testing/selftests/kvm/include/x86_64/processor.h

+12 −0
Original line number Diff line number Diff line
@@ -366,6 +366,18 @@ static inline unsigned long get_xmm(int n) 
bool is_intel_cpu(void);

bool is_amd_cpu(void);



static inline unsigned int x86_family(unsigned int eax)

{

        unsigned int x86;



        x86 = (eax >> 8) & 0xf;



        if (x86 == 0xf)

                x86 += (eax >> 20) & 0xff;



        return x86;

}



struct kvm_x86_state *vcpu_save_state(struct kvm_vm *vm, uint32_t vcpuid);

void vcpu_load_state(struct kvm_vm *vm, uint32_t vcpuid,

		     struct kvm_x86_state *state);

tools/testing/selftests/kvm/lib/x86_64/processor.c

+0 −12
Original line number Diff line number Diff line
@@ -1516,18 +1516,6 @@ struct kvm_cpuid2 *vcpu_get_supported_hv_cpuid(struct kvm_vm *vm, uint32_t vcpui 
	return cpuid;

}



static inline unsigned x86_family(unsigned int eax)

{

        unsigned int x86;



        x86 = (eax >> 8) & 0xf;



        if (x86 == 0xf)

                x86 += (eax >> 20) & 0xff;



        return x86;

}



unsigned long vm_compute_max_gfn(struct kvm_vm *vm)

{

	const unsigned long num_ht_pages = 12 << (30 - vm->page_shift); /* 12 GiB */