From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms1.migadu.com with LMTPS id AK7bKjFJHWbtswAAqHPOHw:P1 (envelope-from ) for ; Mon, 15 Apr 2024 17:35:13 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:58f0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id AK7bKjFJHWbtswAAqHPOHw (envelope-from ) for ; Mon, 15 Apr 2024 17:35:13 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; 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=1713195313; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: 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; bh=T8uxgwneC6GsQTCC2m1HyTprFlbpQCnKKO2cVnvbAJk=; b=S00nJNqkpp8kiWV41DLuh0RvmTZpcDOsS7/GyXmvXtM0uPU0e9l06sBk4mKmajNu5lFRtv kcmGKltk2HD+HBfRQvoPAYQID8QC4RrnOp6RcL7Pmdn68c9Mf+039zvt/oZ8uflwqs2qyr 8b6aZ8WCY6cx0JeS4SJ6tCTNyLgxarALzpYWkIldFr5RxwjVqYltfcZryj1fn83CqWR9i7 FAafPKRNnyTQbESKgk0Msi0dfQlvyoomC/nc7zFbeeP3KdE59RqxcZdCS7+GbjeEGAhX2F iJhuCMq3+iahddJ5VZnzgSF3HQlrB4kS/HrpEAPf5W19uOIa25rij3WbjZFTEw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=none; 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-Seal: i=1; s=key1; d=yhetil.org; t=1713195313; a=rsa-sha256; cv=none; b=r6rjKz4Nbo6Q2lMi50XLRyHLzqgMZtgGSlw7UgP6dPX04PKYN9Q5EKhCLhqv0AMKfq7RWj KRiOHfpN1bhThwuRyG4Dv604HNJp8QrghPP5YaO+OiKiRtjIUsYJAc+/eGpJkDrvlPTO4J I0xh1UIBw+78FcK75TeKI5XMWNsfk8XEe8qOcfG4bkwOdpDB9SnJlknhlQs42hyFof/8wy hNgbh7BJxSK9y8S/GSOmAMBi40uENXaXPsJn4s2ezPFgtoeGGQiS2WuKnpTKnOIgYom1Z9 4S1TCKzkX3vAMC6otZAD4RiUabFtl5j9m0TEShdX4HPkf9whL2SeK5ULqGHrnA== 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 88938BD17 for ; Mon, 15 Apr 2024 17:35:13 +0200 (CEST) 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 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -3.57 X-Migadu-Scanner: mx11.migadu.com X-Spam-Score: -3.57 X-Migadu-Queue-Id: 88938BD17 X-TUID: 5oxuR3eWNoUT * 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)) -- 2.41.0