Message ID | 20231108111806.92604-2-nsaenz@amazon.com |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:aa0b:0:b0:403:3b70:6f57 with SMTP id k11csp841275vqo; Wed, 8 Nov 2023 03:18:40 -0800 (PST) X-Google-Smtp-Source: AGHT+IFEHHGmZJxd97Fmn12T7CDkGEeYM/MxcX2qvyGpt7y/lV+6U7kSvuEs48qcdDaUuYvpr8C+ X-Received: by 2002:a17:90b:1a8a:b0:280:e85a:9dde with SMTP id ng10-20020a17090b1a8a00b00280e85a9ddemr1558331pjb.33.1699442320588; Wed, 08 Nov 2023 03:18:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699442320; cv=none; d=google.com; s=arc-20160816; b=HqdCTbSGdmB8DQVtINSQpUf25+yjnwXZIDfH0hbvS3kI4hXbW+y8vLwT40kdx+PKxB aaeYKmheRgZlRMXLwjwlGBxF4adF7c2/F9+8bNsetzfaSeeGtXCQf7zoydErWVyfEW1t 2dHd0Ac2yNpGZmhZUcv76ub2FKrfrljPWlr1zhxEwAghQafx2qspJrQbPwbXO+E309Id WkFj5t+96IbT6qCcdeKElBg6PMJ6mfWY13Vi2tPV+dmWxISOjHC4Vjw8ELt95lfonJPF Ib0CTo0tufpY4/MhMyc+BmgOFnaLNMOObyPnp6vQ/Osr6/3Ajk79hQpQ+C+Chme3AVyM LDsA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Uq8x7FLfoIR318BRKD0i4hgYzW68ONMdLEubh/+ZbLg=; fh=Qdq7NqGm5JR9LpctBpXjoRI38Lb2mCk6xy26GEDp1Bg=; b=KDT0iScmQdUB2zqBRvlqEQAiBqMqQThO9h+tVhcdpDz3pPhJeyb8DahGtxlYbWHijd D18u//XiX3Vql9HirpiNatmXij2Pk2u6fzj31r+eynRlkl2CM/21IKHJKlDv2ckD09eY XFUqiJKTQPEXKe6dLnbTJzvgJcKDufu8JIrhRYDErbvtoum8wzI2AbPNyQrfXvhQtjST Ftt8un6fNc1CmpKHaKTl9hgZMl9097sAVEEBB2PIFkG9PdSTpwf+rY9cb2yvDv8p6LGj R6ONq91utai/8ZYuQJAwWL9MHh7ogGym0T/oks6r1XGu9zhKKRTg2mdhHC9Cj51Kv/+8 prUw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amazon.com header.s=amazon201209 header.b=cY0+dRyP; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=amazon.com Received: from snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id gm13-20020a17090b100d00b002803c4a0684si1963532pjb.189.2023.11.08.03.18.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 Nov 2023 03:18:40 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@amazon.com header.s=amazon201209 header.b=cY0+dRyP; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=amazon.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id 72CDF838B3C9; Wed, 8 Nov 2023 03:18:39 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344412AbjKHLSf (ORCPT <rfc822;jaysivo@gmail.com> + 32 others); Wed, 8 Nov 2023 06:18:35 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51752 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344383AbjKHLSe (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Wed, 8 Nov 2023 06:18:34 -0500 Received: from smtp-fw-2101.amazon.com (smtp-fw-2101.amazon.com [72.21.196.25]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B7871186; Wed, 8 Nov 2023 03:18:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.com; i=@amazon.com; q=dns/txt; s=amazon201209; t=1699442313; x=1730978313; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=Uq8x7FLfoIR318BRKD0i4hgYzW68ONMdLEubh/+ZbLg=; b=cY0+dRyPVwx/+v+HXR0Jhe77ryGubFD0miWlX3/F6w2LU8JJY03beq5H UlHqWKLtYvOXKD9YLBb5CoWwh+l9/3uWt2XKQauGXUdroYEFFOz7AAtFO G8lWw2z/bZWgPl7FrUHwDU7yi7pL+HkfHPkrhLjv/g2592ptsfSupSXi/ o=; X-IronPort-AV: E=Sophos;i="6.03,286,1694736000"; d="scan'208";a="361602176" Received: from iad12-co-svc-p1-lb1-vlan3.amazon.com (HELO email-inbound-relay-pdx-2a-m6i4x-44b6fc51.us-west-2.amazon.com) ([10.43.8.6]) by smtp-border-fw-2101.iad2.amazon.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Nov 2023 11:18:29 +0000 Received: from smtpout.prod.us-west-2.prod.farcaster.email.amazon.dev (pdx2-ws-svc-p26-lb5-vlan2.pdx.amazon.com [10.39.38.66]) by email-inbound-relay-pdx-2a-m6i4x-44b6fc51.us-west-2.amazon.com (Postfix) with ESMTPS id 8BB26A07F7; Wed, 8 Nov 2023 11:18:26 +0000 (UTC) Received: from EX19MTAEUC001.ant.amazon.com [10.0.10.100:45371] by smtpin.naws.eu-west-1.prod.farcaster.email.amazon.dev [10.0.26.101:2525] with esmtp (Farcaster) id 58210a6b-8421-43e3-b3a6-2ece76fce745; Wed, 8 Nov 2023 11:18:25 +0000 (UTC) X-Farcaster-Flow-ID: 58210a6b-8421-43e3-b3a6-2ece76fce745 Received: from EX19D004EUC001.ant.amazon.com (10.252.51.190) by EX19MTAEUC001.ant.amazon.com (10.252.51.155) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.39; Wed, 8 Nov 2023 11:18:25 +0000 Received: from dev-dsk-nsaenz-1b-189b39ae.eu-west-1.amazon.com (10.13.235.138) by EX19D004EUC001.ant.amazon.com (10.252.51.190) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1118.39; Wed, 8 Nov 2023 11:18:20 +0000 From: Nicolas Saenz Julienne <nsaenz@amazon.com> To: <kvm@vger.kernel.org> CC: <linux-kernel@vger.kernel.org>, <linux-hyperv@vger.kernel.org>, <pbonzini@redhat.com>, <seanjc@google.com>, <vkuznets@redhat.com>, <anelkz@amazon.com>, <graf@amazon.com>, <dwmw@amazon.co.uk>, <jgowans@amazon.com>, <corbert@lwn.net>, <kys@microsoft.com>, <haiyangz@microsoft.com>, <decui@microsoft.com>, <x86@kernel.org>, <linux-doc@vger.kernel.org>, Nicolas Saenz Julienne <nsaenz@amazon.com> Subject: [RFC 01/33] KVM: x86: Decouple lapic.h from hyperv.h Date: Wed, 8 Nov 2023 11:17:34 +0000 Message-ID: <20231108111806.92604-2-nsaenz@amazon.com> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231108111806.92604-1-nsaenz@amazon.com> References: <20231108111806.92604-1-nsaenz@amazon.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.13.235.138] X-ClientProxiedBy: EX19D037UWC004.ant.amazon.com (10.13.139.254) To EX19D004EUC001.ant.amazon.com (10.252.51.190) Precedence: bulk List-ID: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Wed, 08 Nov 2023 03:18:39 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1781994430427409273 X-GMAIL-MSGID: 1781994430427409273 |
Series |
KVM: x86: hyperv: Introduce VSM support
|
|
Commit Message
Nicolas Saenz Julienne
Nov. 8, 2023, 11:17 a.m. UTC
lapic.h has no dependencies with hyperv.h, so don't include it there.
Additionally, cpuid.c implicitly relied on hyperv.h's inclusion through
lapic.h, so include it explicitly there.
Signed-off-by: Nicolas Saenz Julienne <nsaenz@amazon.com>
---
arch/x86/kvm/cpuid.c | 1 +
arch/x86/kvm/lapic.h | 1 -
2 files changed, 1 insertion(+), 1 deletion(-)
Comments
On Wed, Nov 08, 2023, Nicolas Saenz Julienne wrote: > lapic.h has no dependencies with hyperv.h, so don't include it there. > > Additionally, cpuid.c implicitly relied on hyperv.h's inclusion through > lapic.h, so include it explicitly there. > > Signed-off-by: Nicolas Saenz Julienne <nsaenz@amazon.com> > --- FWIW, feel free to post patches like this without the full context, I'm more than happy to take patches that resolve header inclusion issues even if the issue(s) only become visible with additional changes. I'll earmark this one for 6.8.
diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c index 773132c3bf5a..eabd5e9dc003 100644 --- a/arch/x86/kvm/cpuid.c +++ b/arch/x86/kvm/cpuid.c @@ -28,6 +28,7 @@ #include "trace.h" #include "pmu.h" #include "xen.h" +#include "hyperv.h" /* * Unlike "struct cpuinfo_x86.x86_capability", kvm_cpu_caps doesn't need to be diff --git a/arch/x86/kvm/lapic.h b/arch/x86/kvm/lapic.h index 0a0ea4b5dd8c..e1021517cf04 100644 --- a/arch/x86/kvm/lapic.h +++ b/arch/x86/kvm/lapic.h @@ -6,7 +6,6 @@ #include <linux/kvm_host.h> -#include "hyperv.h" #include "smm.h" #define KVM_APIC_INIT 0