Page MenuHomeFreeBSD
Files F135535966

D12618.diff
No OneTemporary
Actions

D12618.diff
View Options

Index: head/sys/dev/random/random_harvestq.c
===================================================================
--- head/sys/dev/random/random_harvestq.c
+++ head/sys/dev/random/random_harvestq.c
@@ -260,26 +260,28 @@
return (error);
}
-static const char *(random_source_descr[]) = {
- "CACHED",
- "ATTACH",
- "KEYBOARD",
- "MOUSE",
- "NET_TUN",
- "NET_ETHER",
- "NET_NG",
- "INTERRUPT",
- "SWI",
- "FS_ATIME",
- "UMA", /* ENVIRONMENTAL_END */
- "PURE_OCTEON",
- "PURE_SAFE",
- "PURE_GLXSB",
- "PURE_UBSEC",
- "PURE_HIFN",
- "PURE_RDRAND",
- "PURE_NEHEMIAH",
- "PURE_RNDTEST",
+static const char *random_source_descr[ENTROPYSOURCE] = {
+ [RANDOM_CACHED] = "CACHED",
+ [RANDOM_ATTACH] = "ATTACH",
+ [RANDOM_KEYBOARD] = "KEYBOARD",
+ [RANDOM_MOUSE] = "MOUSE",
+ [RANDOM_NET_TUN] = "NET_TUN",
+ [RANDOM_NET_ETHER] = "NET_ETHER",
+ [RANDOM_NET_NG] = "NET_NG",
+ [RANDOM_INTERRUPT] = "INTERRUPT",
+ [RANDOM_SWI] = "SWI",
+ [RANDOM_FS_ATIME] = "FS_ATIME",
+ [RANDOM_UMA] = "UMA", /* ENVIRONMENTAL_END */
+ [RANDOM_PURE_OCTEON] = "PURE_OCTEON",
+ [RANDOM_PURE_SAFE] = "PURE_SAFE",
+ [RANDOM_PURE_GLXSB] = "PURE_GLXSB",
+ [RANDOM_PURE_UBSEC] = "PURE_UBSEC",
+ [RANDOM_PURE_HIFN] = "PURE_HIFN",
+ [RANDOM_PURE_RDRAND] = "PURE_RDRAND",
+ [RANDOM_PURE_NEHEMIAH] = "PURE_NEHEMIAH",
+ [RANDOM_PURE_RNDTEST] = "PURE_RNDTEST",
+ [RANDOM_PURE_VIRTIO] = "PURE_VIRTIO",
+ [RANDOM_PURE_BROADCOM] = "PURE_BROADCOM",
/* "ENTROPYSOURCE" */
};
Index: head/sys/sys/random.h
===================================================================
--- head/sys/sys/random.h
+++ head/sys/sys/random.h
@@ -58,9 +58,9 @@
#endif
/*
- * Note: if you add or remove members of random_entropy_source, remember to also update the
- * KASSERT regarding what valid members are in random_harvest_internal(), and remember the
- * strings in the static array random_source_descr[] in random_harvestq.c.
+ * Note: if you add or remove members of random_entropy_source, remember to
+ * also update the strings in the static array random_source_descr[] in
+ * random_harvestq.c.
*
* NOTE: complain loudly to markm@ or on the lists if this enum gets more than 32
* distinct values (0-31)! ENTROPYSOURCE may be == 32, but not > 32.

File Metadata

Mime Type
text/plain
Expires
Tue, Nov 11, 3:18 PM (9 h, 51 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
25162463
Default Alt Text
D12618.diff (2 KB)

Event Timeline