From f08dd2725712b3a002da8a5eb9f1ec1258c8a935 Mon Sep 17 00:00:00 2001 From: Astro Date: Mon, 25 Sep 2023 21:32:47 +0200 Subject: [PATCH] stratovirt: 2.2.0 -> 2.3.0 --- pkgs/applications/virtualization/stratovirt/default.nix | 6 +++--- .../stratovirt/micro_vm-allow-SYS_clock_gettime.patch | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/virtualization/stratovirt/default.nix b/pkgs/applications/virtualization/stratovirt/default.nix index b9fbc191d9c1..75641547ad2e 100644 --- a/pkgs/applications/virtualization/stratovirt/default.nix +++ b/pkgs/applications/virtualization/stratovirt/default.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage rec { pname = "stratovirt"; - version = "2.2.0"; + version = "2.3.0"; src = fetchgit { url = "https://gitee.com/openeuler/stratovirt.git"; rev = "v${version}"; - sha256 = "sha256-K99CmaBrJu30/12FxnsNsDKsTyX4f2uQSO7cwHsPuDw="; + sha256 = "sha256-f5710f7Lz7ul1DYrC0CAfDR+7e1NrE9ESPdB8nlVUKw="; }; patches = [ ./micro_vm-allow-SYS_clock_gettime.patch ]; - cargoSha256 = "sha256-SFIOGGRzGkVWHIXkviVWuhDN29pa0uD3GqKh+G421xI="; + cargoSha256 = "sha256-prs7zkPAKQ99gjW7gy+4+CgEgGhaTTCLPTbLk/ZHdts="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/applications/virtualization/stratovirt/micro_vm-allow-SYS_clock_gettime.patch b/pkgs/applications/virtualization/stratovirt/micro_vm-allow-SYS_clock_gettime.patch index 6aa0da30c44a..11d2a0e88e19 100644 --- a/pkgs/applications/virtualization/stratovirt/micro_vm-allow-SYS_clock_gettime.patch +++ b/pkgs/applications/virtualization/stratovirt/micro_vm-allow-SYS_clock_gettime.patch @@ -1,4 +1,4 @@ -From af3001b1b2697ae3165e2fdf47a560fd9ab19a68 Mon Sep 17 00:00:00 2001 +From c5ef87eb831f7f77c0564dd1dce92a579e7c4747 Mon Sep 17 00:00:00 2001 From: Astro Date: Sun, 18 Jun 2023 23:10:23 +0200 Subject: [PATCH] micro_vm: allow SYS_clock_gettime @@ -8,13 +8,13 @@ Subject: [PATCH] micro_vm: allow SYS_clock_gettime 1 file changed, 2 insertions(+) diff --git a/machine/src/micro_vm/syscall.rs b/machine/src/micro_vm/syscall.rs -index 89ce5c29..2a6aa0cc 100644 +index c37d3f4e..f9e7cce2 100644 --- a/machine/src/micro_vm/syscall.rs +++ b/machine/src/micro_vm/syscall.rs -@@ -128,6 +128,8 @@ pub fn syscall_whitelist() -> Vec { - #[cfg(all(target_env = "gnu", target_arch = "x86_64"))] +@@ -125,6 +125,8 @@ pub fn syscall_whitelist() -> Vec { 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(),