These changes are the raw update to qemu-2.6.

[kvmfornfv.git] / qemu / roms / ipxe / src / include / ipxe / linux / linux_entropy.h

diff --git a/qemu/roms/ipxe/src/include/ipxe/linux/linux_entropy.h b/qemu/roms/ipxe/src/include/ipxe/linux/linux_entropy.h
index bd89bd5..afef6fe 100644 (file)
--- a/qemu/roms/ipxe/src/include/ipxe/linux/linux_entropy.h
+++ b/qemu/roms/ipxe/src/include/ipxe/linux/linux_entropy.h
@@ -3,11 +3,11 @@
 
 /** @file
  *
- * iPXE entropy API for linux
+ * /dev/random-based entropy source
  *
  */
 
-FILE_LICENCE(GPL2_OR_LATER);
+FILE_LICENCE ( GPL2_OR_LATER_OR_UBDL );
 
 #ifdef ENTROPY_LINUX
 #define ENTROPY_PREFIX_linux
@@ -23,10 +23,12 @@ FILE_LICENCE(GPL2_OR_LATER);
 static inline __always_inline double
 ENTROPY_INLINE ( linux, min_entropy_per_sample ) ( void ) {
 
-       /* We read single bytes from /dev/random and assume that each
-        * contains full entropy.
+       /* linux_get_noise() reads a single byte from /dev/random,
+        * which is supposed to block until a sufficient amount of
+        * entropy is available.  We therefore assume that each sample
+        * contains exactly 8 bits of entropy.
         */
-       return 8;
+       return 8.0;
 }
 
 #endif /* _IPXE_LINUX_ENTROPY_H */