From 7a3c7344fac32ba948c412ec411e48dcb1f4c894 Mon Sep 17 00:00:00 2001
From: Ivan Kruglov <mail@ikruglov.com>
Date: Wed, 14 May 2025 02:45:15 -0700
Subject: [PATCH 1/2] core: manager-varlink.{c,h} -> varlink-manager.{c,h}

---
 src/core/meson.build                              | 2 +-
 src/core/{manager-varlink.c => varlink-manager.c} | 2 +-
 src/core/{manager-varlink.h => varlink-manager.h} | 0
 src/core/varlink.c                                | 2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename src/core/{manager-varlink.c => varlink-manager.c} (99%)
 rename src/core/{manager-varlink.h => varlink-manager.h} (100%)

diff --git a/src/core/meson.build b/src/core/meson.build
index 24843ec789..a48342bb68 100644
--- a/src/core/meson.build
+++ b/src/core/meson.build
@@ -43,7 +43,6 @@ libcore_sources = files(
         'load-fragment.c',
         'manager-dump.c',
         'manager-serialize.c',
-        'manager-varlink.c',
         'manager.c',
         'mount.c',
         'namespace.c',
@@ -65,6 +64,7 @@ libcore_sources = files(
         'unit.c',
         'varlink.c',
         'varlink-common.c',
+        'varlink-manager.c',
 )
 
 subdir('bpf/socket_bind')
diff --git a/src/core/manager-varlink.c b/src/core/varlink-manager.c
similarity index 99%
rename from src/core/manager-varlink.c
rename to src/core/varlink-manager.c
index 8986ef8dbe..9e61571684 100644
--- a/src/core/manager-varlink.c
+++ b/src/core/varlink-manager.c
@@ -9,7 +9,6 @@
 #include "build.h"
 #include "confidential-virt.h"
 #include "json-util.h"
-#include "manager-varlink.h"
 #include "manager.h"
 #include "set.h"
 #include "strv.h"
@@ -17,6 +16,7 @@
 #include "taint.h"
 #include "version.h"
 #include "varlink-common.h"
+#include "varlink-manager.h"
 #include "virt.h"
 #include "watchdog.h"
 
diff --git a/src/core/manager-varlink.h b/src/core/varlink-manager.h
similarity index 100%
rename from src/core/manager-varlink.h
rename to src/core/varlink-manager.h
diff --git a/src/core/varlink.c b/src/core/varlink.c
index 2e9be69c5e..f5248ea210 100644
--- a/src/core/varlink.c
+++ b/src/core/varlink.c
@@ -7,7 +7,6 @@
 #include "errno-util.h"
 #include "json-util.h"
 #include "manager.h"
-#include "manager-varlink.h"
 #include "path-util.h"
 #include "pidref.h"
 #include "string-util.h"
@@ -19,6 +18,7 @@
 #include "varlink-io.systemd.ManagedOOM.h"
 #include "varlink-io.systemd.UserDatabase.h"
 #include "varlink-io.systemd.service.h"
+#include "varlink-manager.h"
 #include "varlink-serialize.h"
 #include "varlink-util.h"
 

From 9ffa967413ea4b79585fe8d7c6ab254b404f8c02 Mon Sep 17 00:00:00 2001
From: Ivan Kruglov <mail@ikruglov.com>
Date: Fri, 23 May 2025 06:32:47 -0700
Subject: [PATCH 2/2] core: lowercase Context/Runtime

Varlink fields are camelCase unless well defined config names.
---
 src/core/varlink-manager.c              | 4 ++--
 src/shared/varlink-io.systemd.Manager.c | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/core/varlink-manager.c b/src/core/varlink-manager.c
index 9e61571684..a8cffc4515 100644
--- a/src/core/varlink-manager.c
+++ b/src/core/varlink-manager.c
@@ -167,8 +167,8 @@ int vl_method_describe_manager(sd_varlink *link, sd_json_variant *parameters, sd
                 return r;
 
         r = sd_json_buildo(&v,
-                        SD_JSON_BUILD_PAIR_CALLBACK("Context", manager_context_build_json, manager),
-                        SD_JSON_BUILD_PAIR_CALLBACK("Runtime", manager_runtime_build_json, manager));
+                        SD_JSON_BUILD_PAIR_CALLBACK("context", manager_context_build_json, manager),
+                        SD_JSON_BUILD_PAIR_CALLBACK("runtime", manager_runtime_build_json, manager));
         if (r < 0)
                 return log_error_errno(r, "Failed to build manager JSON data: %m");
 
diff --git a/src/shared/varlink-io.systemd.Manager.c b/src/shared/varlink-io.systemd.Manager.c
index a3e274d0d1..8ab65cf3c4 100644
--- a/src/shared/varlink-io.systemd.Manager.c
+++ b/src/shared/varlink-io.systemd.Manager.c
@@ -170,9 +170,9 @@ static SD_VARLINK_DEFINE_STRUCT_TYPE(
 static SD_VARLINK_DEFINE_METHOD(
                 Describe,
                 SD_VARLINK_FIELD_COMMENT("Configuration of the manager"),
-                SD_VARLINK_DEFINE_OUTPUT_BY_TYPE(Context, ManagerContext, 0),
+                SD_VARLINK_DEFINE_OUTPUT_BY_TYPE(context, ManagerContext, 0),
                 SD_VARLINK_FIELD_COMMENT("Runtime information of the manager"),
-                SD_VARLINK_DEFINE_OUTPUT_BY_TYPE(Runtime, ManagerRuntime, 0));
+                SD_VARLINK_DEFINE_OUTPUT_BY_TYPE(runtime, ManagerRuntime, 0));
 
 SD_VARLINK_DEFINE_INTERFACE(
                 io_systemd_Manager,