Received: by 2002:a25:6193:0:0:0:0:0 with SMTP id v141csp1292475ybb; Wed, 25 Mar 2020 20:27:35 -0700 (PDT) X-Google-Smtp-Source: ADFU+vu5ndl/8ARWGxdq/rB0BU3RFKg13O0O2zIhY/Nweqvuul2POLVkL2/K3/H2oaK3t/dZl27X X-Received: by 2002:a9d:6857:: with SMTP id c23mr4880741oto.224.1585193254871; Wed, 25 Mar 2020 20:27:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1585193254; cv=none; d=google.com; s=arc-20160816; b=pAeF8JtsOAZJT8Q8tp6G47cb4+0lGV8pobjtfIegkEPAzuvXygr3KU5fuip0DYpMtH VfX8Gh1uEVYPTYIiZ3dGcOOmy1WgefXQFGG8aHNSt7tHWtFO3RLwAsgsL5opt+f3O25F +IAnrEOB4Sx6IJRcGyE73mqWEtrXElUFPY46dH9KO3rflqVtw+tIJn7vq22wVG/BawEG QChM/yTDO4HprNlf5+yaruZktizY2I+XRbr/OV2VmVhDuFx14ptvjs5bjjXdrybiTdD1 PtPjusS7SgAeFrRYWOZE3ZYh3bZCNZ91lHeIU1PW6pPKo+SFmaSk/C7oIqGfA8Iu8Z+X xNBw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :ironport-sdr:ironport-sdr; bh=tOZcxuf6adkFXla9EqvgqShMYnTNhnYlV+29uq/guog=; b=BoJCGHaNIenetneoUuwmlEQfRY99W2EOTpELK1H+oExWw5lZqsjDMJhFGbv6L4YCxV MfWzhOECS8EWzFV6rNtzb7whTVyfXkDF4BhzJsONk+6Qwx7GUIoAuxrTG5B17d52Qj2W Z3MDcQgtA+WWjuqhrqnU7ooWmJh1nPHCt6o2baQrpsLlOKN4Y85/5eMdCYOCPu9rE7hb 6gXB74sZrbXtS8kG+Yi0n7TI+eGUks2ke7cj5yd6musD1nHOloKloZqEEawB5W6krFRp DaYeafrXkobI89LrLJy57QoAMP6LK64GmnmbjrIQ7BCst4H52wpQ+s/u4YlUvYhyRPHx ZO4w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id v142si512717oie.217.2020.03.25.20.27.22; Wed, 25 Mar 2020 20:27:34 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727809AbgCZDZq (ORCPT + 99 others); Wed, 25 Mar 2020 23:25:46 -0400 Received: from mga18.intel.com ([134.134.136.126]:53303 "EHLO mga18.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728091AbgCZDZe (ORCPT ); Wed, 25 Mar 2020 23:25:34 -0400 IronPort-SDR: l6DxRvyZmYypsM5UXg0z+8FoC/FymFGj+N/iYD65bXOgNEmPckZj6A3BkcR/t10z/yd4jsP+vW A27dT4u8fDLQ== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Mar 2020 20:25:33 -0700 IronPort-SDR: LXjqAhcF6kDMzEy0by7c8b642y5+g9LGiqo6QedAJkauKrkA6dwIpeKt0KeAqWEHLG3W8rhJqF tz6vmJ2tAl3g== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.72,306,1580803200"; d="scan'208";a="446842833" Received: from lxy-clx-4s.sh.intel.com ([10.239.43.39]) by fmsmga005.fm.intel.com with ESMTP; 25 Mar 2020 20:25:32 -0700 From: Xiaoyao Li To: Paolo Bonzini , Shuah Khan Cc: kvm@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org, Xiaoyao Li Subject: [RFC v3 3/3] kvm: selftests: Fix header path when built from parent level with O specified Date: Thu, 26 Mar 2020 11:07:50 +0800 Message-Id: <20200326030750.173972-4-xiaoyao.li@intel.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200326030750.173972-1-xiaoyao.li@intel.com> References: <20200326030750.173972-1-xiaoyao.li@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When build kvm selftests in tools/testing/selftests directory with make O=/home/lxy/kselftests TARGETS=kvm it fails building some kvm test binaries due to lack of header files, e.g., x86_64/vmx_set_nested_state_test.c: In function ‘set_default_vmx_state’: x86_64/vmx_set_nested_state_test.c:85:7: error: ‘struct kvm_nested_state’ has no member named ‘hdr’ state->hdr.vmx.vmxon_pa = 0x1000; ... With "O" is specified, it also takes effect on "make headers_install", which causes no header files generated in "kernel-src/usr". Fix INSTALL_HDR_PATH with correct path for this case. Opportunistically fix the case when KBUILD_OUTPUT specified as well, even though it can work currently. Signed-off-by: Xiaoyao Li --- tools/testing/selftests/kvm/Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/testing/selftests/kvm/Makefile b/tools/testing/selftests/kvm/Makefile index 6a95878b2ab7..bf8f56488914 100644 --- a/tools/testing/selftests/kvm/Makefile +++ b/tools/testing/selftests/kvm/Makefile @@ -50,7 +50,11 @@ ifeq (0,$(MAKELEVEL)) INSTALL_HDR_PATH := $(top_srcdir)/usr endif else + ifneq ($(O)$(KBUILD_OUTPUT),) + INSTALL_HDR_PATH := $(BUILD)/usr + else INSTALL_HDR_PATH := $(top_srcdir)/usr + endif endif LINUX_HDR_PATH = $(INSTALL_HDR_PATH)/include/ LINUX_TOOL_INCLUDE = $(top_srcdir)/tools/include -- 2.20.1