From patchwork Mon Apr 15 15:33:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Zheng Junjie X-Patchwork-Id: 63052 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 A7E2B27BBEA; Mon, 15 Apr 2024 16:35:14 +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.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS 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 9120627BBE9 for ; Mon, 15 Apr 2024 16:35:12 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rwOMC-0005ex-9m; Mon, 15 Apr 2024 11:34:56 -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 1rwOM9-0005eL-5E for guix-patches@gnu.org; Mon, 15 Apr 2024 11:34: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 1rwOM8-00011N-5v for guix-patches@gnu.org; Mon, 15 Apr 2024 11:34:52 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rwOMJ-0007TH-Kw for guix-patches@gnu.org; Mon, 15 Apr 2024 11:35:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#69899] [PATCH 1/2] vm: override %CURRENT-SYSTEM to always use a native emulator. References: In-Reply-To: Resent-From: Zheng Junjie Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 15 Apr 2024 15:35:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69899 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69899@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 69899-submit@debbugs.gnu.org id=B69899.171319524928274 (code B ref 69899); Mon, 15 Apr 2024 15:35:03 +0000 Received: (at 69899) by debbugs.gnu.org; 15 Apr 2024 15:34:09 +0000 Received: from localhost ([127.0.0.1]:37863 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rwOLR-0007Lx-8F for submit@debbugs.gnu.org; Mon, 15 Apr 2024 11:34:09 -0400 Received: from smtp21.cstnet.cn ([159.226.251.21]:39244 helo=cstnet.cn) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rwOLJ-0007JA-Ln for 69899@debbugs.gnu.org; Mon, 15 Apr 2024 11:34:07 -0400 Received: from m.tailaa68d.ts.net (unknown [111.0.51.68]) by APP-01 (Coremail) with SMTP id qwCowAAX+VHTSB1maiCyAw--.14358S2; Mon, 15 Apr 2024 23:33:40 +0800 (CST) From: Zheng Junjie Date: Mon, 15 Apr 2024 23:33:37 +0800 Message-ID: <4d858dc7d62800138c0d8fd78c598c9a89044662.1713194805.git.zhengjunjie@iscas.ac.cn> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-CM-TRANSID: qwCowAAX+VHTSB1maiCyAw--.14358S2 X-Coremail-Antispam: 1UD129KBjvJXoW7WF43ur4Uur4ruryDWF4xtFb_yoW8XF45pF nYk3y5K3WrGryIya409Fs7Xry7tr92y34Uur92yw48Aws8trWqgr1akr4YyFyDZFWrCry5 ZFyUKFyUZ3W5GaUanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUyab7Iv0xC_Kw4lb4IE77IF4wAFF20E14v26r1j6r4UM7CY07I2 0VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28lY4IEw2IIxxk0rw A2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Ar0_tr1l84ACjcxK6xII jxv20xvEc7CjxVAFwI0_Cr0_Gr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK6I 8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI 64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8Jw Am72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41l42xK82IYc2Ij64vIr41l4I8I 3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s026x8GjcxK67AKxV WUGVWUWwC2zVAF1VAY17CE14v26r1Y6r17MIIYrxkI7VAKI48JMIIF0xvE2Ix0cI8IcVAF wI0_Jr0_JF4lIxAIcVC0I7IYx2IY6xkF7I0E14v26r1j6r4UMIIF0xvE42xK8VAvwI8IcI k0rVWUJVWUCwCI42IY6I8E87Iv67AKxVWxJVW8Jr1lIxAIcVC2z280aVCY1x0267AKxVW8 JVW8JrUvcSsGvfC2KfnxnUUI43ZEXa7IU5PpnJUUUUU== X-Originating-IP: [111.0.51.68] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ 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 From: Ludovic Courtès * gnu/system/vm.scm (system-qemu-image/shared-store-script): override %CURRENT-SYSTEM to always use a native emulator. Change-Id: Ia2cb7cca33eec018d810bd00d0208b58392ea483 --- gnu/system/vm.scm | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) base-commit: 6b3c90f638292f9604a221ac6dbf22234f6e4c4b diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index 7d9d07ebb7..2d1a4a9df1 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -287,8 +287,11 @@ (define* (system-qemu-image/shared-store-script os #~(format #f "/tmp/guix-image-~a" (basename #$base-image))) (define qemu-exec - #~(list #+(file-append qemu "/bin/" - (qemu-command (or target system))) + #~(list #+(with-parameters ((%current-system %system) + (%current-target-system #f)) + ;; Override %CURRENT-SYSTEM to always use a native emulator. + (file-append qemu "/bin/" + (qemu-command (or target system)))) ;; Tells qemu to use the terminal it was started in for IO. #$@(if graphic? '() #~("-nographic")) #$@(if full-boot? @@ -325,7 +328,9 @@ (define* (system-qemu-image/shared-store-script os #~(call-with-output-file #$output (lambda (port) (format port "#!~a~%" - #+(file-append bash "/bin/sh")) + #+(with-parameters ((%current-system %system) + (%current-target-system #f)) + (file-append bash "/bin/sh"))) #$@(if volatile? #~() #~((format port "~a~%" #+copy-image))) From patchwork Mon Apr 15 15:33:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zheng Junjie X-Patchwork-Id: 63053 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 04A8627BBE9; Mon, 15 Apr 2024 16:35:15 +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.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=ham 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 6B41327BBEB for ; Mon, 15 Apr 2024 16:35:13 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rwOMC-0005et-55; Mon, 15 Apr 2024 11:34:56 -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 1rwOM9-0005eV-W7 for guix-patches@gnu.org; Mon, 15 Apr 2024 11:34:54 -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 1rwOM9-00012M-Am for guix-patches@gnu.org; Mon, 15 Apr 2024 11:34:53 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rwOML-0007TZ-15 for guix-patches@gnu.org; Mon, 15 Apr 2024 11:35:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#69899] [PATCH 2/2] vm: Don't add -enable-kvm when SYSTEM and %system are not same. Resent-From: Zheng Junjie Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 15 Apr 2024 15:35:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69899 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69899@debbugs.gnu.org Received: via spool by 69899-submit@debbugs.gnu.org id=B69899.171319525028280 (code B ref 69899); Mon, 15 Apr 2024 15:35:04 +0000 Received: (at 69899) by debbugs.gnu.org; 15 Apr 2024 15:34:10 +0000 Received: from localhost ([127.0.0.1]:37865 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rwOLR-0007Lz-JU for submit@debbugs.gnu.org; Mon, 15 Apr 2024 11:34:09 -0400 Received: from smtp21.cstnet.cn ([159.226.251.21]:39246 helo=cstnet.cn) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rwOLJ-0007JB-M9 for 69899@debbugs.gnu.org; Mon, 15 Apr 2024 11:34:07 -0400 Received: from m.tailaa68d.ts.net (unknown [111.0.51.68]) by APP-01 (Coremail) with SMTP id qwCowAAX+VHTSB1maiCyAw--.14358S3; Mon, 15 Apr 2024 23:33:40 +0800 (CST) From: Zheng Junjie Date: Mon, 15 Apr 2024 23:33:38 +0800 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: <4d858dc7d62800138c0d8fd78c598c9a89044662.1713194805.git.zhengjunjie@iscas.ac.cn> References: <4d858dc7d62800138c0d8fd78c598c9a89044662.1713194805.git.zhengjunjie@iscas.ac.cn> MIME-Version: 1.0 X-CM-TRANSID: qwCowAAX+VHTSB1maiCyAw--.14358S3 X-Coremail-Antispam: 1UD129KBjvJXoW7CF4UZr1UCryDtw15Xw1rCrg_yoW8Xry7pF n0kFy5Kr48KrWIgw40gFn7Xr9Iyr9Yk3yUCr97Aw4xZas8trykKr13tr1akF17ZFWrCryU ZFy0yry5Zr45CF7anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUU9Yb7Iv0xC_Kw4lb4IE77IF4wAFF20E14v26r1j6r4UM7CY07I2 0VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28IrcIa0xkI8VA2jI 8067AKxVWUGwA2048vs2IY020Ec7CjxVAFwI0_Jr4l8cAvFVAK0II2c7xJM28CjxkF64kE wVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVW7JVWDJwA2z4x0Y4vE2Ix0cI8IcVCY1x 0267AKxVWxJVW8Jr1l84ACjcxK6I8E87Iv67AKxVW0oVCq3wA2z4x0Y4vEx4A2jsIEc7Cj xVAFwI0_GcCE3s1le2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4xG64xvF2IEw4CE5I8CrV C2j2WlYx0E2Ix0cI8IcVAFwI0_Jr0_Jr4lYx0Ex4A2jsIE14v26r1j6r4UMcvjeVCFs4IE 7xkEbVWUJVW8JwACjcxG0xvY0x0EwIxGrwCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7x kEbVWUJVW8JwC20s026c02F40E14v26r1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E 67AF67kF1VAFwI0_Jr0_JrylIxkGc2Ij64vIr41lIxAIcVC0I7IYx2IY67AKxVWUJVWUCw CI42IY6xIIjxv20xvEc7CjxVAFwI0_Jr0_Gr1lIxAIcVCF04k26cxKx2IYs7xG6r1j6r1x MIIF0xvEx4A2jsIE14v26F4j6r4UJwCI42IY6I8E87Iv6xkF7I0E14v26r4j6r4UJbIYCT nIWIevJa73UjIFyTuYvjxUgQeoUUUUU X-Originating-IP: [111.0.51.68] X-CM-SenderInfo: x2kh0wxmxqyx3h6l2u1dvotugofq/ 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 * gnu/system/vm.scm (common-qemu-options): Don't add -enable-kvm when SYSTEM and %system are not same. Change-Id: Ie6c602b297c39423a693fdc26bed1627266e5911 --- gnu/system/vm.scm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index 2d1a4a9df1..b7ee5f8d42 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -212,7 +212,8 @@ (define* (virtualized-operating-system os (define* (common-qemu-options image shared-fs #:key rw-image? - (target (%current-target-system))) + (target (%current-target-system)) + (system (%current-system))) "Return the a string-value gexp with the common QEMU options to boot IMAGE, with '-virtfs' options for the host file systems listed in SHARED-FS." @@ -223,7 +224,9 @@ (define* (common-qemu-options image shared-fs #~(;; Only enable kvm if we see /dev/kvm exists. ;; This allows users without hardware virtualization to still use these ;; commands. - #$@(if (and (not target) (file-exists? "/dev/kvm")) + #$@(if (and (not target) + (string=? system %system) + (file-exists? "/dev/kvm")) '("-enable-kvm") '()) @@ -308,7 +311,8 @@ (define* (system-qemu-image/shared-store-script os (map file-system-mapping-source (cons %store-mapping mappings)) #:rw-image? (not volatile?) - #:target target) + #:target target + #:system system) "-m " (number->string #$memory-size) #$@options))