From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C240AC4321E for ; Wed, 4 May 2022 22:56:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1380021AbiEDW7i (ORCPT ); Wed, 4 May 2022 18:59:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40772 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1379245AbiEDWxh (ORCPT ); Wed, 4 May 2022 18:53:37 -0400 Received: from mail-pf1-x449.google.com (mail-pf1-x449.google.com [IPv6:2607:f8b0:4864:20::449]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8F64A53E00 for ; Wed, 4 May 2022 15:49:51 -0700 (PDT) Received: by mail-pf1-x449.google.com with SMTP id g5-20020a62f945000000b0050578328060so818393pfm.17 for ; Wed, 04 May 2022 15:49:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=reply-to:date:in-reply-to:message-id:mime-version:references :subject:from:to:cc; bh=RSDJ745FCphTNvqXw5uFQREWtoioB/PaIos9DDppyWw=; b=oZ/X9DlVHgrCDxUpGT4sgQW8stjbvmGDtc8TWZWTAgjt8ks3kbmWV6duE6LmBa8I6G 2nKsESB6OCm++OL8zzx2XtRt8vbE3sTkYlMSDEoJhDXCM+9edXSl3UD2DuQO/rX1Pdy/ k8RvNOdMdItWFiKuFYVRvL3frS11egfJltj55lza18KWSOtC2OEO2Mx4OFT+Io4KuT2b kpB+rVw1yXoJ/aVUi516ES6yWrBbajMbDy5b9CgLQuJVGSYJVIetGfY4yMp1KqDlWumT FTqcxzCMVKw6V8C4pHl/0SftLGXBjXFQYtbBf1KuTQH0kTpV7hhyscxuSumIauT8b/4s EC4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:reply-to:date:in-reply-to:message-id :mime-version:references:subject:from:to:cc; bh=RSDJ745FCphTNvqXw5uFQREWtoioB/PaIos9DDppyWw=; b=PMSHc+aI3uP9VNwib+REvzJ12eURmpYRDoe6ab10uWhWIDVxnq17SIi5b8L8utHKhg s2Wc8WBPgrJCdlg8t9rK9rx02b2Lw5aKdrAt0xOqch0nlISz3qCWxAcl2QpAtRE0GERj wkTemFemmrPS/TXAfnfThbZgzDHhyjP1q9476VDSQ0bzMsGjgCsNKyGOsbwPuuVoZnEx zZ9LE9CJy0spEm80cWs16R44Jc2+wEGtm5ooGbXX+Y94egpI2ljZV7GI4ln/irec7TBc HjcqGJfuJL9gaXWnKXhxEU07XG+S3V3jABcNexP2L+VOsfQoyue0mSdKjnmStFOoiCKr JyhA== X-Gm-Message-State: AOAM533CE7avPu1fgL4C42h095vyVJvJlPBKkYKrcbqX06zzitsUsjlr iC6ZEK/k6roJsmkRfK7Am7d74U6YUjw= X-Google-Smtp-Source: ABdhPJxBI1IzjPiVO4Es15vna+ytUi3AjeD9zbHHoabY6Z8o7u8NsyabMQ7V/VC75TepWxFO/1w9hT8+6yY= X-Received: from seanjc.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:3e5]) (user=seanjc job=sendgmr) by 2002:a17:903:244d:b0:15e:a3a2:5a75 with SMTP id l13-20020a170903244d00b0015ea3a25a75mr17783647pls.89.1651704591007; Wed, 04 May 2022 15:49:51 -0700 (PDT) Reply-To: Sean Christopherson Date: Wed, 4 May 2022 22:47:17 +0000 In-Reply-To: <20220504224914.1654036-1-seanjc@google.com> Message-Id: <20220504224914.1654036-12-seanjc@google.com> Mime-Version: 1.0 References: <20220504224914.1654036-1-seanjc@google.com> X-Mailer: git-send-email 2.36.0.464.gb9c8b46e94-goog Subject: [PATCH 011/128] KVM: selftests: Use vcpu_access_device_attr() in arm64 code From: Sean Christopherson To: Paolo Bonzini Cc: linux-kernel@vger.kernel.org, kvm@vger.kernel.org, Vitaly Kuznetsov , Andrew Jones , David Matlack , Ben Gardon , Oliver Upton , Sean Christopherson Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Use vcpu_access_device_attr() in arm's arch_timer test instead of manually retrieving the vCPU's fd. This will allow dropping vcpu_get_fd() in a future patch. Signed-off-by: Sean Christopherson --- tools/testing/selftests/kvm/aarch64/arch_timer.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/tools/testing/selftests/kvm/aarch64/arch_timer.c b/tools/testing/selftests/kvm/aarch64/arch_timer.c index 3b940a101bc0..f55c4c20d8b3 100644 --- a/tools/testing/selftests/kvm/aarch64/arch_timer.c +++ b/tools/testing/selftests/kvm/aarch64/arch_timer.c @@ -349,12 +349,10 @@ static void test_run(struct kvm_vm *vm) static void test_init_timer_irq(struct kvm_vm *vm) { /* Timer initid should be same for all the vCPUs, so query only vCPU-0 */ - int vcpu0_fd = vcpu_get_fd(vm, 0); - - kvm_device_access(vcpu0_fd, KVM_ARM_VCPU_TIMER_CTRL, - KVM_ARM_VCPU_TIMER_IRQ_PTIMER, &ptimer_irq, false); - kvm_device_access(vcpu0_fd, KVM_ARM_VCPU_TIMER_CTRL, - KVM_ARM_VCPU_TIMER_IRQ_VTIMER, &vtimer_irq, false); + vcpu_access_device_attr(vm, 0, KVM_ARM_VCPU_TIMER_CTRL, + KVM_ARM_VCPU_TIMER_IRQ_PTIMER, &ptimer_irq, false); + vcpu_access_device_attr(vm, 0, KVM_ARM_VCPU_TIMER_CTRL, + KVM_ARM_VCPU_TIMER_IRQ_VTIMER, &vtimer_irq, false); sync_global_to_guest(vm, ptimer_irq); sync_global_to_guest(vm, vtimer_irq); -- 2.36.0.464.gb9c8b46e94-goog