Ensure that pxe_netdev is set before starting up PXE NBP.

diff --git a/src/arch/i386/image/pxe_image.c b/src/arch/i386/image/pxe_image.c
index c646929007d4b5504742db14e74c3bceae53ab59..3da38e09e1956863f1e6f2fe6906e40841dee3ec 100644 (file)
--- a/src/arch/i386/image/pxe_image.c
+++ b/src/arch/i386/image/pxe_image.c
@@ -38,7 +38,7 @@ struct image_type pxe_image_type __image_type ( PROBE_PXE );
  * @v image            PXE image
  * @ret rc             Return status code
  */
-static int pxe_exec ( struct image *image __unused ) {
+static int pxe_exec ( struct image *image ) {
        struct net_device *netdev;
        int rc;
 
@@ -52,6 +52,13 @@ static int pxe_exec ( struct image *image __unused ) {
                break;
        }
 
+       /* Many things will break if pxe_netdev is NULL */
+       if ( ! pxe_netdev ) {
+               DBGC ( image, "IMAGE %p could not locate PXE net device\n",
+                      image );
+               return -ENODEV;
+       }
+
        /* Start PXE NBP */
        rc = pxe_start_nbp();
 
@@ -80,8 +87,8 @@ int pxe_load ( struct image *image ) {
 
        /* Verify and prepare segment */
        if ( ( rc = prep_segment ( buffer, filesz, memsz ) ) != 0 ) {
-               DBG ( "PXE image could not prepare segment: %s\n",
-                     strerror ( rc ) );
+               DBGC ( image, "IMAGE %p could not prepare segment: %s\n",
+                      image, strerror ( rc ) );
                return rc;
        }