diff options
| -rw-r--r-- | Makefile.am | 7 | ||||
| -rw-r--r-- | src/machine/image-dbus.c | 3 | ||||
| -rw-r--r-- | src/machine/image-dbus.h | 31 | ||||
| -rw-r--r-- | src/machine/machine-dbus.c | 1 | ||||
| -rw-r--r-- | src/machine/machine-dbus.h | 41 | ||||
| -rw-r--r-- | src/machine/machine.c | 3 | ||||
| -rw-r--r-- | src/machine/machine.h | 16 | ||||
| -rw-r--r-- | src/machine/machined-dbus.c | 4 | ||||
| -rw-r--r-- | src/machine/machined.h | 3 | ||||
| -rw-r--r-- | src/shared/machine-image.c (renamed from src/machine/image.c) | 2 | ||||
| -rw-r--r-- | src/shared/machine-image.h (renamed from src/machine/image.h) | 8 |
11 files changed, 87 insertions, 32 deletions
diff --git a/Makefile.am b/Makefile.am index f71bc9ac4b..e1e0843086 100644 --- a/Makefile.am +++ b/Makefile.am @@ -899,6 +899,8 @@ libsystemd_shared_la_SOURCES = \ src/shared/btrfs-ctree.h \ src/shared/verbs.c \ src/shared/verbs.h \ + src/shared/machine-image.c \ + src/shared/machine-image.h \ src/shared/build.h if HAVE_UTMP @@ -5039,11 +5041,10 @@ rootlibexec_PROGRAMS += \ libsystemd_machine_core_la_SOURCES = \ src/machine/machine.c \ src/machine/machine.h \ - src/machine/image.c \ - src/machine/image.h \ src/machine/machined-dbus.c \ src/machine/machine-dbus.c \ - src/machine/image-dbus.c + src/machine/image-dbus.c \ + src/machine/image-dbus.h libsystemd_machine_core_la_LIBADD = \ libsystemd-label.la \ diff --git a/src/machine/image-dbus.c b/src/machine/image-dbus.c index 8d9ad5589e..c8d1328fe9 100644 --- a/src/machine/image-dbus.c +++ b/src/machine/image-dbus.c @@ -22,7 +22,8 @@ #include "bus-label.h" #include "bus-common-errors.h" #include "strv.h" -#include "image.h" +#include "machine-image.h" +#include "image-dbus.h" static int image_find_by_bus_path(const char *path, Image **ret) { _cleanup_free_ char *e = NULL; diff --git a/src/machine/image-dbus.h b/src/machine/image-dbus.h new file mode 100644 index 0000000000..d176ff728b --- /dev/null +++ b/src/machine/image-dbus.h @@ -0,0 +1,31 @@ +/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ + +#pragma once + +/*** + This file is part of systemd. + + Copyright 2014 Lennart Poettering + + systemd is free software; you can redistribute it and/or modify it + under the terms of the GNU Lesser General Public License as published by + the Free Software Foundation; either version 2.1 of the License, or + (at your option) any later version. + + systemd is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with systemd; If not, see <http://www.gnu.org/licenses/>. +***/ + +#include "machined.h" + +extern const sd_bus_vtable image_vtable[]; + +char *image_bus_path(const char *name); + +int image_object_find(sd_bus *bus, const char *path, const char *interface, void *userdata, void **found, sd_bus_error *error); +int image_node_enumerator(sd_bus *bus, const char *path, void *userdata, char ***nodes, sd_bus_error *error); diff --git a/src/machine/machine-dbus.c b/src/machine/machine-dbus.c index 31a6fc4715..cbdbc52a14 100644 --- a/src/machine/machine-dbus.c +++ b/src/machine/machine-dbus.c @@ -34,6 +34,7 @@ #include "path-util.h" #include "bus-internal.h" #include "machine.h" +#include "machine-dbus.h" static int property_get_id( sd_bus *bus, diff --git a/src/machine/machine-dbus.h b/src/machine/machine-dbus.h new file mode 100644 index 0000000000..601252722d --- /dev/null +++ b/src/machine/machine-dbus.h @@ -0,0 +1,41 @@ +/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ + +#pragma once + +/*** + This file is part of systemd. + + Copyright 2013 Lennart Poettering + + systemd is free software; you can redistribute it and/or modify it + under the terms of the GNU Lesser General Public License as published by + the Free Software Foundation; either version 2.1 of the License, or + (at your option) any later version. + + systemd is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with systemd; If not, see <http://www.gnu.org/licenses/>. +***/ + +#include "sd-bus.h" +#include "machine.h" + +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 *userdata, void **found, sd_bus_error *error); +int machine_node_enumerator(sd_bus *bus, const char *path, void *userdata, char ***nodes, sd_bus_error *error); + +int bus_machine_method_terminate(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error); +int bus_machine_method_kill(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error); +int bus_machine_method_get_addresses(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error); +int bus_machine_method_get_os_release(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error); +int bus_machine_method_open_pty(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error); +int bus_machine_method_open_login(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error); + +int machine_send_signal(Machine *m, bool new_machine); +int machine_send_create_reply(Machine *m, sd_bus_error *error); diff --git a/src/machine/machine.c b/src/machine/machine.c index 0d84213eea..8dec716d71 100644 --- a/src/machine/machine.c +++ b/src/machine/machine.c @@ -32,9 +32,10 @@ #include "fileio.h" #include "special.h" #include "unit-name.h" -#include "machine.h" #include "bus-util.h" #include "bus-error.h" +#include "machine.h" +#include "machine-dbus.h" Machine* machine_new(Manager *manager, const char *name) { Machine *m; diff --git a/src/machine/machine.h b/src/machine/machine.h index 3a78ab4484..64accda8b1 100644 --- a/src/machine/machine.h +++ b/src/machine/machine.h @@ -94,22 +94,6 @@ int machine_kill(Machine *m, KillWho who, int signo); 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 *userdata, void **found, sd_bus_error *error); -int machine_node_enumerator(sd_bus *bus, const char *path, void *userdata, char ***nodes, sd_bus_error *error); - -int bus_machine_method_terminate(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error); -int bus_machine_method_kill(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error); -int bus_machine_method_get_addresses(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error); -int bus_machine_method_get_os_release(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error); -int bus_machine_method_open_pty(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error); -int bus_machine_method_open_login(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error); - -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_; diff --git a/src/machine/machined-dbus.c b/src/machine/machined-dbus.c index 1ca2c95898..66594ab0b1 100644 --- a/src/machine/machined-dbus.c +++ b/src/machine/machined-dbus.c @@ -38,8 +38,10 @@ #include "bus-common-errors.h" #include "time-util.h" #include "cgroup-util.h" -#include "image.h" +#include "machine-image.h" +#include "image-dbus.h" #include "machined.h" +#include "machine-dbus.h" static int method_get_machine(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error) { _cleanup_free_ char *p = NULL; diff --git a/src/machine/machined.h b/src/machine/machined.h index 5fc1bd17b3..695ba297cc 100644 --- a/src/machine/machined.h +++ b/src/machine/machined.h @@ -33,7 +33,8 @@ typedef struct Manager Manager; #include "machine.h" -#include "image.h" +#include "machine-dbus.h" +#include "image-dbus.h" struct Manager { sd_event *event; diff --git a/src/machine/image.c b/src/shared/machine-image.c index 46a216bbb7..51f89d5921 100644 --- a/src/machine/image.c +++ b/src/shared/machine-image.c @@ -25,7 +25,7 @@ #include "utf8.h" #include "btrfs-util.h" #include "path-util.h" -#include "image.h" +#include "machine-image.h" static const char image_search_path[] = "/var/lib/machines\0" diff --git a/src/machine/image.h b/src/shared/machine-image.h index 2e8f78147c..646598f9c8 100644 --- a/src/machine/image.h +++ b/src/shared/machine-image.h @@ -23,7 +23,6 @@ #include "time-util.h" #include "hashmap.h" -#include "machined.h" typedef enum ImageType { IMAGE_DIRECTORY, @@ -52,12 +51,5 @@ DEFINE_TRIVIAL_CLEANUP_FUNC(Hashmap*, image_hashmap_free); int image_find(const char *name, Image **ret); int image_discover(Hashmap *map); -extern const sd_bus_vtable image_vtable[]; - -char *image_bus_path(const char *name); - -int image_object_find(sd_bus *bus, const char *path, const char *interface, void *userdata, void **found, sd_bus_error *error); -int image_node_enumerator(sd_bus *bus, const char *path, void *userdata, char ***nodes, sd_bus_error *error); - const char* image_type_to_string(ImageType t) _const_; ImageType image_type_from_string(const char *s) _pure_; |