Add per-file error identifiers

src/arch/i386/include/bits/errfile.h

@@ -0,0 +1,31 @@
+#ifndef _BITS_ERRFILE_H
+#define _BITS_ERRFILE_H
+
+/**
+ * @addtogroup errfile Error file identifiers
+ * @{
+ */
+
+#define ERRFILE_umalloc		( ERRFILE_ARCH | ERRFILE_CORE | 0x00000000 )
+#define ERRFILE_memmap		( ERRFILE_ARCH | ERRFILE_CORE | 0x00010000 )
+#define ERRFILE_pnpbios		( ERRFILE_ARCH | ERRFILE_CORE | 0x00020000 )
+#define ERRFILE_smbios		( ERRFILE_ARCH | ERRFILE_CORE | 0x00030000 )
+#define ERRFILE_biosint		( ERRFILE_ARCH | ERRFILE_CORE | 0x00040000 )
+#define ERRFILE_int13		( ERRFILE_ARCH | ERRFILE_CORE | 0x00050000 )
+
+#define ERRFILE_bootsector     ( ERRFILE_ARCH | ERRFILE_IMAGE | 0x00000000 )
+#define ERRFILE_bzimage	       ( ERRFILE_ARCH | ERRFILE_IMAGE | 0x00010000 )
+#define ERRFILE_eltorito       ( ERRFILE_ARCH | ERRFILE_IMAGE | 0x00020000 )
+#define ERRFILE_multiboot      ( ERRFILE_ARCH | ERRFILE_IMAGE | 0x00030000 )
+#define ERRFILE_nbi	       ( ERRFILE_ARCH | ERRFILE_IMAGE | 0x00040000 )
+#define ERRFILE_pxe_image      ( ERRFILE_ARCH | ERRFILE_IMAGE | 0x00050000 )
+
+#define ERRFILE_undi		 ( ERRFILE_ARCH | ERRFILE_NET | 0x00000000 )
+#define ERRFILE_undiload	 ( ERRFILE_ARCH | ERRFILE_NET | 0x00010000 )
+#define ERRFILE_undinet		 ( ERRFILE_ARCH | ERRFILE_NET | 0x00020000 )
+#define ERRFILE_undionly	 ( ERRFILE_ARCH | ERRFILE_NET | 0x00030000 )
+#define ERRFILE_undirom		 ( ERRFILE_ARCH | ERRFILE_NET | 0x00040000 )
+
+/** @} */
+
+#endif /* _BITS_ERRFILE_H */

src/core/iobuf.c

@@ -17,6 +17,7 @@
  */
 
 #include <stdint.h>
+#include <errno.h>
 #include <gpxe/malloc.h>
 #include <gpxe/iobuf.h>
 
@@ -72,3 +73,22 @@ void free_iob ( struct io_buffer *iobuf ) {
 			   ( iobuf->end - iobuf->head ) + sizeof ( *iobuf ) );
 	}
 }
+
+/**
+ * Ensure I/O buffer has sufficient headroom
+ *
+ * @v iobuf	I/O buffer
+ * @v len	Required headroom
+ *
+ * This function currently only checks for the required headroom; it
+ * does not reallocate the I/O buffer if required.  If we ever have a
+ * code path that requires this functionality, it's a fairly trivial
+ * change to make.
+ */
+int iob_ensure_headroom ( struct io_buffer *iobuf, size_t len ) {
+
+	if ( iob_headroom ( iobuf ) >= len )
+		return 0;
+	return -ENOBUFS;
+}
+

src/crypto/axtls_aes.c

@@ -1,5 +1,6 @@
 #include "crypto/axtls/crypto.h"
 #include <string.h>
+#include <errno.h>
 #include <gpxe/crypto.h>
 #include <gpxe/aes.h>
 

src/crypto/cipher.c

@@ -0,0 +1,24 @@
+#include <stdint.h>
+#include <errno.h>
+#include <gpxe/crypto.h>
+
+int cipher_encrypt ( struct crypto_algorithm *crypto,
+		     void *ctx, const void *src, void *dst,
+		     size_t len ) {
+	if ( ( len & ( crypto->blocksize - 1 ) ) ) {
+		return -EINVAL;
+	}
+	crypto->encode ( ctx, src, dst, len );
+	return 0;
+}
+
+int cipher_decrypt ( struct crypto_algorithm *crypto,
+		     void *ctx, const void *src, void *dst,
+		     size_t len ) {
+	if ( ( len & ( crypto->blocksize - 1 ) ) ) {
+		return -EINVAL;
+	}
+	crypto->decode ( ctx, src, dst, len );
+	return 0;
+}
+

src/hci/strerror.c

@@ -60,15 +60,7 @@ static struct errortab * find_closest_error ( int errno ) {
 	/* Second, try masking off the gPXE-specific bit and seeing if
 	 * we have an entry for the generic POSIX error message.
 	 */
-	if ( ( errortab = find_error ( errno, 0x0000ffff ) ) != NULL )
-		return errortab;
-
-	/* Lastly, try masking off the POSIX bits and seeing if we
-	 * have a match just based on the PXENV component.  This
-	 * allows us to report errors from underlying PXE stacks.
-	 */
-	if ( ( errortab = find_error ( ( errno & 0x000000ff ),
-				       0xffff00ff ) ) != NULL )
+	if ( ( errortab = find_error ( errno, 0x4f0000ff ) ) != NULL )
 		return errortab;
 
 	return NULL;
@@ -109,6 +101,10 @@ const char * strerror ( int errno ) {
 	return errbuf;
 }
 
+/* Do not include ERRFILE portion in the numbers in the error table */
+#undef ERRFILE
+#define ERRFILE 0
+
 /** The most common errors */
 struct errortab common_errors[] __errortab = {
 	{ 0, "No error" },
@@ -121,4 +117,5 @@ struct errortab common_errors[] __errortab = {
 	{ ENETUNREACH, "Network unreachable" },
 	{ ETIMEDOUT, "Connection timed out" },
 	{ EPIPE, "Broken pipe" },
+	{ ECANCELED, "Operation cancelled" },
 };

src/include/compiler.h

@@ -267,6 +267,9 @@ extern void dbg_hex_dump_da ( unsigned long dispaddr,
 #define NDEBUG
 #endif
 
+/** Select file identifier for errno.h (if used) */
+#define ERRFILE PREFIX_OBJECT ( ERRFILE_ )
+
 /** Declare a data structure as packed. */
 #define PACKED __attribute__ (( packed ))