Merge pull request #322734 from astro/stratovirt

stratovirt: 2.3.0 -> 2.4.0

pkgs/applications/virtualization/stratovirt/default.nix

@@ -6,16 +6,15 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "stratovirt";
-  version = "2.3.0";
+  version = "2.4.0";
 
   src = fetchgit {
     url = "https://gitee.com/openeuler/stratovirt.git";
     rev = "v${version}";
-    sha256 = "sha256-f5710f7Lz7ul1DYrC0CAfDR+7e1NrE9ESPdB8nlVUKw=";
+    sha256 = "sha256-1Ex6ahKBoVRikSqrgHGYaBFzWkPFDm8bGVyB7KmO8tI=";
   };
-  patches = [ ./micro_vm-allow-SYS_clock_gettime.patch ];
 
-  cargoSha256 = "sha256-prs7zkPAKQ99gjW7gy+4+CgEgGhaTTCLPTbLk/ZHdts=";
+  cargoSha256 = "sha256-uuZCbmt3eIlKurwMOV7LezVSjOVG/90OdT2PC8YLi3I=";
 
   nativeBuildInputs = [
     pkg-config

pkgs/applications/virtualization/stratovirt/micro_vm-allow-SYS_clock_gettime.patch

@@ -1,25 +0,0 @@
-From c5ef87eb831f7f77c0564dd1dce92a579e7c4747 Mon Sep 17 00:00:00 2001
-From: Astro <astro@spaceboyz.net>
-Date: Sun, 18 Jun 2023 23:10:23 +0200
-Subject: [PATCH] micro_vm: allow SYS_clock_gettime
-
----
- machine/src/micro_vm/syscall.rs | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/machine/src/micro_vm/syscall.rs b/machine/src/micro_vm/syscall.rs
-index c37d3f4e..f9e7cce2 100644
---- a/machine/src/micro_vm/syscall.rs
-+++ b/machine/src/micro_vm/syscall.rs
-@@ -125,6 +125,8 @@ pub fn syscall_whitelist() -> Vec<BpfRule> {
-         BpfRule::new(libc::SYS_readlink),
-         BpfRule::new(libc::SYS_getrandom),
-         BpfRule::new(libc::SYS_fallocate),
-+        #[cfg(target_env = "gnu")]
-+        BpfRule::new(libc::SYS_clock_gettime),
-         madvise_rule(),
-     ]
- }
--- 
-2.41.0
-