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=3f07d4dd8ec92ef1569303e42321da3ce7e9a516;hpb=d3e84ddb885e9d5f0ae9930eb905910e3a81f157;p=elogind.git

diff --git a/src/machine/machined.h b/src/machine/machined.h
index 3f07d4dd8..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;
@@ -42,6 +44,11 @@ struct Manager {
         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);
 };
 
@@ -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);