lkml.org 
[lkml]   [2022]   [Jun]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    Subject[PATCH v2 133/144] KVM: selftests: Drop vcpu_get(), rename vcpu_find() => vcpu_exists()
    From
    Drop vcpu_get() and rename vcpu_find() to vcpu_exists() to make it that
    much harder for a test to give meaning to a vCPU ID. I.e. force tests to
    capture a vCPU when the vCPU is created.

    Signed-off-by: Sean Christopherson <seanjc@google.com>
    ---
    .../selftests/kvm/include/kvm_util_base.h | 2 --
    tools/testing/selftests/kvm/lib/kvm_util.c | 34 +++++++------------
    2 files changed, 13 insertions(+), 23 deletions(-)

    diff --git a/tools/testing/selftests/kvm/include/kvm_util_base.h b/tools/testing/selftests/kvm/include/kvm_util_base.h
    index 640634bdba9a..2da9db060378 100644
    --- a/tools/testing/selftests/kvm/include/kvm_util_base.h
    +++ b/tools/testing/selftests/kvm/include/kvm_util_base.h
    @@ -93,8 +93,6 @@ struct kvm_vm {
    continue; \
    else

    -struct kvm_vcpu *vcpu_get(struct kvm_vm *vm, uint32_t vcpu_id);
    -
    struct userspace_mem_region *
    memslot2region(struct kvm_vm *vm, uint32_t memslot);

    diff --git a/tools/testing/selftests/kvm/lib/kvm_util.c b/tools/testing/selftests/kvm/lib/kvm_util.c
    index e08e89174610..8775d7ab39c8 100644
    --- a/tools/testing/selftests/kvm/lib/kvm_util.c
    +++ b/tools/testing/selftests/kvm/lib/kvm_util.c
    @@ -459,26 +459,6 @@ kvm_userspace_memory_region_find(struct kvm_vm *vm, uint64_t start,
    return &region->region;
    }

    -static struct kvm_vcpu *vcpu_find(struct kvm_vm *vm, uint32_t vcpu_id)
    -{
    - struct kvm_vcpu *vcpu;
    -
    - list_for_each_entry(vcpu, &vm->vcpus, list) {
    - if (vcpu->id == vcpu_id)
    - return vcpu;
    - }
    -
    - return NULL;
    -}
    -
    -struct kvm_vcpu *vcpu_get(struct kvm_vm *vm, uint32_t vcpu_id)
    -{
    - struct kvm_vcpu *vcpu = vcpu_find(vm, vcpu_id);
    -
    - TEST_ASSERT(vcpu, "vCPU %d does not exist", vcpu_id);
    - return vcpu;
    -}
    -
    /*
    * VM VCPU Remove
    *
    @@ -1049,6 +1029,18 @@ static int vcpu_mmap_sz(void)
    return ret;
    }

    +static bool vcpu_exists(struct kvm_vm *vm, uint32_t vcpu_id)
    +{
    + struct kvm_vcpu *vcpu;
    +
    + list_for_each_entry(vcpu, &vm->vcpus, list) {
    + if (vcpu->id == vcpu_id)
    + return true;
    + }
    +
    + return false;
    +}
    +
    /*
    * Adds a virtual CPU to the VM specified by vm with the ID given by vcpu_id.
    * No additional vCPU setup is done. Returns the vCPU.
    @@ -1058,7 +1050,7 @@ struct kvm_vcpu *__vm_vcpu_add(struct kvm_vm *vm, uint32_t vcpu_id)
    struct kvm_vcpu *vcpu;

    /* Confirm a vcpu with the specified id doesn't already exist. */
    - TEST_ASSERT(!vcpu_find(vm, vcpu_id), "vCPU%d already exists\n", vcpu_id);
    + TEST_ASSERT(!vcpu_exists(vm, vcpu_id), "vCPU%d already exists\n", vcpu_id);

    /* Allocate and initialize new vcpu structure. */
    vcpu = calloc(1, sizeof(*vcpu));
    --
    2.36.1.255.ge46751e96f-goog
    \
     
     \ /
      Last update: 2022-06-03 03:02    [W:4.354 / U:0.072 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site