[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#70913] [PATCH 11/11] tests: install: Use a default qemu machine for
From: |
Efraim Flashner |
Subject: |
[bug#70913] [PATCH 11/11] tests: install: Use a default qemu machine for arm architectures. |
Date: |
Mon, 13 May 2024 11:22:00 +0300 |
* gnu/tests/install.scm (qemu-command*): Adjust qemu command when run on
armhf-linux or aarch64-linux to include a machine type.
(run-install): Same.
Change-Id: I32f85183cd8ec39c6a2e66624954743fd5983582
---
gnu/tests/install.scm | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/gnu/tests/install.scm b/gnu/tests/install.scm
index 90e1ca6e75..36dbd9111f 100644
--- a/gnu/tests/install.scm
+++ b/gnu/tests/install.scm
@@ -289,6 +289,12 @@ (define* (run-install target-os target-os-source
(define marionette
(make-marionette
`(,(which #$(qemu-command system))
+ ;; Neither of these architectures have a default machine.
+ ,@(if (or (string=? "aarch64-linux" #$system)
+ (string=? "armhf-linux" #$system))
+ '("-machine" "virt"
+ "-cpu" "host")
+ '())
"-no-reboot"
"-m" "1200"
,@(if #$uefi-firmware
@@ -363,6 +369,12 @@ (define* (qemu-command* images #:key (uefi-support? #f)
(memory-size 256))
(use-modules (srfi srfi-1))
`(,(string-append #$qemu-minimal "/bin/"
#$(qemu-command system))
+ ;; Neither of these architectures have a default machine.
+ ,@(if (or (string=? "aarch64-linux" #$system)
+ (string=? "armhf-linux" #$system))
+ '("-machine" "virt"
+ "-cpu" "host")
+ '())
"-snapshot" ;for the volatile, writable overlay
,@(if (file-exists? "/dev/kvm")
'("-enable-kvm")
--
Efraim Flashner <efraim@flashner.co.il> רנשלפ םירפא
GPG key = A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted
- [bug#70913] [PATCH 00/11] Combine edk2-tools and ovmf firmware, Efraim Flashner, 2024/05/13
- [bug#70913] [PATCH 01/11] gnu: edk2-tools: Update to 202402., Efraim Flashner, 2024/05/13
- [bug#70913] [PATCH 02/11] gnu: edk2-tools: Enable submodules., Efraim Flashner, 2024/05/13
- [bug#70913] [PATCH 05/11] gnu: ovmf-aarch64: Update to 202402., Efraim Flashner, 2024/05/13
- [bug#70913] [PATCH 08/11] gnu: Use new ovmf firmware packages., Efraim Flashner, 2024/05/13
- [bug#70913] [PATCH 09/11] tests: install: Add support for aarch64 UEFI tests., Efraim Flashner, 2024/05/13
- [bug#70913] [PATCH 04/11] gnu: Add ovmf-i686., Efraim Flashner, 2024/05/13
- [bug#70913] [PATCH 11/11] tests: install: Use a default qemu machine for arm architectures.,
Efraim Flashner <=
- [bug#70913] [PATCH 03/11] gnu: Add ovmf-x86-64., Efraim Flashner, 2024/05/13
- [bug#70913] [PATCH 07/11] gnu: ovmf-riscv64: Update to 202402., Efraim Flashner, 2024/05/13
- [bug#70913] [PATCH 06/11] gnu: ovmf-arm: Update to 202402., Efraim Flashner, 2024/05/13
- [bug#70913] [PATCH 10/11] gnu: ovmf: Deprecate in favor of ovmf-x86-64., Efraim Flashner, 2024/05/13
- Message not available