From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:37416) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e3p9l-0000uW-Un for guix-patches@gnu.org; Sun, 15 Oct 2017 16:05:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e3p9j-0005Sa-1U for guix-patches@gnu.org; Sun, 15 Oct 2017 16:05:05 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:33324) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1e3p9i-0005SV-Ul for guix-patches@gnu.org; Sun, 15 Oct 2017 16:05:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1e3p9i-0001nM-Md for guix-patches@gnu.org; Sun, 15 Oct 2017 16:05:02 -0400 Subject: [bug#28853] [PATCH 2/8] gnu: qemu: Enable spice usb redirection support. Resent-Message-ID: From: Andy Patterson Date: Sun, 15 Oct 2017 16:03:22 -0400 Message-Id: <20171015200328.4830-2-ajpatter@uwaterloo.ca> In-Reply-To: <20171015151545.024a589f@uwaterloo.ca> References: <20171015151545.024a589f@uwaterloo.ca> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 28853@debbugs.gnu.org * gnu/packages/virtualization.scm (qemu)[arguments]<#:configure-flags>: New argument. [inputs]: Add usbredir. (qemu-minimal)[arguments]<#:configure-flags>: Restrict them even when they are set by qemu. [inputs]: Remove usbredir. --- gnu/packages/virtualization.scm | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 5cdf6d09b..24ffc2f28 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2016, 2017 Efraim Flashner ;;; Copyright © 2016 Ricardo Wurmus ;;; Copyright © 2017 Alex Vong +;;; Copyright © 2017 Andy Patterson ;;; ;;; This file is part of GNU Guix. ;;; @@ -85,7 +86,7 @@ '(;; Running tests in parallel can occasionally lead to failures, like: ;; boot_sector_test: assertion failed (signature == SIGNATURE): (0x00000000 == 0x0000dead) #:parallel-tests? #f - + #:configure-flags '("--enable-usb-redir") #:phases (modify-phases %standard-phases (replace 'configure @@ -152,6 +153,7 @@ ("pixman" ,pixman) ("sdl" ,sdl) ("spice" ,spice) + ("usbredir" ,usbredir) ("util-linux" ,util-linux) ;; ("vde2" ,vde2) ("virglrenderer" ,virglrenderer) @@ -188,14 +190,17 @@ server and embedded PowerPC, and S390 guests.") (name "qemu-minimal") (synopsis "Machine emulator and virtualizer (without GUI)") (arguments - `(#:configure-flags - ;; Restrict to the targets supported by Guix. - '("--target-list=i386-softmmu,x86_64-softmmu,mips64el-softmmu,arm-softmmu,aarch64-softmmu") - ,@(package-arguments qemu))) + (substitute-keyword-arguments (package-arguments qemu) + ((#:configure-flags _ '(list)) + `(list + ,(string-append + "--target-list=i386-softmmu,x86_64-softmmu,mips64el-softmmu" + ",arm-softmmu,aarch64-softmmu"))))) ;; Remove dependencies on optional libraries, notably GUI libraries. (inputs (fold alist-delete (package-inputs qemu) - '("libusb" "mesa" "sdl" "spice" "virglrenderer"))))) + '("libusb" "mesa" "sdl" "spice" "virglrenderer" + "usbredir"))))) (define-public libosinfo (package -- 2.14.2