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 051/105] KVM: selftests: Convert vmx_close_while_nested_test away from VCPU_ID
    From
    Signed-off-by: Sean Christopherson <seanjc@google.com>
    ---
    .../kvm/x86_64/vmx_close_while_nested_test.c | 17 +++++++----------
    1 file changed, 7 insertions(+), 10 deletions(-)

    diff --git a/tools/testing/selftests/kvm/x86_64/vmx_close_while_nested_test.c b/tools/testing/selftests/kvm/x86_64/vmx_close_while_nested_test.c
    index edac8839e717..da0363076fba 100644
    --- a/tools/testing/selftests/kvm/x86_64/vmx_close_while_nested_test.c
    +++ b/tools/testing/selftests/kvm/x86_64/vmx_close_while_nested_test.c
    @@ -18,15 +18,10 @@

    #include "kselftest.h"

    -#define VCPU_ID 5
    -
    enum {
    PORT_L0_EXIT = 0x2000,
    };

    -/* The virtual machine object. */
    -static struct kvm_vm *vm;
    -
    static void l2_guest_code(void)
    {
    /* Exit to L0 */
    @@ -53,20 +48,22 @@ static void l1_guest_code(struct vmx_pages *vmx_pages)
    int main(int argc, char *argv[])
    {
    vm_vaddr_t vmx_pages_gva;
    + struct kvm_vcpu *vcpu;
    + struct kvm_vm *vm;

    nested_vmx_check_supported();

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

    /* Allocate VMX pages and shared descriptors (vmx_pages). */
    vcpu_alloc_vmx(vm, &vmx_pages_gva);
    - vcpu_args_set(vm, VCPU_ID, 1, vmx_pages_gva);
    + vcpu_args_set(vm, vcpu->id, 1, vmx_pages_gva);

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

    - 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,
    @@ -75,7 +72,7 @@ int main(int argc, char *argv[])
    if (run->io.port == PORT_L0_EXIT)
    break;

    - 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]);
    /* NOT REACHED */
    --
    2.35.1.723.g4982287a31-goog
    \
     
     \ /
      Last update: 2022-03-11 06:59    [W:2.517 / U:0.908 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site