lkml.org 
[lkml]   [2022]   [Jun]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    Subject[PATCH 21/42] KVM: selftests: Use get_cpuid_entry() in kvm_get_supported_cpuid_index()
    From
    Use get_cpuid_entry() in kvm_get_supported_cpuid_index() to replace
    functionally identical code.

    Signed-off-by: Sean Christopherson <seanjc@google.com>
    ---
    .../selftests/kvm/include/x86_64/processor.h | 14 ++++----
    .../selftests/kvm/lib/x86_64/processor.c | 32 -------------------
    2 files changed, 7 insertions(+), 39 deletions(-)

    diff --git a/tools/testing/selftests/kvm/include/x86_64/processor.h b/tools/testing/selftests/kvm/include/x86_64/processor.h
    index fcfeac1590a2..e43a1d2fd112 100644
    --- a/tools/testing/selftests/kvm/include/x86_64/processor.h
    +++ b/tools/testing/selftests/kvm/include/x86_64/processor.h
    @@ -616,6 +616,8 @@ static inline struct kvm_cpuid2 *allocate_kvm_cpuid2(int nr_entries)
    return cpuid;
    }

    +struct kvm_cpuid_entry2 *get_cpuid_entry(struct kvm_cpuid2 *cpuid,
    + uint32_t function, uint32_t index);
    void vcpu_init_cpuid(struct kvm_vcpu *vcpu, struct kvm_cpuid2 *cpuid);

    static inline int __vcpu_set_cpuid(struct kvm_vcpu *vcpu)
    @@ -641,8 +643,11 @@ static inline void vcpu_set_cpuid(struct kvm_vcpu *vcpu)
    vcpu_ioctl(vcpu, KVM_GET_CPUID2, vcpu->cpuid);
    }

    -struct kvm_cpuid_entry2 *
    -kvm_get_supported_cpuid_index(uint32_t function, uint32_t index);
    +static inline struct kvm_cpuid_entry2 *kvm_get_supported_cpuid_index(uint32_t function,
    + uint32_t index)
    +{
    + return get_cpuid_entry(kvm_get_supported_cpuid(), function, index);
    +}

    static inline struct kvm_cpuid_entry2 *
    kvm_get_supported_cpuid_entry(uint32_t function)
    @@ -689,11 +694,6 @@ uint64_t vm_get_page_table_entry(struct kvm_vm *vm, struct kvm_vcpu *vcpu,
    void vm_set_page_table_entry(struct kvm_vm *vm, struct kvm_vcpu *vcpu,
    uint64_t vaddr, uint64_t pte);

    -/*
    - * get_cpuid() - find matching CPUID entry and return pointer to it.
    - */
    -struct kvm_cpuid_entry2 *get_cpuid_entry(struct kvm_cpuid2 *cpuid,
    - uint32_t function, uint32_t index);
    /*
    * set_cpuid() - overwrites a matching cpuid entry with the provided value.
    * matches based on ent->function && ent->index. returns true
    diff --git a/tools/testing/selftests/kvm/lib/x86_64/processor.c b/tools/testing/selftests/kvm/lib/x86_64/processor.c
    index b481ad131ec6..a835a63a6924 100644
    --- a/tools/testing/selftests/kvm/lib/x86_64/processor.c
    +++ b/tools/testing/selftests/kvm/lib/x86_64/processor.c
    @@ -767,38 +767,6 @@ void vcpu_init_cpuid(struct kvm_vcpu *vcpu, struct kvm_cpuid2 *cpuid)
    vcpu_set_cpuid(vcpu);
    }

    -/*
    - * Locate a cpuid entry.
    - *
    - * Input Args:
    - * function: The function of the cpuid entry to find.
    - * index: The index of the cpuid entry.
    - *
    - * Output Args: None
    - *
    - * Return: A pointer to the cpuid entry. Never returns NULL.
    - */
    -struct kvm_cpuid_entry2 *
    -kvm_get_supported_cpuid_index(uint32_t function, uint32_t index)
    -{
    - struct kvm_cpuid2 *cpuid;
    - struct kvm_cpuid_entry2 *entry = NULL;
    - int i;
    -
    - cpuid = kvm_get_supported_cpuid();
    - for (i = 0; i < cpuid->nent; i++) {
    - if (cpuid->entries[i].function == function &&
    - cpuid->entries[i].index == index) {
    - entry = &cpuid->entries[i];
    - break;
    - }
    - }
    -
    - TEST_ASSERT(entry, "Guest CPUID entry not found: (EAX=%x, ECX=%x).",
    - function, index);
    - return entry;
    -}
    -
    uint64_t vcpu_get_msr(struct kvm_vcpu *vcpu, uint64_t msr_index)
    {
    struct {
    --
    2.36.1.255.ge46751e96f-goog
    \
     
     \ /
      Last update: 2022-06-04 03:24    [W:4.136 / U:0.036 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site