machine: Remove circular header dependencies

diff --git a/src/machine/image-dbus.c b/src/machine/image-dbus.c
index 0e96127a0550f41c3dc3f08995407291ca8efdf8..5ad765237cb0a11e7097bfb0dc836b486d94a811 100644 (file)
--- a/src/machine/image-dbus.c
+++ b/src/machine/image-dbus.c
@@ -7,6 +7,7 @@
 #include "bus-get-properties.h"
 #include "bus-label.h"
 #include "bus-polkit.h"
+#include "bus-util.h"
 #include "copy.h"
 #include "discover-image.h"
 #include "dissect-image.h"
@@ -16,7 +17,9 @@
 #include "image-dbus.h"
 #include "io-util.h"
 #include "loop-util.h"
+#include "machined.h"
 #include "mount-util.h"
+#include "operation.h"
 #include "os-util.h"
 #include "process-util.h"
 #include "raw-clone.h"

diff --git a/src/machine/image-dbus.h b/src/machine/image-dbus.h
index 0a7975bc52882411320e6a6967bd08a3b1363ff4..38626cffe28961be6cc890506ce71a6e6d16d791 100644 (file)
--- a/src/machine/image-dbus.h
+++ b/src/machine/image-dbus.h
@@ -2,8 +2,6 @@
 #pragma once
 
 #include "bus-object.h"
-#include "discover-image.h"
-#include "machined.h"
 
 extern const BusObjectImplementation image_object;
 

diff --git a/src/machine/image-varlink.c b/src/machine/image-varlink.c
index fc05edf8e1498c73f61100031f07ddc39077d682..4749487541cf535a2e225f292c98ad90d12d53ed 100644 (file)
--- a/src/machine/image-varlink.c
+++ b/src/machine/image-varlink.c
@@ -5,6 +5,7 @@
 
 #include "bus-polkit.h"
 #include "btrfs-util.h"
+#include "discover-image.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "image.h"
@@ -12,7 +13,9 @@
 #include "io-util.h"
 #include "json-util.h"
 #include "machine.h"
+#include "machined.h"
 #include "machine-pool.h"
+#include "operation.h"
 #include "process-util.h"
 #include "string-util.h"
 

diff --git a/src/machine/image.c b/src/machine/image.c
index de4fba08568ec8148dff767ed15156074fec34a3..f30c29e9ddfab68eab899343605491874c2383e5 100644 (file)
--- a/src/machine/image.c
+++ b/src/machine/image.c
@@ -7,6 +7,7 @@
 #include "fileio.h"
 #include "image.h"
 #include "io-util.h"
+#include "machined.h"
 #include "operation.h"
 #include "process-util.h"
 #include "string-table.h"

diff --git a/src/machine/image.h b/src/machine/image.h
index 522b7459e4bc9ade60f78d43dac283433d23ba78..fc8de564e8b3fe6839f8ed27e3def4d9d56e249e 100644 (file)
--- a/src/machine/image.h
+++ b/src/machine/image.h
@@ -1,8 +1,14 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include "machined.h"
-#include "operation.h"
+#include <errno.h>
+
+#include "sd-bus.h"
+
+#include "macro.h"
+
+typedef struct Manager Manager;
+typedef struct Operation Operation;
 
 typedef enum ImageCleanPoolMode {
         IMAGE_CLEAN_POOL_REMOVE_ALL,

diff --git a/src/machine/machine-dbus.c b/src/machine/machine-dbus.c
index 657b9e919361c1156a8d725ba644d538ed170975..fc48d44a6efcdf48ab2c64518826e60234f29ba7 100644 (file)
--- a/src/machine/machine-dbus.c
+++ b/src/machine/machine-dbus.c
@@ -11,6 +11,7 @@
 #include "bus-label.h"
 #include "bus-locator.h"
 #include "bus-polkit.h"
+#include "bus-util.h"
 #include "copy.h"
 #include "env-file.h"
 #include "env-util.h"
@@ -22,10 +23,12 @@
 #include "local-addresses.h"
 #include "machine-dbus.h"
 #include "machine.h"
+#include "machined.h"
 #include "mkdir.h"
 #include "mount-util.h"
 #include "mountpoint-util.h"
 #include "namespace-util.h"
+#include "operation.h"
 #include "os-util.h"
 #include "path-util.h"
 #include "process-util.h"

diff --git a/src/machine/machine-dbus.h b/src/machine/machine-dbus.h
index fc9ec680877f19b5cbbac4a4b6f6aee285779b45..72b6984660dc4ebf0f855226b037f45eec636b24 100644 (file)
--- a/src/machine/machine-dbus.h
+++ b/src/machine/machine-dbus.h
@@ -3,8 +3,9 @@
 
 #include "sd-bus.h"
 
-#include "bus-util.h"
-#include "machine.h"
+#include "bus-object.h"
+
+typedef struct Machine Machine;
 
 typedef enum {
         MACHINE_COPY_REPLACE = 1 << 0, /* Public API via DBUS, do not change */

diff --git a/src/machine/machine-varlink.c b/src/machine/machine-varlink.c
index 038aa411ff4a6d083ec3c20477eadb9867209548..e59cb85155782e2c9272925990da80b270edf733 100644 (file)
--- a/src/machine/machine-varlink.c
+++ b/src/machine/machine-varlink.c
@@ -13,7 +13,9 @@
 #include "json-util.h"
 #include "machine-varlink.h"
 #include "machine.h"
+#include "machined.h"
 #include "mount-util.h"
+#include "operation.h"
 #include "path-util.h"
 #include "pidref.h"
 #include "process-util.h"

diff --git a/src/machine/machine-varlink.h b/src/machine/machine-varlink.h
index 1c089bc7bc3ee47bc249537ea3da42d2e9f9e487..83f396d708bb702b49c077e58a4e5622da8a8c54 100644 (file)
--- a/src/machine/machine-varlink.h
+++ b/src/machine/machine-varlink.h
@@ -3,7 +3,10 @@
 
 #include "sd-varlink.h"
 
-#include "machine.h"
+#include "pidref.h"
+
+typedef struct Machine Machine;
+typedef struct Manager Manager;
 
 #define VARLINK_ERROR_MACHINE_NO_SUCH_MACHINE           "io.systemd.Machine.NoSuchMachine"
 #define VARLINK_ERROR_MACHINE_EXISTS                    "io.systemd.Machine.MachineExists"

diff --git a/src/machine/machine.c b/src/machine/machine.c
index 0568b22c461fb4c5bdeefb21bec7970ef2223522..36fc2a1476a384c2cf1342286de0d5ee4a674d47 100644 (file)
--- a/src/machine/machine.c
+++ b/src/machine/machine.c
@@ -23,8 +23,10 @@
 #include "hashmap.h"
 #include "machine-dbus.h"
 #include "machine.h"
+#include "machined.h"
 #include "mkdir-label.h"
 #include "namespace-util.h"
+#include "operation.h"
 #include "parse-util.h"
 #include "path-util.h"
 #include "process-util.h"

diff --git a/src/machine/machine.h b/src/machine/machine.h
index 520c2fcade601153a03c496b349ad52f2c537cad..a4b375ca32e5ebbe8bbf9d3317caca7581b2bc4f 100644 (file)
--- a/src/machine/machine.h
+++ b/src/machine/machine.h
@@ -1,16 +1,19 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-typedef struct Machine Machine;
-typedef enum KillWhom KillWhom;
+#include "sd-bus.h"
+#include "sd-event.h"
+#include "sd-id128.h"
 
 #include "copy.h"
 #include "list.h"
-#include "machined.h"
-#include "operation.h"
 #include "pidref.h"
 #include "time-util.h"
 
+typedef struct Machine Machine;
+typedef struct Manager Manager;
+typedef struct Operation Operation;
+
 typedef enum MachineState {
         MACHINE_OPENING,    /* Machine is being registered */
         MACHINE_RUNNING,    /* Machine is running */
@@ -27,12 +30,12 @@ typedef enum MachineClass {
         _MACHINE_CLASS_INVALID = -EINVAL,
 } MachineClass;
 
-enum KillWhom {
+typedef enum KillWhom {
         KILL_LEADER,
         KILL_ALL,
         _KILL_WHOM_MAX,
         _KILL_WHOM_INVALID = -EINVAL,
-};
+} KillWhom;
 
 struct Machine {
         Manager *manager;

diff --git a/src/machine/machined-core.c b/src/machine/machined-core.c
index 5c6d225051901b60473f4278501772dbbbec8ca5..d5804b54abd084fa47910818cb6ef5f2c9075c18 100644 (file)
--- a/src/machine/machined-core.c
+++ b/src/machine/machined-core.c
@@ -2,12 +2,16 @@
 
 #include "cgroup-util.h"
 #include "copy.h"
+#include "discover-image.h"
 #include "env-file.h"
 #include "fd-util.h"
 #include "fileio.h"
 #include "iovec-util.h"
+#include "log.h"
+#include "machine.h"
 #include "machined.h"
 #include "namespace-util.h"
+#include "os-util.h"
 #include "process-util.h"
 #include "socket-util.h"
 #include "strv.h"

diff --git a/src/machine/machined-dbus.c b/src/machine/machined-dbus.c
index e1969d69d8d2364c5f80f1fbc995a841d6c0eccf..f50ce901703f30d388bff23fa2f0f903811d275d 100644 (file)
--- a/src/machine/machined-dbus.c
+++ b/src/machine/machined-dbus.c
@@ -12,6 +12,7 @@
 #include "bus-locator.h"
 #include "bus-message-util.h"
 #include "bus-polkit.h"
+#include "bus-util.h"
 #include "cgroup-util.h"
 #include "discover-image.h"
 #include "errno-util.h"
@@ -24,7 +25,9 @@
 #include "io-util.h"
 #include "machine-dbus.h"
 #include "machine-pool.h"
+#include "machine.h"
 #include "machined.h"
+#include "operation.h"
 #include "os-util.h"
 #include "path-util.h"
 #include "process-util.h"

diff --git a/src/machine/machined-varlink.c b/src/machine/machined-varlink.c
index 7c1210209bdfede8a9154eec974919abeb49f45a..e331ccba6662c761b093a015401a194fbb88bb49 100644 (file)
--- a/src/machine/machined-varlink.c
+++ b/src/machine/machined-varlink.c
@@ -9,6 +9,8 @@
 #include "image-varlink.h"
 #include "json-util.h"
 #include "machine-varlink.h"
+#include "machine.h"
+#include "machined.h"
 #include "machined-varlink.h"
 #include "mkdir.h"
 #include "process-util.h"

diff --git a/src/machine/machined-varlink.h b/src/machine/machined-varlink.h
index f26bbe588c319882070a909595caa7576517be14..b96700719bf4721580235820b282d457277b4eaa 100644 (file)
--- a/src/machine/machined-varlink.h
+++ b/src/machine/machined-varlink.h
@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1-or-later */
 #pragma once
 
-#include "machined.h"
+typedef struct Manager Manager;
 
 int manager_varlink_init(Manager *m);
 void manager_varlink_done(Manager *m);

diff --git a/src/machine/machined.c b/src/machine/machined.c
index 3a235aa0d4005a5c0eb3117081906b6cbf1f2438..253561e4350f7eb5324c5639271911e4455c9791 100644 (file)
--- a/src/machine/machined.c
+++ b/src/machine/machined.c
@@ -19,10 +19,12 @@
 #include "fd-util.h"
 #include "format-util.h"
 #include "hostname-util.h"
+#include "machine.h"
 #include "machined-varlink.h"
 #include "machined.h"
 #include "main-func.h"
 #include "mkdir-label.h"
+#include "operation.h"
 #include "process-util.h"
 #include "service-util.h"
 #include "signal-util.h"

diff --git a/src/machine/machined.h b/src/machine/machined.h
index 758678a2059722c7ad3e30382135061a811d51b9..10de674e7f7bdebce6b56f168e8ffb56dcb9ef7a 100644 (file)
--- a/src/machine/machined.h
+++ b/src/machine/machined.h
@@ -7,18 +7,18 @@
 #include "sd-event.h"
 #include "sd-varlink.h"
 
-typedef struct Manager Manager;
-
+#include "bus-object.h"
 #include "hashmap.h"
-#include "image-dbus.h"
 #include "list.h"
 #include "local-addresses.h"
-#include "machine-dbus.h"
-#include "machine.h"
-#include "operation.h"
 #include "pidref.h"
+#include "runtime-scope.h"
+
+typedef struct Image Image;
+typedef struct Machine Machine;
+typedef struct Operation Operation;
 
-struct Manager {
+typedef struct Manager {
         sd_event *event;
         sd_bus *bus;
 
@@ -44,7 +44,7 @@ struct Manager {
         sd_varlink_server *varlink_machine_server;
 
         RuntimeScope runtime_scope; /* for now: always RUNTIME_SCOPE_SYSTEM */
-};
+} Manager;
 
 int manager_add_machine(Manager *m, const char *name, Machine **ret);
 int manager_get_machine_by_pidref(Manager *m, const PidRef *pidref, Machine **ret);

diff --git a/src/machine/operation.c b/src/machine/operation.c
index ef4e178a8c0b1a604f59f2b767ba50cd6b08dea3..22168a3670f3c3ed8a6159e8e798fb8e1235986f 100644 (file)
--- a/src/machine/operation.c
+++ b/src/machine/operation.c
@@ -5,6 +5,9 @@
 
 #include "alloc-util.h"
 #include "fd-util.h"
+#include "log.h"
+#include "machine.h"
+#include "machined.h"
 #include "operation.h"
 #include "process-util.h"
 

diff --git a/src/machine/operation.h b/src/machine/operation.h
index 1a92847b80d490e79a3a11eb9f649e42a2ae7e96..1fd8d42a2ef943b2f3b88339a11e62e2929f9852 100644 (file)
--- a/src/machine/operation.h
+++ b/src/machine/operation.h
@@ -5,13 +5,14 @@
 
 #include "sd-bus.h"
 #include "sd-event.h"
+#include "sd-varlink.h"
 
 #include "list.h"
 
+typedef struct Machine Machine;
+typedef struct Manager Manager;
 typedef struct Operation Operation;
 
-#include "machined.h"
-
 #define OPERATIONS_MAX 64
 
 struct Operation {