[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH v5 34/44] x86/boot: drop the use of initial_images unit global
- To: "Daniel P. Smith" <dpsmith@xxxxxxxxxxxxxxxxxxxx>, <xen-devel@xxxxxxxxxxxxxxxxxxxx>
- From: Jason Andryuk <jason.andryuk@xxxxxxx>
- Date: Tue, 8 Oct 2024 15:04:03 -0400
- Arc-authentication-results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=apertussolutions.com smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none (0)
- Arc-message-signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=T/zwxJmTDvd+Sb0ZsZpXiiC6o797eVDbhEu5vYueHsU=; b=ccl67xwwlV3/tK+dYY3fzbhzSLTOnWqoCqqTywZneKpVaRHKmRqT8bOlTetYJCX21zFEyhKp0omoluxyebDTzGtSudxCvArfmxrRjkJ4LsziGmZ8ii3Rti773zHbdjrP3/WhCNB20HymWVKgJzonKUMXvtBXqisola6vGGMcm+f/fx7hOXqBIa3dhaXqXDhQxd3l71i12cp/sSdSQ0wqn0Zgcw9mu5/L/qE7Y7ir32L3wInAFcE8WEONMPIv+fAWqEmUdlcFLJ63yTmWODUUP8oKh4xAHREXsxld0OMmYszok60I8ZnZxelMK0ofxL4JhY9cJRHH3HsujmWL7m5oAQ==
- Arc-seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=pkzy1NxOaHKPrKbsp+c1k6QXyYG7gH3djtbvZck2wfm2y+7gs4a7xEIjUK+Tnx7SReVF59EWAsIRvF1evA5d3dQL9wKs4fgPp82UYueezE38u6hjc1LCxovMFBRhOL+K4hGjQ92mhZItXag8XipNKrky+iACzVqesbhbNXm/OYD7ek8u094fqQiYNSYl+/5iyfbKNzyE8kf09g843cRxdrrkuTSZTsK8IwMKPBMuaNcdBJhzKgPfY1FFrybrhITCK3BhzuYP8iJe1+1NVOtRt8se2+dKl8jMh5pwWxKkA7itRMXDu34HJPQg6flfzeSB4ExefgHfsF5Iwn7bCYylUA==
- Cc: <christopher.w.clark@xxxxxxxxx>, <stefano.stabellini@xxxxxxx>, Jan Beulich <jbeulich@xxxxxxxx>, Andrew Cooper <andrew.cooper3@xxxxxxxxxx>, Roger Pau Monné <roger.pau@xxxxxxxxxx>
- Delivery-date: Tue, 08 Oct 2024 20:05:17 +0000
- List-id: Xen developer discussion <xen-devel.lists.xenproject.org>
On 2024-10-06 17:49, Daniel P. Smith wrote:
Signed-off-by: Daniel P. Smith <dpsmith@xxxxxxxxxxxxxxxxxxxx>
---
xen/arch/x86/setup.c | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c
index 30a139074833..b3b6e6f38622 100644
--- a/xen/arch/x86/setup.c
+++ b/xen/arch/x86/setup.c
@@ -276,8 +276,6 @@ custom_param("acpi", parse_acpi_param);
static const char *cmdline_cook(const char *p, const char *loader_name);
-static const struct boot_module *__initdata initial_images;
-
struct boot_info __initdata xen_boot_info;
static struct boot_info __init *multiboot_fill_boot_info(unsigned long mbi_p)
@@ -336,9 +334,9 @@ unsigned long __init initial_images_nrpages(nodeid_t node)
for ( nr = i = 0; i < bi->nr_modules; ++i )
{
- unsigned long start = initial_images[i].mod->mod_start;
+ unsigned long start = bi->mods[i].mod->mod_start;
unsigned long end = start +
- PFN_UP(initial_images[i].mod->mod_end);
+ PFN_UP(bi->mods[i].mod->mod_end);
Fits on a single line.
if ( end > node_start && node_end > start )
nr += min(node_end, end) - max(node_start, start);
@@ -355,15 +353,14 @@ void __init discard_initial_images(void)
for ( i = 0; i < bi->nr_modules; ++i )
{
uint64_t start =
- (uint64_t)initial_images[i].mod->mod_start << PAGE_SHIFT;
+ (uint64_t)bi->mods[i].mod->mod_start << PAGE_SHIFT;
Fits on one line. Can also be pfn_to_paddr(), which applies to earlier
patches. Having said that, maybe it's okay to skip pfn_to_paddr as at
the end of the series mods[i].start is used without a shift. i.e. fewer
transformations in these "mechanical" changes make review easier.
Unless someone else wants pfn_to_addr(), I am okay without that conversion.
init_domheap_pages(start,
start +
- PAGE_ALIGN(initial_images[i].mod->mod_end));
+ PAGE_ALIGN(bi->mods[i].mod->mod_end));
One line.
}
bi->nr_modules = 0;
- initial_images = NULL;
}
static void __init init_idle_domain(void)
With the line fixups:
Reviewed-by: Jason Andryuk <jason.andryuk@xxxxxxx>
|
