From 64a8be3b5a7b86522483222f6acf127323ebdfd5 Mon Sep 17 00:00:00 2001 From: Justine Tunney Date: Sun, 4 Jun 2023 10:54:52 -0700 Subject: [PATCH] Release Blink 1.0.0 --- blink/biosrom.c | 2 +- blink/memorymalloc.c | 8 ++++---- blink/tunables.h | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/blink/biosrom.c b/blink/biosrom.c index 70a917825..4a9947cc0 100644 --- a/blink/biosrom.c +++ b/blink/biosrom.c @@ -132,7 +132,6 @@ static const u8 kDefBios[] = { void LoadBios(struct Machine *m, const char *biosprog) { off_t size; - size_t protstart, protend; if (biosprog) { off_t kBiosMinSize = kBiosEnd - kBiosEntry, kBiosMaxSize = kBiosEnd - kBiosOptBase; @@ -172,6 +171,7 @@ void LoadBios(struct Machine *m, const char *biosprog) { // try to protect the BIOS ROM area // BeginStore() & EndStore() will avoid scribbling in this area of // memory: so writes to the guest ROM area are effectively ignored + size_t protstart, protend; protstart = ROUNDUP(kBiosOptBase, FLAG_pagesize); protend = ROUNDDOWN(kBiosEnd, FLAG_pagesize); if (protstart < protend) { diff --git a/blink/memorymalloc.c b/blink/memorymalloc.c index 6c297a58e..884fd9a3d 100644 --- a/blink/memorymalloc.c +++ b/blink/memorymalloc.c @@ -205,9 +205,9 @@ struct System *NewSystem(struct XedMachineMode mode) { memset(s, 0, sizeof(*s)); s->mode = mode; if (s->mode.omode == XED_MODE_REAL) { - u8 *real = Mmap(NULL, ROUNDUP(kRealSize, FLAG_pagesize), - PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS_, - -1, 0, "real"); + u8 *real = + Mmap(NULL, ROUNDUP(kRealSize, FLAG_pagesize), PROT_READ | PROT_WRITE, + MAP_PRIVATE | MAP_ANONYMOUS_, -1, 0, "real"); if (!real) { free(s); enomem(); @@ -342,7 +342,7 @@ void FreeSystem(struct System *s) { unassert(!pthread_mutex_destroy(&s->exec_lock)); unassert(!pthread_mutex_destroy(&s->mmap_lock)); // TODO(jart): Figure out why sig_lock sometimes fails to destroy - pthread_mutex_destroy(&s->sig_lock); + (void)pthread_mutex_destroy(&s->sig_lock); free(s->elf.interpreter); DestroyFds(&s->fds); free(s->elf.execfn); diff --git a/blink/tunables.h b/blink/tunables.h index 49034ed8b..6cab9f5e6 100644 --- a/blink/tunables.h +++ b/blink/tunables.h @@ -4,9 +4,9 @@ #include "blink/builtin.h" -#define BLINK_MAJOR 0 -#define BLINK_MINOR 9 -#define BLINK_PATCH 2 +#define BLINK_MAJOR 1 +#define BLINK_MINOR 0 +#define BLINK_PATCH 0 #define LINUX_MAJOR 4 #define LINUX_MINOR 5