kata-containers/s390-tools
1
0
Fork 0
mirror of https://github.com/ibm-s390-linux/s390-tools.git synced 2026-08-05 02:14:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

zipl/src: Reuse data of buffer components in bootmap

Browse Source 
Don't duplicate data of components added via add_component_buffer()
and friends to bootmap file. Instead, reuse data that were previously
added when preparing a program table for the first mirror to create
metadata (block lists, program tables, etc) specific for other mirrors.


Signed-off-by: Eduard Shishkin <edward6@linux.ibm.com>
Reviewed-by: Stefan Haberland <sth@linux.ibm.com>
Signed-off-by: Steffen Eiden <seiden@linux.ibm.com>
This commit is contained in:
Eduard Shishkin
2025-07-26 13:30:15 +02:00
committed by Steffen Eiden
parent 431e4542ca
commit 60bc1e38d0
1 changed files with 26 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
zipl/src/bootmap.c
View File

@@ -480,6 +480,14 @@ static int add_component_buffer_align(struct install_set *bis, void *buffer,
error_text("Could not write to bootmap file");
return -1;
}
if (!bis->comp_reg[comp_id].offset) {
/*
* save component offset and size
*/
assert(offset && *offset);
bis->comp_reg[comp_id].offset = *offset;
bis->comp_reg[comp_id].len = size;
}
if (component_type_by_id(comp_id) == COMPONENT_TYPE_LOAD) {
/* Fill in component location */
location->addr = data.load_address;
@@ -510,9 +518,26 @@ static int add_component_buffer(struct install_set *bis, void *buffer,
int mirror_id, int program_table_id)
{
struct disk_info *info = &bis->info->base[mirror_id];
loff_t offset;
if (bis->comp_reg[comp_id].offset > 0) {
/*
* The component data has been already written to the
* bootmap. Refer the respective region in the bootmap
* file.
*/
return add_component_file_range(bis,
bis->filename /* bootmap */,
&bis->comp_reg[comp_id],
data.load_address,
0 /*trailer */,
component,
0 /* do not add file data*/,
comp_id, menu_idx, mirror_id,
program_table_id);
}
return add_component_buffer_align(bis, buffer, size, data, component,
info->phy_block_size, NULL,
info->phy_block_size, &offset,
comp_id, menu_idx, mirror_id,
program_table_id);
}