From: amarjargal Date: Mon, 11 Apr 2022 13:29:22 +0000 (+0800) Subject: core: update to use new-style sd-bus macros X-Git-Tag: v251-rc2~140 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a008b6d771dd330ab4d8a791809cd5b822323947;p=thirdparty%2Fsystemd.git core: update to use new-style sd-bus macros Replace old SD_BUS_METHOD_WITH_NAMES and SD_BUS_SIGNAL_WITH_NAMES macros to the new SD_BUS_METHOD_WITH_ARGS and SD_BUS_SIGNAL_WITH_ARGS macros. --- diff --git a/src/core/dbus-manager.c b/src/core/dbus-manager.c index 156071f1681..a6b2ea28866 100644 --- a/src/core/dbus-manager.c +++ b/src/core/dbus-manager.c @@ -2839,261 +2839,171 @@ const sd_bus_vtable bus_manager_vtable[] = { SD_BUS_PROPERTY("DefaultOOMScoreAdjust", "i", property_get_oom_score_adjust, 0, SD_BUS_VTABLE_PROPERTY_CONST), SD_BUS_PROPERTY("CtrlAltDelBurstAction", "s", bus_property_get_emergency_action, offsetof(Manager, cad_burst_action), SD_BUS_VTABLE_PROPERTY_CONST), - SD_BUS_METHOD_WITH_NAMES("GetUnit", - "s", - SD_BUS_PARAM(name), - "o", - SD_BUS_PARAM(unit), - method_get_unit, - SD_BUS_VTABLE_UNPRIVILEGED), - SD_BUS_METHOD_WITH_NAMES("GetUnitByPID", - "u", - SD_BUS_PARAM(pid), - "o", - SD_BUS_PARAM(unit), - method_get_unit_by_pid, - SD_BUS_VTABLE_UNPRIVILEGED), - SD_BUS_METHOD_WITH_NAMES("GetUnitByInvocationID", - "ay", - SD_BUS_PARAM(invocation_id), - "o", - SD_BUS_PARAM(unit), - method_get_unit_by_invocation_id, - SD_BUS_VTABLE_UNPRIVILEGED), - SD_BUS_METHOD_WITH_NAMES("GetUnitByControlGroup", - "s", - SD_BUS_PARAM(cgroup), - "o", - SD_BUS_PARAM(unit), - method_get_unit_by_control_group, - SD_BUS_VTABLE_UNPRIVILEGED), - SD_BUS_METHOD_WITH_NAMES("LoadUnit", - "s", - SD_BUS_PARAM(name), - "o", - SD_BUS_PARAM(unit), - method_load_unit, - SD_BUS_VTABLE_UNPRIVILEGED), - SD_BUS_METHOD_WITH_NAMES("StartUnit", - "ss", - SD_BUS_PARAM(name) - SD_BUS_PARAM(mode), - "o", - SD_BUS_PARAM(job), - method_start_unit, - SD_BUS_VTABLE_UNPRIVILEGED), - SD_BUS_METHOD_WITH_NAMES("StartUnitWithFlags", - "sst", - SD_BUS_PARAM(name) - SD_BUS_PARAM(mode) - SD_BUS_PARAM(flags), - "o", - SD_BUS_PARAM(job), - method_start_unit, - SD_BUS_VTABLE_UNPRIVILEGED), - SD_BUS_METHOD_WITH_NAMES("StartUnitReplace", - "sss", - SD_BUS_PARAM(old_unit) - SD_BUS_PARAM(new_unit) - SD_BUS_PARAM(mode), - "o", - SD_BUS_PARAM(job), - method_start_unit_replace, - SD_BUS_VTABLE_UNPRIVILEGED), - SD_BUS_METHOD_WITH_NAMES("StopUnit", - "ss", - SD_BUS_PARAM(name) - SD_BUS_PARAM(mode), - "o", - SD_BUS_PARAM(job), - method_stop_unit, - SD_BUS_VTABLE_UNPRIVILEGED), - SD_BUS_METHOD_WITH_NAMES("ReloadUnit", - "ss", - SD_BUS_PARAM(name) - SD_BUS_PARAM(mode), - "o", - SD_BUS_PARAM(job), - method_reload_unit, - SD_BUS_VTABLE_UNPRIVILEGED), - SD_BUS_METHOD_WITH_NAMES("RestartUnit", - "ss", - SD_BUS_PARAM(name) - SD_BUS_PARAM(mode), - "o", - SD_BUS_PARAM(job), - method_restart_unit, - SD_BUS_VTABLE_UNPRIVILEGED), - SD_BUS_METHOD_WITH_NAMES("TryRestartUnit", - "ss", - SD_BUS_PARAM(name) - SD_BUS_PARAM(mode), - "o", - SD_BUS_PARAM(job), - method_try_restart_unit, - SD_BUS_VTABLE_UNPRIVILEGED), - SD_BUS_METHOD_WITH_NAMES("ReloadOrRestartUnit", - "ss", - SD_BUS_PARAM(name) - SD_BUS_PARAM(mode), - "o", - SD_BUS_PARAM(job), - method_reload_or_restart_unit, - SD_BUS_VTABLE_UNPRIVILEGED), - SD_BUS_METHOD_WITH_NAMES("ReloadOrTryRestartUnit", - "ss", - SD_BUS_PARAM(name) - SD_BUS_PARAM(mode), - "o", - SD_BUS_PARAM(job), - method_reload_or_try_restart_unit, - SD_BUS_VTABLE_UNPRIVILEGED), - SD_BUS_METHOD_WITH_NAMES("EnqueueUnitJob", - "sss", - SD_BUS_PARAM(name) - SD_BUS_PARAM(job_type) - SD_BUS_PARAM(job_mode), - "uososa(uosos)", - SD_BUS_PARAM(job_id) - SD_BUS_PARAM(job_path) - SD_BUS_PARAM(unit_id) - SD_BUS_PARAM(unit_path) - SD_BUS_PARAM(job_type) - SD_BUS_PARAM(affected_jobs), - method_enqueue_unit_job, - SD_BUS_VTABLE_UNPRIVILEGED), - SD_BUS_METHOD_WITH_NAMES("KillUnit", - "ssi", - SD_BUS_PARAM(name) - SD_BUS_PARAM(whom) - SD_BUS_PARAM(signal), - NULL,, - method_kill_unit, - SD_BUS_VTABLE_UNPRIVILEGED), - SD_BUS_METHOD_WITH_NAMES("CleanUnit", - "sas", - SD_BUS_PARAM(name) - SD_BUS_PARAM(mask), - NULL,, - method_clean_unit, - SD_BUS_VTABLE_UNPRIVILEGED), - SD_BUS_METHOD_WITH_NAMES("FreezeUnit", - "s", - SD_BUS_PARAM(name), - NULL,, - method_freeze_unit, - SD_BUS_VTABLE_UNPRIVILEGED), - SD_BUS_METHOD_WITH_NAMES("ThawUnit", - "s", - SD_BUS_PARAM(name), - NULL,, - method_thaw_unit, - SD_BUS_VTABLE_UNPRIVILEGED), - SD_BUS_METHOD_WITH_NAMES("ResetFailedUnit", - "s", - SD_BUS_PARAM(name), - NULL,, - method_reset_failed_unit, - SD_BUS_VTABLE_UNPRIVILEGED), - SD_BUS_METHOD_WITH_NAMES("SetUnitProperties", - "sba(sv)", - SD_BUS_PARAM(name) - SD_BUS_PARAM(runtime) - SD_BUS_PARAM(properties), - NULL,, - method_set_unit_properties, - SD_BUS_VTABLE_UNPRIVILEGED), - SD_BUS_METHOD_WITH_NAMES("BindMountUnit", - "sssbb", - SD_BUS_PARAM(name) - SD_BUS_PARAM(source) - SD_BUS_PARAM(destination) - SD_BUS_PARAM(read_only) - SD_BUS_PARAM(mkdir), - NULL,, - method_bind_mount_unit, - SD_BUS_VTABLE_UNPRIVILEGED), - SD_BUS_METHOD_WITH_NAMES("MountImageUnit", - "sssbba(ss)", - SD_BUS_PARAM(name) - SD_BUS_PARAM(source) - SD_BUS_PARAM(destination) - SD_BUS_PARAM(read_only) - SD_BUS_PARAM(mkdir) - SD_BUS_PARAM(options), - NULL,, - method_mount_image_unit, - SD_BUS_VTABLE_UNPRIVILEGED), - SD_BUS_METHOD_WITH_NAMES("RefUnit", - "s", - SD_BUS_PARAM(name), - NULL,, - method_ref_unit, - SD_BUS_VTABLE_UNPRIVILEGED), - SD_BUS_METHOD_WITH_NAMES("UnrefUnit", - "s", - SD_BUS_PARAM(name), - NULL,, - method_unref_unit, - SD_BUS_VTABLE_UNPRIVILEGED), - SD_BUS_METHOD_WITH_NAMES("StartTransientUnit", - "ssa(sv)a(sa(sv))", - SD_BUS_PARAM(name) - SD_BUS_PARAM(mode) - SD_BUS_PARAM(properties) - SD_BUS_PARAM(aux), - "o", - SD_BUS_PARAM(job), - method_start_transient_unit, - SD_BUS_VTABLE_UNPRIVILEGED), - SD_BUS_METHOD_WITH_NAMES("GetUnitProcesses", - "s", - SD_BUS_PARAM(name), - "a(sus)", - SD_BUS_PARAM(processes), - method_get_unit_processes, - SD_BUS_VTABLE_UNPRIVILEGED), - SD_BUS_METHOD_WITH_NAMES("AttachProcessesToUnit", - "ssau", - SD_BUS_PARAM(unit_name) - SD_BUS_PARAM(subcgroup) - SD_BUS_PARAM(pids), - NULL,, - method_attach_processes_to_unit, - SD_BUS_VTABLE_UNPRIVILEGED), - SD_BUS_METHOD_WITH_NAMES("AbandonScope", - "s", - SD_BUS_PARAM(name), - NULL,, - method_abandon_scope, - SD_BUS_VTABLE_UNPRIVILEGED), - SD_BUS_METHOD_WITH_NAMES("GetJob", - "u", - SD_BUS_PARAM(id), - "o", - SD_BUS_PARAM(job), - method_get_job, - SD_BUS_VTABLE_UNPRIVILEGED), - SD_BUS_METHOD_WITH_NAMES("GetJobAfter", - "u", - SD_BUS_PARAM(id), - "a(usssoo)", - SD_BUS_PARAM(jobs), - method_get_job_waiting, - SD_BUS_VTABLE_UNPRIVILEGED), - SD_BUS_METHOD_WITH_NAMES("GetJobBefore", - "u", - SD_BUS_PARAM(id), - "a(usssoo)", - SD_BUS_PARAM(jobs), - method_get_job_waiting, - SD_BUS_VTABLE_UNPRIVILEGED), - SD_BUS_METHOD_WITH_NAMES("CancelJob", - "u", - SD_BUS_PARAM(id), - NULL,, - method_cancel_job, - SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD_WITH_ARGS("GetUnit", + SD_BUS_ARGS("s", name), + SD_BUS_RESULT("o", unit), + method_get_unit, + SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD_WITH_ARGS("GetUnitByPID", + SD_BUS_ARGS("u", pid), + SD_BUS_RESULT("o", unit), + method_get_unit_by_pid, + SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD_WITH_ARGS("GetUnitByInvocationID", + SD_BUS_ARGS("ay", invocation_id), + SD_BUS_RESULT("o", unit), + method_get_unit_by_invocation_id, + SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD_WITH_ARGS("GetUnitByControlGroup", + SD_BUS_ARGS("s", cgroup), + SD_BUS_RESULT("o", unit), + method_get_unit_by_control_group, + SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD_WITH_ARGS("LoadUnit", + SD_BUS_ARGS("s", name), + SD_BUS_RESULT("o", unit), + method_load_unit, + SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD_WITH_ARGS("StartUnit", + SD_BUS_ARGS("s", name, "s", mode), + SD_BUS_RESULT("o", job), + method_start_unit, + SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD_WITH_ARGS("StartUnitWithFlags", + SD_BUS_ARGS("s", name, "s", mode, "t", flags), + SD_BUS_RESULT("o", job), + method_start_unit, + SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD_WITH_ARGS("StartUnitReplace", + SD_BUS_ARGS("s", old_unit, "s", new_unit, "s", mode), + SD_BUS_RESULT("o", job), + method_start_unit_replace, + SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD_WITH_ARGS("StopUnit", + SD_BUS_ARGS("s", name, "s", mode), + SD_BUS_RESULT("o", job), + method_stop_unit, + SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD_WITH_ARGS("ReloadUnit", + SD_BUS_ARGS("s", name, "s", mode), + SD_BUS_RESULT("o", job), + method_reload_unit, + SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD_WITH_ARGS("RestartUnit", + SD_BUS_ARGS("s", name, "s", mode), + SD_BUS_RESULT("o", job), + method_restart_unit, + SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD_WITH_ARGS("TryRestartUnit", + SD_BUS_ARGS("s", name, "s", mode), + SD_BUS_RESULT("o", job), + method_try_restart_unit, + SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD_WITH_ARGS("ReloadOrRestartUnit", + SD_BUS_ARGS("s", name, "s", mode), + SD_BUS_RESULT("o", job), + method_reload_or_restart_unit, + SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD_WITH_ARGS("ReloadOrTryRestartUnit", + SD_BUS_ARGS("s", name, "s", mode), + SD_BUS_RESULT("o", job), + method_reload_or_try_restart_unit, + SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD_WITH_ARGS("EnqueueUnitJob", + SD_BUS_ARGS("s", name, "s", job_type, "s", job_mode), + SD_BUS_RESULT("u", job_id, "o", job_path, "s", unit_id, "o", unit_path, "s", job_type, "a(uosos)", affected_jobs), + method_enqueue_unit_job, + SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD_WITH_ARGS("KillUnit", + SD_BUS_ARGS("s", name, "s", whom, "i", signal), + SD_BUS_NO_RESULT, + method_kill_unit, + SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD_WITH_ARGS("CleanUnit", + SD_BUS_ARGS("s", name, "as", mask), + SD_BUS_NO_RESULT, + method_clean_unit, + SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD_WITH_ARGS("FreezeUnit", + SD_BUS_ARGS("s", name), + SD_BUS_NO_RESULT, + method_freeze_unit, + SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD_WITH_ARGS("ThawUnit", + SD_BUS_ARGS("s", name), + SD_BUS_NO_RESULT, + method_thaw_unit, + SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD_WITH_ARGS("ResetFailedUnit", + SD_BUS_ARGS("s", name), + SD_BUS_NO_RESULT, + method_reset_failed_unit, + SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD_WITH_ARGS("SetUnitProperties", + SD_BUS_ARGS("s", name, "b", runtime, "a(sv)", properties), + SD_BUS_NO_RESULT, + method_set_unit_properties, + SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD_WITH_ARGS("BindMountUnit", + SD_BUS_ARGS("s", name, "s", source, "s", destination, "b", read_only, "b", mkdir), + SD_BUS_NO_RESULT, + method_bind_mount_unit, + SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD_WITH_ARGS("MountImageUnit", + SD_BUS_ARGS("s", name, "s", source, "s", destination, "b", read_only, "b", mkdir, "a(ss)", options), + SD_BUS_NO_RESULT, + method_mount_image_unit, + SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD_WITH_ARGS("RefUnit", + SD_BUS_ARGS("s", name), + SD_BUS_NO_RESULT, + method_ref_unit, + SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD_WITH_ARGS("UnrefUnit", + SD_BUS_ARGS("s", name), + SD_BUS_NO_RESULT, + method_unref_unit, + SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD_WITH_ARGS("StartTransientUnit", + SD_BUS_ARGS("s", name, "s", mode, "a(sv)", properties, "a(sa(sv))", aux), + SD_BUS_RESULT("o", job), + method_start_transient_unit, + SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD_WITH_ARGS("GetUnitProcesses", + SD_BUS_ARGS("s", name), + SD_BUS_RESULT("a(sus)", processes), + method_get_unit_processes, + SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD_WITH_ARGS("AttachProcessesToUnit", + SD_BUS_ARGS("s", unit_name, "s", subcgroup, "au", pids), + SD_BUS_NO_RESULT, + method_attach_processes_to_unit, + SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD_WITH_ARGS("AbandonScope", + SD_BUS_ARGS("s", name), + SD_BUS_NO_RESULT, + method_abandon_scope, + SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD_WITH_ARGS("GetJob", + SD_BUS_ARGS("u", id), + SD_BUS_RESULT("o", job), + method_get_job, + SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD_WITH_ARGS("GetJobAfter", + SD_BUS_ARGS("u", id), + SD_BUS_RESULT("a(usssoo)", jobs), + method_get_job_waiting, + SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD_WITH_ARGS("GetJobBefore", + SD_BUS_ARGS("u", id), + SD_BUS_RESULT("a(usssoo)", jobs), + method_get_job_waiting, + SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD_WITH_ARGS("CancelJob", + SD_BUS_ARGS("u", id), + SD_BUS_NO_RESULT, + method_cancel_job, + SD_BUS_VTABLE_UNPRIVILEGED), SD_BUS_METHOD("ClearJobs", NULL, NULL, @@ -3104,46 +3014,36 @@ const sd_bus_vtable bus_manager_vtable[] = { NULL, method_reset_failed, SD_BUS_VTABLE_UNPRIVILEGED), - SD_BUS_METHOD_WITH_NAMES("SetShowStatus", - "s", - SD_BUS_PARAM(mode), - NULL,, - method_set_show_status, - SD_BUS_VTABLE_UNPRIVILEGED), - SD_BUS_METHOD_WITH_NAMES("ListUnits", - NULL,, - "a(ssssssouso)", - SD_BUS_PARAM(units), - method_list_units, - SD_BUS_VTABLE_UNPRIVILEGED), - SD_BUS_METHOD_WITH_NAMES("ListUnitsFiltered", - "as", - SD_BUS_PARAM(states), - "a(ssssssouso)", - SD_BUS_PARAM(units), - method_list_units_filtered, - SD_BUS_VTABLE_UNPRIVILEGED), - SD_BUS_METHOD_WITH_NAMES("ListUnitsByPatterns", - "asas", - SD_BUS_PARAM(states) - SD_BUS_PARAM(patterns), - "a(ssssssouso)", - SD_BUS_PARAM(units), - method_list_units_by_patterns, - SD_BUS_VTABLE_UNPRIVILEGED), - SD_BUS_METHOD_WITH_NAMES("ListUnitsByNames", - "as", - SD_BUS_PARAM(names), - "a(ssssssouso)", - SD_BUS_PARAM(units), - method_list_units_by_names, - SD_BUS_VTABLE_UNPRIVILEGED), - SD_BUS_METHOD_WITH_NAMES("ListJobs", - NULL,, - "a(usssoo)", - SD_BUS_PARAM(jobs), - method_list_jobs, - SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD_WITH_ARGS("SetShowStatus", + SD_BUS_ARGS("s", mode), + SD_BUS_NO_RESULT, + method_set_show_status, + SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD_WITH_ARGS("ListUnits", + SD_BUS_NO_ARGS, + SD_BUS_RESULT("a(ssssssouso)", units), + method_list_units, + SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD_WITH_ARGS("ListUnitsFiltered", + SD_BUS_ARGS("as", states), + SD_BUS_RESULT("a(ssssssouso)", units), + method_list_units_filtered, + SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD_WITH_ARGS("ListUnitsByPatterns", + SD_BUS_ARGS("as", states, "as", patterns), + SD_BUS_RESULT("a(ssssssouso)", units), + method_list_units_by_patterns, + SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD_WITH_ARGS("ListUnitsByNames", + SD_BUS_ARGS("as", names), + SD_BUS_RESULT("a(ssssssouso)", units), + method_list_units_by_names, + SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD_WITH_ARGS("ListJobs", + SD_BUS_NO_ARGS, + SD_BUS_RESULT("a(usssoo)", jobs), + method_list_jobs, + SD_BUS_VTABLE_UNPRIVILEGED), SD_BUS_METHOD("Subscribe", NULL, NULL, @@ -3154,32 +3054,26 @@ const sd_bus_vtable bus_manager_vtable[] = { NULL, method_unsubscribe, SD_BUS_VTABLE_UNPRIVILEGED), - SD_BUS_METHOD_WITH_NAMES("Dump", - NULL,, - "s", - SD_BUS_PARAM(output), - method_dump, - SD_BUS_VTABLE_UNPRIVILEGED), - SD_BUS_METHOD_WITH_NAMES("DumpByFileDescriptor", - NULL,, - "h", - SD_BUS_PARAM(fd), - method_dump_by_fd, - SD_BUS_VTABLE_UNPRIVILEGED), - SD_BUS_METHOD_WITH_NAMES("CreateSnapshot", - "sb", - SD_BUS_PARAM(name) - SD_BUS_PARAM(cleanup), - "o", - SD_BUS_PARAM(unit), - method_refuse_snapshot, - SD_BUS_VTABLE_UNPRIVILEGED|SD_BUS_VTABLE_HIDDEN), - SD_BUS_METHOD_WITH_NAMES("RemoveSnapshot", - "s", - SD_BUS_PARAM(name), - NULL,, - method_refuse_snapshot, - SD_BUS_VTABLE_UNPRIVILEGED|SD_BUS_VTABLE_HIDDEN), + SD_BUS_METHOD_WITH_ARGS("Dump", + SD_BUS_NO_ARGS, + SD_BUS_RESULT("s", output), + method_dump, + SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD_WITH_ARGS("DumpByFileDescriptor", + SD_BUS_NO_ARGS, + SD_BUS_RESULT("h", fd), + method_dump_by_fd, + SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD_WITH_ARGS("CreateSnapshot", + SD_BUS_ARGS("s", name, "b", cleanup), + SD_BUS_RESULT("o", unit), + method_refuse_snapshot, + SD_BUS_VTABLE_UNPRIVILEGED|SD_BUS_VTABLE_HIDDEN), + SD_BUS_METHOD_WITH_ARGS("RemoveSnapshot", + SD_BUS_ARGS("s", name), + SD_BUS_NO_RESULT, + method_refuse_snapshot, + SD_BUS_VTABLE_UNPRIVILEGED|SD_BUS_VTABLE_HIDDEN), SD_BUS_METHOD("Reload", NULL, NULL, @@ -3215,264 +3109,166 @@ const sd_bus_vtable bus_manager_vtable[] = { NULL, method_kexec, SD_BUS_VTABLE_CAPABILITY(CAP_SYS_BOOT)), - SD_BUS_METHOD_WITH_NAMES("SwitchRoot", - "ss", - SD_BUS_PARAM(new_root) - SD_BUS_PARAM(init), - NULL,, - method_switch_root, - SD_BUS_VTABLE_CAPABILITY(CAP_SYS_BOOT)), - SD_BUS_METHOD_WITH_NAMES("SetEnvironment", - "as", - SD_BUS_PARAM(assignments), - NULL,, - method_set_environment, - SD_BUS_VTABLE_UNPRIVILEGED), - SD_BUS_METHOD_WITH_NAMES("UnsetEnvironment", - "as", - SD_BUS_PARAM(names), - NULL,, - method_unset_environment, - SD_BUS_VTABLE_UNPRIVILEGED), - SD_BUS_METHOD_WITH_NAMES("UnsetAndSetEnvironment", - "asas", - SD_BUS_PARAM(names) - SD_BUS_PARAM(assignments), - NULL,, - method_unset_and_set_environment, - SD_BUS_VTABLE_UNPRIVILEGED), - SD_BUS_METHOD_WITH_NAMES("EnqueueMarkedJobs", - NULL,, - "ao", - SD_BUS_PARAM(jobs), - method_enqueue_marked_jobs, - SD_BUS_VTABLE_UNPRIVILEGED), - SD_BUS_METHOD_WITH_NAMES("ListUnitFiles", - NULL,, - "a(ss)", - SD_BUS_PARAM(unit_files), - method_list_unit_files, - SD_BUS_VTABLE_UNPRIVILEGED), - SD_BUS_METHOD_WITH_NAMES("ListUnitFilesByPatterns", - "asas", - SD_BUS_PARAM(states) - SD_BUS_PARAM(patterns), - "a(ss)", - SD_BUS_PARAM(unit_files), - method_list_unit_files_by_patterns, - SD_BUS_VTABLE_UNPRIVILEGED), - SD_BUS_METHOD_WITH_NAMES("GetUnitFileState", - "s", - SD_BUS_PARAM(file), - "s", - SD_BUS_PARAM(state), - method_get_unit_file_state, - SD_BUS_VTABLE_UNPRIVILEGED), - SD_BUS_METHOD_WITH_NAMES("EnableUnitFiles", - "asbb", - SD_BUS_PARAM(files) - SD_BUS_PARAM(runtime) - SD_BUS_PARAM(force), - "ba(sss)", - SD_BUS_PARAM(carries_install_info) - SD_BUS_PARAM(changes), - method_enable_unit_files, - SD_BUS_VTABLE_UNPRIVILEGED), - SD_BUS_METHOD_WITH_NAMES("DisableUnitFiles", - "asb", - SD_BUS_PARAM(files) - SD_BUS_PARAM(runtime), - "a(sss)", - SD_BUS_PARAM(changes), - method_disable_unit_files, - SD_BUS_VTABLE_UNPRIVILEGED), - SD_BUS_METHOD_WITH_NAMES("EnableUnitFilesWithFlags", - "ast", - SD_BUS_PARAM(files) - SD_BUS_PARAM(flags), - "ba(sss)", - SD_BUS_PARAM(carries_install_info) - SD_BUS_PARAM(changes), - method_enable_unit_files_with_flags, - SD_BUS_VTABLE_UNPRIVILEGED), - SD_BUS_METHOD_WITH_NAMES("DisableUnitFilesWithFlags", - "ast", - SD_BUS_PARAM(files) - SD_BUS_PARAM(flags), - "a(sss)", - SD_BUS_PARAM(changes), - method_disable_unit_files_with_flags, - SD_BUS_VTABLE_UNPRIVILEGED), - SD_BUS_METHOD_WITH_NAMES("ReenableUnitFiles", - "asbb", - SD_BUS_PARAM(files) - SD_BUS_PARAM(runtime) - SD_BUS_PARAM(force), - "ba(sss)", - SD_BUS_PARAM(carries_install_info) - SD_BUS_PARAM(changes), - method_reenable_unit_files, - SD_BUS_VTABLE_UNPRIVILEGED), - SD_BUS_METHOD_WITH_NAMES("LinkUnitFiles", - "asbb", - SD_BUS_PARAM(files) - SD_BUS_PARAM(runtime) - SD_BUS_PARAM(force), - "a(sss)", - SD_BUS_PARAM(changes), - method_link_unit_files, - SD_BUS_VTABLE_UNPRIVILEGED), - SD_BUS_METHOD_WITH_NAMES("PresetUnitFiles", - "asbb", - SD_BUS_PARAM(files) - SD_BUS_PARAM(runtime) - SD_BUS_PARAM(force), - "ba(sss)", - SD_BUS_PARAM(carries_install_info) - SD_BUS_PARAM(changes), - method_preset_unit_files, - SD_BUS_VTABLE_UNPRIVILEGED), - SD_BUS_METHOD_WITH_NAMES("PresetUnitFilesWithMode", - "assbb", - SD_BUS_PARAM(files) - SD_BUS_PARAM(mode) - SD_BUS_PARAM(runtime) - SD_BUS_PARAM(force), - "ba(sss)", - SD_BUS_PARAM(carries_install_info) - SD_BUS_PARAM(changes), - method_preset_unit_files_with_mode, - SD_BUS_VTABLE_UNPRIVILEGED), - SD_BUS_METHOD_WITH_NAMES("MaskUnitFiles", - "asbb", - SD_BUS_PARAM(files) - SD_BUS_PARAM(runtime) - SD_BUS_PARAM(force), - "a(sss)", - SD_BUS_PARAM(changes), - method_mask_unit_files, - SD_BUS_VTABLE_UNPRIVILEGED), - SD_BUS_METHOD_WITH_NAMES("UnmaskUnitFiles", - "asb", - SD_BUS_PARAM(files) - SD_BUS_PARAM(runtime), - "a(sss)", - SD_BUS_PARAM(changes), - method_unmask_unit_files, - SD_BUS_VTABLE_UNPRIVILEGED), - SD_BUS_METHOD_WITH_NAMES("RevertUnitFiles", - "as", - SD_BUS_PARAM(files), - "a(sss)", - SD_BUS_PARAM(changes), - method_revert_unit_files, - SD_BUS_VTABLE_UNPRIVILEGED), - SD_BUS_METHOD_WITH_NAMES("SetDefaultTarget", - "sb", - SD_BUS_PARAM(name) - SD_BUS_PARAM(force), - "a(sss)", - SD_BUS_PARAM(changes), - method_set_default_target, - SD_BUS_VTABLE_UNPRIVILEGED), - SD_BUS_METHOD_WITH_NAMES("GetDefaultTarget", - NULL,, - "s", - SD_BUS_PARAM(name), - method_get_default_target, - SD_BUS_VTABLE_UNPRIVILEGED), - SD_BUS_METHOD_WITH_NAMES("PresetAllUnitFiles", - "sbb", - SD_BUS_PARAM(mode) - SD_BUS_PARAM(runtime) - SD_BUS_PARAM(force), - "a(sss)", - SD_BUS_PARAM(changes), - method_preset_all_unit_files, - SD_BUS_VTABLE_UNPRIVILEGED), - SD_BUS_METHOD_WITH_NAMES("AddDependencyUnitFiles", - "asssbb", - SD_BUS_PARAM(files) - SD_BUS_PARAM(target) - SD_BUS_PARAM(type) - SD_BUS_PARAM(runtime) - SD_BUS_PARAM(force), - "a(sss)", - SD_BUS_PARAM(changes), - method_add_dependency_unit_files, - SD_BUS_VTABLE_UNPRIVILEGED), - SD_BUS_METHOD_WITH_NAMES("GetUnitFileLinks", - "sb", - SD_BUS_PARAM(name) - SD_BUS_PARAM(runtime), - "as", - SD_BUS_PARAM(links), - method_get_unit_file_links, - SD_BUS_VTABLE_UNPRIVILEGED), - SD_BUS_METHOD_WITH_NAMES("SetExitCode", - "y", - SD_BUS_PARAM(number), - NULL,, - method_set_exit_code, - SD_BUS_VTABLE_UNPRIVILEGED), - SD_BUS_METHOD_WITH_NAMES("LookupDynamicUserByName", - "s", - SD_BUS_PARAM(name), - "u", - SD_BUS_PARAM(uid), - method_lookup_dynamic_user_by_name, - SD_BUS_VTABLE_UNPRIVILEGED), - SD_BUS_METHOD_WITH_NAMES("LookupDynamicUserByUID", - "u", - SD_BUS_PARAM(uid), - "s", - SD_BUS_PARAM(name), - method_lookup_dynamic_user_by_uid, - SD_BUS_VTABLE_UNPRIVILEGED), - SD_BUS_METHOD_WITH_NAMES("GetDynamicUsers", - NULL,, - "a(us)", - SD_BUS_PARAM(users), - method_get_dynamic_users, - SD_BUS_VTABLE_UNPRIVILEGED), - - SD_BUS_SIGNAL_WITH_NAMES("UnitNew", - "so", - SD_BUS_PARAM(id) - SD_BUS_PARAM(unit), - 0), - SD_BUS_SIGNAL_WITH_NAMES("UnitRemoved", - "so", - SD_BUS_PARAM(id) - SD_BUS_PARAM(unit), - 0), - SD_BUS_SIGNAL_WITH_NAMES("JobNew", - "uos", - SD_BUS_PARAM(id) - SD_BUS_PARAM(job) - SD_BUS_PARAM(unit), - 0), - SD_BUS_SIGNAL_WITH_NAMES("JobRemoved", - "uoss", - SD_BUS_PARAM(id) - SD_BUS_PARAM(job) - SD_BUS_PARAM(unit) - SD_BUS_PARAM(result), - 0), - SD_BUS_SIGNAL_WITH_NAMES("StartupFinished", - "tttttt", - SD_BUS_PARAM(firmware) - SD_BUS_PARAM(loader) - SD_BUS_PARAM(kernel) - SD_BUS_PARAM(initrd) - SD_BUS_PARAM(userspace) - SD_BUS_PARAM(total), - 0), + SD_BUS_METHOD_WITH_ARGS("SwitchRoot", + SD_BUS_ARGS("s", new_root, "s", init), + SD_BUS_NO_RESULT, + method_switch_root, + SD_BUS_VTABLE_CAPABILITY(CAP_SYS_BOOT)), + SD_BUS_METHOD_WITH_ARGS("SetEnvironment", + SD_BUS_ARGS("as", assignments), + SD_BUS_NO_RESULT, + method_set_environment, + SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD_WITH_ARGS("UnsetEnvironment", + SD_BUS_ARGS("as", names), + SD_BUS_NO_RESULT, + method_unset_environment, + SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD_WITH_ARGS("UnsetAndSetEnvironment", + SD_BUS_ARGS("as", names, "as", assignments), + SD_BUS_NO_RESULT, + method_unset_and_set_environment, + SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD_WITH_ARGS("EnqueueMarkedJobs", + SD_BUS_NO_ARGS, + SD_BUS_RESULT("ao", jobs), + method_enqueue_marked_jobs, + SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD_WITH_ARGS("ListUnitFiles", + SD_BUS_NO_ARGS, + SD_BUS_RESULT("a(ss)", unit_files), + method_list_unit_files, + SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD_WITH_ARGS("ListUnitFilesByPatterns", + SD_BUS_ARGS("as", states, "as", patterns), + SD_BUS_RESULT("a(ss)", unit_files), + method_list_unit_files_by_patterns, + SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD_WITH_ARGS("GetUnitFileState", + SD_BUS_ARGS("s", file), + SD_BUS_RESULT("s", state), + method_get_unit_file_state, + SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD_WITH_ARGS("EnableUnitFiles", + SD_BUS_ARGS("as", files, "b", runtime, "b", force), + SD_BUS_RESULT("b", carries_install_info, "a(sss)", changes), + method_enable_unit_files, + SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD_WITH_ARGS("DisableUnitFiles", + SD_BUS_ARGS("as", files, "b", runtime), + SD_BUS_RESULT("a(sss)", changes), + method_disable_unit_files, + SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD_WITH_ARGS("EnableUnitFilesWithFlags", + SD_BUS_ARGS("as", files, "t", flags), + SD_BUS_RESULT("b", carries_install_info, "a(sss)", changes), + method_enable_unit_files_with_flags, + SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD_WITH_ARGS("DisableUnitFilesWithFlags", + SD_BUS_ARGS("as", files, "t", flags), + SD_BUS_RESULT("a(sss)", changes), + method_disable_unit_files_with_flags, + SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD_WITH_ARGS("ReenableUnitFiles", + SD_BUS_ARGS("as", files, "b", runtime, "b", force), + SD_BUS_RESULT("b", carries_install_info, "a(sss)", changes), + method_reenable_unit_files, + SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD_WITH_ARGS("LinkUnitFiles", + SD_BUS_ARGS("as", files, "b", runtime, "b", force), + SD_BUS_RESULT("a(sss)", changes), + method_link_unit_files, + SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD_WITH_ARGS("PresetUnitFiles", + SD_BUS_ARGS("as", files, "b", runtime, "b", force), + SD_BUS_RESULT("b", carries_install_info, "a(sss)", changes), + method_preset_unit_files, + SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD_WITH_ARGS("PresetUnitFilesWithMode", + SD_BUS_ARGS("as", files, "s", mode, "b", runtime, "b", force), + SD_BUS_RESULT("b", carries_install_info, "a(sss)", changes), + method_preset_unit_files_with_mode, + SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD_WITH_ARGS("MaskUnitFiles", + SD_BUS_ARGS("as", files, "b", runtime, "b", force), + SD_BUS_RESULT("a(sss)", changes), + method_mask_unit_files, + SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD_WITH_ARGS("UnmaskUnitFiles", + SD_BUS_ARGS("as", files, "b", runtime), + SD_BUS_RESULT("a(sss)", changes), + method_unmask_unit_files, + SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD_WITH_ARGS("RevertUnitFiles", + SD_BUS_ARGS("as", files), + SD_BUS_RESULT("a(sss)", changes), + method_revert_unit_files, + SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD_WITH_ARGS("SetDefaultTarget", + SD_BUS_ARGS("s", name, "b", force), + SD_BUS_RESULT("a(sss)", changes), + method_set_default_target, + SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD_WITH_ARGS("GetDefaultTarget", + SD_BUS_NO_ARGS, + SD_BUS_RESULT("s", name), + method_get_default_target, + SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD_WITH_ARGS("PresetAllUnitFiles", + SD_BUS_ARGS("s", mode, "b", runtime, "b", force), + SD_BUS_RESULT("a(sss)", changes), + method_preset_all_unit_files, + SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD_WITH_ARGS("AddDependencyUnitFiles", + SD_BUS_ARGS("as", files, "s", target, "s", type, "b", runtime, "b", force), + SD_BUS_RESULT("a(sss)", changes), + method_add_dependency_unit_files, + SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD_WITH_ARGS("GetUnitFileLinks", + SD_BUS_ARGS("s", name, "b", runtime), + SD_BUS_RESULT("as", links), + method_get_unit_file_links, + SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD_WITH_ARGS("SetExitCode", + SD_BUS_ARGS("y", number), + SD_BUS_NO_RESULT, + method_set_exit_code, + SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD_WITH_ARGS("LookupDynamicUserByName", + SD_BUS_ARGS("s", name), + SD_BUS_RESULT("u", uid), + method_lookup_dynamic_user_by_name, + SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD_WITH_ARGS("LookupDynamicUserByUID", + SD_BUS_ARGS("u", uid), + SD_BUS_RESULT("s", name), + method_lookup_dynamic_user_by_uid, + SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD_WITH_ARGS("GetDynamicUsers", + SD_BUS_NO_ARGS, + SD_BUS_RESULT("a(us)", users), + method_get_dynamic_users, + SD_BUS_VTABLE_UNPRIVILEGED), + + SD_BUS_SIGNAL_WITH_ARGS("UnitNew", + SD_BUS_ARGS("s", id, "o", unit), + 0), + SD_BUS_SIGNAL_WITH_ARGS("UnitRemoved", + SD_BUS_ARGS("s", id, "o", unit), + 0), + SD_BUS_SIGNAL_WITH_ARGS("JobNew", + SD_BUS_ARGS("u", id, "o", job, "s", unit), + 0), + SD_BUS_SIGNAL_WITH_ARGS("JobRemoved", + SD_BUS_ARGS("u", id, "o", job, "s", unit, "s", result), + 0), + SD_BUS_SIGNAL_WITH_ARGS("StartupFinished", + SD_BUS_ARGS("t", firmware, "t", loader, "t", kernel, "t", initrd, "t", userspace, "t", total), + 0), SD_BUS_SIGNAL("UnitFilesChanged", NULL, 0), - SD_BUS_SIGNAL_WITH_NAMES("Reloading", - "b", - SD_BUS_PARAM(active), - 0), + SD_BUS_SIGNAL_WITH_ARGS("Reloading", + SD_BUS_ARGS("b", active), + 0), SD_BUS_VTABLE_END }; diff --git a/src/core/dbus-service.c b/src/core/dbus-service.c index e90fe4f596b..9c7da5a3514 100644 --- a/src/core/dbus-service.c +++ b/src/core/dbus-service.c @@ -247,24 +247,15 @@ const sd_bus_vtable bus_service_vtable[] = { BUS_EXEC_COMMAND_LIST_VTABLE("ExecStopPost", offsetof(Service, exec_command[SERVICE_EXEC_STOP_POST]), SD_BUS_VTABLE_PROPERTY_EMITS_INVALIDATION), BUS_EXEC_EX_COMMAND_LIST_VTABLE("ExecStopPostEx", offsetof(Service, exec_command[SERVICE_EXEC_STOP_POST]), SD_BUS_VTABLE_PROPERTY_EMITS_INVALIDATION), - SD_BUS_METHOD_WITH_NAMES("BindMount", - "ssbb", - SD_BUS_PARAM(source) - SD_BUS_PARAM(destination) - SD_BUS_PARAM(read_only) - SD_BUS_PARAM(mkdir), - NULL,, - bus_service_method_bind_mount, - SD_BUS_VTABLE_UNPRIVILEGED), - - SD_BUS_METHOD_WITH_NAMES("MountImage", - "ssbba(ss)", - SD_BUS_PARAM(source) - SD_BUS_PARAM(destination) - SD_BUS_PARAM(read_only) - SD_BUS_PARAM(mkdir) - SD_BUS_PARAM(options), - NULL,, + SD_BUS_METHOD_WITH_ARGS("BindMount", + SD_BUS_ARGS("s", source, "s", destination, "b", read_only, "b", mkdir), + SD_BUS_NO_RESULT, + bus_service_method_bind_mount, + SD_BUS_VTABLE_UNPRIVILEGED), + + SD_BUS_METHOD_WITH_ARGS("MountImage", + SD_BUS_ARGS("s", source, "s", destination, "b", read_only, "b", mkdir, "a(ss)", options), + SD_BUS_NO_RESULT, bus_service_method_mount_image, SD_BUS_VTABLE_UNPRIVILEGED), diff --git a/src/core/dbus-unit.c b/src/core/dbus-unit.c index 9c4e0fee5a0..34608fc0915 100644 --- a/src/core/dbus-unit.c +++ b/src/core/dbus-unit.c @@ -951,87 +951,61 @@ const sd_bus_vtable bus_unit_vtable[] = { SD_BUS_PROPERTY("CollectMode", "s", property_get_collect_mode, offsetof(Unit, collect_mode), SD_BUS_VTABLE_PROPERTY_CONST), SD_BUS_PROPERTY("Refs", "as", property_get_refs, 0, 0), - SD_BUS_METHOD_WITH_NAMES("Start", - "s", - SD_BUS_PARAM(mode), - "o", - SD_BUS_PARAM(job), - bus_unit_method_start, - SD_BUS_VTABLE_UNPRIVILEGED), - SD_BUS_METHOD_WITH_NAMES("Stop", - "s", - SD_BUS_PARAM(mode), - "o", - SD_BUS_PARAM(job), - bus_unit_method_stop, - SD_BUS_VTABLE_UNPRIVILEGED), - SD_BUS_METHOD_WITH_NAMES("Reload", - "s", - SD_BUS_PARAM(mode), - "o", - SD_BUS_PARAM(job), - bus_unit_method_reload, - SD_BUS_VTABLE_UNPRIVILEGED), - SD_BUS_METHOD_WITH_NAMES("Restart", - "s", - SD_BUS_PARAM(mode), - "o", - SD_BUS_PARAM(job), - bus_unit_method_restart, - SD_BUS_VTABLE_UNPRIVILEGED), - SD_BUS_METHOD_WITH_NAMES("TryRestart", - "s", - SD_BUS_PARAM(mode), - "o", - SD_BUS_PARAM(job), - bus_unit_method_try_restart, - SD_BUS_VTABLE_UNPRIVILEGED), - SD_BUS_METHOD_WITH_NAMES("ReloadOrRestart", - "s", - SD_BUS_PARAM(mode), - "o", - SD_BUS_PARAM(job), - bus_unit_method_reload_or_restart, - SD_BUS_VTABLE_UNPRIVILEGED), - SD_BUS_METHOD_WITH_NAMES("ReloadOrTryRestart", - "s", - SD_BUS_PARAM(mode), - "o", - SD_BUS_PARAM(job), - bus_unit_method_reload_or_try_restart, - SD_BUS_VTABLE_UNPRIVILEGED), - SD_BUS_METHOD_WITH_NAMES("EnqueueJob", - "ss", - SD_BUS_PARAM(job_type) - SD_BUS_PARAM(job_mode), - "uososa(uosos)", - SD_BUS_PARAM(job_id) - SD_BUS_PARAM(job_path) - SD_BUS_PARAM(unit_id) - SD_BUS_PARAM(unit_path) - SD_BUS_PARAM(job_type) - SD_BUS_PARAM(affected_jobs), - bus_unit_method_enqueue_job, - SD_BUS_VTABLE_UNPRIVILEGED), - SD_BUS_METHOD_WITH_NAMES("Kill", - "si", - SD_BUS_PARAM(whom) - SD_BUS_PARAM(signal), - NULL,, - bus_unit_method_kill, - SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD_WITH_ARGS("Start", + SD_BUS_ARGS("s", mode), + SD_BUS_RESULT("o", job), + bus_unit_method_start, + SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD_WITH_ARGS("Stop", + SD_BUS_ARGS("s", mode), + SD_BUS_RESULT("o", job), + bus_unit_method_stop, + SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD_WITH_ARGS("Reload", + SD_BUS_ARGS("s", mode), + SD_BUS_RESULT("o", job), + bus_unit_method_reload, + SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD_WITH_ARGS("Restart", + SD_BUS_ARGS("s", mode), + SD_BUS_RESULT("o", job), + bus_unit_method_restart, + SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD_WITH_ARGS("TryRestart", + SD_BUS_ARGS("s", mode), + SD_BUS_RESULT("o", job), + bus_unit_method_try_restart, + SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD_WITH_ARGS("ReloadOrRestart", + SD_BUS_ARGS("s", mode), + SD_BUS_RESULT("o", job), + bus_unit_method_reload_or_restart, + SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD_WITH_ARGS("ReloadOrTryRestart", + SD_BUS_ARGS("s", mode), + SD_BUS_RESULT("o", job), + bus_unit_method_reload_or_try_restart, + SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD_WITH_ARGS("EnqueueJob", + SD_BUS_ARGS("s", job_type, "s", job_mode), + SD_BUS_RESULT("u", job_id, "o", job_path, "s", unit_id, "o", unit_path, "s", job_type, "a(uosos)", affected_jobs), + bus_unit_method_enqueue_job, + SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD_WITH_ARGS("Kill", + SD_BUS_ARGS("s", whom, "i", signal), + SD_BUS_NO_RESULT, + bus_unit_method_kill, + SD_BUS_VTABLE_UNPRIVILEGED), SD_BUS_METHOD("ResetFailed", NULL, NULL, bus_unit_method_reset_failed, SD_BUS_VTABLE_UNPRIVILEGED), - SD_BUS_METHOD_WITH_NAMES("SetProperties", - "ba(sv)", - SD_BUS_PARAM(runtime) - SD_BUS_PARAM(properties), - NULL,, - bus_unit_method_set_properties, - SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD_WITH_ARGS("SetProperties", + SD_BUS_ARGS("b", runtime, "a(sv)", properties), + SD_BUS_NO_RESULT, + bus_unit_method_set_properties, + SD_BUS_VTABLE_UNPRIVILEGED), SD_BUS_METHOD("Ref", NULL, NULL, @@ -1042,12 +1016,11 @@ const sd_bus_vtable bus_unit_vtable[] = { NULL, bus_unit_method_unref, SD_BUS_VTABLE_UNPRIVILEGED), - SD_BUS_METHOD_WITH_NAMES("Clean", - "as", - SD_BUS_PARAM(mask), - NULL,, - bus_unit_method_clean, - SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD_WITH_ARGS("Clean", + SD_BUS_ARGS("as", mask), + SD_BUS_NO_RESULT, + bus_unit_method_clean, + SD_BUS_VTABLE_UNPRIVILEGED), SD_BUS_METHOD("Freeze", NULL, NULL, @@ -1600,18 +1573,15 @@ const sd_bus_vtable bus_unit_cgroup_vtable[] = { SD_BUS_PROPERTY("IOWriteBytes", "t", property_get_io_counter, 0, 0), SD_BUS_PROPERTY("IOWriteOperations", "t", property_get_io_counter, 0, 0), - SD_BUS_METHOD_WITH_NAMES("GetProcesses", - NULL,, - "a(sus)", - SD_BUS_PARAM(processes), + SD_BUS_METHOD_WITH_ARGS("GetProcesses", + SD_BUS_NO_ARGS, + SD_BUS_ARGS("a(sus)", processes), bus_unit_method_get_processes, SD_BUS_VTABLE_UNPRIVILEGED), - SD_BUS_METHOD_WITH_NAMES("AttachProcesses", - "sau", - SD_BUS_PARAM(subcgroup) - SD_BUS_PARAM(pids), - NULL,, + SD_BUS_METHOD_WITH_ARGS("AttachProcesses", + SD_BUS_ARGS("s", subcgroup, "au", pids), + SD_BUS_NO_RESULT, bus_unit_method_attach_processes, SD_BUS_VTABLE_UNPRIVILEGED),