From patchwork Fri Sep 22 12:54:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 54161 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 27FB827BBE2; Fri, 22 Sep 2023 13:56:40 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id CE79D27BBE9 for ; Fri, 22 Sep 2023 13:56:38 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qjfhK-0001OE-0g; Fri, 22 Sep 2023 08:55:54 -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 1qjfhJ-0001Nr-1K for guix-patches@gnu.org; Fri, 22 Sep 2023 08:55:53 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qjfhI-0008BG-PN for guix-patches@gnu.org; Fri, 22 Sep 2023 08:55:52 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qjfhT-0005jF-Bm for guix-patches@gnu.org; Fri, 22 Sep 2023 08:56:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66156] [PATCH 09/12] tests: hurd-vm: Remove custom disk image configuration. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 22 Sep 2023 12:56:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66156 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66156@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 66156-submit@debbugs.gnu.org id=B66156.169538732821939 (code B ref 66156); Fri, 22 Sep 2023 12:56:03 +0000 Received: (at 66156) by debbugs.gnu.org; 22 Sep 2023 12:55:28 +0000 Received: from localhost ([127.0.0.1]:35595 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qjfgf-0005hM-BK for submit@debbugs.gnu.org; Fri, 22 Sep 2023 08:55:28 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50932) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qjfgO-0005ei-UI for 66156@debbugs.gnu.org; Fri, 22 Sep 2023 08:54:58 -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 1qjfg8-0007oA-30; Fri, 22 Sep 2023 08:54:41 -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=zVxSiWmiS2cjF7P9JxuvGUvSz261vLrhyVQvNxIQH74=; b=BhclJqNVPcIFSuLwaqJ/ KBhzokKielDRZNsZlSqNSqlUhclqfccZzbVJjtmcBwi6yWRRTIorgy+mt+rNwg34lIoRwfDzwIgXm 37bY7yCcYfHscwPCWWuJC8Abzc4QB0vl+ogLf/QiH8HT9hV18UlSfHoJMi8j1h4eMzgc6UNy0k/Bw aSVrdjyyDB6VgguHRR1ZQRZ9k5mZPCc/yNpxtKkoNyt4ms6MRqJS9XCFYPqW/oNIjYn3u+66EFRTX BNRZ2Q36CbRz9KIi3eV4McBXv6LzYhZ/valnFbafEAVkNgdG3X/pR6NNzFpLmlG7SNNNYLDD/9MWc F6xAGPcuOPqPdQ==; From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Fri, 22 Sep 2023 14:54:10 +0200 Message-ID: <9dfb8d083002c9f6a6252a13a422420dc9c8ab73.1695386493.git.ludo@gnu.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches This was added in 18e76f89055f25f015fadb7c999b410f38a88cc6. Presumably, the problem was that using compressed QCOW2 images makes the childhurd slower, so it’s eventually marked as failing to start. By enabling KVM inside the Guix System VM, we allow the childhurd to run on KVM, which compensates the slowdown due to the use of a compressed image. * gnu/tests/virtualization.scm (hurd-vm-disk-image-raw): Remove. (%childhurd-os): Use default config for ‘hurd-vm-service-type’. (run-childhurd-test)[test]: Pass “-cpu host” to the run-vm script. --- gnu/tests/virtualization.scm | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/gnu/tests/virtualization.scm b/gnu/tests/virtualization.scm index 41253968e9..9e7928703e 100644 --- a/gnu/tests/virtualization.scm +++ b/gnu/tests/virtualization.scm @@ -225,23 +225,10 @@ (define %test-qemu-guest-agent ;;; GNU/Hurd virtual machines, aka. childhurds. ;;; -;; Copy of `hurd-vm-disk-image', using plain disk-image for test -(define (hurd-vm-disk-image-raw config) - (let ((os ((@@ (gnu services virtualization) secret-service-operating-system) - (hurd-vm-configuration-os config))) - (disk-size (hurd-vm-configuration-disk-size config))) - (image - (inherit hurd-disk-image) - (format 'disk-image) - (size disk-size) - (operating-system os)))) - (define %childhurd-os (simple-operating-system (service dhcp-client-service-type) - (service hurd-vm-service-type - (hurd-vm-configuration - (image (hurd-vm-disk-image-raw this-record)))))) + (service hurd-vm-service-type))) (define (run-childhurd-test) (define os @@ -292,7 +279,10 @@ (define (run-childhurd-test) (ice-9 match)) (define marionette - (make-marionette (list #$vm))) + ;; Emulate the host CPU so that KVM is available inside as well + ;; ("nested KVM"), provided + ;; /sys/module/kvm_intel/parameters/nested (or similar) allows it. + (make-marionette (list #$vm "-cpu" "host"))) (test-runner-current (system-test-runner #$output)) (test-begin "childhurd")