From c6575c5d753e6019782baeceb5d3d8fa91ede3cd Mon Sep 17 00:00:00 2001 From: "dupont-y@univ-nantes.fr" Date: Thu, 25 May 2023 15:49:08 +0200 Subject: [PATCH] correction --- glicid/services/virtualization.scm | 74 +++++------------------------- 1 file changed, 11 insertions(+), 63 deletions(-) diff --git a/glicid/services/virtualization.scm b/glicid/services/virtualization.scm index 61b7213..7f18eca 100644 --- a/glicid/services/virtualization.scm +++ b/glicid/services/virtualization.scm @@ -1,8 +1,8 @@ (define-module (glicid services virtualization) #:use-module (gnu services) #:use-module (gnu services shepherd) - #:use-module ((gnu services virtualization) #:prefix gnu) - #:use-module ((gnu packages virtualization) #:prefix gnu) + #:use-module ((gnu services virtualization) #:prefix gnu:) + #:use-module ((gnu packages virtualization) #:prefix gnu:) ; #:use-module (guix records) ; #:use-module (guix utils) #:use-module (guix gexp) ;; file-like? @@ -13,63 +13,6 @@ ) -;;; -;;; Redef QEMU guest agent service. -;;; - - - -;(define (serialize-field field-name val) -; (format #t "~a = ~a\n" (uglify-field-name field-name) val)) - -;(define (serialize-string field-name val) -; (serialize-field field-name (quote-val val))) - - -;; - -;(define-configuration qemu-guest-agent-configuration -; (qemu -; (file-like gnu:qemu-minimal) -; "QEMU package.") -; (device -; (string "") -; "Path to device or socket used to communicate with the host. If not -;specified, the QEMU default path is used.")) - -;(define (qemu-guest-agent-shepherd-service config) -; (let ((qemu (qemu-guest-agent-configuration-qemu config)) -; (device (qemu-guest-agent-configuration-device config))) -; (list -; (shepherd-service -; (provision '(qemu-guest-agent)) -; (documentation "Run the QEMU guest agent.") -; (start #~(make-forkexec-constructor -; `(,(string-append #$qemu "/bin/qemu-ga") -; "--statedir" "/var/run" -; ,@(if (string-null? #$device) -; '() -; (list "--path" #$device))) -; #:log-file "/var/log/qemu-ga.log")) -; (stop #~(make-kill-destructor)))))) - - -;(define (qemu-guest-agent-shepherd-service config) -; (let ((qemu (qemu-guest-agent-configuration-qemu config)) -; (device (qemu-guest-agent-configuration-device config))) -; (list -; (shepherd-service -; (provision '(qemu-guest-agent)) -; (requirement '(udev)) ;; GLiCID -; (documentation "Run the QEMU guest agent.") -; (start #~(make-forkexec-constructor -; `(,(string-append #$qemu "/bin/qemu-ga") -; "--statedir" "/var/run" -; ,@(if (string-null? #$device) -; '() -; (list "--path" #$device))) -; #:log-file "/var/log/qemu-ga.log")) -; (stop #~(make-kill-destructor)))))) (define (qemu-guest-agent-shepherd-service config) (inherit gnu:qemu-guest-agent-shepherd-service) @@ -77,12 +20,17 @@ ) - -;(define qemu-guest-agent-service-type -; (service-type +(define qemu-guest-agent-service-type + (service-type + (inherit gnu:qemu-guest-agent-service-type) + (extensions + (list (service-extension shepherd-root-service-type + qemu-guest-agent-shepherd-service))) + )) + ; (name 'qemu-guest-agent) ; (extensions ; (list (service-extension shepherd-root-service-type ; qemu-guest-agent-shepherd-service))) -; (default-value (qemu-guest-agent-configuration)) +; (default-value (gnu:qemu-guest-agent-configuration)) ; (description "Run the QEMU guest agent.")))