machined: Move image discovery logic into src/shared, so that we can make use of...

[elogind.git] / src / machine / machine.h

diff --git a/src/machine/machine.h b/src/machine/machine.h
index bfb28d1e8e6763597f7072cecd19a403d6572af3..64accda8b1131ce07768f855f7ac18917512037f 100644 (file)
--- a/src/machine/machine.h
+++ b/src/machine/machine.h
@@ -63,7 +63,7 @@ struct Machine {
         char *service;
         char *root_directory;
 
         char *service;
         char *root_directory;
 

-        char *scope;
+        char *unit;

         char *scope_job;
 
         pid_t leader;
         char *scope_job;
 
         pid_t leader;


@@ -72,15 +72,19 @@ struct Machine {
 
         bool in_gc_queue:1;
         bool started:1;
 
         bool in_gc_queue:1;
         bool started:1;

+        bool registered:1;

 
         sd_bus_message *create_message;
 
 
         sd_bus_message *create_message;
 

+        int *netif;
+        unsigned n_netif;
+

         LIST_FIELDS(Machine, gc_queue);
 };
 
 Machine* machine_new(Manager *manager, const char *name);
 void machine_free(Machine *m);
         LIST_FIELDS(Machine, gc_queue);
 };
 
 Machine* machine_new(Manager *manager, const char *name);
 void machine_free(Machine *m);

-int machine_check_gc(Machine *m, bool drop_not_started);
+bool machine_check_gc(Machine *m, bool drop_not_started);

 void machine_add_to_gc_queue(Machine *m);
 int machine_start(Machine *m, sd_bus_message *properties, sd_bus_error *error);
 int machine_stop(Machine *m);
 void machine_add_to_gc_queue(Machine *m);
 int machine_start(Machine *m, sd_bus_message *properties, sd_bus_error *error);
 int machine_stop(Machine *m);


@@ -90,14 +94,6 @@ int machine_kill(Machine *m, KillWho who, int signo);
 
 MachineState machine_get_state(Machine *u);
 
 
 MachineState machine_get_state(Machine *u);
 

-extern const sd_bus_vtable machine_vtable[];
-
-char *machine_bus_path(Machine *s);
-int machine_object_find(sd_bus *bus, const char *path, const char *interface, void **found, void *userdata);
-
-int machine_send_signal(Machine *m, bool new_machine);
-int machine_send_create_reply(Machine *m, sd_bus_error *error);
-

 const char* machine_class_to_string(MachineClass t) _const_;
 MachineClass machine_class_from_string(const char *s) _pure_;
 
 const char* machine_class_to_string(MachineClass t) _const_;
 MachineClass machine_class_from_string(const char *s) _pure_;