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 047/144] KVM: selftests: Rename vcpu.state => vcpu.run
    From
    Rename the "state" field of 'struct vcpu' to "run".  KVM calls it "run",
    the struct name is "kvm_run", etc...

    Signed-off-by: Sean Christopherson <seanjc@google.com>
    ---
    .../selftests/kvm/include/kvm_util_base.h | 2 +-
    tools/testing/selftests/kvm/lib/kvm_util.c | 24 +++++++------------
    .../selftests/kvm/lib/s390x/processor.c | 2 +-
    3 files changed, 11 insertions(+), 17 deletions(-)

    diff --git a/tools/testing/selftests/kvm/include/kvm_util_base.h b/tools/testing/selftests/kvm/include/kvm_util_base.h
    index 6418b1c04bc0..b83c3327d0e4 100644
    --- a/tools/testing/selftests/kvm/include/kvm_util_base.h
    +++ b/tools/testing/selftests/kvm/include/kvm_util_base.h
    @@ -48,7 +48,7 @@ struct vcpu {
    uint32_t id;
    int fd;
    struct kvm_vm *vm;
    - struct kvm_run *state;
    + struct kvm_run *run;
    struct kvm_dirty_gfn *dirty_gfns;
    uint32_t fetch_index;
    uint32_t dirty_gfns_count;
    diff --git a/tools/testing/selftests/kvm/lib/kvm_util.c b/tools/testing/selftests/kvm/lib/kvm_util.c
    index 76ac1c50c3e7..aca9ebffdc0e 100644
    --- a/tools/testing/selftests/kvm/lib/kvm_util.c
    +++ b/tools/testing/selftests/kvm/lib/kvm_util.c
    @@ -514,7 +514,7 @@ static void vm_vcpu_rm(struct kvm_vm *vm, struct vcpu *vcpu)
    vcpu->dirty_gfns = NULL;
    }

    - ret = munmap(vcpu->state, vcpu_mmap_sz());
    + ret = munmap(vcpu->run, vcpu_mmap_sz());
    TEST_ASSERT(!ret, __KVM_SYSCALL_ERROR("munmap()", ret));

    ret = close(vcpu->fd);
    @@ -1081,13 +1081,7 @@ void vm_vcpu_add(struct kvm_vm *vm, uint32_t vcpuid)
    struct vcpu *vcpu;

    /* Confirm a vcpu with the specified id doesn't already exist. */
    - vcpu = vcpu_find(vm, vcpuid);
    - if (vcpu != NULL)
    - TEST_FAIL("vcpu with the specified id "
    - "already exists,\n"
    - " requested vcpuid: %u\n"
    - " existing vcpuid: %u state: %p",
    - vcpuid, vcpu->id, vcpu->state);
    + TEST_ASSERT(!vcpu_find(vm, vcpuid), "vCPU%d already exists\n", vcpuid);

    /* Allocate and initialize new vcpu structure. */
    vcpu = calloc(1, sizeof(*vcpu));
    @@ -1098,12 +1092,12 @@ void vm_vcpu_add(struct kvm_vm *vm, uint32_t vcpuid)
    vcpu->fd = __vm_ioctl(vm, KVM_CREATE_VCPU, (void *)(unsigned long)vcpuid);
    TEST_ASSERT(vcpu->fd >= 0, KVM_IOCTL_ERROR(KVM_CREATE_VCPU, vcpu->fd));

    - TEST_ASSERT(vcpu_mmap_sz() >= sizeof(*vcpu->state), "vcpu mmap size "
    + TEST_ASSERT(vcpu_mmap_sz() >= sizeof(*vcpu->run), "vcpu mmap size "
    "smaller than expected, vcpu_mmap_sz: %i expected_min: %zi",
    - vcpu_mmap_sz(), sizeof(*vcpu->state));
    - vcpu->state = (struct kvm_run *) mmap(NULL, vcpu_mmap_sz(),
    + vcpu_mmap_sz(), sizeof(*vcpu->run));
    + vcpu->run = (struct kvm_run *) mmap(NULL, vcpu_mmap_sz(),
    PROT_READ | PROT_WRITE, MAP_SHARED, vcpu->fd, 0);
    - TEST_ASSERT(vcpu->state != MAP_FAILED,
    + TEST_ASSERT(vcpu->run != MAP_FAILED,
    __KVM_SYSCALL_ERROR("mmap()", (int)(unsigned long)MAP_FAILED));

    /* Add to linked-list of VCPUs. */
    @@ -1460,7 +1454,7 @@ struct kvm_run *vcpu_state(struct kvm_vm *vm, uint32_t vcpuid)
    {
    struct vcpu *vcpu = vcpu_get(vm, vcpuid);

    - return vcpu->state;
    + return vcpu->run;
    }

    /*
    @@ -1502,9 +1496,9 @@ void vcpu_run_complete_io(struct kvm_vm *vm, uint32_t vcpuid)
    struct vcpu *vcpu = vcpu_get(vm, vcpuid);
    int ret;

    - vcpu->state->immediate_exit = 1;
    + vcpu->run->immediate_exit = 1;
    ret = __vcpu_run(vm, vcpuid);
    - vcpu->state->immediate_exit = 0;
    + vcpu->run->immediate_exit = 0;

    TEST_ASSERT(ret == -1 && errno == EINTR,
    "KVM_RUN IOCTL didn't exit immediately, rc: %i, errno: %i",
    diff --git a/tools/testing/selftests/kvm/lib/s390x/processor.c b/tools/testing/selftests/kvm/lib/s390x/processor.c
    index 53c413932f64..df9d9650d916 100644
    --- a/tools/testing/selftests/kvm/lib/s390x/processor.c
    +++ b/tools/testing/selftests/kvm/lib/s390x/processor.c
    @@ -210,7 +210,7 @@ void vcpu_dump(FILE *stream, struct kvm_vm *vm, uint32_t vcpuid, uint8_t indent)
    struct vcpu *vcpu = vcpu_get(vm, vcpuid);

    fprintf(stream, "%*spstate: psw: 0x%.16llx:0x%.16llx\n",
    - indent, "", vcpu->state->psw_mask, vcpu->state->psw_addr);
    + indent, "", vcpu->run->psw_mask, vcpu->run->psw_addr);
    }

    void assert_on_unhandled_exception(struct kvm_vm *vm, uint32_t vcpuid)
    --
    2.36.1.255.ge46751e96f-goog
    \
     
     \ /
      Last update: 2022-06-03 02:54    [W:2.727 / U:0.348 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site