From: Ivan Kruglov <mail@ikruglov.com>
Date: Thu, 9 Jan 2025 14:24:58 +0000 (+0100)
Subject: machine: VARLINK_ERROR_MACHINE_IMAGE_* defines
X-Git-Tag: v258-rc1~1639^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F35940%2Fhead;p=thirdparty%2Fsystemd.git

machine: VARLINK_ERROR_MACHINE_IMAGE_* defines
---

diff --git a/src/machine/image-varlink.c b/src/machine/image-varlink.c
index 1784de61465..4a4f611bda8 100644
--- a/src/machine/image-varlink.c
+++ b/src/machine/image-varlink.c
@@ -52,7 +52,7 @@ int vl_method_update_image(sd_varlink *link, sd_json_variant *parameters, sd_var
 
         r = manager_acquire_image(manager, p.name, &image);
         if (r == -ENOENT)
-                return sd_varlink_error(link, "io.systemd.MachineImage.NoSuchImage", NULL);
+                return sd_varlink_error(link, VARLINK_ERROR_MACHINE_IMAGE_NO_SUCH_IMAGE, NULL);
         if (r < 0)
                 return r;
 
@@ -111,7 +111,7 @@ int vl_method_clone_image(sd_varlink *link, sd_json_variant *parameters, sd_varl
         assert(parameters);
 
         if (manager->n_operations >= OPERATIONS_MAX)
-                return sd_varlink_error(link, "io.systemd.MachineImage.TooManyOperations", NULL);
+                return sd_varlink_error(link, VARLINK_ERROR_MACHINE_IMAGE_TOO_MANY_OPERATIONS, NULL);
 
         r = sd_varlink_dispatch(link, parameters, dispatch_table, &p);
         if (r != 0)
@@ -125,7 +125,7 @@ int vl_method_clone_image(sd_varlink *link, sd_json_variant *parameters, sd_varl
 
         r = manager_acquire_image(manager, p.name, &image);
         if (r == -ENOENT)
-                return sd_varlink_error(link, "io.systemd.MachineImage.NoSuchImage", NULL);
+                return sd_varlink_error(link, VARLINK_ERROR_MACHINE_IMAGE_NO_SUCH_IMAGE, NULL);
         if (r < 0)
                 return r;
 
@@ -182,7 +182,7 @@ int vl_method_remove_image(sd_varlink *link, sd_json_variant *parameters, sd_var
         assert(parameters);
 
         if (manager->n_operations >= OPERATIONS_MAX)
-                return sd_varlink_error(link, "io.systemd.MachineImage.TooManyOperations", NULL);
+                return sd_varlink_error(link, VARLINK_ERROR_MACHINE_IMAGE_TOO_MANY_OPERATIONS, NULL);
 
         r = sd_varlink_dispatch(link, parameters, dispatch_table, &image_name);
         if (r != 0)
@@ -193,7 +193,7 @@ int vl_method_remove_image(sd_varlink *link, sd_json_variant *parameters, sd_var
 
         r = manager_acquire_image(manager, image_name, &image);
         if (r == -ENOENT)
-                return sd_varlink_error(link, "io.systemd.MachineImage.NoSuchImage", NULL);
+                return sd_varlink_error(link, VARLINK_ERROR_MACHINE_IMAGE_NO_SUCH_IMAGE, NULL);
         if (r < 0)
                 return r;
 
diff --git a/src/machine/image-varlink.h b/src/machine/image-varlink.h
index 8ae1103780f..7f68fe86fbd 100644
--- a/src/machine/image-varlink.h
+++ b/src/machine/image-varlink.h
@@ -3,6 +3,9 @@
 
 #include "sd-varlink.h"
 
+#define VARLINK_ERROR_MACHINE_IMAGE_NO_SUCH_IMAGE               "io.systemd.MachineImage.NoSuchImage"
+#define VARLINK_ERROR_MACHINE_IMAGE_TOO_MANY_OPERATIONS         "io.systemd.MachineImage.TooManyOperations"
+
 int vl_method_update_image(sd_varlink *link, sd_json_variant *parameters, sd_varlink_method_flags_t flags, void *userdata);
 int vl_method_clone_image(sd_varlink *link, sd_json_variant *parameters, sd_varlink_method_flags_t flags, void *userdata);
 int vl_method_remove_image(sd_varlink *link, sd_json_variant *parameters, sd_varlink_method_flags_t flags, void *userdata);
diff --git a/src/machine/machined-varlink.c b/src/machine/machined-varlink.c
index f8faab6eafa..72ded672dc1 100644
--- a/src/machine/machined-varlink.c
+++ b/src/machine/machined-varlink.c
@@ -682,7 +682,7 @@ static int vl_method_list_images(sd_varlink *link, sd_json_variant *parameters,
 
                 r = image_find(m->runtime_scope, IMAGE_MACHINE, p.image_name, /* root = */ NULL, &found);
                 if (r == -ENOENT)
-                        return sd_varlink_error(link, "io.systemd.MachineImage.NoSuchImage", NULL);
+                        return sd_varlink_error(link, VARLINK_ERROR_MACHINE_IMAGE_NO_SUCH_IMAGE, NULL);
                 if (r < 0)
                         return log_debug_errno(r, "Failed to find image: %m");
 
@@ -714,7 +714,7 @@ static int vl_method_list_images(sd_varlink *link, sd_json_variant *parameters,
         if (previous)
                 return list_image_one_and_maybe_read_metadata(link, previous, /* more = */ false, p.acquire_metadata);
 
-        return sd_varlink_error(link, "io.systemd.MachineImage.NoSuchImage", NULL);
+        return sd_varlink_error(link, VARLINK_ERROR_MACHINE_IMAGE_NO_SUCH_IMAGE, NULL);
 }
 
 static int manager_varlink_init_userdb(Manager *m) {