sysadmin/ipxe
1
0
Fork 0
mirror of https://github.com/ipxe/ipxe synced 2025-12-16 09:32:33 +03:00
Code Issues Packages Projects Releases Wiki Activity

[image] Provide image_memory()

Browse Source 
Consolidate the remaining logic common to initrd_init() and imgmem()
into a shared image_memory() function.

Signed-off-by: Michael Brown <mcb30@ipxe.org>
This commit is contained in:
Michael Brown
2021-01-25 16:18:28 +00:00
parent ffc41ae9d1
commit 989a7a8032
6 changed files with 62 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/arch/x86/core/runtime.c
View File

@@ -179,7 +179,6 @@ static int cmdline_init ( void ) {
*/
static int initrd_init ( void ) {
struct image *image;
int rc;
/* Do nothing if no initrd was specified */
if ( ! initrd_phys ) {
@@ -193,51 +192,18 @@ static int initrd_init ( void ) {
DBGC ( colour, "RUNTIME found initrd at [%x,%x)\n",
initrd_phys, ( initrd_phys + initrd_len ) );
/* Allocate image */
image = alloc_image ( NULL );
/* Create initrd image */
image = image_memory ( "<INITRD>", phys_to_user ( initrd_phys ),
initrd_len );
if ( ! image ) {
DBGC ( colour, "RUNTIME could not allocate image for "
"initrd\n" );
rc = -ENOMEM;
goto err_alloc_image;
}
/* Set image name */
if ( ( rc = image_set_name ( image, "<INITRD>" ) ) != 0 ) {
DBGC ( colour, "RUNTIME could not set image name: %s\n",
strerror ( rc ) );
goto err_set_name;
}
/* Set image content */
if ( ( rc = image_set_data ( image, phys_to_user ( initrd_phys ),
initrd_len ) ) != 0 ) {
DBGC ( colour, "RUNTIME could not set image data: %s\n",
strerror ( rc ) );
goto err_set_data;
DBGC ( colour, "RUNTIME could not create initrd image\n" );
return -ENOMEM;
}
/* Mark initrd as consumed */
initrd_phys = 0;
/* Register image */
if ( ( rc = register_image ( image ) ) != 0 ) {
DBGC ( colour, "RUNTIME could not register initrd: %s\n",
strerror ( rc ) );
goto err_register_image;
}
/* Drop our reference to the image */
image_put ( image );
return 0;
err_register_image:
err_set_data:
err_set_name:
image_put ( image );
err_alloc_image:
return rc;
}
/**