From e107692f3a98c19d2457050635818226ee675c52 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Sun, 1 Dec 2019 16:49:36 +0100 Subject: [PATCH] vm: Force native qemu usage. --- gnu/system/vm.scm | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index 8609bd2ace..e760e7f42d 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -68,6 +68,7 @@ #:use-module (gnu system uuid) #:use-module (srfi srfi-1) + #:use-module (srfi srfi-9) #:use-module (srfi srfi-26) #:use-module (rnrs bytevectors) #:use-module (ice-9 match) @@ -141,6 +142,16 @@ packages)))) (list guile-gcrypt guile-sqlite3))) +(define-record-type + (%native-qemu qemu system) + native-qemu? + (qemu native-qemu-qemu) + (system native-qemu-system)) + +(define-gexp-compiler (native-qemu-compiler (native-qemu ) system target) + (package->derivation (native-qemu-qemu native-qemu) + (native-qemu-system native-qemu))) + (define* (expression->derivation-in-linux-vm name exp #:key (system (%current-system)) target @@ -193,6 +204,9 @@ made available under the /xchg CIFS share." (reboot) (exit 1)))) + (define qemu-native + (%native-qemu qemu (@ (guix config) %system))) + (let ((initrd (or initrd (base-initrd file-systems #:on-error 'backtrace @@ -215,7 +229,7 @@ made available under the /xchg CIFS share." (gnu build vm)) (let* ((native-inputs - '#+(list qemu (canonical-package coreutils))) + '#+(list qemu-native (canonical-package coreutils))) (linux (string-append #$linux "/" #$(system-linux-image-file-name))) (initrd #$initrd) -- 2.24.0