chore: fix log strings
Optimise the lines in the dlog strings.
Signed-off-by: J-Alves <joao.alves@arm.com>
Change-Id: Id345f1f8e4035cd84b23c5136edfe3c8ae059f32
diff --git a/src/api.c b/src/api.c
index f5ff325..fad3c3f 100644
--- a/src/api.c
+++ b/src/api.c
@@ -474,8 +474,7 @@
if (buffer_size > HF_MAILBOX_SIZE) {
dlog_error(
"Partition information does not fit in the "
- "VM's RX "
- "buffer.\n");
+ "VM's RX buffer.\n");
return ffa_error(FFA_NO_MEMORY);
}
@@ -3273,8 +3272,7 @@
}
dlog_verbose(
- "Updating memory transaction descriptor "
- " from v1.0 to v1.1.\n");
+ "Updating memory transaction descriptor from v1.0 to v1.1.\n");
memory_region_v1_0 = (struct ffa_memory_region_v1_0 *)allocated;
@@ -3508,8 +3506,8 @@
share_func == FFA_MEM_DONATE_64) &&
memory_region->receiver_count != 1U) {
dlog_verbose(
- "FFA_MEM_DONATE only supports one recipient. "
- "Specified %u\n",
+ "FFA_MEM_DONATE only supports one recipient. Specified "
+ "%u\n",
memory_region->receiver_count);
ret = ffa_error(FFA_INVALID_PARAMETERS);
goto out;
diff --git a/src/ffa_memory.c b/src/ffa_memory.c
index ac54502..f600d5e 100644
--- a/src/ffa_memory.c
+++ b/src/ffa_memory.c
@@ -2970,8 +2970,8 @@
retrieve_request_receiver->impdef.val[1]) {
dlog_verbose(
"Impdef value in memory send does not "
- "match retrieve request value "
- "send value %#lx %#lx retrieve request "
+ "match retrieve request value send "
+ "value %#lx %#lx retrieve request "
"value %#lx %#lx\n",
receiver->impdef.val[0],
receiver->impdef.val[1],
@@ -3114,8 +3114,7 @@
if (other_world_count > 1) {
dlog_verbose(
- "Support one receiver from the other "
- "world.\n");
+ "Support one receiver from the other world.\n");
return ffa_error(FFA_NOT_SUPPORTED);
}
}
@@ -3785,8 +3784,8 @@
if (relinquish_request->endpoint_count != 1) {
dlog_verbose(
- "Stream endpoints not supported (got %d "
- "endpoints on FFA_MEM_RELINQUISH, expected 1).\n",
+ "Stream endpoints not supported (got %d endpoints on "
+ "FFA_MEM_RELINQUISH, expected 1).\n",
relinquish_request->endpoint_count);
return ffa_error(FFA_INVALID_PARAMETERS);
}
@@ -3794,8 +3793,8 @@
if (vm_id_is_current_world(from_locked.vm->id) &&
relinquish_request->endpoints[0] != from_locked.vm->id) {
dlog_verbose(
- "VM ID %d in relinquish message doesn't match "
- "calling VM ID %d.\n",
+ "VM ID %d in relinquish message doesn't match calling "
+ "VM ID %d.\n",
relinquish_request->endpoints[0], from_locked.vm->id);
return ffa_error(FFA_INVALID_PARAMETERS);
}
@@ -3838,8 +3837,7 @@
if (share_state->retrieved_fragment_count[receiver_index] !=
share_state->fragment_count) {
dlog_verbose(
- "Memory with handle %#lx not yet fully "
- "retrieved, "
+ "Memory with handle %#lx not yet fully retrieved, "
"receiver %x can't relinquish.\n",
handle, from_locked.vm->id);
ret = ffa_error(FFA_INVALID_PARAMETERS);
@@ -3969,9 +3967,8 @@
assert(receiver != NULL);
(void)receiver;
dlog_verbose(
- "Tried to reclaim memory handle %#lx "
- "that has not been relinquished by all "
- "borrowers(%x).\n",
+ "Tried to reclaim memory handle %#lx that has "
+ "not been relinquished by all borrowers(%x).\n",
handle,
receiver->receiver_permissions.receiver);
ret = ffa_error(FFA_DENIED);
diff --git a/src/manifest.c b/src/manifest.c
index a78118b..5435408 100644
--- a/src/manifest.c
+++ b/src/manifest.c
@@ -1376,8 +1376,8 @@
} else if (vm->partition.other_s_interrupts_action >
OTHER_S_INT_ACTION_SIGNALED) {
dlog_error(
- "Illegal value specified for the field"
- " 'other-s-interrupts-action': %u\n",
+ "Illegal value specified for the field "
+ "'other-s-interrupts-action': %u\n",
vm->partition.other_s_interrupts_action);
return MANIFEST_ERROR_ILLEGAL_OTHER_S_INT_ACTION;
}
@@ -1496,8 +1496,8 @@
if (vm->partition.load_addr != load_address) {
dlog_warning(
- "Partition's load address at its manifest differs"
- " from specified in partition's package.\n");
+ "Partition's load address at its manifest differs from "
+ "specified in partition's package.\n");
vm->partition.load_addr = load_address;
}