From nobody Sun Nov 2 12:49:11 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=1740413296; cv=none; d=zohomail.com; s=zohoarc; b=h//Y9o0K+SxY4BOB2Kjl95hRBl5fjr9vBmzV+GwDk1i6proHUBe1e+Pc2V5uOQ/6OCwVlsOAnWnlif9CyRh101BOX2gE3sMhioRwzntl79w2xgN6X/pXqS357Za8x7Oh0ykSV/JBkZ0Whp6H2i2xizF2lo0bAqgtv9TlQWD8eWU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1740413296; 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=JvCaSQyWyY+FfA/0O37EX9qIMHCSri3oO6tt1sgXoWI=; b=LqcxsmI0WadXZT4RcWz8UcH4NhPsEmfq2xAGCcbjAJCoxI3LxgyRoLQ2/1yo799HKNp/CrOnTncRoQPyCOgtKtyj3mDGa6tyeXSXCV0XU/LUGEZmnLvPZaWgGMTNqcbdt4Cm/c28UHibmF+zZP5GBVa3m+4aDVGitjSh5hmZhsI= 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 174041329620916.390585411185043; Mon, 24 Feb 2025 08:08:16 -0800 (PST) Received: from list by lists.xenproject.org with outflank-mailman.895264.1303863 (Exim 4.92) (envelope-from ) id 1tmazE-00042r-PW; Mon, 24 Feb 2025 16:07:16 +0000 Received: by outflank-mailman (output) from mailman id 895264.1303863; Mon, 24 Feb 2025 16:07:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1tmazE-00042k-Mu; Mon, 24 Feb 2025 16:07:16 +0000 Received: by outflank-mailman (input) for mailman id 895264; Mon, 24 Feb 2025 16:07:15 +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 1tmazC-0003oc-Tr for xen-devel@lists.xenproject.org; Mon, 24 Feb 2025 16:07:15 +0000 Received: from mail-wm1-x331.google.com (mail-wm1-x331.google.com [2a00:1450:4864:20::331]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 690c9190-f2c9-11ef-9aae-95dc52dad729; Mon, 24 Feb 2025 17:07:13 +0100 (CET) Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-43aac0390e8so5807175e9.2 for ; Mon, 24 Feb 2025 08:07:13 -0800 (PST) Received: from andrewcoop.eng.citrite.net (host-92-26-98-202.as13285.net. [92.26.98.202]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-439b02d6837sm109356675e9.13.2025.02.24.08.07.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Feb 2025 08:07:11 -0800 (PST) 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: 690c9190-f2c9-11ef-9aae-95dc52dad729 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1740413233; x=1741018033; 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=JvCaSQyWyY+FfA/0O37EX9qIMHCSri3oO6tt1sgXoWI=; b=ViPtUzDw465K6WlJUNmHTgZlKAFWw57mV/QMQg/C/L8PIkWGIbIhW7X2gsPOLyPvJv u+yBnnJDnm1pbuq8PzL20LJEhyocObxgRI5DceeBdAe1kdV0rILOhb89p/u3A5IGcjTM iM6j0Ypgbc/0w6JuNXD3tiaq5e0bjQnaTvaBE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740413233; x=1741018033; 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=JvCaSQyWyY+FfA/0O37EX9qIMHCSri3oO6tt1sgXoWI=; b=m90XipnWIA7mwKNOc410GNZmZIm8s00Av5fuiciIA9TwP6MP5l1bXmdMQkzRccj6iF GOkIYYXGznk/+wFdQSM3IBBQrScunRvw3jnNEVpxjUvTm9mN05zk/oJK6N1jq420rhWv ru9oVS4H5licaMSslbSdkMKYd0ebSyFigGhiskUncj00xS1Odd+o712u45mA0nI0dXsw 3jLNhzUOfkV/fSYhILG9Kp7Spi2pAcw54Z6AQUoFxerXLuEqgJd82k+QBvuZhgg/m5st PsmASslXX8WrrRv2i0KnB3RSaXDQtPID5D28gmgGluxAZPYPUQgsUcC7OUfL2lHdWADg VZGA== X-Gm-Message-State: AOJu0YxtDalCEfJu/PoBIoGTndsVXE1YPNno7ZmNN8sNzkFf/jOQT0iE 3XZT9SuvF8V1KRwMNYglYIeN6NVgd+OxlPVh07lvI9CwBcH2f7ufo5QO9CueRE9VD7FFf9SUWaY 8 X-Gm-Gg: ASbGncvid2eo6T4kBP3JHHc6Of9+xD0bGGezvEdC3J0+s7a254NtIy1MB53lXPSDcQ7 SJF8rDdbGCevDvvCF2LFnchLN5CTaGFtiYyn1aPuIc6uvqD1SoQPBMjnOrdoV2sUd9MCrawHzMn 0lO1wQ5NhqlONxhCmFOMKFphemdQQwsDEXPg9XM2m6zmvCkj3qCHHc+oNFr2C7+/+pb7pHnRq56 CKm8PZ/Pd0Hpi+WihAQgHzYvh1FAJw1lSDz0ppYMIN1aaagD8D6QMAT4XTUjozy57GSuYBQqVVb cWCBRwncmoqin1Ego2SGEzRz5JRbzIhrP6EVNNoLtt5BoXcien43WRM4SmFL2YJgxHPE0GPoVaL cB9Z5Gg== X-Google-Smtp-Source: AGHT+IHpCNuKguKsVgryvYncGdJmySmys+0NiLMW5l1uYv1H3AVOCvOB6AXKqOdatQ8d1+juBkhxyw== X-Received: by 2002:a05:600c:1c83:b0:434:a4b3:5ebe with SMTP id 5b1f17b1804b1-439ae21ce20mr91851365e9.24.1740413232063; Mon, 24 Feb 2025 08:07:12 -0800 (PST) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , Jan Beulich , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= Subject: [PATCH 1/8] x86: Sort includes in various files Date: Mon, 24 Feb 2025 16:05:02 +0000 Message-Id: <20250224160509.1117847-2-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250224160509.1117847-1-andrew.cooper3@citrix.com> References: <20250224160509.1117847-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: 1740413298403019100 FRED support involves quite a lot of header file shuffling and cleanup. St= art by sorting the includes of impacted files, and dropping duplciates. domain.c: Double asm/spec_ctrl.h power.c: Double xen/sched.h setup.c: Double xen/serial.h mm.c: Double xen/mm.h No functional change. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- CC: Jan Beulich CC: Roger Pau Monn=C3=A9 No difference in compiled binary either, except for embedded line numbers. --- xen/arch/x86/acpi/power.c | 19 ++++---- xen/arch/x86/cpu/common.c | 15 ++++--- xen/arch/x86/crash.c | 32 +++++++------- xen/arch/x86/domain.c | 84 ++++++++++++++++++------------------ xen/arch/x86/hvm/vmx/vmcs.c | 25 +++++------ xen/arch/x86/machine_kexec.c | 5 ++- xen/arch/x86/mm.c | 54 ++++++++++++----------- xen/arch/x86/setup.c | 84 ++++++++++++++++++------------------ xen/arch/x86/smpboot.c | 22 +++++----- xen/arch/x86/traps.c | 79 +++++++++++++++++---------------- xen/arch/x86/x86_64/traps.c | 25 ++++++----- 11 files changed, 229 insertions(+), 215 deletions(-) diff --git a/xen/arch/x86/acpi/power.c b/xen/arch/x86/acpi/power.c index 08a7fc250800..d0b67614d521 100644 --- a/xen/arch/x86/acpi/power.c +++ b/xen/arch/x86/acpi/power.c @@ -11,28 +11,29 @@ */ =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 =20 +#include + #include =20 uint32_t system_reset_counter =3D 1; diff --git a/xen/arch/x86/cpu/common.c b/xen/arch/x86/cpu/common.c index 067d855badf0..1cc4adccb471 100644 --- a/xen/arch/x86/cpu/common.c +++ b/xen/arch/x86/cpu/common.c @@ -1,24 +1,25 @@ -#include -#include #include +#include #include #include +#include =20 #include +#include #include #include #include -#include -#include -#include #include #include -#include +#include +#include #include #include #include #include -#include /* for XEN_INVALID_{SOCKET,CORE}_ID */ +#include + +#include =20 #include "cpu.h" #include "mcheck/x86_mca.h" diff --git a/xen/arch/x86/crash.c b/xen/arch/x86/crash.c index 26057c71d3c9..4afe0ad859a7 100644 --- a/xen/arch/x86/crash.c +++ b/xen/arch/x86/crash.c @@ -8,27 +8,29 @@ * - Magnus Damm */ =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 =20 static cpumask_t waiting_to_crash; static unsigned int crashing_cpu; diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index 78a13e6812c9..7b2549091fd3 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -11,66 +11,68 @@ * Gareth Hughes , May 2000 */ =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 + #ifdef CONFIG_COMPAT #include #endif -#include -#include -#include -#include -#include =20 DEFINE_PER_CPU(struct vcpu *, curr_vcpu); =20 diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c index 8c0ea789c1a3..fa9d8b3267ea 100644 --- a/xen/arch/x86/hvm/vmx/vmcs.c +++ b/xen/arch/x86/hvm/vmx/vmcs.c @@ -4,33 +4,34 @@ * 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 =20 static bool __read_mostly opt_vpid_enabled =3D true; boolean_param("vpid", opt_vpid_enabled); diff --git a/xen/arch/x86/machine_kexec.c b/xen/arch/x86/machine_kexec.c index d50772ad6ca3..e20e8d0b1563 100644 --- a/xen/arch/x86/machine_kexec.c +++ b/xen/arch/x86/machine_kexec.c @@ -15,14 +15,15 @@ * Version 2. See the file COPYING for more details. */ =20 -#include #include #include #include +#include + #include #include -#include #include +#include =20 /* * Add a mapping for a page to the page tables used during kexec. diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index fa21903eb25a..6b34b908efcd 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -87,51 +87,53 @@ * doing the final put_page(), and remove it from the iommu if so. */ =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 =20 #ifdef CONFIG_PV #include "pv/mm.h" diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index 8ebe5a9443f3..143749e5da5b 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -1,68 +1,70 @@ -#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 -#ifdef CONFIG_COMPAT -#include -#include -#endif -#include -#include -#include -#include -#include + +#include #include -#include +#include +#include +#include #include -#include #include -#include #include -#include -#include -#include /* for bzimage_headroom */ #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 +#ifdef CONFIG_COMPAT +#include +#include +#endif + /* opt_nosmp: If true, secondary processors are ignored. */ static bool __initdata opt_nosmp; boolean_param("nosmp", opt_nosmp); diff --git a/xen/arch/x86/smpboot.c b/xen/arch/x86/smpboot.c index 891a29fca146..f904d5623272 100644 --- a/xen/arch/x86/smpboot.c +++ b/xen/arch/x86/smpboot.c @@ -7,39 +7,39 @@ * (c) 1998, 1999, 2000 Ingo Molnar */ =20 +#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 #include #include #include #include #include #include -#include #include +#include #include -#include =20 uint32_t __ro_after_init trampoline_phys; enum ap_boot_method __read_mostly ap_boot_method =3D AP_BOOT_NORMAL; diff --git a/xen/arch/x86/traps.c b/xen/arch/x86/traps.c index dca11a613dbd..e8d5aa9fd46b 100644 --- a/xen/arch/x86/traps.c +++ b/xen/arch/x86/traps.c @@ -12,68 +12,71 @@ * Gareth Hughes , May 2000 */ =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 -#include -#include -#include -#include -#include =20 /* * opt_nmi: one of 'ignore', 'dom0', or 'fatal'. diff --git a/xen/arch/x86/x86_64/traps.c b/xen/arch/x86/x86_64/traps.c index 02fdb3637d09..93f32ac66c92 100644 --- a/xen/arch/x86/x86_64/traps.c +++ b/xen/arch/x86/x86_64/traps.c @@ -1,28 +1,27 @@ - -#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 =20 static void print_xen_info(void) --=20 2.39.5