From nobody Fri Oct 31 03:41:53 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=reject dis=none) header.from=citrix.com ARC-Seal: i=1; a=rsa-sha256; t=1755290507; cv=none; d=zohomail.com; s=zohoarc; b=Jf7638HMJ6n/TDaJS8F4BKC33xcz3IQk5uLll7gyW4ILddCCcMCNGdRORQekTPTpGU8FOfJg2diuWriU0CSy6Sl++B8S2omO/ae4W4nOjWquBs2e1zY8LhGySwpLS5Cos56QiJh0TDAlvpAPZ8POXjI3nZ0tz9gwOgWoI63BbPs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1755290507; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=paeLb+OeWm7Kh4afS3Tq+uDEFsCiAJMk5Nnn8+ey0D4=; b=dPVSplwtkZTypuwBKzwz9Z9jKfv6HL4ynDzZW5Cjbnypi+FaYPODULT8d4w6dCk/KMOmKthvfrRiTrc/gHCPetJgswLlpB3XVp6ZC90f8sjJrkNJ/ws6Cm7HFE0MkduQW7KpnATg5Imu+oTNppJOr7hLK/8Va16DJMhoOcMstOg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1755290507823849.7412020610907; Fri, 15 Aug 2025 13:41:47 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1083884.1443325 (Exim 4.92) (envelope-from ) id 1un1Er-0005SS-Oa; Fri, 15 Aug 2025 20:41:25 +0000 Received: by outflank-mailman (output) from mailman id 1083884.1443325; Fri, 15 Aug 2025 20:41:25 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1un1Er-0005SL-La; Fri, 15 Aug 2025 20:41:25 +0000 Received: by outflank-mailman (input) for mailman id 1083884; Fri, 15 Aug 2025 20:41:24 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1un1Eq-0005E7-25 for xen-devel@lists.xenproject.org; Fri, 15 Aug 2025 20:41:24 +0000 Received: from mail-wr1-x435.google.com (mail-wr1-x435.google.com [2a00:1450:4864:20::435]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 35163475-7a18-11f0-a328-13f23c93f187; Fri, 15 Aug 2025 22:41:23 +0200 (CEST) Received: by mail-wr1-x435.google.com with SMTP id ffacd0b85a97d-3b9d41cd38dso1675740f8f.0 for ; Fri, 15 Aug 2025 13:41:23 -0700 (PDT) Received: from localhost.localdomain (host-195-149-20-212.as13285.net. [195.149.20.212]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3bb5d089e07sm3153924f8f.0.2025.08.15.13.41.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Aug 2025 13:41:22 -0700 (PDT) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 35163475-7a18-11f0-a328-13f23c93f187 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1755290483; x=1755895283; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=paeLb+OeWm7Kh4afS3Tq+uDEFsCiAJMk5Nnn8+ey0D4=; b=OHN4L3LLc64luS8hYrI1Sq9Lc+4kTqBvQL67lJ9mCgASSXaOe4tkOvrZYH4bfytR1X Hz3adDXY70lHFF4cIe25DICmgJ534y4ROJ+DUaCvguG992m1l07oPfU8QAzW3xoYcjRs Ji+dMqMjK7kRWDuLVsz3rrNWp+bhxBvdyLOnM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755290483; x=1755895283; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=paeLb+OeWm7Kh4afS3Tq+uDEFsCiAJMk5Nnn8+ey0D4=; b=J9ByAzHL2Q9R3L2ui9Tyi7ZKMCTIntQ40mqIrkr+njKgpOsDP63ikmQKDBKdZfehvk LSnOIbLDGCLPQbihEfnhTgEPSwZXFKCqYJnSNHDUcbKeZJyOpDN619c6MXxoVBqhkRFI niyDYZSFppKbfo6PARIJkkhdhE2hi4M/QBKLAaa3HAR3WwWty0q/aC0vPCELev9KWcUV uKS/o6LVdVAM0JBbcLIGJAM/IDqJPOkx0Lj76vud0d0m76q8kOUYfCatgRvFNtmCLTmR hDS7lbrQh0bJ5Bk68FZwXVvEk95CCuYOz88BA2ULbEOkMcwhhEePst8Hz4nSDG5nU1j2 H1KA== X-Gm-Message-State: AOJu0Yyajeyn+0KuiJAsw3eeDClAa6Vb6ONObAwrJcmECsIvUyoQxeaT VxFC9V1aVtYLgOgPfFsyCy+j0+9ymTMPHsB2Xp0S57db99xmT8tCKBsnG9hYGQJvHYW0cyOl3U4 fOseR X-Gm-Gg: ASbGncsf34wQHiG53et00rg/q+coh3WIfXHqgX5BKSYrTR759oJaOnEdxVOGwxHJTLC +E0b2JN4wy90n6KslVMbthm+WVYa+zfW2JnyGCnd3ls7F3v1JqXlr7pCI5v3q2Lu91hs3bAV6lk ONT9m6EfcZIIeSMqs0UZU67XPwAMJxxaQ78tpv2um129GmNGBp2kU+0/BSCkrl0mGpxRezMjCMv /asHxiNKdmmf2IMWNkybEXeasYE6K7bOSf11iVuP3CEiRufTITQdbNGaPlvtehKUuW1dHnX0Pm0 jgcoz/c1F3+l86IyXUJW3gugwWcUFBrOwpBfJU87mH99Pk1srWrfltCWA91UzXB7/RtkRUe3ddC TDNE5DRJXQQIiJXfJu2t4yYCTOKlvIVKUXoQcNqT+EAjBaAxeeZptJZL0+46wDpLasGhQPPyEJH dd X-Google-Smtp-Source: AGHT+IGifGN3xZ06BUeGeyRrpuDRd2B66yl+ECqdoH4ziQ81hz+1O0IIjPXxjds+8gHb/yjolvgiVA== X-Received: by 2002:a05:6000:2f88:b0:3b7:84fc:ef4c with SMTP id ffacd0b85a97d-3bb66180488mr2439327f8f.6.1755290482728; Fri, 15 Aug 2025 13:41:22 -0700 (PDT) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , Jan Beulich , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= Subject: [PATCH v2 03/16] x86: Sort headers Date: Fri, 15 Aug 2025 21:41:04 +0100 Message-Id: <20250815204117.3312742-4-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250815204117.3312742-1-andrew.cooper3@citrix.com> References: <20250815204117.3312742-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @citrix.com) X-ZM-MESSAGEID: 1755290508833116600 No functional change. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- CC: Jan Beulich CC: Roger Pau Monn=C3=A9 I'm disappointed to notice that this is the second time I've done this to arch/x86/domain.c recently, and screwed it up the first time. I think we need some tooling to help keep this in order, not that I remotely have time to look into this. --- xen/arch/x86/acpi/cpufreq/acpi.c | 2 +- xen/arch/x86/cpu/mcheck/mce.h | 2 +- xen/arch/x86/domain.c | 4 +- xen/arch/x86/domctl.c | 44 ++++++++--------- xen/arch/x86/hvm/hvm.c | 76 +++++++++++++++--------------- xen/arch/x86/hvm/svm/svm.c | 6 +-- xen/arch/x86/hvm/svm/vmcb.c | 4 +- xen/arch/x86/hvm/vmx/vmx.c | 54 +++++++++++---------- xen/arch/x86/hvm/vmx/vvmx.c | 6 +-- xen/arch/x86/include/asm/hvm/hvm.h | 2 +- xen/arch/x86/tboot.c | 15 +++--- xen/arch/x86/xstate.c | 4 +- xen/drivers/acpi/apei/apei-base.c | 14 +++--- 13 files changed, 121 insertions(+), 112 deletions(-) diff --git a/xen/arch/x86/acpi/cpufreq/acpi.c b/xen/arch/x86/acpi/cpufreq/a= cpi.c index 0c2537640608..b81f2afc9b9b 100644 --- a/xen/arch/x86/acpi/cpufreq/acpi.c +++ b/xen/arch/x86/acpi/cpufreq/acpi.c @@ -11,8 +11,8 @@ * porting acpi-cpufreq.c from Linux 2.6.23 to Xen hypervisor */ =20 -#include #include +#include #include #include =20 diff --git a/xen/arch/x86/cpu/mcheck/mce.h b/xen/arch/x86/cpu/mcheck/mce.h index eba4b536c797..6157a41aaeea 100644 --- a/xen/arch/x86/cpu/mcheck/mce.h +++ b/xen/arch/x86/cpu/mcheck/mce.h @@ -7,8 +7,8 @@ #include #include =20 -#include #include +#include =20 #include "x86_mca.h" #include "mctelem.h" diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 28c91cf023f1..6e3fd35c934e 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -24,11 +24,13 @@ #include #include #include +#include #include #include #include #include #include +#include #include #include #include @@ -64,8 +66,6 @@ #include #include #include -#include -#include =20 #include #include diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index f07cae6a70b8..d7781b7dc5fd 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -4,39 +4,41 @@ * Copyright (c) 2002-2006, K A Fraser */ =20 -#include -#include -#include -#include #include -#include -#include -#include +#include #include -#include #include -#include -#include -#include +#include +#include +#include #include +#include +#include +#include #include +#include +#include +#include +#include +#include =20 +#include +#include #include -#include #include #include +#include +#include +#include +#include #include -#include /* for hvm_acpi_power_button */ -#include /* for arch_do_domctl */ +#include +#include + #include -#include -#include + +#include #include -#include -#include -#include -#include -#include =20 static int update_domain_cpu_policy(struct domain *d, xen_domctl_cpu_policy_t *xdpc) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index cb8ecd050d41..6d2b937b62ba 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -7,64 +7,66 @@ * Copyright (c) 2008, Citrix Systems, Inc. */ =20 +#include +#include +#include +#include +#include +#include +#include #include #include #include -#include -#include -#include #include -#include -#include -#include -#include -#include -#include -#include -#include +#include #include -#include #include -#include -#include -#include #include +#include +#include +#include +#include +#include #include -#include -#include -#include +#include +#include +#include + +#include +#include +#include #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include #include #include -#include -#include -#include -#include #include +#include +#include #include #include -#include +#include +#include +#include +#include +#include +#include #include -#include +#include +#include +#include +#include #include -#include +#include + +#include #include -#include #include +#include +#include #include -#include =20 #include =20 diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c index 57520ac3ec2d..a807cab305aa 100644 --- a/xen/arch/x86/hvm/svm/svm.c +++ b/xen/arch/x86/hvm/svm/svm.c @@ -18,7 +18,6 @@ #include #include #include -#include #include #include #include @@ -29,13 +28,14 @@ #include #include #include -#include #include +#include +#include #include #include +#include #include #include -#include #include #include =20 diff --git a/xen/arch/x86/hvm/svm/vmcb.c b/xen/arch/x86/hvm/svm/vmcb.c index 839d3ff91b5a..e4c797608f25 100644 --- a/xen/arch/x86/hvm/svm/vmcb.c +++ b/xen/arch/x86/hvm/svm/vmcb.c @@ -14,11 +14,11 @@ #include #include =20 +#include +#include #include #include #include -#include -#include #include =20 struct vmcb_struct *alloc_vmcb(void) diff --git a/xen/arch/x86/hvm/vmx/vmx.c b/xen/arch/x86/hvm/vmx/vmx.c index 6341fa20457c..c6bf435b744a 100644 --- a/xen/arch/x86/hvm/vmx/vmx.c +++ b/xen/arch/x86/hvm/vmx/vmx.c @@ -4,51 +4,53 @@ * Copyright (c) 2004, Intel Corporation. */ =20 +#include #include +#include #include +#include #include #include -#include +#include #include -#include #include -#include -#include -#include -#include -#include -#include -#include +#include + +#include +#include #include -#include +#include #include -#include -#include -#include +#include +#include #include #include +#include +#include #include -#include -#include -#include -#include #include -#include +#include +#include #include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include #include +#include #include +#include +#include +#include #include +#include #include #include +#include +#include + #include +#include +#include +#include =20 static bool __initdata opt_force_ept; boolean_param("force-ept", opt_force_ept); diff --git a/xen/arch/x86/hvm/vmx/vvmx.c b/xen/arch/x86/hvm/vmx/vvmx.c index 2432af58e0e0..95d3c2ee7b79 100644 --- a/xen/arch/x86/hvm/vmx/vvmx.c +++ b/xen/arch/x86/hvm/vmx/vvmx.c @@ -10,12 +10,12 @@ =20 #include =20 -#include -#include +#include #include #include #include -#include +#include +#include =20 static DEFINE_PER_CPU(u64 *, vvmcs_buf); =20 diff --git a/xen/arch/x86/include/asm/hvm/hvm.h b/xen/arch/x86/include/asm/= hvm/hvm.h index 18e40910ff71..228f47dbde8b 100644 --- a/xen/arch/x86/include/asm/hvm/hvm.h +++ b/xen/arch/x86/include/asm/hvm/hvm.h @@ -14,8 +14,8 @@ =20 #include #include -#include #include +#include =20 struct pirq; /* needed by pi_update_irte */ =20 diff --git a/xen/arch/x86/tboot.c b/xen/arch/x86/tboot.c index d5db60d335e3..319116857d4a 100644 --- a/xen/arch/x86/tboot.c +++ b/xen/arch/x86/tboot.c @@ -1,19 +1,20 @@ +#include +#include #include #include -#include +#include #include #include -#include -#include -#include -#include #include +#include +#include + +#include #include #include #include -#include -#include #include +#include #include =20 #include diff --git a/xen/arch/x86/xstate.c b/xen/arch/x86/xstate.c index e8e218caed36..f6d677eb121d 100644 --- a/xen/arch/x86/xstate.c +++ b/xen/arch/x86/xstate.c @@ -10,12 +10,12 @@ #include #include =20 +#include #include #include -#include #include +#include #include -#include =20 /* * Maximum size (in byte) of the XSAVE/XRSTOR save area required by all diff --git a/xen/drivers/acpi/apei/apei-base.c b/xen/drivers/acpi/apei/apei= -base.c index 053a92c307bb..4fe99573a220 100644 --- a/xen/drivers/acpi/apei/apei-base.c +++ b/xen/drivers/acpi/apei/apei-base.c @@ -30,15 +30,17 @@ * You should have received a copy of the GNU General Public License * along with this program; If not, see . */ -#include -#include + +#include #include -#include -#include -#include +#include #include -#include +#include +#include +#include + #include + #include #include =20 --=20 2.39.5