From d2f27a34f71c3836ccc8b5ffd9991d7edd61fb97 Mon Sep 17 00:00:00 2001 From: Alexander Boettcher Date: Thu, 26 Jan 2023 14:14:55 +0100 Subject: [PATCH] nova: avoid fault during thread migration triggert by cpu_balancer.run on Qemu Fixes #4742 --- repos/base-nova/ports/nova.hash | 2 +- repos/base-nova/ports/nova.port | 2 +- repos/os/run/cpu_balancer.run | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/repos/base-nova/ports/nova.hash b/repos/base-nova/ports/nova.hash index 69875ea18e..6e3b49b5f0 100644 --- a/repos/base-nova/ports/nova.hash +++ b/repos/base-nova/ports/nova.hash @@ -1 +1 @@ -55bf35a51a039d4fe420fcc310c4271b615913eb +c7c2e9cf8d1bcd15608da93d5aa152d32aef1a33 diff --git a/repos/base-nova/ports/nova.port b/repos/base-nova/ports/nova.port index 81e04de82c..c7b80e4042 100644 --- a/repos/base-nova/ports/nova.port +++ b/repos/base-nova/ports/nova.port @@ -4,7 +4,7 @@ DOWNLOADS := nova.git # r10 branch URL(nova) := https://github.com/alex-ab/NOVA.git -REV(nova) := 953b8d36d909f87d8465e43ab35c22b636d04c87 +REV(nova) := 0cb9c8abfe9cb9d0992c8dbe048f55610fb54539 DIR(nova) := src/kernel/nova PATCHES := $(sort $(wildcard $(REP_DIR)/patches/*.patch)) diff --git a/repos/os/run/cpu_balancer.run b/repos/os/run/cpu_balancer.run index d96142b1e7..2e13f40d80 100644 --- a/repos/os/run/cpu_balancer.run +++ b/repos/os/run/cpu_balancer.run @@ -127,6 +127,7 @@ append config { + @@ -163,4 +164,4 @@ build_boot_image { core ld.lib.so init timer cpu_balancer cpu_burner top dynamic append qemu_args " -nographic" append qemu_args " -smp [expr $cpu_width * $cpu_height],cores=$cpu_width,threads=$cpu_height" -run_genode_until {.*thread xpos="1" ypos="0" name="signal handler" policy="max-utilize".*\n} 60 +run_genode_until {.*thread xpos="[1-9]" ypos="0" name="signal handler" policy="max-utilize".*\n} 60