From 13d6c5de4197ee6e053c86f1bc40b2e3969f1aaf Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Sat, 11 May 2024 19:52:19 +0200 Subject: [PATCH] =?UTF-8?q?varlink:=20rename=20vsockCid=20=E2=86=92=20vSoc?= =?UTF-8?q?kCid=20field?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/machine/machine-varlink.c | 2 +- src/shared/varlink-io.systemd.Machine.c | 2 +- src/vmspawn/vmspawn-register.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/machine/machine-varlink.c b/src/machine/machine-varlink.c index 377b3d3f0e..60792d76b1 100644 --- a/src/machine/machine-varlink.c +++ b/src/machine/machine-varlink.c @@ -132,7 +132,7 @@ int vl_method_register(Varlink *link, JsonVariant *parameters, VarlinkMethodFlag { "leader", JSON_VARIANT_UNSIGNED, machine_leader, offsetof(Machine, leader), 0 }, { "rootDirectory", JSON_VARIANT_STRING, json_dispatch_absolute_path, offsetof(Machine, root_directory), 0 }, { "ifIndices", JSON_VARIANT_ARRAY, machine_ifindices, 0, 0 }, - { "vsockCid", JSON_VARIANT_UNSIGNED, machine_cid, offsetof(Machine, vsock_cid), 0 }, + { "vSockCid", JSON_VARIANT_UNSIGNED, machine_cid, offsetof(Machine, vsock_cid), 0 }, { "sshAddress", JSON_VARIANT_STRING, json_dispatch_string, offsetof(Machine, ssh_address), JSON_SAFE }, { "sshPrivateKeyPath", JSON_VARIANT_STRING, json_dispatch_absolute_path, offsetof(Machine, ssh_private_key_path), 0 }, {} diff --git a/src/shared/varlink-io.systemd.Machine.c b/src/shared/varlink-io.systemd.Machine.c index 936f01f366..6675492076 100644 --- a/src/shared/varlink-io.systemd.Machine.c +++ b/src/shared/varlink-io.systemd.Machine.c @@ -12,7 +12,7 @@ static VARLINK_DEFINE_METHOD( VARLINK_DEFINE_INPUT(leader, VARLINK_INT, VARLINK_NULLABLE), VARLINK_DEFINE_INPUT(rootDirectory, VARLINK_STRING, VARLINK_NULLABLE), VARLINK_DEFINE_INPUT(ifIndices, VARLINK_INT, VARLINK_ARRAY|VARLINK_NULLABLE), - VARLINK_DEFINE_INPUT(vsockCid, VARLINK_INT, VARLINK_NULLABLE), + VARLINK_DEFINE_INPUT(vSockCid, VARLINK_INT, VARLINK_NULLABLE), VARLINK_DEFINE_INPUT(sshAddress, VARLINK_STRING, VARLINK_NULLABLE), VARLINK_DEFINE_INPUT(sshPrivateKeyPath, VARLINK_STRING, VARLINK_NULLABLE)); diff --git a/src/vmspawn/vmspawn-register.c b/src/vmspawn/vmspawn-register.c index 35c1455945..ed70df5fb8 100644 --- a/src/vmspawn/vmspawn-register.c +++ b/src/vmspawn/vmspawn-register.c @@ -67,7 +67,7 @@ int register_machine( JSON_BUILD_PAIR_CONDITION(!sd_id128_is_null(uuid), "id", JSON_BUILD_ID128(uuid)), JSON_BUILD_PAIR_STRING("service", service), JSON_BUILD_PAIR_STRING("class", "vm"), - JSON_BUILD_PAIR_CONDITION(VSOCK_CID_IS_REGULAR(cid), "vsockCid", JSON_BUILD_UNSIGNED(cid)), + JSON_BUILD_PAIR_CONDITION(VSOCK_CID_IS_REGULAR(cid), "vSockCid", JSON_BUILD_UNSIGNED(cid)), JSON_BUILD_PAIR_CONDITION(directory, "rootDirectory", JSON_BUILD_STRING(directory)), JSON_BUILD_PAIR_CONDITION(address, "sshAddress", JSON_BUILD_STRING(address)), JSON_BUILD_PAIR_CONDITION(key_path, "sshPrivateKeyPath", JSON_BUILD_STRING(key_path))));