X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fcore%2Fdbus-slice.c;h=2a48ea455e0cfc3aed8f522a350eca67f566ad04;hb=cccb0b2cdbd25e90ae92d2d5b107125cb1ca3433;hp=8243305848b1f3051840637cdb3af70b2646cceb;hpb=4ad490007b70e6ac18d3cb04fa2ed92eba1451fa;p=elogind.git
diff --git a/src/core/dbus-slice.c b/src/core/dbus-slice.c
index 824330584..2a48ea455 100644
--- a/src/core/dbus-slice.c
+++ b/src/core/dbus-slice.c
@@ -19,44 +19,35 @@
along with systemd; If not, see .
***/
-#include
-
+#include "unit.h"
+#include "slice.h"
#include "dbus-unit.h"
-#include "dbus-common.h"
#include "dbus-cgroup.h"
-#include "selinux-access.h"
#include "dbus-slice.h"
-#define BUS_SLICE_INTERFACE \
- " \n" \
- " \n"
-
-#define INTROSPECTION \
- DBUS_INTROSPECT_1_0_XML_DOCTYPE_DECL_NODE \
- "\n" \
- BUS_UNIT_INTERFACE \
- BUS_SLICE_INTERFACE \
- BUS_PROPERTIES_INTERFACE \
- BUS_PEER_INTERFACE \
- BUS_INTROSPECTABLE_INTERFACE \
- "\n"
-
-#define INTERFACES_LIST \
- BUS_UNIT_INTERFACES_LIST \
- "org.freedesktop.systemd1.Slice\0"
+const sd_bus_vtable bus_slice_vtable[] = {
+ SD_BUS_VTABLE_START(0),
+ SD_BUS_VTABLE_END
+};
-const char bus_slice_interface[] _introspect_("Slice") = BUS_SLICE_INTERFACE;
+int bus_slice_set_property(
+ Unit *u,
+ const char *name,
+ sd_bus_message *message,
+ UnitSetPropertiesMode mode,
+ sd_bus_error *error) {
-DBusHandlerResult bus_slice_message_handler(Unit *u, DBusConnection *c, DBusMessage *message) {
Slice *s = SLICE(u);
- const BusBoundProperties bps[] = {
- { "org.freedesktop.systemd1.Unit", bus_unit_properties, u },
- { "org.freedesktop.systemd1.Slice", bus_cgroup_context_properties, &s->cgroup_context },
- { NULL, }
- };
+ assert(name);
+ assert(u);
+
+ return bus_cgroup_set_property(u, &s->cgroup_context, name, message, mode, error);
+}
- SELINUX_UNIT_ACCESS_CHECK(u, c, message, "status");
+int bus_slice_commit_properties(Unit *u) {
+ assert(u);
- return bus_default_message_handler(c, message, INTROSPECTION, INTERFACES_LIST, bps);
+ unit_realize_cgroup(u);
+ return 0;
}