From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id oCgbIZjyZWTQEwEASxT56A (envelope-from ) for ; Thu, 18 May 2023 11:40:40 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id 0FsmIZjyZWThJAEA9RJhRA (envelope-from ) for ; Thu, 18 May 2023 11:40:40 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 4DB6B14B2A for ; Thu, 18 May 2023 11:40:40 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pza7E-0002Lo-4N; Thu, 18 May 2023 05:40:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pza7B-0002LA-Sn for guix-patches@gnu.org; Thu, 18 May 2023 05:40:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pza7B-0006cL-Kq for guix-patches@gnu.org; Thu, 18 May 2023 05:40:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pza7B-0004Js-Dm for guix-patches@gnu.org; Thu, 18 May 2023 05:40:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63527] [PATCH v4 8/8] system: hurd: Boot with pci.arbiter and rumpdisk. Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 18 May 2023 09:40:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63527 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63527@debbugs.gnu.org Received: via spool by 63527-submit@debbugs.gnu.org id=B63527.168440277616477 (code B ref 63527); Thu, 18 May 2023 09:40:05 +0000 Received: (at 63527) by debbugs.gnu.org; 18 May 2023 09:39:36 +0000 Received: from localhost ([127.0.0.1]:52082 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pza6h-0004Hc-IK for submit@debbugs.gnu.org; Thu, 18 May 2023 05:39:36 -0400 Received: from eggs.gnu.org ([209.51.188.92]:47232) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pza6b-0004G2-Hp for 63527@debbugs.gnu.org; Thu, 18 May 2023 05:39:30 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pza6W-0006Mq-BL; Thu, 18 May 2023 05:39:24 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=sSJfa0BztPSqifWm50KJnKP5djVPoVLoa+DKArt/AhY=; b=TzvlciHmpUwXeF580Y0h ChWE16G1tUWsls8qF/PoSrzwC8vWDAY+jBF9dzvQOVk4oMMLuGMWnHbkc+BKbGvhweM7z2zjM8Fb2 oqBNmQAyClYx/GgBYK5B+BTtPUlr4yYC0NK9b4Nx02j/egVEI63uVqrfFZdEsGSmVPALXplKQFrXg 1C6wt29coQEoX98AcTbPuFUmlFZSVsdrU+jiaPKog1bcZ3PbWL0F8IkCUTX7hMxTEfTzgrib1hANQ x8nbqw07RooU2VVmNdvy40fkuzYxMIFeOmBttz82a95DsvqQXSLRCuzGOMoFBgCifjN1nna/If+9G HxsSFBzOvV9/vQ==; Received: from [2a02:a462:da03:1:2701:7f81:a736:4607] (helo=drakenpad.fritz.box) by fencepost.gnu.org with esmtpa (Exim 4.90_1) (envelope-from ) id 1pza6V-0006zE-VC; Thu, 18 May 2023 05:39:24 -0400 From: Janneke Nieuwenhuizen Date: Thu, 18 May 2023 11:39:03 +0200 Message-Id: <91b78533b3abd24c04f3f09463bc061f56cf4805.1684402361.git.janneke@gnu.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Seal: i=1; s=key1; d=yhetil.org; t=1684402840; a=rsa-sha256; cv=none; b=KnO4qOqZgTfHiXWhFj+EmlfukpvF1Tp1iPEYGKAXzpRtUnKzkvy7qsaDgLMbRtwAglodA0 usgU0OK0kMIgxk+dBSz+slpqrRMtKLW0Z7JYWHZfc6WI/xY/bAUNlSaOrT6fNW/mP6blL2 3G3UZYk+eNitmJXU3hbCbj9jZKyKKG1W6oFCgbwdRS3sk/ZkkyygcE/gPUQ9H5ddBhCOqn SxWal7HkMQoaBY9pRz4gsNR3Piys8m+xOStYExc1EDj+s6arc7byLdbcyXzuhSMUFDCYHM ryV/PiOqYlxgPrGxv0LJWyL45H2523Rso4w1MxbcyPv/Yi/8npfrOTMVvyYHrg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=TzvlciHm; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1684402840; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=sSJfa0BztPSqifWm50KJnKP5djVPoVLoa+DKArt/AhY=; b=QjbrzANW0vO9NqqzDkUdg0qChc/Ja433SdRhBFwVpVnRdUjf/QLlF9oqcOYa5eZRhCJTTq cGnlxLEnmG7n4KABvlYq8Gx+UuOt9/BA6YhiqnaHsnvUh0Go0eyMCRifvdr5L8KK3k4tj/ 3w46r11a10e6DdKP/LSwM9JaOKCbeTRl61j9sPZeQvzGW7xY8EUNE7vFgmTk5YtKEVEPWM m4ywvDCjM+ShMssBpnpuahHrcqadmeHKgbp+ISSXtLo7C/Wd5l6BblKJLR+E3bcmQoFZP+ +0vbYtugSA3Uin/wVCCyJbT+Ud4Zn0q2spcJj+Klr6YBxv3e3es82jzF7WPF7w== X-Migadu-Spam-Score: -3.89 X-Spam-Score: -3.89 X-Migadu-Queue-Id: 4DB6B14B2A X-Migadu-Scanner: scn0.migadu.com Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gnu.org header.s=fencepost-gnu-org header.b=TzvlciHm; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-TUID: YPThIyJ6+qNJ Be sure to give the Hurd enough (virtual) memory * gnu/system.scm (hurd-multiboot-modules): Add commands for pci.arbiter and rumpdisk. --- gnu/system.scm | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/gnu/system.scm b/gnu/system.scm index 354f58f55b..23addf41e9 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -10,7 +10,7 @@ ;;; Copyright © 2020, 2021 Brice Waegeneire ;;; Copyright © 2020 Florian Pelz ;;; Copyright © 2020, 2022 Maxim Cournoyer -;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen +;;; Copyright © 2020, 2023 Janneke Nieuwenhuizen ;;; Copyright © 2020, 2022 Efraim Flashner ;;; Copyright © 2021 Maxime Devos ;;; Copyright © 2021 raid5atemyhomework @@ -1486,16 +1486,28 @@ (define (operating-system-multiboot-modules os) (define (hurd-multiboot-modules os) (let* ((hurd (operating-system-hurd os)) + (pci-arbiter-command + (list (file-append hurd "/hurd/pci-arbiter.static") + "pci-arbiter" + "--host-priv-port='${host-port}'" + "--device-master-port='${device-port}'" + "--next-task='${disk-task}'" + "'$(pci-task=task-create)'" + "'$(task-resume)'")) + (rumpdisk-command + (list (file-append hurd "/hurd/rumpdisk.static") + "rumpdisk" + "--next-task='${fs-task}'" + "'$(disk-task=task-create)'")) (root-file-system-command (list (file-append hurd "/hurd/ext2fs.static") "ext2fs" "--multiboot-command-line='${kernel-command-line}'" - "--host-priv-port='${host-port}'" - "--device-master-port='${device-port}'" "--exec-server-task='${exec-task}'" "--store-type=typed" "--x-xattr-translator-records" - "'${root}'" "'$(task-create)'" "'$(task-resume)'")) + "'${root}'" + "'$(fs-task=task-create)'")) (target (%current-target-system)) (libc (if target (with-parameters ((%current-target-system #f)) @@ -1512,7 +1524,10 @@ (define (hurd-multiboot-modules os) ;; (file-append hurd "/hurd/exec") "'$(exec-task=task-create)'") (list (file-append hurd "/hurd/exec.static") "exec" "'$(exec-task=task-create)'"))) - (list root-file-system-command exec-server-command))) + (list pci-arbiter-command + rumpdisk-command + root-file-system-command + exec-server-command))) (define* (operating-system-boot-parameters os root-device #:key system-kernel-arguments?) -- 2.39.2