diff options
| author | Amarjargal <amarjargal16@gmail.com> | 2022-04-09 04:43:18 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-08 21:43:18 +0100 |
| commit | d5e4e60bf2071cb46de559b2275e4190c2968927 (patch) | |
| tree | 3db63ba346ae23f5d742fe5e751069c900142750 /src/machine/machine-dbus.c | |
| parent | 11b957b59b24447c8ac20d4fef281f4313510fe1 (diff) | |
| download | systemd-d5e4e60bf2071cb46de559b2275e4190c2968927.tar.gz | |
machine: update to use new-style sd-bus macros (#23012)
* machine: 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.
Meson test, mkosi test image and running machinectl after build returned
no error. But since I don't have any virtual machines or containers, I'm not
sure how to test the changes thoroughly.
Diffstat (limited to 'src/machine/machine-dbus.c')
| -rw-r--r-- | src/machine/machine-dbus.c | 134 |
1 files changed, 55 insertions, 79 deletions
diff --git a/src/machine/machine-dbus.c b/src/machine/machine-dbus.c index 7baca67f1b..293be0bf8b 100644 --- a/src/machine/machine-dbus.c +++ b/src/machine/machine-dbus.c @@ -1278,85 +1278,61 @@ static const sd_bus_vtable machine_vtable[] = { NULL, bus_machine_method_terminate, SD_BUS_VTABLE_UNPRIVILEGED), - SD_BUS_METHOD_WITH_NAMES("Kill", - "si", - SD_BUS_PARAM(who) - SD_BUS_PARAM(signal), - NULL,, - bus_machine_method_kill, - SD_BUS_VTABLE_UNPRIVILEGED), - SD_BUS_METHOD_WITH_NAMES("GetAddresses", - NULL,, - "a(iay)", - SD_BUS_PARAM(addresses), - bus_machine_method_get_addresses, - SD_BUS_VTABLE_UNPRIVILEGED), - SD_BUS_METHOD_WITH_NAMES("GetOSRelease", - NULL,, - "a{ss}", - SD_BUS_PARAM(fields), - bus_machine_method_get_os_release, - SD_BUS_VTABLE_UNPRIVILEGED), - SD_BUS_METHOD_WITH_NAMES("GetUIDShift", - NULL,, - "u", - SD_BUS_PARAM(shift), - bus_machine_method_get_uid_shift, - SD_BUS_VTABLE_UNPRIVILEGED), - SD_BUS_METHOD_WITH_NAMES("OpenPTY", - NULL,, - "hs", - SD_BUS_PARAM(pty) - SD_BUS_PARAM(pty_path), - bus_machine_method_open_pty, - SD_BUS_VTABLE_UNPRIVILEGED), - SD_BUS_METHOD_WITH_NAMES("OpenLogin", - NULL,, - "hs", - SD_BUS_PARAM(pty) - SD_BUS_PARAM(pty_path), - bus_machine_method_open_login, - SD_BUS_VTABLE_UNPRIVILEGED), - SD_BUS_METHOD_WITH_NAMES("OpenShell", - "ssasas", - SD_BUS_PARAM(user) - SD_BUS_PARAM(path) - SD_BUS_PARAM(args) - SD_BUS_PARAM(environment), - "hs", - SD_BUS_PARAM(pty) - SD_BUS_PARAM(pty_path), - bus_machine_method_open_shell, - SD_BUS_VTABLE_UNPRIVILEGED), - 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_machine_method_bind_mount, - SD_BUS_VTABLE_UNPRIVILEGED), - SD_BUS_METHOD_WITH_NAMES("CopyFrom", - "ss", - SD_BUS_PARAM(source) - SD_BUS_PARAM(destination), - NULL,, - bus_machine_method_copy, - SD_BUS_VTABLE_UNPRIVILEGED), - SD_BUS_METHOD_WITH_NAMES("CopyTo", - "ss", - SD_BUS_PARAM(source) - SD_BUS_PARAM(destination), - NULL,, - bus_machine_method_copy, - SD_BUS_VTABLE_UNPRIVILEGED), - SD_BUS_METHOD_WITH_NAMES("OpenRootDirectory", - NULL,, - "h", - SD_BUS_PARAM(fd), - bus_machine_method_open_root_directory, - SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD_WITH_ARGS("Kill", + SD_BUS_ARGS("s", who, "i", signal), + SD_BUS_NO_RESULT, + bus_machine_method_kill, + SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD_WITH_ARGS("GetAddresses", + SD_BUS_NO_ARGS, + SD_BUS_RESULT("a(iay)", addresses), + bus_machine_method_get_addresses, + SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD_WITH_ARGS("GetOSRelease", + SD_BUS_NO_ARGS, + SD_BUS_RESULT("a{ss}", fields), + bus_machine_method_get_os_release, + SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD_WITH_ARGS("GetUIDShift", + SD_BUS_NO_ARGS, + SD_BUS_RESULT("u", shift), + bus_machine_method_get_uid_shift, + SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD_WITH_ARGS("OpenPTY", + SD_BUS_NO_ARGS, + SD_BUS_RESULT("h", pty, "s", pty_path), + bus_machine_method_open_pty, + SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD_WITH_ARGS("OpenLogin", + SD_BUS_NO_ARGS, + SD_BUS_RESULT("h", pty, "s", pty_path), + bus_machine_method_open_login, + SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD_WITH_ARGS("OpenShell", + SD_BUS_ARGS("s", user, "s", path, "as", args, "as", environment), + SD_BUS_RESULT("h", pty, "s", pty_path), + bus_machine_method_open_shell, + SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD_WITH_ARGS("BindMount", + SD_BUS_ARGS("s", source, "s", destination, "b", read_only, "b", mkdir), + SD_BUS_NO_RESULT, + bus_machine_method_bind_mount, + SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD_WITH_ARGS("CopyFrom", + SD_BUS_ARGS("s", source, "s", destination), + SD_BUS_NO_RESULT, + bus_machine_method_copy, + SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD_WITH_ARGS("CopyTo", + SD_BUS_ARGS("s", source, "s", destination), + SD_BUS_NO_RESULT, + bus_machine_method_copy, + SD_BUS_VTABLE_UNPRIVILEGED), + SD_BUS_METHOD_WITH_ARGS("OpenRootDirectory", + SD_BUS_NO_ARGS, + SD_BUS_RESULT("h", fd), + bus_machine_method_open_root_directory, + SD_BUS_VTABLE_UNPRIVILEGED), SD_BUS_VTABLE_END }; |