lkml.org 
[lkml]   [2022]   [Mar]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    Subject[RFC PATCH 042/105] KVM: selftests: Convert svm_int_ctl_test away from VCPU_ID
    From
    Signed-off-by: Sean Christopherson <seanjc@google.com>
    ---
    .../selftests/kvm/x86_64/svm_int_ctl_test.c | 21 +++++++++----------
    1 file changed, 10 insertions(+), 11 deletions(-)

    diff --git a/tools/testing/selftests/kvm/x86_64/svm_int_ctl_test.c b/tools/testing/selftests/kvm/x86_64/svm_int_ctl_test.c
    index 30a81038df46..8e90e463895a 100644
    --- a/tools/testing/selftests/kvm/x86_64/svm_int_ctl_test.c
    +++ b/tools/testing/selftests/kvm/x86_64/svm_int_ctl_test.c
    @@ -13,10 +13,6 @@
    #include "svm_util.h"
    #include "apic.h"

    -#define VCPU_ID 0
    -
    -static struct kvm_vm *vm;
    -
    bool vintr_irq_called;
    bool intr_irq_called;

    @@ -88,31 +84,34 @@ static void l1_guest_code(struct svm_test_data *svm)

    int main(int argc, char *argv[])
    {
    + struct kvm_vcpu *vcpu;
    + struct kvm_run *run;
    vm_vaddr_t svm_gva;
    + struct kvm_vm *vm;
    + struct ucall uc;

    nested_svm_check_supported();

    - vm = vm_create_default(VCPU_ID, 0, (void *) l1_guest_code);
    + vm = vm_create_with_one_vcpu(&vcpu, l1_guest_code);

    vm_init_descriptor_tables(vm);
    - vcpu_init_descriptor_tables(vm, VCPU_ID);
    + vcpu_init_descriptor_tables(vm, vcpu->id);

    vm_install_exception_handler(vm, VINTR_IRQ_NUMBER, vintr_irq_handler);
    vm_install_exception_handler(vm, INTR_IRQ_NUMBER, intr_irq_handler);

    vcpu_alloc_svm(vm, &svm_gva);
    - vcpu_args_set(vm, VCPU_ID, 1, svm_gva);
    + vcpu_args_set(vm, vcpu->id, 1, svm_gva);

    - struct kvm_run *run = vcpu_state(vm, VCPU_ID);
    - struct ucall uc;
    + run = vcpu->run;

    - vcpu_run(vm, VCPU_ID);
    + vcpu_run(vm, vcpu->id);
    TEST_ASSERT(run->exit_reason == KVM_EXIT_IO,
    "Got exit_reason other than KVM_EXIT_IO: %u (%s)\n",
    run->exit_reason,
    exit_reason_str(run->exit_reason));

    - switch (get_ucall(vm, VCPU_ID, &uc)) {
    + switch (get_ucall(vm, vcpu->id, &uc)) {
    case UCALL_ABORT:
    TEST_FAIL("%s", (const char *)uc.args[0]);
    break;
    --
    2.35.1.723.g4982287a31-goog
    \
     
     \ /
      Last update: 2022-03-11 06:56    [W:4.085 / U:0.160 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site