These changes are the raw update to qemu-2.6.

[kvmfornfv.git] / qemu / roms / ipxe / src / core / main.c

diff --git a/qemu/roms/ipxe/src/core/main.c b/qemu/roms/ipxe/src/core/main.c
index db09e4c..638dea9 100644 (file)
--- a/qemu/roms/ipxe/src/core/main.c
+++ b/qemu/roms/ipxe/src/core/main.c
@@ -12,7 +12,7 @@ Literature dealing with the network protocols:
 
 **************************************************************************/
 
-FILE_LICENCE ( GPL2_OR_LATER );
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
 #include <stddef.h>
 #include <stdio.h>
@@ -26,6 +26,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
  * @ret rc             Return status code
  */
 __asmcall int main ( void ) {
+       int rc;
 
        /* Perform one-time-only initialisation (e.g. heap) */
        initialise();
@@ -35,9 +36,11 @@ __asmcall int main ( void ) {
        startup();
        printf ( "ok\n" );
 
-       ipxe ( NULL );
+       /* Attempt to boot */
+       if ( ( rc = ipxe ( NULL ) ) != 0 )
+               goto err_ipxe;
 
+ err_ipxe:
        shutdown_exit();
-
-       return 0;
+       return rc;
 }