From patchwork Thu Oct 17 17:03:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Daniel P. Smith" X-Patchwork-Id: 13840492 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 1992AD3C526 for ; Thu, 17 Oct 2024 17:17:23 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.820943.1234692 (Exim 4.92) (envelope-from ) id 1t1U7f-0004gO-KP; Thu, 17 Oct 2024 17:17:15 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 820943.1234692; Thu, 17 Oct 2024 17:17:15 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1t1U7f-0004gH-Hq; Thu, 17 Oct 2024 17:17:15 +0000 Received: by outflank-mailman (input) for mailman id 820943; Thu, 17 Oct 2024 17:17:13 +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 1t1TzY-0008TH-14 for xen-devel@lists.xenproject.org; Thu, 17 Oct 2024 17:08:52 +0000 Received: from sender4-of-o51.zoho.com (sender4-of-o51.zoho.com [136.143.188.51]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 7a61aa24-8caa-11ef-a0be-8be0dac302b0; Thu, 17 Oct 2024 19:08:51 +0200 (CEST) Received: by mx.zohomail.com with SMTPS id 1729184661673704.2726553863293; Thu, 17 Oct 2024 10:04:21 -0700 (PDT) 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: 7a61aa24-8caa-11ef-a0be-8be0dac302b0 ARC-Seal: i=1; a=rsa-sha256; t=1729184664; cv=none; d=zohomail.com; s=zohoarc; b=FGaplFOEg0rWI0UwXkCA+tRto+W1AeKjKp/IK1sImY8OaZ0tt2Hwb3CBRrNcwNVSewTgRHEPOPlRZFPQOswlI+1dYOfuxLrEw6PMzvJZsYhV3TDfsOIEq9pxwprgNN2P8NLChp7FSWcHs0+bdZ6xyEd9Ljm+asRWKTH/Eqmo2A8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1729184664; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:Subject:To:To:Message-Id:Reply-To; bh=t8mwfgj0+AG9djRszVKShE80Ero/zF+/yhs316UwKJo=; b=WauNIwkoJRLSMZUi9LAolyhJZfXfdMN1GuLam2sWYVV4151l5t33HuKcCNqIdgohaiwEJ6OEW6DjjJZUBclRbNC6ucxcH7u7HQZsGU3rdmgBWuHT8X9/Ebo4m9EBG2uoto6W06+FLiZOuFcv51LblVaYTNfyCV0CKiFDt6klqrc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=apertussolutions.com; spf=pass smtp.mailfrom=dpsmith@apertussolutions.com; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1729184664; s=zoho; d=apertussolutions.com; i=dpsmith@apertussolutions.com; h=From:From:To:To:Cc:Cc:Subject:Subject:Date:Date:Message-Id:Message-Id:In-Reply-To:References:MIME-Version:Content-Transfer-Encoding:Reply-To; bh=t8mwfgj0+AG9djRszVKShE80Ero/zF+/yhs316UwKJo=; b=V/XPjZlOPZgdAHyA7bfz3i0WTSD1qZbB+lW7Mi6BUdIyPL8JTejU6Ixn8DiCqQxW Nq6v5VZ8gQZfDhceAcmaSmSaq8g6yIMr+YkjrA820OeUKHtaWugOxLvPXze+TRJHhHP y3d1OCR2oN89UagNAVviywYA7jmq0z/iwLBWphB4= From: "Daniel P. Smith" To: xen-devel@lists.xenproject.org Cc: "Daniel P. Smith" , jason.andryuk@amd.com, christopher.w.clark@gmail.com, stefano.stabellini@amd.com, Jan Beulich , Andrew Cooper , =?utf-8?q?Roger_Pau_Monn=C3=A9?= Subject: [PATCH v6 37/44] x86/boot: remove mod from struct boot_module Date: Thu, 17 Oct 2024 13:03:17 -0400 Message-Id: <20241017170325.3842-38-dpsmith@apertussolutions.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20241017170325.3842-1-dpsmith@apertussolutions.com> References: <20241017170325.3842-1-dpsmith@apertussolutions.com> MIME-Version: 1.0 X-ZohoMailClient: External With all references to mod field removed, remove the mod field from struct boot_module. Signed-off-by: Daniel P. Smith Reviewed-by: Jason Andryuk --- xen/arch/x86/include/asm/bootinfo.h | 3 --- xen/arch/x86/setup.c | 2 -- 2 files changed, 5 deletions(-) diff --git a/xen/arch/x86/include/asm/bootinfo.h b/xen/arch/x86/include/asm/bootinfo.h index 24c2f37c7b11..b65b55c0a2c2 100644 --- a/xen/arch/x86/include/asm/bootinfo.h +++ b/xen/arch/x86/include/asm/bootinfo.h @@ -8,7 +8,6 @@ #ifndef __XEN_X86_BOOTINFO_H__ #define __XEN_X86_BOOTINFO_H__ -#include #include /* Max number of boot modules a bootloader can provide in addition to Xen */ @@ -25,8 +24,6 @@ enum bootmod_type { }; struct boot_module { - /* Transitionary only */ - module_t *mod; /* * A boot module may contain a compressed kernel that will require * additional space, before the module data, into which the kernel will be diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index 5ae82f3abcb5..ae027667eb82 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -308,8 +308,6 @@ static struct boot_info *__init multiboot_fill_boot_info(unsigned long mbi_p) */ for ( i = 0; i <= bi->nr_modules; i++ ) { - bi->mods[i].mod = &mods[i]; - bi->mods[i].cmdline = (paddr_t)mods[i].string; bi->mods[i].start = (paddr_t)mods[i].mod_start;