diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2018-02-20 17:36:56 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2018-02-20 17:36:56 +0100 |
| commit | 7f69459aca16756f35f08049c64a1bd77d23f33e (patch) | |
| tree | 1d267fb62feab89de5d97582672540cbaa37392c /gnu/build/marionette.scm | |
| parent | 4a82722a658220ec1e10f9f2d5d77407d38db90e (diff) | |
| parent | b1989c12501e880afab62d3ff961791906fef350 (diff) | |
| download | guix-7f69459aca16756f35f08049c64a1bd77d23f33e.tar guix-7f69459aca16756f35f08049c64a1bd77d23f33e.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/build/marionette.scm')
| -rw-r--r-- | gnu/build/marionette.scm | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/gnu/build/marionette.scm b/gnu/build/marionette.scm index 7554a710a0..173a67cef9 100644 --- a/gnu/build/marionette.scm +++ b/gnu/build/marionette.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2016, 2017 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -97,8 +97,11 @@ QEMU monitor and to the guest's backdoor REPL." "-monitor" (string-append "unix:" socket-directory "/monitor") "-chardev" (string-append "socket,id=repl,path=" socket-directory "/repl") + + ;; See + ;; <http://www.linux-kvm.org/page/VMchannel_Requirements#Invocation>. "-device" "virtio-serial" - "-device" "virtconsole,chardev=repl")) + "-device" "virtserialport,chardev=repl,name=org.gnu.guix.port.0")) (define (accept* port) (match (select (list port) '() (list port) timeout) |