From patchwork Wed May 4 22:49:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 12838869 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 55D59C35280 for ; Wed, 4 May 2022 23:07:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1381745AbiEDXF2 (ORCPT ); Wed, 4 May 2022 19:05:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58772 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1379686AbiEDXAQ (ORCPT ); Wed, 4 May 2022 19:00:16 -0400 Received: from mail-pj1-x104a.google.com (mail-pj1-x104a.google.com [IPv6:2607:f8b0:4864:20::104a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4EA5458E51 for ; Wed, 4 May 2022 15:53:34 -0700 (PDT) Received: by mail-pj1-x104a.google.com with SMTP id m8-20020a17090aab0800b001cb1320ef6eso3574187pjq.3 for ; Wed, 04 May 2022 15:53:34 -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=Cs3lrlk//K4240Pgi+YoisL+MewmkZIIzZJnWpx8Epc=; b=Ez6iCchAKdIAAjAmpHp4etoCIMg+Bnn/G4Mheykuxmmv3dfo6s/myDED7m3XWOCD5u JbG3fUMs8ffxJN0RSjiFHFN75y772Kjr0rDdbIW7xCCNtrsgW9P52Yz9Fw7AZJg8MFgZ z1gfwzzgKAsK/5uw2GGpGMZWp2Bb5axfVGTLROgogGcWUwHSww3YEHnMDinXcqkIEAMo ZeYtfWaOh4VabHzYWAI9/k/oYGm4K0V5rKzJXBWDvUeWa3ghL6Wb7R6VSoeGKPl+uQ/v xsV8qrGDkKr0xz+fUfA+W/Qpj+JUiPkz45Vr9bgekZrC7ijaGF4Y9rfrnMDADrMf7m/n wC1Q== 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=Cs3lrlk//K4240Pgi+YoisL+MewmkZIIzZJnWpx8Epc=; b=ezoDSk4uwZnvn00f+FTRe1kg8r+r4An0HwnjqMe+zRwxYpdpEb7isG8ze/nfIvEK4+ IYDzgHJc1w42ZM+1yeiL9b2cn2P9SxF+QrZh4v3YqSGQ0UO70dgjGXKFUgkG6ygenm3c +vK+yy7SWI94gLvBoM3out9/sLRFm+FwSSMwt7GaX1ioUmsBjgMMpOlnd3Ja0cYtbaCA 1PPgKtenU7RYDEnpLtcqP8JSBtd+Az2wg820MndQjh49IKEg5eeK2fnyCH5EAVZgHGp1 YmDEB0V6hRWhJxqP+48bYuBlGw8sIY5eXqNLbFynB/zHqw+u4sSgB2G/6PgPelOPZsBY Pcfg== X-Gm-Message-State: AOAM530R3Y6GNAfix9wpV+ZdkKOkHQjDDgf5Vn1CHIX1UZVpVGsA8t6E 3jCTncsli9QF+9QwxbU5BtKlNkPyisE= X-Google-Smtp-Source: ABdhPJwOTKxPcmf9BY/3xz/aG2xI6EbTE3LGKyI2GIzyxNuOmgTlKZmr7lBMQtZAGbje4/LPKg6JzKCYDpM= X-Received: from seanjc.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:3e5]) (user=seanjc job=sendgmr) by 2002:a05:6a00:b41:b0:50d:35fa:476d with SMTP id p1-20020a056a000b4100b0050d35fa476dmr22962184pfo.33.1651704781583; Wed, 04 May 2022 15:53:01 -0700 (PDT) Reply-To: Sean Christopherson Date: Wed, 4 May 2022 22:49:08 +0000 In-Reply-To: <20220504224914.1654036-1-seanjc@google.com> Message-Id: <20220504224914.1654036-123-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 122/128] KVM: selftests: Remove vcpu_state() helper 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 Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Drop vcpu_state() now that all tests reference vcpu->run directly. Signed-off-by: Sean Christopherson --- .../selftests/kvm/include/kvm_util_base.h | 1 - tools/testing/selftests/kvm/lib/kvm_util.c | 19 +------------------ 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/tools/testing/selftests/kvm/include/kvm_util_base.h b/tools/testing/selftests/kvm/include/kvm_util_base.h index 5ab9b5380310..97376446c093 100644 --- a/tools/testing/selftests/kvm/include/kvm_util_base.h +++ b/tools/testing/selftests/kvm/include/kvm_util_base.h @@ -290,7 +290,6 @@ void *addr_gva2hva(struct kvm_vm *vm, vm_vaddr_t gva); vm_paddr_t addr_hva2gpa(struct kvm_vm *vm, void *hva); void *addr_gpa2alias(struct kvm_vm *vm, vm_paddr_t gpa); -struct kvm_run *vcpu_state(struct kvm_vcpu *vcpu); void vcpu_run(struct kvm_vcpu *vcpu); int _vcpu_run(struct kvm_vcpu *vcpu); diff --git a/tools/testing/selftests/kvm/lib/kvm_util.c b/tools/testing/selftests/kvm/lib/kvm_util.c index c5156e0caa98..8ee116048864 100644 --- a/tools/testing/selftests/kvm/lib/kvm_util.c +++ b/tools/testing/selftests/kvm/lib/kvm_util.c @@ -1005,19 +1005,7 @@ void vm_mem_region_delete(struct kvm_vm *vm, uint32_t slot) __vm_mem_region_delete(vm, memslot2region(vm, slot), true); } -/* - * VCPU mmap Size - * - * Input Args: None - * - * Output Args: None - * - * Return: - * Size of VCPU state - * - * Returns the size of the structure pointed to by the return value - * of vcpu_state(). - */ +/* Returns the size of a vCPU's kvm_run structure. */ static int vcpu_mmap_sz(void) { int dev_fd, ret; @@ -1398,11 +1386,6 @@ void vm_create_irqchip(struct kvm_vm *vm) vm->has_irqchip = true; } -struct kvm_run *vcpu_state(struct kvm_vcpu *vcpu) -{ - return vcpu->run; -} - int _vcpu_run(struct kvm_vcpu *vcpu) {