]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
implement ExecContext for io.systemd.Unit.List (#38212)
authorDaan De Meyer <daan.j.demeyer@gmail.com>
Thu, 16 Oct 2025 17:06:46 +0000 (19:06 +0200)
committerGitHub <noreply@github.com>
Thu, 16 Oct 2025 17:06:46 +0000 (19:06 +0200)
1  2 
src/core/varlink-common.c
src/core/varlink-common.h
src/libsystemd/sd-json/json-util.h
src/shared/nsflags.h
src/shared/securebits-util.h

index 6a1e6af9ae9ed9bd7038f93deb144bb093b737fe,37d82e3fe0fa85ee430bfeba5411bd4fb8deaa3c..babed68378fa602a16ff8c79359d5fc75768e709
@@@ -50,7 -50,30 +51,32 @@@ int rlimit_table_build_json(sd_json_var
                          return r;
          }
  
 +        *ret = TAKE_PTR(v);
 +
          return 0;
  }
+ int cpuset_build_json(sd_json_variant **ret, const char *name, void *userdata) {
+         _cleanup_free_ uint8_t *array = NULL;
+         CPUSet *cpuset = ASSERT_PTR(userdata);
+         size_t allocated;
+         int r;
+         assert(ret);
+         if (!cpuset->set)
+                 goto empty;
+         r = cpu_set_to_dbus(cpuset, &array, &allocated);
+         if (r < 0)
+                 return log_debug_errno(r, "Failed to serialize cpu set to dbus: %m");
+         if (allocated == 0)
+                 goto empty;
+         return sd_json_variant_new_array_bytes(ret, array, allocated);
+ empty:
+         *ret = NULL;
+         return 0;
+ }
Simple merge
Simple merge
Simple merge
index dc61ecd57ea8b605fad876e7ca7982d51a1dc236,553b717a5762e89ef6dc2d624e7fdd2e83247620..6251fb7922f0a719aa5ad3be3496dbf3c80411d1
@@@ -3,9 -3,10 +3,10 @@@
  
  #include <linux/securebits.h>
  
 -#include "forward.h"
 +#include "shared-forward.h"
  
- int secure_bits_to_string_alloc(int i, char **s);
+ int secure_bits_to_strv(int i, char ***ret);
+ int secure_bits_to_string_alloc(int i, char **ret);
  int secure_bits_from_string(const char *s);
  
  static inline bool secure_bits_is_valid(int i) {