diff options
| -rw-r--r-- | src/core/downloader.c | 9 | ||||
| -rw-r--r-- | src/include/ipxe/downloader.h | 1 | ||||
| -rw-r--r-- | src/include/usr/imgmgmt.h | 4 | ||||
| -rw-r--r-- | src/usr/imgmgmt.c | 18 |
4 files changed, 13 insertions, 19 deletions
diff --git a/src/core/downloader.c b/src/core/downloader.c index 3e21ee9a..6e107bee 100644 --- a/src/core/downloader.c +++ b/src/core/downloader.c @@ -50,8 +50,6 @@ struct downloader { struct image *image; /** Current position within image buffer */ size_t pos; - /** Image registration routine */ - int ( * register_image ) ( struct image *image ); }; /** @@ -75,10 +73,6 @@ static void downloader_free ( struct refcnt *refcnt ) { */ static void downloader_finished ( struct downloader *downloader, int rc ) { - /* Register image if download was successful */ - if ( rc == 0 ) - rc = downloader->register_image ( downloader->image ); - /* Shut down interfaces */ intf_shutdown ( &downloader->xfer, rc ); intf_shutdown ( &downloader->job, rc ); @@ -219,7 +213,6 @@ static struct interface_descriptor downloader_job_desc = * * @v job Job control interface * @v image Image to fill with downloaded file - * @v register_image Image registration routine * @v type Location type to pass to xfer_open() * @v ... Remaining arguments to pass to xfer_open() * @ret rc Return status code @@ -229,7 +222,6 @@ static struct interface_descriptor downloader_job_desc = * image registration routine @c register_image() will be called. */ int create_downloader ( struct interface *job, struct image *image, - int ( * register_image ) ( struct image *image ), int type, ... ) { struct downloader *downloader; va_list args; @@ -245,7 +237,6 @@ int create_downloader ( struct interface *job, struct image *image, intf_init ( &downloader->xfer, &downloader_xfer_desc, &downloader->refcnt ); downloader->image = image_get ( image ); - downloader->register_image = register_image; va_start ( args, type ); /* Instantiate child objects and attach to our interfaces */ diff --git a/src/include/ipxe/downloader.h b/src/include/ipxe/downloader.h index 3b6a9d66..a7efa3f7 100644 --- a/src/include/ipxe/downloader.h +++ b/src/include/ipxe/downloader.h @@ -13,7 +13,6 @@ struct interface; struct image; extern int create_downloader ( struct interface *job, struct image *image, - int ( * register_image ) ( struct image *image ), int type, ... ); #endif /* _IPXE_DOWNLOADER_H */ diff --git a/src/include/usr/imgmgmt.h b/src/include/usr/imgmgmt.h index 0beab513..64e51499 100644 --- a/src/include/usr/imgmgmt.h +++ b/src/include/usr/imgmgmt.h @@ -12,9 +12,9 @@ FILE_LICENCE ( GPL2_OR_LATER ); struct image; extern int imgdownload ( struct image *image, struct uri *uri, - int ( * image_register ) ( struct image *image ) ); + int ( * action ) ( struct image *image ) ); extern int imgfetch ( struct image *image, const char *uri_string, - int ( * image_register ) ( struct image *image ) ); + int ( * action ) ( struct image *image ) ); extern int imgload ( struct image *image ); extern int imgexec ( struct image *image ); extern struct image * imgautoselect ( void ); diff --git a/src/usr/imgmgmt.c b/src/usr/imgmgmt.c index e958bc19..6b150353 100644 --- a/src/usr/imgmgmt.c +++ b/src/usr/imgmgmt.c @@ -40,11 +40,11 @@ FILE_LICENCE ( GPL2_OR_LATER ); * * @v image Image * @v uri URI - * @v image_register Action to take upon a successful download + * @v action Action to take upon a successful download * @ret rc Return status code */ int imgdownload ( struct image *image, struct uri *uri, - int ( * image_register ) ( struct image *image ) ) { + int ( * action ) ( struct image *image ) ) { size_t len = ( unparse_uri ( NULL, 0, uri, URI_ALL ) + 1 ); char uri_string_redacted[len]; const char *password; @@ -62,14 +62,18 @@ int imgdownload ( struct image *image, struct uri *uri, uri->password = password; /* Create downloader */ - if ( ( rc = create_downloader ( &monojob, image, image_register, - LOCATION_URI, uri ) ) != 0 ) + if ( ( rc = create_downloader ( &monojob, image, LOCATION_URI, + uri ) ) != 0 ) return rc; /* Wait for download to complete */ if ( ( rc = monojob_wait ( uri_string_redacted ) ) != 0 ) return rc; + /* Act upon downloaded image */ + if ( ( rc = action ( image ) ) != 0 ) + return rc; + return 0; } @@ -78,18 +82,18 @@ int imgdownload ( struct image *image, struct uri *uri, * * @v image Image * @v uri_string URI as a string (e.g. "http://www.nowhere.com/vmlinuz") - * @v image_register Action to take upon a successful fetch + * @v action Action to take upon a successful download * @ret rc Return status code */ int imgfetch ( struct image *image, const char *uri_string, - int ( * image_register ) ( struct image *image ) ) { + int ( * action ) ( struct image *image ) ) { struct uri *uri; int rc; if ( ! ( uri = parse_uri ( uri_string ) ) ) return -ENOMEM; - rc = imgdownload ( image, uri, image_register ); + rc = imgdownload ( image, uri, action ); uri_put ( uri ); return rc; |