- Spectrum Development - spectrum-os.org

[PATCH ucspi-vsock] Makefile: use $@ where possible
by Alyssa Ross 19 Mar '21

19 Mar '21

This is, unfortunately, the only "internal macro" POSIX requires to be available for target rules, and I do want to keep the Makefile POSIX-compatible. But this is at least a slight improvement. --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 2045cdd..e05e32f 100644 --- a/Makefile +++ b/Makefile @@ -21,9 +21,9 @@ install: $(PROGRAMS) .PHONY: install vsockclient: vsockclient.o env.o log.o num.o vsock.o - $(CC) $(LDFLAGS) -o vsockclient vsockclient.o env.o log.o num.o vsock.o $(LDLIBS) + $(CC) $(LDFLAGS) -o $@ $@.o env.o log.o num.o vsock.o $(LDLIBS) vsockserver: vsockserver.o env.o log.o num.o vsock.o - $(CC) $(LDFLAGS) -o vsockserver vsockserver.o env.o log.o num.o vsock.o $(LDLIBS) + $(CC) $(LDFLAGS) -o $@ $@.o env.o log.o num.o vsock.o $(LDLIBS) vsockclient.o: env.h log.h num.h vsock.h vsockserver.o: env.h log.h num.h vsock.h -- 2.30.0

2 2

[PATCH ucspi-vsock] Makefile: stop repeating program list
by Alyssa Ross 18 Mar '21

18 Mar '21

Using a wildcard with rm -f means that if there are no object files to remove, rm will try to remove a non-existent file named '*.c', and then ignore the failure it gets by trying to do that. Which is fine. --- Makefile | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 1a4bb10..2045cdd 100644 --- a/Makefile +++ b/Makefile @@ -10,12 +10,14 @@ INSTALL_PROGRAM = $(INSTALL) prefix = /usr/local bindir = $(prefix)/bin -all: vsockclient vsockserver +PROGRAMS = vsockclient vsockserver + +all: $(PROGRAMS) .PHONY: all -install: vsockclient vsockserver +install: $(PROGRAMS) mkdir -p $(DESTDIR)$(bindir) - $(INSTALL_PROGRAM) vsockclient vsockserver $(DESTDIR)$(bindir) + $(INSTALL_PROGRAM) $(PROGRAMS) $(DESTDIR)$(bindir) .PHONY: install vsockclient: vsockclient.o env.o log.o num.o vsock.o @@ -27,6 +29,5 @@ vsockclient.o: env.h log.h num.h vsock.h vsockserver.o: env.h log.h num.h vsock.h clean: - rm -f env.o log.o num.o vsock.o \ - vsockclient.o vsockclient vsockserver.o vsockserver + rm -f $(PROGRAMS) *.o .PHONY: clean -- 2.30.0

2 4

[PATCH ucspi-vsock] num: rename from util
by Alyssa Ross 18 Mar '21

18 Mar '21

I don't want to have anything called "util", because that will inevitably become a dumping ground for all sorts of unrelated stuff. --- Makefile | 14 +++++++------- util.c => num.c | 2 +- util.h => num.h | 0 vsockclient.c | 2 +- vsockserver.c | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) rename util.c => num.c (97%) rename util.h => num.h (100%) diff --git a/Makefile b/Makefile index 07ff09b..1a4bb10 100644 --- a/Makefile +++ b/Makefile @@ -18,15 +18,15 @@ install: vsockclient vsockserver $(INSTALL_PROGRAM) vsockclient vsockserver $(DESTDIR)$(bindir) .PHONY: install -vsockclient: vsockclient.o env.o log.o util.o vsock.o - $(CC) $(LDFLAGS) -o vsockclient vsockclient.o env.o log.o util.o vsock.o $(LDLIBS) -vsockserver: vsockserver.o env.o log.o util.o vsock.o - $(CC) $(LDFLAGS) -o vsockserver vsockserver.o env.o log.o util.o vsock.o $(LDLIBS) +vsockclient: vsockclient.o env.o log.o num.o vsock.o + $(CC) $(LDFLAGS) -o vsockclient vsockclient.o env.o log.o num.o vsock.o $(LDLIBS) +vsockserver: vsockserver.o env.o log.o num.o vsock.o + $(CC) $(LDFLAGS) -o vsockserver vsockserver.o env.o log.o num.o vsock.o $(LDLIBS) -vsockclient.o: env.h log.h util.h vsock.h -vsockserver.o: env.h log.h util.h vsock.h +vsockclient.o: env.h log.h num.h vsock.h +vsockserver.o: env.h log.h num.h vsock.h clean: - rm -f env.o log.o util.o vsock.o \ + rm -f env.o log.o num.o vsock.o \ vsockclient.o vsockclient vsockserver.o vsockserver .PHONY: clean diff --git a/util.c b/num.c similarity index 97% rename from util.c rename to num.c index 2b39df1..ac7f0a4 100644 --- a/util.c +++ b/num.c @@ -3,7 +3,7 @@ #define _GNU_SOURCE -#include "util.h" +#include "num.h" #include <ctype.h> #include <stdlib.h> diff --git a/util.h b/num.h similarity index 100% rename from util.h rename to num.h diff --git a/vsockclient.c b/vsockclient.c index d25ab13..fbdd20e 100644 --- a/vsockclient.c +++ b/vsockclient.c @@ -16,7 +16,7 @@ #include "env.h" #include "log.h" -#include "util.h" +#include "num.h" #include "vsock.h" noreturn static void ex_usage(void) diff --git a/vsockserver.c b/vsockserver.c index 4c251b0..df9d334 100644 --- a/vsockserver.c +++ b/vsockserver.c @@ -19,7 +19,7 @@ #include "env.h" #include "log.h" -#include "util.h" +#include "num.h" #include "vsock.h" noreturn static void ex_usage(void) -- 2.30.0

2 2

[PATCH ucspi-vsock] Factor out set_verbosity()
by Alyssa Ross 18 Mar '21

18 Mar '21

This will save some cognitive load when reading main functions. --- log.c | 20 +++++++++++++++++++- log.h | 5 +++++ vsockclient.c | 6 +----- vsockserver.c | 6 +----- 4 files changed, 26 insertions(+), 11 deletions(-) diff --git a/log.c b/log.c index 385d39f..cdfacd6 100644 --- a/log.c +++ b/log.c @@ -1,15 +1,33 @@ // SPDX-License-Identifier: GPL-2.0-or-later -// SPDX-FileCopyrightText: 2020 Alyssa Ross <hi(a)alyssa.is> +// SPDX-FileCopyrightText: 2020-2021 Alyssa Ross <hi(a)alyssa.is> #define _GNU_SOURCE #include "log.h" #include <err.h> +#include <stdbool.h> #include <stdlib.h> enum verbosity verbosity = errors; +bool set_verbosity(int opt) +{ + switch (opt) { + case 'q': + verbosity = nothing; + return true; + case 'Q': + verbosity = errors; + return true; + case 'v': + verbosity = all; + return true; + } + + return false; +} + void veloge(const char *fmt, va_list args) { if (verbosity) diff --git a/log.h b/log.h index ea9e9cf..7b40e48 100644 --- a/log.h +++ b/log.h @@ -11,6 +11,11 @@ enum verbosity { extern enum verbosity verbosity; +// If opt is a character that matches a standard UCSPI command line +// verbosity option, sets the verbosity appropriately and returns +// true. Otherwise, returns false. +_Bool set_verbosity(int opt); + // Log an error message, followed by strerrno(errno), then exit with // status eval. _Noreturn void diee(int eval, const char *fmt, ...); diff --git a/vsockclient.c b/vsockclient.c index 91e1320..d25ab13 100644 --- a/vsockclient.c +++ b/vsockclient.c @@ -35,13 +35,9 @@ int main(int argc, char *argv[]) while ((opt = getopt(argc, argv, "+qQv")) != -1) { switch (opt) { case 'q': - verbosity = nothing; - break; case 'Q': - verbosity = errors; - break; case 'v': - verbosity = all; + set_verbosity(opt); break; default: ex_usage(); diff --git a/vsockserver.c b/vsockserver.c index 03d9838..4c251b0 100644 --- a/vsockserver.c +++ b/vsockserver.c @@ -43,13 +43,9 @@ int main(int argc, char *argv[]) notify = true; break; case 'q': - verbosity = nothing; - break; case 'Q': - verbosity = errors; - break; case 'v': - verbosity = all; + set_verbosity(opt); break; default: ex_usage(); -- 2.30.0

2 2

[PATCH ucspi-vsock] vsockserver: consistently use {STDIN,STDOUT}_FILENO
by Alyssa Ross 18 Mar '21

18 Mar '21

--- vsockserver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vsockserver.c b/vsockserver.c index 8f809ec..03d9838 100644 --- a/vsockserver.c +++ b/vsockserver.c @@ -110,7 +110,7 @@ int main(int argc, char *argv[]) diee(EX_OSERR, "dup2"); if (dup2(conn, STDOUT_FILENO) == -1) diee(EX_OSERR, "dup2"); - if (conn != 0 && conn != 1) + if (conn != STDIN_FILENO && conn != STDOUT_FILENO) close(conn); execvp(argv[optind], &argv[optind]); diee(EX_OSERR, "exec"); -- 2.30.0

2 2

[PATCH ucspi-vsock] vsockserver: consistently use diee instead of err
by Alyssa Ross 18 Mar '21

18 Mar '21

diee is our function that respects the verbosity setting. --- vsockserver.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/vsockserver.c b/vsockserver.c index 0317cd4..8f809ec 100644 --- a/vsockserver.c +++ b/vsockserver.c @@ -3,7 +3,6 @@ #define _GNU_SOURCE -#include <err.h> #include <errno.h> #include <inttypes.h> #include <stdbool.h> @@ -105,22 +104,22 @@ int main(int argc, char *argv[]) ilog("connection from %" PRIu32 " port %" PRIu32, rcid, rport); switch (child = fork()) { - case -1: err(EX_OSERR, "fork"); + case -1: diee(EX_OSERR, "fork"); case 0: if (dup2(conn, STDIN_FILENO) == -1) - err(EX_OSERR, "dup2"); + diee(EX_OSERR, "dup2"); if (dup2(conn, STDOUT_FILENO) == -1) - err(EX_OSERR, "dup2"); + diee(EX_OSERR, "dup2"); if (conn != 0 && conn != 1) close(conn); execvp(argv[optind], &argv[optind]); - err(EX_OSERR, "exec"); + diee(EX_OSERR, "exec"); } if (waitpid(child, NULL, 0) == -1) - err(EX_OSERR, "waitpid"); + diee(EX_OSERR, "waitpid"); close(conn); } - err(EX_OSERR, "accept"); + diee(EX_OSERR, "accept"); } -- 2.30.0

2 2

[PATCH ucspi-vsock] Use C11 noreturn instead of GNU attribute extension
by Alyssa Ross 18 Mar '21

18 Mar '21

--- log.h | 4 ++-- vsockclient.c | 8 ++++---- vsockserver.c | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/log.h b/log.h index a1b0c16..ea9e9cf 100644 --- a/log.h +++ b/log.h @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-or-later -// SPDX-FileCopyrightText: 2020 Alyssa Ross <hi(a)alyssa.is> +// SPDX-FileCopyrightText: 2020-2021 Alyssa Ross <hi(a)alyssa.is> #include <stdarg.h> @@ -13,7 +13,7 @@ extern enum verbosity verbosity; // Log an error message, followed by strerrno(errno), then exit with // status eval. -void diee(int eval, const char *fmt, ...) __attribute__((noreturn)); +_Noreturn void diee(int eval, const char *fmt, ...); // Log an error message. void elog(const char *fmt, ...); diff --git a/vsockclient.c b/vsockclient.c index ff8b7dc..91e1320 100644 --- a/vsockclient.c +++ b/vsockclient.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-or-later -// SPDX-FileCopyrightText: 2020 Alyssa Ross <hi(a)alyssa.is> +// SPDX-FileCopyrightText: 2020-2021 Alyssa Ross <hi(a)alyssa.is> #define _GNU_SOURCE @@ -7,9 +7,10 @@ #include <inttypes.h> #include <stdio.h> #include <stdlib.h> +#include <stdnoreturn.h> +#include <sys/socket.h> #include <sysexits.h> #include <unistd.h> -#include <sys/socket.h> #include <linux/vm_sockets.h> @@ -18,8 +19,7 @@ #include "util.h" #include "vsock.h" -static void ex_usage(void) __attribute__((noreturn)); -static void ex_usage(void) +noreturn static void ex_usage(void) { if (verbosity) fprintf(stderr, "Usage: %s [ -q | -Q | -v ] cid port prog...\n", diff --git a/vsockserver.c b/vsockserver.c index 2fb4f8e..0317cd4 100644 --- a/vsockserver.c +++ b/vsockserver.c @@ -1,5 +1,5 @@ // SPDX-License-Identifier: GPL-2.0-or-later -// SPDX-FileCopyrightText: 2020 Alyssa Ross <hi(a)alyssa.is> +// SPDX-FileCopyrightText: 2020-2021 Alyssa Ross <hi(a)alyssa.is> #define _GNU_SOURCE @@ -9,6 +9,7 @@ #include <stdbool.h> #include <stdio.h> #include <stdlib.h> +#include <stdnoreturn.h> #include <string.h> #include <sys/socket.h> #include <sys/wait.h> @@ -22,8 +23,7 @@ #include "util.h" #include "vsock.h" -static void ex_usage(void) __attribute__((noreturn)); -static void ex_usage(void) +noreturn static void ex_usage(void) { if (verbosity) fprintf(stderr, "Usage: %s [ -1 ] [ -q | -Q | -v ] cid port prog...\n", -- 2.30.0

2 2

[PATCH ucspi-vsock] Makefile: remove vsock{server,client}.o in clean
by Alyssa Ross 18 Mar '21

18 Mar '21

--- Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 4f11b64..07ff09b 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0-or-later -# SPDX-FileCopyrightText: 2020 Alyssa Ross <hi(a)alyssa.is> +# SPDX-FileCopyrightText: 2020-2021 Alyssa Ross <hi(a)alyssa.is> .POSIX: @@ -27,5 +27,6 @@ vsockclient.o: env.h log.h util.h vsock.h vsockserver.o: env.h log.h util.h vsock.h clean: - rm -f env.o log.o util.o vsock.o vsockclient vsockserver + rm -f env.o log.o util.o vsock.o \ + vsockclient.o vsockclient vsockserver.o vsockserver .PHONY: clean -- 2.30.0

2 2

[PATCH nixpkgs] spectrumPackages.spectrum-vm: fix without Wayland
by Alyssa Ross 16 Mar '21

16 Mar '21

This errored because of the undefined XDG_RUNTIME_DIR or WAYLAND_DISPLAY. I'd tried to prevent that by disabling -e around this part, but it turns out I should have disabled -u instead. --- pkgs/os-specific/linux/spectrum/spectrum-vm/spectrum-vm.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/spectrum/spectrum-vm/spectrum-vm.in b/pkgs/os-specific/linux/spectrum/spectrum-vm/spectrum-vm.in index 4fa0287a805..8d95c178689 100755 --- a/pkgs/os-specific/linux/spectrum/spectrum-vm/spectrum-vm.in +++ b/pkgs/os-specific/linux/spectrum/spectrum-vm/spectrum-vm.in @@ -55,7 +55,7 @@ do esac done -set +e +set +u if [ -n "$XDG_RUNTIME_DIR" ] then set -- -s "$XDG_RUNTIME_DIR" "$@" @@ -63,7 +63,7 @@ then then set -- --wayland-sock "$XDG_RUNTIME_DIR/$WAYLAND_DISPLAY" "$@" fi fi -set -e +set -u exec "$crosvm" run \ -p init=/sbin/init \ -- 2.27.0

2 4

[PATCH nixpkgs] spectrumPackages.rootfs: add /sys
by Alyssa Ross 16 Mar '21

16 Mar '21

Programs assume this and it's useful to have. --- pkgs/os-specific/linux/spectrum/rootfs/generic.nix | 2 +- pkgs/os-specific/linux/spectrum/rootfs/stage1.nix | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/spectrum/rootfs/generic.nix b/pkgs/os-specific/linux/spectrum/rootfs/generic.nix index 778b18dafa0..0a99f99bd5b 100644 --- a/pkgs/os-specific/linux/spectrum/rootfs/generic.nix +++ b/pkgs/os-specific/linux/spectrum/rootfs/generic.nix @@ -31,7 +31,7 @@ let mkdir $out cd $out - mkdir bin sbin dev proc run tmp + mkdir bin sbin dev proc run sys tmp ln -s ${dash}/bin/dash bin/sh ln -s ${makeStage1 { inherit run; }} sbin/init cp -r ${./etc} etc diff --git a/pkgs/os-specific/linux/spectrum/rootfs/stage1.nix b/pkgs/os-specific/linux/spectrum/rootfs/stage1.nix index 75cfed56e7f..be7853316e9 100644 --- a/pkgs/os-specific/linux/spectrum/rootfs/stage1.nix +++ b/pkgs/os-specific/linux/spectrum/rootfs/stage1.nix @@ -27,6 +27,7 @@ writeScript "init-stage1" '' if { s6-mount -t devpts -o gid=4,mode=620 none /dev/pts } if { s6-mount -t tmpfs none /dev/shm } if { s6-mount -t proc none /proc } + if { s6-mount -t sysfs none /sys } if { s6-ln -s ${mesa.drivers} /run/opengl-driver } export HOME / -- 2.30.0

2 3