shared: move OOMPolicy varlink enum to varlink-idl-common

OOMPolicy is used by both io.systemd.Manager (DefaultOOMPolicy) and io.systemd.Unit (ScopeContext.OOMPolicy), so it belongs in the shared common types alongside ManagedOOMMode and EmergencyAction.

diff --git a/src/shared/varlink-idl-common.c b/src/shared/varlink-idl-common.c
index 24eec3bfcf48a5b7477dbb2a308823becfaddaeb..a543c92a3b8a3f2c7171926b7142fdd7e554cb5f 100644 (file)
--- a/src/shared/varlink-idl-common.c
+++ b/src/shared/varlink-idl-common.c
@@ -98,6 +98,12 @@ SD_VARLINK_DEFINE_ENUM_TYPE(
                 SD_VARLINK_DEFINE_ENUM_VALUE(auto),
                 SD_VARLINK_DEFINE_ENUM_VALUE(kill));
 
+SD_VARLINK_DEFINE_ENUM_TYPE(
+                OOMPolicy,
+                SD_VARLINK_DEFINE_ENUM_VALUE(continue),
+                SD_VARLINK_DEFINE_ENUM_VALUE(stop),
+                SD_VARLINK_DEFINE_ENUM_VALUE(kill));
+
 SD_VARLINK_DEFINE_ENUM_TYPE(
                 EmergencyAction,
                 SD_VARLINK_DEFINE_ENUM_VALUE(none),

diff --git a/src/shared/varlink-idl-common.h b/src/shared/varlink-idl-common.h
index fdfbfc7986faa5e0301c53899d90341ef4b08718..a42df7118bdc1d9e8913ec9d0880a32613ffaaf4 100644 (file)
--- a/src/shared/varlink-idl-common.h
+++ b/src/shared/varlink-idl-common.h
@@ -12,4 +12,5 @@ extern const sd_varlink_symbol vl_type_ExecCommand;
 extern const sd_varlink_symbol vl_type_ExecOutputType;
 extern const sd_varlink_symbol vl_type_CGroupPressureWatch;
 extern const sd_varlink_symbol vl_type_ManagedOOMMode;
+extern const sd_varlink_symbol vl_type_OOMPolicy;
 extern const sd_varlink_symbol vl_type_EmergencyAction;

diff --git a/src/shared/varlink-io.systemd.Manager.c b/src/shared/varlink-io.systemd.Manager.c
index 81b3e894a348df24b6eae1aa6bda03858199d158..d4702b249d2517016970f2fb1bc39b9b1ff51dad 100644 (file)
--- a/src/shared/varlink-io.systemd.Manager.c
+++ b/src/shared/varlink-io.systemd.Manager.c
@@ -15,12 +15,6 @@ SD_VARLINK_DEFINE_ENUM_TYPE(
                 SD_VARLINK_DEFINE_ENUM_VALUE(auto),
                 SD_VARLINK_DEFINE_ENUM_VALUE(null));
 
-SD_VARLINK_DEFINE_ENUM_TYPE(
-                OOMPolicy,
-                SD_VARLINK_DEFINE_ENUM_VALUE(continue),
-                SD_VARLINK_DEFINE_ENUM_VALUE(stop),
-                SD_VARLINK_DEFINE_ENUM_VALUE(kill));
-
 static SD_VARLINK_DEFINE_STRUCT_TYPE(
                 LogLevelStruct,
                 SD_VARLINK_FIELD_COMMENT("'console' target log level"),

diff --git a/src/shared/varlink-io.systemd.Manager.h b/src/shared/varlink-io.systemd.Manager.h
index 48247dd3506790a827d222d38a08fe567fdcd488..620d80e3a6ff6e1389c33e3cd68a87ad27b12b7b 100644 (file)
--- a/src/shared/varlink-io.systemd.Manager.h
+++ b/src/shared/varlink-io.systemd.Manager.h
@@ -6,4 +6,3 @@
 extern const sd_varlink_interface vl_interface_io_systemd_Manager;
 
 extern const sd_varlink_symbol vl_type_LogTarget;
-extern const sd_varlink_symbol vl_type_OOMPolicy;