From patchwork Tue Dec 13 00:16:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 32576 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp2545205wrr; Mon, 12 Dec 2022 16:20:04 -0800 (PST) X-Google-Smtp-Source: AA0mqf4E95dhPzlU3yJQDkLzFhkNa6+PqCgksUuxJYf4fDm3dhG0lvbVCTNDp6h41JGL4QBKLGgA X-Received: by 2002:a17:90a:ae12:b0:218:c83e:4733 with SMTP id t18-20020a17090aae1200b00218c83e4733mr18152747pjq.38.1670890803656; Mon, 12 Dec 2022 16:20:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670890803; cv=none; d=google.com; s=arc-20160816; b=T/rKEznomKl4/9r1R3oGF07QJ3g7A2KcQaTkAM8KKRhJJV+IhLFl8WW8VPcp2GLmGJ CnVN5kgUe08OuZC0HouRl0ONvvqLpVAgKbpwmNz8D/gwn8zVPW5dqI22k8VEFhC5nK0X ZXsS6SNw+8mdGJlS81iN/KFtrcSykPWuE5JpuFnMlQ9leWM5tnGtmdk3TORJeEi8JqBy nS6yZvLPJ4fenlq4pj86Dc52E+Q1am/69qPRiz8hfMebetpHgWRMcs5NsU1pf9Ur+FlE 1qF4XKeyz2rD/s4gQZImGLWPmSFV+rXYH7OOIonkBdeSa7H+f7iFMeUErqDeLLABkNRk A7JQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:message-id:references :mime-version:in-reply-to:date:reply-to:dkim-signature; bh=xj/6XiZ0FcL9g/cIOTUKNxH2a5zHGMGnhonaffOKQyU=; b=h6MXUeUwpQmHUKVIfgSK1U8LwpwUITGid+Rng61wXBw5LPi9Ml/CPqDsX0M3zJKS7Z a2cGazEaEEMPe9u1ANxS3mIvEsFaPuKik7xKFtZK7/i5+f8qfMo5AIHDrhNS6v2uiDpw 4U12gQPAX4y3xZFdGtD3DpiD3K0+ZW24PiFP/R4l6ceGnZZxQlNZclFJabppJMCs+V0K iiyGXwyXPYnt5D69bPXwfPwOEhkM2lNd248OzLUWE8jQmGAidkAu3Is04RHFHwzi0VJK 5TdJrMPzQ1tvoMGVNatCK1gVJtHUIBgejHpVpcXJG5aB1NFj/s4gea3wFXFIyd6BTsSN mPwg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=Ynr5HNzm; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id l6-20020a635706000000b00460dd0eed0csi10355331pgb.176.2022.12.12.16.19.50; Mon, 12 Dec 2022 16:20:03 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=Ynr5HNzm; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234147AbiLMASL (ORCPT + 99 others); Mon, 12 Dec 2022 19:18:11 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39120 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234124AbiLMARZ (ORCPT ); Mon, 12 Dec 2022 19:17:25 -0500 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 A41921CB2E for ; Mon, 12 Dec 2022 16:17:17 -0800 (PST) Received: by mail-pj1-x104a.google.com with SMTP id z4-20020a17090ab10400b002195a146546so1013156pjq.9 for ; Mon, 12 Dec 2022 16:17:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:from:to:cc:subject:date:message-id:reply-to; bh=xj/6XiZ0FcL9g/cIOTUKNxH2a5zHGMGnhonaffOKQyU=; b=Ynr5HNzm6tcPWug6yfLA7uxzPSFdxsDbFS0g0RKFnUjDpg1KpLtNRGj/Gf5/eVmZS7 /E+4Syq2m0k2o5pz9jJkKOO6Sj8cSiSA59XiRJyOIRS4qCG3ooDGOujDsXFak0y3HWEH JVE64IrNpMB7KkNprBOvUTG/cEurYq5To2UJjMVj8f7IjF8u6mpzW6rAt4PhQmyqLhQB 1i18xIcii3lgptRuB9CPP2XNPfFgre8ZBl8B6sbn4hkuTa1njt/nq23+dRz4CjgSzC33 AdeV5GwIU5qK4qiw325lbgQvG6tA0I6pTb5gl4H3ZodnnRxzTiH/D2U7oooCiaGH4QZQ TQFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=xj/6XiZ0FcL9g/cIOTUKNxH2a5zHGMGnhonaffOKQyU=; b=DKuZYnbulzWuq1yahcPuFUYwon8Z+49yH5J9alQf6Rspa9Tbi+bxd22QL52LPIB03h rIQUHiLkapG6ZVGlV/vY5nGthiqEHnEOIeh8fae4zi3PaijHFufUoN4F+URMNoQ2bVJ6 7nzQCX/rbwNyfeJY4/lvwzI5NaMppqNjNwFJYRC6v87txn0jxE5PaQuE/hUarUjlg183 5m/Dj6R8L1zWtosahM/si17oUhTMFEGjv5/lRMGt8FnyM1y7OF+J4+zsiPYZ40l6DEWI MP4WGnDsBLvWVVeCDeroWuX6z/psi0UIjh89H4gCG1BF88nvCymkaC3gpGPFqccW/Vpi yqhQ== X-Gm-Message-State: ANoB5pm5pNb4PoQRSE/Ww294CrF6WbSnnqTjsSYTQ4Uvye8DllaIhWuG phlIEKPUYE7SpWxKbvqblYqz1cwfVOo= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a17:90a:1b21:b0:218:e3e8:c024 with SMTP id q30-20020a17090a1b2100b00218e3e8c024mr75063pjq.125.1670890637231; Mon, 12 Dec 2022 16:17:17 -0800 (PST) Reply-To: Sean Christopherson Date: Tue, 13 Dec 2022 00:16:51 +0000 In-Reply-To: <20221213001653.3852042-1-seanjc@google.com> Mime-Version: 1.0 References: <20221213001653.3852042-1-seanjc@google.com> X-Mailer: git-send-email 2.39.0.rc1.256.g54fd8350bd-goog Message-ID: <20221213001653.3852042-13-seanjc@google.com> Subject: [PATCH 12/14] KVM: selftests: Use wildcards to find library source files From: Sean Christopherson To: Paolo Bonzini , Marc Zyngier , Paul Walmsley , Palmer Dabbelt , Albert Ou , Nathan Chancellor , Nick Desaulniers Cc: James Morse , Alexandru Elisei , Suzuki K Poulose , Oliver Upton , Tom Rix , kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, kvmarm@lists.cs.columbia.edu, linux-riscv@lists.infradead.org, llvm@lists.linux.dev, linux-kernel@vger.kernel.org, Ricardo Koller , Sean Christopherson , Aaron Lewis , Raghavendra Rao Ananta X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1752055995269533261?= X-GMAIL-MSGID: =?utf-8?q?1752055995269533261?= Use $(wildcard ...) to find the library source files instead of manually defining the inputs, which is a maintenance burden and error prone. Signed-off-by: Sean Christopherson --- tools/testing/selftests/kvm/Makefile | 45 ++++------------------------ 1 file changed, 5 insertions(+), 40 deletions(-) diff --git a/tools/testing/selftests/kvm/Makefile b/tools/testing/selftests/kvm/Makefile index 9cff99a1cb2e..a9930e9197da 100644 --- a/tools/testing/selftests/kvm/Makefile +++ b/tools/testing/selftests/kvm/Makefile @@ -19,44 +19,6 @@ else $(error Unknown architecture '$(ARCH)') endif -LIBKVM += lib/assert.c -LIBKVM += lib/elf.c -LIBKVM += lib/guest_modes.c -LIBKVM += lib/io.c -LIBKVM += lib/kvm_util.c -LIBKVM += lib/memstress.c -LIBKVM += lib/rbtree.c -LIBKVM += lib/sparsebit.c -LIBKVM += lib/test_util.c -LIBKVM += lib/ucall_common.c -LIBKVM += lib/userfaultfd_util.c - -LIBKVM_STRING += lib/string_override.c - -LIBKVM_x86_64 += lib/x86_64/apic.c -LIBKVM_x86_64 += lib/x86_64/handlers.S -LIBKVM_x86_64 += lib/x86_64/hyperv.c -LIBKVM_x86_64 += lib/x86_64/memstress.c -LIBKVM_x86_64 += lib/x86_64/processor.c -LIBKVM_x86_64 += lib/x86_64/svm.c -LIBKVM_x86_64 += lib/x86_64/ucall.c -LIBKVM_x86_64 += lib/x86_64/vmx.c - -LIBKVM_aarch64 += lib/aarch64/gic.c -LIBKVM_aarch64 += lib/aarch64/gic_v3.c -LIBKVM_aarch64 += lib/aarch64/handlers.S -LIBKVM_aarch64 += lib/aarch64/processor.c -LIBKVM_aarch64 += lib/aarch64/spinlock.c -LIBKVM_aarch64 += lib/aarch64/ucall.c -LIBKVM_aarch64 += lib/aarch64/vgic.c - -LIBKVM_s390x += lib/s390x/diag318_test_handler.c -LIBKVM_s390x += lib/s390x/processor.c -LIBKVM_s390x += lib/s390x/ucall.c - -LIBKVM_riscv += lib/riscv/processor.c -LIBKVM_riscv += lib/riscv/ucall.c - # Non-compiled test targets TEST_PROGS_x86_64 += x86_64/nx_huge_pages_test.sh @@ -213,10 +175,13 @@ pgste-option = $(call try-run, echo 'int main(void) { return 0; }' | \ LDLIBS += -ldl LDFLAGS += -pthread $(no-pie-option) $(pgste-option) -LIBKVM_C := $(filter %.c,$(LIBKVM)) -LIBKVM_S := $(filter %.S,$(LIBKVM)) +LIBKVM_C := $(filter-out lib/string_override.c,$(wildcard lib/*.c)) +LIBKVM_C += $(wildcard lib/$(ARCH_DIR)/*.c) +LIBKVM_S := $(wildcard lib/*.S) +LIBKVM_S += $(wildcard lib/$(ARCH_DIR)/*.S) LIBKVM_C_OBJ := $(patsubst %.c, $(OUTPUT)/%.o, $(LIBKVM_C)) LIBKVM_S_OBJ := $(patsubst %.S, $(OUTPUT)/%.o, $(LIBKVM_S)) +LIBKVM_STRING := lib/string_override.c LIBKVM_STRING_OBJ := $(patsubst %.c, $(OUTPUT)/%.o, $(LIBKVM_STRING)) LIBKVM_OBJS = $(LIBKVM_C_OBJ) $(LIBKVM_S_OBJ) $(LIBKVM_STRING_OBJ)