From nobody Fri Dec 19 04:18:17 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=1746808361; cv=none; d=zohomail.com; s=zohoarc; b=aC8TqnYITpxym9rbcdsMwBiTWBsMh3E/tDC4g5NfMhNqgFxLS0G68tmqxYfNapitQ/3rTFsOLWvlSVobpI21vmiEl6/VKDIq7kwtj3x/sbyx+Tj39KurjeAghDwG/pXoueR7afyibOdoMIx4XOhme0idtabMTR3bRAjyCdYh6nU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1746808361; 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=Uj6rfH1i3XcyxsQoQ74OA6E4STBRj/hMndAunES5dfs=; b=DGkP/3Kt1YWCLm2h9bbUSK1AVTImkVZnN2X08H2aMAJoOAmeVlqBtOvpGe/O+A3gaudoLOM9c2WfzR4SpNFGVnwnEQLOB+ZYaQEqN4JxP+NfqMZYYcE4t6tj9YZDV4v3Z8xIgqfDbM6itqBjKb5WZUrINoig/lv+px3TQpO27/s= 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 1746808361315996.303659638104; Fri, 9 May 2025 09:32:41 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.980251.1366723 (Exim 4.92) (envelope-from ) id 1uDQe8-0001lJ-5f; Fri, 09 May 2025 16:32:24 +0000 Received: by outflank-mailman (output) from mailman id 980251.1366723; Fri, 09 May 2025 16:32:24 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDQe7-0001jg-Ur; Fri, 09 May 2025 16:32:23 +0000 Received: by outflank-mailman (input) for mailman id 980251; Fri, 09 May 2025 16:32:22 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDQe6-0001fR-7L for xen-devel@lists.xenproject.org; Fri, 09 May 2025 16:32:22 +0000 Received: from mail-wr1-x42a.google.com (mail-wr1-x42a.google.com [2a00:1450:4864:20::42a]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 2d730218-2cf3-11f0-9ffb-bf95429c2676; Fri, 09 May 2025 18:32:20 +0200 (CEST) Received: by mail-wr1-x42a.google.com with SMTP id ffacd0b85a97d-3a0b7fbdde7so2047296f8f.2 for ; Fri, 09 May 2025 09:32:20 -0700 (PDT) Received: from localhost.localdomain (host-92-26-98-202.as13285.net. [92.26.98.202]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a1f58ecb46sm3790069f8f.30.2025.05.09.09.32.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 May 2025 09:32:18 -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: 2d730218-2cf3-11f0-9ffb-bf95429c2676 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1746808339; x=1747413139; 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=Uj6rfH1i3XcyxsQoQ74OA6E4STBRj/hMndAunES5dfs=; b=DnXFDBJ69KKbZ0j21DMhaNt20PrO0WjrB8dwwTjt6WAYckw7I7srlFiSuRDMuFzaek g0f6SLMXoHL7foAcKQWrD/ygopxlePssLY7QlrIxWJhIjctpuCNEllwUs/5CQRaBg2oC 0LbHuO9HVWGPDO+9sQQj1vTql45vo1T/7zIQA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746808339; x=1747413139; 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=Uj6rfH1i3XcyxsQoQ74OA6E4STBRj/hMndAunES5dfs=; b=K7izd/B83m43vwC9+lhmgH19GTLvcXBaCUqT9Nmqwxa0Rlie2OYvAHVEJb5FszSlmC CjLBHFZWQId6JeI2aYk2/BYNKP4umar+wFXUgb2Mk/ch4sZAlHBrl+DX0iBVGM5CGaqu vZpC9vCRw6YRz5I915o81ObMoiOOZ7ldcbOTLvZJRuGrLj1lS4Hd8MwdvO3plkqb/LaW r54BFHPadDBFH85JdYeO4GXjEPxChqveLqA+apu2YCPP+xovDWuzzl2X94ZB1WbN0Q2K BYXVUQ9jfDiMjcoYO2OFD0G+d7bd3kK0EGd8tg4Z9QpbLhyi2KxHp7ef2qkOM00FY3lQ euNg== X-Gm-Message-State: AOJu0Yy7HWWdIBTeoNm5ONksLbmFyyxHcFgfd28DNMhvwliVyyqTty6Z QzjOrKvz95iMpz98IXn4haMTlpwT5uS+z+lohcjXZhX6kKBM755510yHKauIvdvhQZC0Wf6nRY0 B X-Gm-Gg: ASbGnctpZaLLX2kdk9Md57XOvvFV6VaJpNEqdZCMz+ym5qpHKPzMFjE+Z+cMWFJyaPh Hacy9gnwYIGuVj0F9h95fxMruoyMFgm2/32JD3Oon+gScxFa2mEA019PhnU/sOKEx9r7Pmj6j6Z 6BS0LJsxGNbaX/CN2UDSBWVxY5iVqGr1/8pVE4TI7coS9ZVveZ+sxDaJyx6dGZ7S+LrD+sDqGmL 3fyIzeTu109ideNqrfIXON+C/DK8LTZdhKOxjBjcRJ5pRU521ZV2ZbSIgBPXLeNwr9EYEilPGl1 /XP4NID3AurTKRKrVNhaZAiFsk4VqcKNtfz05UVjLP6Sua6Ywi4/kEtyaYGzrn4/+uyX+ZP96KQ +qyuRNWuNEC1PYg== X-Google-Smtp-Source: AGHT+IH3Z38Rocwpp+dGJAJ8JcleA2f+AdZVLNkSuF3mEpA1/A4xYZVt3i6ya5jaCgnAUPzV9Mf9Qw== X-Received: by 2002:a5d:588b:0:b0:39c:dfa:d33e with SMTP id ffacd0b85a97d-3a1f643ba3emr3805411f8f.23.1746808339322; Fri, 09 May 2025 09:32:19 -0700 (PDT) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , Anthony PERARD , Michal Orzel , Jan Beulich , Julien Grall , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , Stefano Stabellini , Volodymyr Babchuk , Bertrand Marquis , Oleksii Kurochko , Shawn Anastasio , Ross Lagerwall Subject: [PATCH v2 1/3] xen/elfstructs: Include xen/types.h Date: Fri, 9 May 2025 17:32:10 +0100 Message-Id: <20250509163212.2948359-2-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250509163212.2948359-1-andrew.cooper3@citrix.com> References: <20250509163212.2948359-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: 1746808363002116600 elfstructs.h needs the stdint.h types. Two headers arrange this manually, = but elf.h and livepatch.h do not, which breaks source files whose headers are properly sorted. elfstructs.h is used by tools too, so use stdint directly outside of Xen. Clean up trailing whitespace. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich Reviewed-by: Ross Lagerwall --- CC: Anthony PERARD CC: Michal Orzel CC: Jan Beulich CC: Julien Grall CC: Roger Pau Monn=C3=A9 CC: Stefano Stabellini CC: Volodymyr Babchuk CC: Bertrand Marquis CC: Oleksii Kurochko CC: Shawn Anastasio CC: Ross Lagerwall v2: * Include stdint outside of Xen. --- xen/include/xen/elfstructs.h | 8 +++++++- xen/include/xen/livepatch_elf.h | 1 - xen/include/xen/version.h | 1 - 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/xen/include/xen/elfstructs.h b/xen/include/xen/elfstructs.h index eb6b87a823a8..0ca86cd6ac4d 100644 --- a/xen/include/xen/elfstructs.h +++ b/xen/include/xen/elfstructs.h @@ -26,6 +26,12 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ =20 +#ifdef __XEN__ +#include +#else +#include +#endif + typedef uint32_t Elf32_Addr; /* Unsigned program address */ typedef uint32_t Elf32_Off; /* Unsigned file offset */ typedef uint16_t Elf32_Half; /* Unsigned medium integer */ @@ -45,7 +51,7 @@ typedef uint64_t Elf64_Xword; =20 /* * e_ident[] identification indexes - * See http://www.caldera.com/developers/gabi/2000-07-17/ch4.eheader.html=20 + * See http://www.caldera.com/developers/gabi/2000-07-17/ch4.eheader.html */ #define EI_MAG0 0 /* file ID */ #define EI_MAG1 1 /* file ID */ diff --git a/xen/include/xen/livepatch_elf.h b/xen/include/xen/livepatch_el= f.h index 842111e14518..a8aafecd34b1 100644 --- a/xen/include/xen/livepatch_elf.h +++ b/xen/include/xen/livepatch_elf.h @@ -5,7 +5,6 @@ #ifndef __XEN_LIVEPATCH_ELF_H__ #define __XEN_LIVEPATCH_ELF_H__ =20 -#include #include =20 /* The following describes an Elf file as consumed by Xen Live Patch. */ diff --git a/xen/include/xen/version.h b/xen/include/xen/version.h index 4856ad1b446d..bc69ec9fb029 100644 --- a/xen/include/xen/version.h +++ b/xen/include/xen/version.h @@ -1,7 +1,6 @@ #ifndef __XEN_VERSION_H__ #define __XEN_VERSION_H__ =20 -#include #include =20 const char *xen_compile_date(void); --=20 2.39.5 From nobody Fri Dec 19 04:18:17 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=1746808370; cv=none; d=zohomail.com; s=zohoarc; b=G2B9GLjuh5uSUOyB5/dTHHAmZyC9p6PxEwrARRpshrB9w5AvNritIW3wg4rvwdUSrUW6H57QCiyixKq3vopNSyAbho6uYnakJqIJoqiSI6HCUyjeIzLU59jK3AziAAiOxL6MS/k0Ssy7zcWiMTV8LdpeKNIsVovV6Qak7J3h0zQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1746808370; 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=tFM0Y+gqadqzp0ENY31mMAUk5m2pUiR3mi691rrtM+k=; b=c57uli5LVyYXZyv7qVFw6cPhPj91QIW4U8stXqoTOl7Nvw8i3yvcY0J+KSjVQgXyscxUj3s8FczSwOR24EUlzTxzzznRGz+WUMTGSqoJoN5vysqWJyfLetcAECoJ05wEPSazjky9ho9UHV6fTDu9q4YiOMdY56DMD7qvw/4Mnfo= 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 1746808370863380.3785086730111; Fri, 9 May 2025 09:32:50 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.980250.1366717 (Exim 4.92) (envelope-from ) id 1uDQe7-0001j5-UJ; Fri, 09 May 2025 16:32:23 +0000 Received: by outflank-mailman (output) from mailman id 980250.1366717; Fri, 09 May 2025 16:32:23 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDQe7-0001hZ-Mf; Fri, 09 May 2025 16:32:23 +0000 Received: by outflank-mailman (input) for mailman id 980250; Fri, 09 May 2025 16:32:21 +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 1uDQe5-0001fS-Uh for xen-devel@lists.xenproject.org; Fri, 09 May 2025 16:32:21 +0000 Received: from mail-wr1-x433.google.com (mail-wr1-x433.google.com [2a00:1450:4864:20::433]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 2e05b200-2cf3-11f0-9eb4-5ba50f476ded; Fri, 09 May 2025 18:32:21 +0200 (CEST) Received: by mail-wr1-x433.google.com with SMTP id ffacd0b85a97d-3a1fb18420aso544125f8f.1 for ; Fri, 09 May 2025 09:32:21 -0700 (PDT) Received: from localhost.localdomain (host-92-26-98-202.as13285.net. [92.26.98.202]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a1f58ecb46sm3790069f8f.30.2025.05.09.09.32.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 May 2025 09:32:19 -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: 2e05b200-2cf3-11f0-9eb4-5ba50f476ded DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1746808340; x=1747413140; 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=tFM0Y+gqadqzp0ENY31mMAUk5m2pUiR3mi691rrtM+k=; b=lZ/dpJzBgkMVeDeQdUtBozlLtP64syKgtay9nq6eDcH9HgbwamN8BHsNmaBuv+WgE8 xKkLEBrbLHlp5kWlHfAgIfdxsz9DYCRkMcQsclKPcdblIoq836rZAUpQagR3Z++HDn9+ 0hQ+4qS0dY9N+QPOQSUQEfo9Bvs3cKFxHvL8U= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746808340; x=1747413140; 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=tFM0Y+gqadqzp0ENY31mMAUk5m2pUiR3mi691rrtM+k=; b=mTCqOOclrK9e26Br/dabDS0otbzZSF4EzKQ1mG9fLWV04Q11ErhhYHK9G0cwInu23n IHrUwbDMq/XrFVZI1/DMi2vA84ujFD8AfDvYfT/zuA3zpk3Ii08fGBPp3FrXwYC3fFeT j6LupXY9WqXrQtfMWwrU2MeNOeOul7WHpjisK4P+FGDMYcE2TAfUuwrTFY+DdrRsg6xt owBtgnr+D3zGuCw9XcPXRryKrzE4jU/AAyq4WGSAvGohjKp07oKabBcilEYIJdpq8kxL y0TcTeBBRg+w7U4qTC/AS5nZT7+xIlfWeqFy8t4I+dUU6r3ubWRcvNUviT3vIoLZ8MA5 Ji2Q== X-Gm-Message-State: AOJu0Yx33lMskSwj6mtFvmhdk0vixgzvqLKu47vKRhfaBzTnU9Z6Bs5U 6samGcDyS2p2v+uhXBXgeLg6tEv4sQEZq31I7mor4to+/3/33T3St/G7N1VbKc+XbUAnUnRDPVf L X-Gm-Gg: ASbGnctsru9qGh5a/1DClfRut3XaQ8E4y+XCPPA49mpsFDKZJ4mRgcvp/bMsMxFkVXp 59GIFMvg2y4wTb5rvMVmAXfawL3PHf9kybki8M4uRZhU0vEkuJl3xinuP0bwmDfo0GKFGPXveP3 82GCivcNGWhJPYLNJIzedd2oZbdMRJdw4quM1kYtL6II+T9oJhmqtxEbVpPFrOoVfk1V5dKWqQB PWtAWkovfsyy0wnpfTaE3f7gunqttYlS4fYEfSqRTqXHP5MzWFbi2C5KBsN/omrq8p6aPAuQe2+ SFYpvqK2WwE7UzB40b1UInfyE3ps+vI84m+fu06ShszkQ/xTneOsEe12l66xiBGDi/ORXaa9EGm 5ihR4vjr8iytiWr2Uc3Zfq9mW X-Google-Smtp-Source: AGHT+IEqpvqY6582XcpA4QoHaFF9RITN5vO2tcxP+51EaANNWJAgY2M9NmV5yf3g9aG70LBWTdSPOA== X-Received: by 2002:a05:6000:e07:b0:3a1:f561:6894 with SMTP id ffacd0b85a97d-3a1f649aa9amr2723924f8f.44.1746808340249; Fri, 09 May 2025 09:32:20 -0700 (PDT) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , Anthony PERARD , Michal Orzel , Jan Beulich , Julien Grall , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , Stefano Stabellini , Volodymyr Babchuk , Bertrand Marquis , Oleksii Kurochko , Shawn Anastasio , Ross Lagerwall Subject: [PATCH v2 2/3] xen/livepatch: Fix include hierarchy Date: Fri, 9 May 2025 17:32:11 +0100 Message-Id: <20250509163212.2948359-3-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250509163212.2948359-1-andrew.cooper3@citrix.com> References: <20250509163212.2948359-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: 1746808371886019000 xen/livepatch.h includes public/sysctl.h twice, which can be deduplicated, = and includes asm/livepatch.h meaning that each livepatch.c does not need to include both. Comment the #else and #endif cases to aid legibility. Signed-off-by: Andrew Cooper --- CC: Anthony PERARD CC: Michal Orzel CC: Jan Beulich CC: Julien Grall CC: Roger Pau Monn=C3=A9 CC: Stefano Stabellini CC: Volodymyr Babchuk CC: Bertrand Marquis CC: Oleksii Kurochko CC: Shawn Anastasio CC: Ross Lagerwall --- xen/arch/arm/arm32/livepatch.c | 1 - xen/arch/arm/arm64/livepatch.c | 1 - xen/arch/arm/livepatch.c | 1 - xen/arch/x86/livepatch.c | 1 - xen/include/xen/livepatch.h | 10 +++++----- 5 files changed, 5 insertions(+), 9 deletions(-) diff --git a/xen/arch/arm/arm32/livepatch.c b/xen/arch/arm/arm32/livepatch.c index 134d07a175bb..8541c71d6e2e 100644 --- a/xen/arch/arm/arm32/livepatch.c +++ b/xen/arch/arm/arm32/livepatch.c @@ -9,7 +9,6 @@ #include =20 #include -#include =20 void arch_livepatch_apply(const struct livepatch_func *func, struct livepatch_fstate *state) diff --git a/xen/arch/arm/arm64/livepatch.c b/xen/arch/arm/arm64/livepatch.c index e135bd5bf99a..39159ba8b5bf 100644 --- a/xen/arch/arm/arm64/livepatch.c +++ b/xen/arch/arm/arm64/livepatch.c @@ -13,7 +13,6 @@ =20 #include #include -#include =20 void arch_livepatch_apply(const struct livepatch_func *func, struct livepatch_fstate *state) diff --git a/xen/arch/arm/livepatch.c b/xen/arch/arm/livepatch.c index 3805b2974663..2fbb7bce60bb 100644 --- a/xen/arch/arm/livepatch.c +++ b/xen/arch/arm/livepatch.c @@ -11,7 +11,6 @@ #include =20 #include -#include =20 /* Override macros from asm/page.h to make them work with mfn_t */ #undef virt_to_mfn diff --git a/xen/arch/x86/livepatch.c b/xen/arch/x86/livepatch.c index be40f625d206..bdca355dc6cc 100644 --- a/xen/arch/x86/livepatch.c +++ b/xen/arch/x86/livepatch.c @@ -17,7 +17,6 @@ #include #include #include -#include #include =20 static bool has_active_waitqueue(const struct vm_event_domain *ved) diff --git a/xen/include/xen/livepatch.h b/xen/include/xen/livepatch.h index d074a5bebecc..c1e76ef55404 100644 --- a/xen/include/xen/livepatch.h +++ b/xen/include/xen/livepatch.h @@ -14,12 +14,14 @@ struct xen_sysctl_livepatch_op; #include #include /* For -ENOSYS or -EOVERFLOW */ =20 -#include /* For LIVEPATCH_OPAQUE_SIZE */ +#include =20 #ifdef CONFIG_LIVEPATCH =20 #include =20 +#include + /* * We use alternative and exception table code - which by default are __in= it * only, however we need them during runtime. These macros allows us to bu= ild @@ -93,8 +95,6 @@ int arch_livepatch_secure(const void *va, unsigned int pa= ges, enum va_type types =20 void arch_livepatch_init(void); =20 -#include /* For struct livepatch_func. */ -#include int arch_livepatch_verify_func(const struct livepatch_func *func); =20 static inline @@ -143,7 +143,7 @@ struct payload; int revert_payload(struct payload *data); void revert_payload_tail(struct payload *data); =20 -#else +#else /* !CONFIG_LIVEPATCH */ =20 /* * If not compiling with Live Patch certain functionality should stay as @@ -165,7 +165,7 @@ static inline bool is_patch(const void *addr) { return 0; } -#endif /* CONFIG_LIVEPATCH */ +#endif /* !CONFIG_LIVEPATCH */ =20 #endif /* __XEN_LIVEPATCH_H__ */ =20 --=20 2.39.5 From nobody Fri Dec 19 04:18:17 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=1746808366; cv=none; d=zohomail.com; s=zohoarc; b=kH14h4RVRNOf4bM36rIpJIGAJ0Xpy80TZIysdaFWd4grhHdGw9AGvVFfpttZ1i4O0E8+V0mdJGcGJLdI3FnS5XeOpqap5IW6aa+NAy1jQHq7Fxts+SbLq8oM1LfCmNFiNwmNV8NQc3/KA/rTZDrdToQA35nGepUrRWnj9UeQm9Q= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1746808366; 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=IAXP9jNKNZBQcjh+QziOUIyrdCODDG8+CjfV4+CNhS0=; b=lpV36/BsnLwr94TxypwwzZJBrDVJRd2evxktXCHu+KMEwOd2gWAM/dDVEqmcQKB2A+LOs4InKNf++jdnUPiVtMTu6NiH++qg9Op8XNrL8w2GYxiK7rwr41M7obskq+32/EAcocqvlm8eSsYa922RiafJCalJqp9ugflbXDS9bQ0= 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 174680836615257.112578464938224; Fri, 9 May 2025 09:32:46 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.980252.1366742 (Exim 4.92) (envelope-from ) id 1uDQe9-0002KY-DT; Fri, 09 May 2025 16:32:25 +0000 Received: by outflank-mailman (output) from mailman id 980252.1366742; Fri, 09 May 2025 16:32: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 1uDQe9-0002KI-7V; Fri, 09 May 2025 16:32:25 +0000 Received: by outflank-mailman (input) for mailman id 980252; Fri, 09 May 2025 16:32:23 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1uDQe7-0001fR-Lm for xen-devel@lists.xenproject.org; Fri, 09 May 2025 16:32:23 +0000 Received: from mail-wr1-x42e.google.com (mail-wr1-x42e.google.com [2a00:1450:4864:20::42e]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 2eaaec2d-2cf3-11f0-9ffb-bf95429c2676; Fri, 09 May 2025 18:32:22 +0200 (CEST) Received: by mail-wr1-x42e.google.com with SMTP id ffacd0b85a97d-3a1fa0d8884so505530f8f.3 for ; Fri, 09 May 2025 09:32:22 -0700 (PDT) Received: from localhost.localdomain (host-92-26-98-202.as13285.net. [92.26.98.202]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3a1f58ecb46sm3790069f8f.30.2025.05.09.09.32.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 09 May 2025 09:32:20 -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: 2eaaec2d-2cf3-11f0-9ffb-bf95429c2676 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=citrix.com; s=google; t=1746808341; x=1747413141; 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=IAXP9jNKNZBQcjh+QziOUIyrdCODDG8+CjfV4+CNhS0=; b=VRx04bEY45W020o8rSwE37xoi/LmCKlhvaCG2VV5UtWPcCoPyeeqAGcWKM5xI+Gjqb pxzNk7SGcqnltq9Nkv7sXsWEOMW5E23CfQvrgvSC7xJy73569cwaZeePfImYSMi4PZzv RY6ul0IEREOVsLQWh7ZWhhPVDaNrvFsEjNBIU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746808341; x=1747413141; 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=IAXP9jNKNZBQcjh+QziOUIyrdCODDG8+CjfV4+CNhS0=; b=UNydKjzBhtoFGe5u5dtlV2F2E82hBHFTrIvUxy2U3ZPZj78XR1GV0nSOchEIKjT61v eHw3u9zRXJct6d79vXYj64gf2DOipyIswk8JEY05nLshn7u0v6Mnuz6PENCaLJId70Jt 7vDvrnC1aRBT+VhTMO8kjws0tRwTqWaYzkCMdlQTleOsyeXORyRXZe5bQhn2l6Rz4ccy 8h5+zw3TJBe9HvszJxdYRtYf7kdM9OUYAhTqT6kG5GWZS6M3Impot7uUpSRxsKROW1uG 5CZNx5ve3CxIfmlFYz0QpTMNSQvyG2s3rz+FH731SKm5eYTHZ0u1W6g0ysKJPPefQ1Ng EhZg== X-Gm-Message-State: AOJu0Yz0HkJ39V19F2AReQByXoqZGWi5ep8dIiEnqmNYlorvrQ5d1GnE H09bVDRB7to737UP8AeXC304f2wpkkliL0AWpYaLSFXFy0XPjCkdzMwLLK8FqJRemK/TcaSN8Ei U X-Gm-Gg: ASbGncu+C7M8FkpWbmZdg66k2Bc3cvzVpyk3/K09JWVQRq67TntXp+b/g1s20+hp644 /It94XnlTNcnKKJ/r+MXfCme4OmhR6kkJ6q2T25rjbTI6Iect6FJs19GdlypE5kVTzVZp9Ocv8U sWphU8Xsp2oHE/CdQsd7HHWmfdc5Q3u7FMVnJBHUokZdjgJQmlwQpoCstC8zXy7gtvOfWkCXMfk pJ3NWPECly7I9SJto7vgzqi84tbmvcSeM3hjMZImB9D409TJfHrUVFc9nNlwch+Ru1/cCvbEnqS QNcLUmmKhOPcPhjfWhmTfsKGwvOvBG2WJ7NcsRsB0aWWbw63SMXSe9d5RnCtDfADgDzyt+J+2Nf Wi1/HQDsyygY8eg== X-Google-Smtp-Source: AGHT+IG1SRocew/woE3uS+KwwlFuShOVr+D6+gAoal7pb1bgIp8zpx4UNcPkC37nC/tBic4cfQ1i1Q== X-Received: by 2002:a5d:64cd:0:b0:3a0:b550:ded4 with SMTP id ffacd0b85a97d-3a1f6437188mr3688417f8f.13.1746808341315; Fri, 09 May 2025 09:32:21 -0700 (PDT) From: Andrew Cooper To: Xen-devel Cc: Andrew Cooper , Jan Beulich , Anthony PERARD , Michal Orzel , Julien Grall , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , Stefano Stabellini , Volodymyr Babchuk , Bertrand Marquis , Oleksii Kurochko , Shawn Anastasio Subject: [PATCH v2 3/3] xen: Sort includes Date: Fri, 9 May 2025 17:32:12 +0100 Message-Id: <20250509163212.2948359-4-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250509163212.2948359-1-andrew.cooper3@citrix.com> References: <20250509163212.2948359-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: 1746808367722019000 ... needing later adjustment. Drop types.h when it's clearly not needed. No functional change. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- CC: Anthony PERARD CC: Michal Orzel CC: Jan Beulich CC: Julien Grall CC: Roger Pau Monn=C3=A9 CC: Stefano Stabellini CC: Volodymyr Babchuk CC: Bertrand Marquis CC: Oleksii Kurochko CC: Shawn Anastasio --- xen/arch/arm/mmu/setup.c | 2 +- xen/arch/x86/alternative.c | 12 ++++++------ xen/arch/x86/livepatch.c | 8 ++++---- xen/common/memory.c | 4 +++- xen/common/page_alloc.c | 5 ++--- xen/include/xen/mm.h | 6 +++--- 6 files changed, 19 insertions(+), 18 deletions(-) diff --git a/xen/arch/arm/mmu/setup.c b/xen/arch/arm/mmu/setup.c index 30afe9778194..f6119ccacf15 100644 --- a/xen/arch/arm/mmu/setup.c +++ b/xen/arch/arm/mmu/setup.c @@ -12,8 +12,8 @@ #include #include =20 -#include #include +#include =20 /* Override macros from asm/page.h to make them work with mfn_t */ #undef mfn_to_virt diff --git a/xen/arch/x86/alternative.c b/xen/arch/x86/alternative.c index 43b009888c02..03669e9d8e8a 100644 --- a/xen/arch/x86/alternative.c +++ b/xen/arch/x86/alternative.c @@ -4,18 +4,18 @@ */ =20 #include -#include +#include +#include + +#include #include #include +#include +#include #include -#include -#include #include #include #include -#include -#include -#include =20 #define MAX_PATCH_LEN (255-1) =20 diff --git a/xen/arch/x86/livepatch.c b/xen/arch/x86/livepatch.c index bdca355dc6cc..5158e91f7e6e 100644 --- a/xen/arch/x86/livepatch.c +++ b/xen/arch/x86/livepatch.c @@ -5,14 +5,14 @@ #include #include #include +#include +#include #include #include -#include -#include -#include #include -#include #include +#include +#include =20 #include #include diff --git a/xen/common/memory.c b/xen/common/memory.c index 8ca4e1a8425b..61a94b23abae 100644 --- a/xen/common/memory.c +++ b/xen/common/memory.c @@ -25,12 +25,14 @@ #include #include #include -#include + #include #include #include #include + #include + #include =20 #ifdef CONFIG_X86 diff --git a/xen/common/page_alloc.c b/xen/common/page_alloc.c index bd4538c28d82..8f891d12dbf0 100644 --- a/xen/common/page_alloc.c +++ b/xen/common/page_alloc.c @@ -133,7 +133,6 @@ #include #include #include -#include #include #include #include @@ -144,14 +143,14 @@ #include #include =20 -#include #include +#include =20 #ifdef CONFIG_X86 #include #include -#include /* for highmem_start only */ #include +#include #else #define p2m_pod_offline_or_broken_hit(pg) 0 #define p2m_pod_offline_or_broken_replace(pg) BUG_ON(pg) diff --git a/xen/include/xen/mm.h b/xen/include/xen/mm.h index e89942b87d1e..78cbb977dd04 100644 --- a/xen/include/xen/mm.h +++ b/xen/include/xen/mm.h @@ -63,12 +63,12 @@ =20 #include #include +#include #include #include -#include -#include -#include #include +#include + #include =20 struct page_info; --=20 2.39.5