These changes are the raw update to qemu-2.6.

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

diff --git a/qemu/roms/ipxe/src/core/settings.c b/qemu/roms/ipxe/src/core/settings.c
index 5e16b27..12e6c7d 100644 (file)
--- a/qemu/roms/ipxe/src/core/settings.c
+++ b/qemu/roms/ipxe/src/core/settings.c
@@ -15,9 +15,13 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
  * 02110-1301, USA.
+ *
+ * You can also choose to distribute this program under the terms of
+ * the Unmodified Binary Distribution Licence (as given in the file
+ * COPYING.UBDL), provided that you have satisfied its requirements.
  */
 
-FILE_LICENCE ( GPL2_OR_LATER );
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
 #include <stdint.h>
 #include <stdlib.h>
@@ -35,6 +39,7 @@ FILE_LICENCE ( GPL2_OR_LATER );
 #include <ipxe/uuid.h>
 #include <ipxe/uri.h>
 #include <ipxe/base16.h>
+#include <ipxe/base64.h>
 #include <ipxe/pci.h>
 #include <ipxe/init.h>
 #include <ipxe/version.h>
@@ -337,17 +342,20 @@ struct settings * autovivify_child_settings ( struct settings *parent,
  */
 const char * settings_name ( struct settings *settings ) {
        static char buf[16];
-       char tmp[ sizeof ( buf ) ];
+       char tmp[ 1 /* '.' */ + sizeof ( buf ) ];
 
        /* Find target settings block */
        settings = settings_target ( settings );
 
        /* Construct name */
-       for ( buf[2] = buf[0] = 0 ; settings ; settings = settings->parent ) {
-               memcpy ( tmp, buf, sizeof ( tmp ) );
-               snprintf ( buf, sizeof ( buf ), ".%s%s", settings->name, tmp );
+       buf[0] = '\0';
+       tmp[0] = '\0';
+       for ( ; settings->parent ; settings = settings->parent ) {
+               memcpy ( ( tmp + 1 ), buf, ( sizeof ( tmp ) - 1 ) );
+               snprintf ( buf, sizeof ( buf ), "%s%s", settings->name, tmp );
+               tmp[0] = '.';
        }
-       return ( buf + 2 );
+       return buf;
 }
 
 /**
@@ -499,10 +507,10 @@ int register_settings ( struct settings *settings, struct settings *parent,
  */
 void unregister_settings ( struct settings *settings ) {
        struct settings *child;
-       struct settings *tmp;
 
        /* Unregister child settings */
-       list_for_each_entry_safe ( child, tmp, &settings->children, siblings ) {
+       while ( ( child = list_first_entry ( &settings->children,
+                                            struct settings, siblings ) ) ) {
                unregister_settings ( child );
        }
 
@@ -1998,32 +2006,6 @@ const struct setting_type setting_type_uint16 __setting_type =
 const struct setting_type setting_type_uint32 __setting_type =
        SETTING_TYPE_UINT ( SETTING_TYPE_INT32 );
 
-/**
- * Format hex string setting value
- *
- * @v delimiter                Byte delimiter
- * @v raw              Raw setting value
- * @v raw_len          Length of raw setting value
- * @v buf              Buffer to contain formatted value
- * @v len              Length of buffer
- * @ret len            Length of formatted value, or negative error
- */
-static int format_hex_setting ( const char *delimiter, const void *raw,
-                               size_t raw_len, char *buf, size_t len ) {
-       const uint8_t *bytes = raw;
-       int used = 0;
-       unsigned int i;
-
-       if ( len )
-               buf[0] = 0; /* Ensure that a terminating NUL exists */
-       for ( i = 0 ; i < raw_len ; i++ ) {
-               used += ssnprintf ( ( buf + used ), ( len - used ),
-                                   "%s%02x", ( used ? delimiter : "" ),
-                                   bytes[i] );
-       }
-       return used;
-}
-
 /**
  * Parse hex string setting value (using colon delimiter)
  *
@@ -2036,7 +2018,7 @@ static int format_hex_setting ( const char *delimiter, const void *raw,
  */
 static int parse_hex_setting ( const struct setting_type *type __unused,
                               const char *value, void *buf, size_t len ) {
-       return hex_decode ( value, ':', buf, len );
+       return hex_decode ( ':', value, buf, len );
 }
 
 /**
@@ -2052,7 +2034,7 @@ static int parse_hex_setting ( const struct setting_type *type __unused,
 static int format_hex_colon_setting ( const struct setting_type *type __unused,
                                      const void *raw, size_t raw_len,
                                      char *buf, size_t len ) {
-       return format_hex_setting ( ":", raw, raw_len, buf, len );
+       return hex_encode ( ':', raw, raw_len, buf, len );
 }
 
 /**
@@ -2068,7 +2050,7 @@ static int format_hex_colon_setting ( const struct setting_type *type __unused,
 static int parse_hex_hyphen_setting ( const struct setting_type *type __unused,
                                      const char *value, void *buf,
                                      size_t len ) {
-       return hex_decode ( value, '-', buf, len );
+       return hex_decode ( '-', value, buf, len );
 }
 
 /**
@@ -2084,7 +2066,7 @@ static int parse_hex_hyphen_setting ( const struct setting_type *type __unused,
 static int format_hex_hyphen_setting ( const struct setting_type *type __unused,
                                       const void *raw, size_t raw_len,
                                       char *buf, size_t len ) {
-       return format_hex_setting ( "-", raw, raw_len, buf, len );
+       return hex_encode ( '-', raw, raw_len, buf, len );
 }
 
 /**
@@ -2099,7 +2081,7 @@ static int format_hex_hyphen_setting ( const struct setting_type *type __unused,
  */
 static int parse_hex_raw_setting ( const struct setting_type *type __unused,
                                   const char *value, void *buf, size_t len ) {
-       return hex_decode ( value, 0, buf, len );
+       return hex_decode ( 0, value, buf, len );
 }
 
 /**
@@ -2115,7 +2097,7 @@ static int parse_hex_raw_setting ( const struct setting_type *type __unused,
 static int format_hex_raw_setting ( const struct setting_type *type __unused,
                                    const void *raw, size_t raw_len,
                                    char *buf, size_t len ) {
-       return format_hex_setting ( "", raw, raw_len, buf, len );
+       return hex_encode ( 0, raw, raw_len, buf, len );
 }
 
 /** A hex-string setting (colon-delimited) */
@@ -2139,6 +2121,46 @@ const struct setting_type setting_type_hexraw __setting_type = {
        .format = format_hex_raw_setting,
 };
 
+/**
+ * Parse Base64-encoded setting value
+ *
+ * @v type             Setting type
+ * @v value            Formatted setting value
+ * @v buf              Buffer to contain raw value
+ * @v len              Length of buffer
+ * @v size             Integer size, in bytes
+ * @ret len            Length of raw value, or negative error
+ */
+static int parse_base64_setting ( const struct setting_type *type __unused,
+                                 const char *value, void *buf, size_t len ) {
+
+       return base64_decode ( value, buf, len );
+}
+
+/**
+ * Format Base64-encoded setting value
+ *
+ * @v type             Setting type
+ * @v raw              Raw setting value
+ * @v raw_len          Length of raw setting value
+ * @v buf              Buffer to contain formatted value
+ * @v len              Length of buffer
+ * @ret len            Length of formatted value, or negative error
+ */
+static int format_base64_setting ( const struct setting_type *type __unused,
+                                  const void *raw, size_t raw_len,
+                                  char *buf, size_t len ) {
+
+       return base64_encode ( raw, raw_len, buf, len );
+}
+
+/** A Base64-encoded setting */
+const struct setting_type setting_type_base64 __setting_type = {
+       .name = "base64",
+       .parse = parse_base64_setting,
+       .format = format_base64_setting,
+};
+
 /**
  * Format UUID setting value
  *