From 2c07d9ac89c4918759c656323ff7b47cfbc132bf Mon Sep 17 00:00:00 2001
From: JEAN-FRANCOIS GUILLAUME <mrbear@yam-it.net>
Date: Fri, 13 May 2022 18:35:04 +0200
Subject: [PATCH 1/4] adding new cgroups

---
 glicid/services/parallel.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/glicid/services/parallel.scm b/glicid/services/parallel.scm
index f4959ba..518f8ec 100644
--- a/glicid/services/parallel.scm
+++ b/glicid/services/parallel.scm
@@ -5,6 +5,7 @@
   #:use-module (guix records)
   #:use-module (ice-9 match)
   #:use-module (gnu packages parallel)
+  #:use-module (glicid system file-systems)
   #:export (
     munged-configuration
     munged-configuration?

From cda8e4954a1d396004331e13fb383744c1d27154 Mon Sep 17 00:00:00 2001
From: JEAN-FRANCOIS GUILLAUME <mrbear@yam-it.net>
Date: Sat, 14 May 2022 19:10:12 +0200
Subject: [PATCH 2/4] forgot to add file-system.scm

---
 glicid/system/file-system.scm | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 glicid/system/file-system.scm

diff --git a/glicid/system/file-system.scm b/glicid/system/file-system.scm
new file mode 100644
index 0000000..abb4179
--- /dev/null
+++ b/glicid/system/file-system.scm
@@ -0,0 +1,32 @@
+(define-module (glicid system file-systems)
+  #:use-module (gnu system file-systems)
+  #:export (%control-groups)
+)
+
+(define %control-groups
+  (let
+    ((parent (file-system
+      (device "cgroup")
+      (mount-point "/sys/fs/cgroup")
+      (type "tmpfs")
+      (check? #f)
+    )))
+    (cons parent
+      (map (lambda (subsystem)
+                    (file-system
+                      (device "cgroup")
+                      (mount-point (string-append "/sys/fs/cgroup/" subsystem))
+                      (type "cgroup")
+                      (check? #f)
+                      (options subsystem)
+                      (create-mount-point? #t)
+                      (dependencies (list parent))
+                    )
+          )
+          '("blkio" "cpu" "cpuacct" "cpuset" "devices" "freezer" "hugetlb"
+            "memory" "net_cls" "net_prio" "perf_event" "pids" "rdma" "unified")
+      )
+    )
+  )
+)
+

From 8c961a354539bc8c42d4f886f0be063eb4e3e262 Mon Sep 17 00:00:00 2001
From: Jean-Francois GUILLAUME <mrbear@yam-it.net>
Date: Mon, 16 May 2022 16:52:04 +0000
Subject: [PATCH 3/4] Update glicid/system/file-systems.scm

---
 glicid/system/{file-system.scm => file-systems.scm} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename glicid/system/{file-system.scm => file-systems.scm} (100%)

diff --git a/glicid/system/file-system.scm b/glicid/system/file-systems.scm
similarity index 100%
rename from glicid/system/file-system.scm
rename to glicid/system/file-systems.scm

From c5c70f1e1fdfeb83be51729547ca41c98032067c Mon Sep 17 00:00:00 2001
From: Yann Dupont <yann.dupont@univ-nantes.fr>
Date: Mon, 23 May 2022 10:51:59 +0200
Subject: [PATCH 4/4] bump qemu version

---
 glicid/packages/virtualization.scm | 37 +++++++++++++++++++++++++++++-
 1 file changed, 36 insertions(+), 1 deletion(-)

diff --git a/glicid/packages/virtualization.scm b/glicid/packages/virtualization.scm
index 3f2d413..37dd2bc 100644
--- a/glicid/packages/virtualization.scm
+++ b/glicid/packages/virtualization.scm
@@ -3,12 +3,47 @@
   #:use-module (guix utils)
   #:use-module (gnu packages virtualization)
   #:use-module (gnu packages storage)
+  #:use-module (guix download)
+  #:use-module (glicid utils)
+
 ;  #:use-module (glicid packages storage)
 )
 
+
+(define-public qemu-7.0-upstream
+ (package
+    (inherit qemu)
+    (name "qemu-upstream")
+    (version "7.0")
+
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://download.qemu.org/qemu-"
+                           version ".tar.xz"))
+       (sha256
+	(base32
+         "0iavlsy9hin8k38230j8lfmyipx3965zljls1dp34mmc8n75vqb8"))
+       (patches (search-patches "qemu-build-info-manual.patch"
+                                "qemu-fix-agent-paths.patch"))
+       (modules '((guix build utils)))
+       (snippet
+        '(begin
+           ;; Delete the bundled meson copy.
+           (delete-file-recursively "meson")))))
+
+
+  )
+)
+
+(define local-qemu qemu-7.0-upstream)
+
+(define qemu-latest (latest-version local-qemu qemu))
+
+
 (define-public qemu-with-rbd
   (package
-    (inherit qemu) 
+    (inherit qemu-latest) 
     (name "qemu-with-rbd")
     (arguments
       (substitute-keyword-arguments `(