Quick hack to get image booting working again

[people/dverkamp/gpxe.git] / src / usr / imgmgmt.c

diff --git a/src/usr/imgmgmt.c b/src/usr/imgmgmt.c
index 2c949ae..df25195 100644 (file)
--- a/src/usr/imgmgmt.c
+++ b/src/usr/imgmgmt.c
@@ -18,10 +18,12 @@
 
 #include <stdint.h>
 #include <stdlib.h>
+#include <stdio.h>
 #include <errno.h>
-#include <vsprintf.h>
 #include <gpxe/image.h>
-#include <usr/fetch.h>
+#include <gpxe/downloader.h>
+#include <gpxe/monojob.h>
+#include <gpxe/open.h>
 #include <usr/imgmgmt.h>
 
 /** @file
@@ -30,43 +32,38 @@
  *
  */
 
+static int imgfetch_autoload ( struct image *image ) {
+       int rc;
+
+       if ( ( rc = register_image ( image ) ) != 0 )
+               return rc;
+
+       if ( ( rc = image_autoload ( image ) ) != 0 )
+               return rc;
+
+       return 0;
+}
+
 /**
  * Fetch an image
  *
- * @v filename         Filename for image
+ * @v uri_string       URI as a string (e.g. "http://www.nowhere.com/vmlinuz")
  * @v name             Name for image, or NULL
  * @ret new_image      Newly created image
  * @ret rc             Return status code
  */
-int imgfetch ( const char *filename, const char *name,
-              struct image **new_image ) {
-       struct image *image;
+int imgfetch ( struct image *image, const char *uri_string, int load ) {
        int rc;
 
-       /* Allocate new image */
-       image = malloc ( sizeof ( *image ) );
-       if ( ! image )
-               return -ENOMEM;
-       memset ( image, 0, sizeof ( *image ) );
+       printf ( "uri_string = %s\n", uri_string );
 
-       /* Fill in image name */
-       if ( name )
-               strncpy ( image->name, name, ( sizeof ( image->name ) - 1 ) );
+       if ( ( rc = create_downloader ( &monojob, image, 
+                                       ( load ? imgfetch_autoload :
+                                         register_image ),
+                                       LOCATION_URI_STRING,
+                                       uri_string ) ) == 0 )
+               rc = monojob_wait();
 
-       /* Fetch the file */
-       if ( ( rc = fetch ( image, filename ) ) != 0 )
-               goto err;
-
-       /* Register the image */
-       if ( ( rc = register_image ( image ) ) != 0 )
-               goto err;
-
-       *new_image = image;
-       return 0;
-
- err:
-       free_image ( image );
-       free ( image );
        return rc;
 }
 
@@ -77,7 +74,13 @@ int imgfetch ( const char *filename, const char *name,
  * @ret rc             Return status code
  */
 int imgload ( struct image *image ) {
-       return image_autoload ( image );
+       int rc;
+
+       /* Try to load image */
+       if ( ( rc = image_autoload ( image ) ) != 0 )
+               return rc;
+
+       return 0;
 }
 
 /**
@@ -129,6 +132,4 @@ void imgstat ( struct image *image ) {
  */
 void imgfree ( struct image *image ) {
        unregister_image ( image );
-       free_image ( image );
-       free ( image );
 }