[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
05/28: vm: <virtual-machine> compiler honors system and target.
From: |
guix-commits |
Subject: |
05/28: vm: <virtual-machine> compiler honors system and target. |
Date: |
Sat, 30 May 2020 11:20:13 -0400 (EDT) |
janneke pushed a commit to branch wip-hurd-vm
in repository guix.
commit e3b6c5dce2ab741c7b152fec84f764cc783d5f72
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Wed May 27 23:09:49 2020 +0200
vm: <virtual-machine> compiler honors system and target.
* gnu/system/vm.scm (system-qemu-image/shared-store): Add #:system
and #:target. Pass it down.
(system-qemu-image/shared-store-script): Likewise.
(virtual-machine-compiler): Likewise.
---
gnu/system/vm.scm | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm
index 991ea2d..05f3986 100644
--- a/gnu/system/vm.scm
+++ b/gnu/system/vm.scm
@@ -764,6 +764,8 @@ environment with the store shared with the host. MAPPINGS
is a list of
(define* (system-qemu-image/shared-store
os
#:key
+ (system (%current-system))
+ (target (%current-target-system))
full-boot?
(disk-image-size (* (if full-boot? 500 30) (expt 2 20))))
"Return a derivation that builds a QEMU image of OS that shares its store
@@ -784,6 +786,8 @@ bootloader refers to: OS kernel, initrd, bootloader data,
etc."
;; This is more than needed (we only need the kernel, initrd, GRUB for its
;; font, and the background image), but it's hard to filter that.
(qemu-image #:os os
+ #:system system
+ #:target target
#:bootcfg-drv bootcfg
#:bootloader (bootloader-configuration-bootloader
(operating-system-bootloader os))
@@ -824,6 +828,8 @@ with '-virtfs' options for the host file systems listed in
SHARED-FS."
(define* (system-qemu-image/shared-store-script os
#:key
+ (system (%current-system))
+ (target
(%current-target-system))
(qemu qemu)
(graphic? #t)
(memory-size 256)
@@ -847,6 +853,8 @@ it is mostly useful when FULL-BOOT? is true."
(mlet* %store-monad ((os -> (virtualized-operating-system os mappings
full-boot?))
(image (system-qemu-image/shared-store
os
+ #:system system
+ #:target target
#:full-boot? full-boot?
#:disk-image-size disk-image-size)))
(define kernel-arguments
@@ -920,10 +928,11 @@ FORWARDINGS is a list of host-port/guest-port pairs."
(define-gexp-compiler (virtual-machine-compiler (vm <virtual-machine>)
system target)
- ;; XXX: SYSTEM and TARGET are ignored.
(match vm
(($ <virtual-machine> os qemu graphic? memory-size disk-image-size ())
(system-qemu-image/shared-store-script os
+ #:system system
+ #:target target
#:qemu qemu
#:graphic? graphic?
#:memory-size memory-size
@@ -936,6 +945,8 @@ FORWARDINGS is a list of host-port/guest-port pairs."
"user,model=virtio-net-pci,"
(port-forwardings->qemu-options forwardings)))))
(system-qemu-image/shared-store-script os
+ #:system system
+ #:target target
#:qemu qemu
#:graphic? graphic?
#:memory-size memory-size
- branch wip-hurd-vm created (now b73d83f), guix-commits, 2020/05/30
- 03/28: vm: 'qemu-image' uses the native partitioning tools and bootloader., guix-commits, 2020/05/30
- 05/28: vm: <virtual-machine> compiler honors system and target.,
guix-commits <=
- 08/28: gnu: hurd: Update to upstream Hurd-reserved xattr index., guix-commits, 2020/05/30
- 14/28: bootloader: Extend `<menu-entry>' for multiboot., guix-commits, 2020/05/30
- 01/28: system: 'system-linux-image-file-name' takes an optional parameter., guix-commits, 2020/05/30
- 04/28: vm: 'qemu-image' preserves the cross-compilation target of the OS., guix-commits, 2020/05/30
- 02/28: vm: 'expression->derivation-in-linux-vm' always returns a native build., guix-commits, 2020/05/30
- 07/28: gnu: guile-static: Disable JIT on ARMv7., guix-commits, 2020/05/30
- 09/28: image: Add Hurd support., guix-commits, 2020/05/30
- 06/28: vm: Shared-store script runs that native QEMU and Bash., guix-commits, 2020/05/30
- 10/28: linux-boot: Update 'make-hurd-device-nodes'., guix-commits, 2020/05/30
- 11/28: image: Support extra-directives, add hurd-directives., guix-commits, 2020/05/30