david/ipxe
david
/
ipxe
Archived
1
0
Fork 0
Code

[image] Move the register_and_{select|boot}_image() functions to imgmgmt.c 

These functions are used only as the "action" parameters to
imgdownload() or imgfetch(), and so belong in imgmgmt.c rather than
image.c

Signed-off-by: Michael Brown <mcb30@ipxe.org>
This commit is contained in:
Michael Brown 2011-03-09 13:11:35 +00:00
parent 3936136e5e
commit d17a84a056
4 changed files with 41 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/core/image.c
View File

@ -286,42 +286,3 @@ struct image * image_find_selected ( void ) {
}
return NULL;
}
/**
* Register and select an image
*
* @v image Executable image
* @ret rc Return status code
*/
int register_and_select_image ( struct image *image ) {
int rc;
if ( ( rc = register_image ( image ) ) != 0 )
return rc;
if ( ( rc = image_probe ( image ) ) != 0 )
return rc;
if ( ( rc = image_select ( image ) ) != 0 )
return rc;
return 0;
}
/**
* Register and boot an image
*
* @v image Image
* @ret rc Return status code
*/
int register_and_boot_image ( struct image *image ) {
int rc;
if ( ( rc = register_and_select_image ( image ) ) != 0 )
return rc;
if ( ( rc = image_exec ( image ) ) != 0 )
return rc;
return 0;
}

2
src/include/ipxe/image.h
View File

@ -143,8 +143,6 @@ extern int image_probe ( struct image *image );
extern int image_exec ( struct image *image );
extern int image_select ( struct image *image );
extern struct image * image_find_selected ( void );
extern int register_and_select_image ( struct image *image );
extern int register_and_boot_image ( struct image *image );
/**
* Increment reference count on an image

2
src/include/usr/imgmgmt.h
View File

@ -11,6 +11,8 @@ FILE_LICENCE ( GPL2_OR_LATER );
#include <ipxe/image.h>
extern int register_and_select_image ( struct image *image );
extern int register_and_boot_image ( struct image *image );
extern int imgdownload ( struct image *image, struct uri *uri,
int ( * action ) ( struct image *image ) );
extern int imgfetch ( struct image *image, const char *uri_string,

39
src/usr/imgmgmt.c
View File

@ -35,6 +35,45 @@ FILE_LICENCE ( GPL2_OR_LATER );
*
*/
/**
* Register and select an image
*
* @v image Executable image
* @ret rc Return status code
*/
int register_and_select_image ( struct image *image ) {
int rc;
if ( ( rc = register_image ( image ) ) != 0 )
return rc;
if ( ( rc = image_probe ( image ) ) != 0 )
return rc;
if ( ( rc = image_select ( image ) ) != 0 )
return rc;
return 0;
}
/**
* Register and boot an image
*
* @v image Image
* @ret rc Return status code
*/
int register_and_boot_image ( struct image *image ) {
int rc;
if ( ( rc = register_and_select_image ( image ) ) != 0 )
return rc;
if ( ( rc = image_exec ( image ) ) != 0 )
return rc;
return 0;
}
/**
* Download an image
*