X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fmachine%2Fmachine.c;h=cf3ef15456bc416615ecd0622a1199c5a5f8c96c;hb=91d53e2b896ed3b1e76c3117a7acb74e4edc921f;hp=be669f02dcf59dcb6258ba6d858660936ec9d3ac;hpb=c335068380fe8c9d843cdb2cf8a00f822cfabed3;p=elogind.git diff --git a/src/machine/machine.c b/src/machine/machine.c index be669f02d..cf3ef1545 100644 --- a/src/machine/machine.c +++ b/src/machine/machine.c @@ -85,6 +85,9 @@ void machine_free(Machine *m) { hashmap_remove(m->manager->machines, m->name); + if (m->leader > 0) + hashmap_remove_value(m->manager->machine_leaders, UINT_TO_PTR(m->leader), m); + sd_bus_message_unref(m->create_message); free(m->name); @@ -263,6 +266,10 @@ int machine_start(Machine *m, sd_bus_message *properties, sd_bus_error *error) { if (m->started) return 0; + r = hashmap_put(m->manager->machine_leaders, UINT_TO_PTR(m->leader), m); + if (r < 0) + return r; + /* Create cgroup */ r = machine_start_scope(m, properties, error); if (r < 0) @@ -338,7 +345,7 @@ int machine_stop(Machine *m) { return r; } -int machine_check_gc(Machine *m, bool drop_not_started) { +bool machine_check_gc(Machine *m, bool drop_not_started) { assert(m); if (drop_not_started && !m->started)