Move functions around to fix underlinking in test-machine-tables

diff --git a/src/machine/machined-dbus.c b/src/machine/machined-dbus.c
index a526a5243ed2128f3fea6062563fb2ec013e1787..22caadfcebff4928421040790264794839e8eb33 100644 (file)
--- a/src/machine/machined-dbus.c
+++ b/src/machine/machined-dbus.c
@@ -40,6 +40,7 @@
 #include "unit-name.h"
 #include "bus-errors.h"
 #include "virt.h"
 #include "unit-name.h"
 #include "bus-errors.h"
 #include "virt.h"

+#include "cgroup-util.h"

 
 #define BUS_MANAGER_INTERFACE                                           \
         " <interface name=\"org.freedesktop.machine1.Manager\">\n"      \
 
 #define BUS_MANAGER_INTERFACE                                           \
         " <interface name=\"org.freedesktop.machine1.Manager\">\n"      \


@@ -994,3 +995,48 @@ int manager_unit_is_active(Manager *manager, const char *unit) {
 
         return !streq(state, "inactive") && !streq(state, "failed");
 }
 
         return !streq(state, "inactive") && !streq(state, "failed");
 }

+
+int manager_add_machine(Manager *m, const char *name, Machine **_machine) {
+        Machine *machine;
+
+        assert(m);
+        assert(name);
+
+        machine = hashmap_get(m->machines, name);
+        if (machine) {
+                if (_machine)
+                        *_machine = machine;
+
+                return 0;
+        }
+
+        machine = machine_new(m, name);
+        if (!machine)
+                return -ENOMEM;
+
+        if (_machine)
+                *_machine = machine;
+
+        return 0;
+}
+
+int manager_get_machine_by_pid(Manager *m, pid_t pid, Machine **machine) {
+        _cleanup_free_ char *unit = NULL;
+        Machine *mm;
+        int r;
+
+        assert(m);
+        assert(pid >= 1);
+        assert(machine);
+
+        r = cg_pid_get_unit(pid, &unit);
+        if (r < 0)
+                return r;
+
+        mm = hashmap_get(m->machine_units, unit);
+        if (!mm)
+                return 0;
+
+        *machine = mm;
+        return 1;
+}

diff --git a/src/machine/machined.c b/src/machine/machined.c
index 3ce51da90d2e827f62c09ae2a5cfcc309140e4c3..ad804a1e140d5721c99b591e62de1d08f2ce8dcc 100644 (file)
--- a/src/machine/machined.c
+++ b/src/machine/machined.c
@@ -34,7 +34,6 @@
 #include "strv.h"
 #include "conf-parser.h"
 #include "mkdir.h"
 #include "strv.h"
 #include "conf-parser.h"
 #include "mkdir.h"

-#include "cgroup-util.h"

 
 Manager *manager_new(void) {
         Manager *m;
 
 Manager *manager_new(void) {
         Manager *m;


@@ -83,30 +82,6 @@ void manager_free(Manager *m) {
         free(m);
 }
 
         free(m);
 }
 

-int manager_add_machine(Manager *m, const char *name, Machine **_machine) {
-        Machine *machine;
-
-        assert(m);
-        assert(name);
-
-        machine = hashmap_get(m->machines, name);
-        if (machine) {
-                if (_machine)
-                        *_machine = machine;
-
-                return 0;
-        }
-
-        machine = machine_new(m, name);
-        if (!machine)
-                return -ENOMEM;
-
-        if (_machine)
-                *_machine = machine;
-
-        return 0;
-}
-

 int manager_enumerate_machines(Manager *m) {
         _cleanup_closedir_ DIR *d = NULL;
         struct dirent *de;
 int manager_enumerate_machines(Manager *m) {
         _cleanup_closedir_ DIR *d = NULL;
         struct dirent *de;


@@ -149,27 +124,6 @@ int manager_enumerate_machines(Manager *m) {
         return r;
 }
 
         return r;
 }
 

-int manager_get_machine_by_pid(Manager *m, pid_t pid, Machine **machine) {
-        _cleanup_free_ char *unit = NULL;
-        Machine *mm;
-        int r;
-
-        assert(m);
-        assert(pid >= 1);
-        assert(machine);
-
-        r = cg_pid_get_unit(pid, &unit);
-        if (r < 0)
-                return r;
-
-        mm = hashmap_get(m->machine_units, unit);
-        if (!mm)
-                return 0;
-
-        *machine = mm;
-        return 1;
-}
-

 static int manager_connect_bus(Manager *m) {
         DBusError error;
         int r;
 static int manager_connect_bus(Manager *m) {
         DBusError error;
         int r;