diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2020-07-18 17:40:27 +0200 |
|---|---|---|
| committer | Damien Zammit <damien@zamaudio.com> | 2023-06-23 23:53:31 +1000 |
| commit | 99462e362d0da8709f29227c586c088fc68f12e4 (patch) | |
| tree | 4ae867dfdb739e21cdd8f0add78860e12a7fdeb8 | |
| parent | e64041f72b21b205992dfce1b29dc016b1bc2e08 (diff) | |
Remove hardfail on missing /dev/urandom for PRNG && add mach_print debug
* patches/rumpuser-rng-debug.diff
| -rw-r--r-- | debian/changelog | 8 | ||||
| -rw-r--r-- | debian/patches/rumpuser-rng-debug.diff | 57 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 66 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index c1469943..b808eeac 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +rumpkernel (0~20191130-2) UNRELEASED; urgency=medium + + [ Damien Zammit ] + * patches/rumpuser-rng-debug.diff: WIP: Remove hardfail on missing + /dev/urandom for PRNG && add mach_print debug + + -- Samuel Thibault <sthibault@debian.org> Sat, 18 Jul 2020 17:40:08 +0200 + rumpkernel (0~20191130-1) unreleased; urgency=medium [ Damien Zammit ] diff --git a/debian/patches/rumpuser-rng-debug.diff b/debian/patches/rumpuser-rng-debug.diff new file mode 100644 index 00000000..1703ee06 --- /dev/null +++ b/debian/patches/rumpuser-rng-debug.diff @@ -0,0 +1,57 @@ +diff --git a/buildrump.sh/src/lib/librumpuser/rumpuser.c b/buildrump.sh/src/lib/librumpuser/rumpuser.c +index 3c03cb90..98da14bd 100644 +--- a/buildrump.sh/src/lib/librumpuser/rumpuser.c ++++ b/buildrump.sh/src/lib/librumpuser/rumpuser.c +@@ -25,6 +25,9 @@ + * SUCH DAMAGE. + */ + ++// putchar debug hack ++#include <mach.h> ++ + #include "rumpuser_port.h" + + #if !defined(lint) +@@ -57,19 +60,13 @@ struct rumpuser_hyperup rumpuser__hyp; + int + rumpuser_init(int version, const struct rumpuser_hyperup *hyp) + { +- int rv; +- + if (version != RUMPUSER_VERSION) { +- fprintf(stderr, "rumpuser mismatch, kern: %d, hypervisor %d\n", ++ rumpuser_dprintf("rumpuser mismatch, kern: %d, hypervisor %d\n", + version, RUMPUSER_VERSION); + abort(); + } + +- rv = rumpuser__random_init(); +- if (rv != 0) { +- ET(rv); +- } +- ++ rumpuser__random_init(); + rumpuser__thrinit(); + rumpuser__hyp = *hyp; + +@@ -223,8 +220,10 @@ rumpuser_getparam(const char *name, void *buf, size_t blen) + void + rumpuser_putchar(int c) + { ++ char s[2] = {0}; + +- putchar(c); ++ s[0] = (char)c; ++ mach_print(s); + } + + __dead void +@@ -254,7 +253,7 @@ rumpuser_dprintf(const char *format, ...) + va_list ap; + + va_start(ap, format); +- vfprintf(stderr, format, ap); ++ vfprintf(stdout, format, ap); + va_end(ap); + } + diff --git a/debian/patches/series b/debian/patches/series index 475d88b6..0a134063 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -6,3 +6,4 @@ ahcisata-rump.diff busspaceunmap-rump.diff memory-range.diff gnumach-update +rumpuser-rng-debug.diff |