X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fmachine%2Fmachined.h;h=df0cb82f8d78cbf13ff5c49f8757579e46e102bf;hb=a38d99451f2bf8026ec51aee91662292e823c6a8;hp=c47a4688302294eac9b88f62ddf589090d6353a5;hpb=c335068380fe8c9d843cdb2cf8a00f822cfabed3;p=elogind.git

diff --git a/src/machine/machined.h b/src/machine/machined.h
index c47a46883..df0cb82f8 100644
--- a/src/machine/machined.h
+++ b/src/machine/machined.h
@@ -33,6 +33,8 @@
 typedef struct Manager Manager;
 
 #include "machine.h"
+#include "machine-dbus.h"
+#include "image-dbus.h"
 
 struct Manager {
         sd_event *event;
@@ -40,6 +42,12 @@ struct Manager {
 
         Hashmap *machines;
         Hashmap *machine_units;
+        Hashmap *machine_leaders;
+
+        Hashmap *polkit_registry;
+
+        Hashmap *image_cache;
+        sd_event_source *image_cache_defer_event;
 
         LIST_HEAD(Machine, machine_gc_queue);
 };
@@ -48,7 +56,6 @@ Manager *manager_new(void);
 void manager_free(Manager *m);
 
 int manager_add_machine(Manager *m, const char *name, Machine **_machine);
-
 int manager_enumerate_machines(Manager *m);
 
 int manager_startup(Manager *m);
@@ -60,15 +67,13 @@ int manager_get_machine_by_pid(Manager *m, pid_t pid, Machine **machine);
 
 extern const sd_bus_vtable manager_vtable[];
 
-int machine_node_enumerator(sd_bus *bus, const char *path, char ***nodes, void *userdata);
-
-int match_reloading(sd_bus *bus, sd_bus_message *message, void *userdata);
-int match_unit_removed(sd_bus *bus, sd_bus_message *message, void *userdata);
-int match_properties_changed(sd_bus *bus, sd_bus_message *message, void *userdata);
-int match_job_removed(sd_bus *bus, sd_bus_message *message, void *userdata);
+int match_reloading(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error);
+int match_unit_removed(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error);
+int match_properties_changed(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error);
+int match_job_removed(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error);
 
 int manager_start_scope(Manager *manager, const char *scope, pid_t pid, const char *slice, const char *description, sd_bus_message *more_properties, sd_bus_error *error, char **job);
 int manager_stop_unit(Manager *manager, const char *unit, sd_bus_error *error, char **job);
-int manager_kill_unit(Manager *manager, const char *unit, KillWho who, int signo, sd_bus_error *error);
+int manager_kill_unit(Manager *manager, const char *unit, int signo, sd_bus_error *error);
 int manager_unit_is_active(Manager *manager, const char *unit);
 int manager_job_is_active(Manager *manager, const char *path);