A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-06 03:45:24 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "soc: qcom: guestvm_loader: fix vm start print message"

Browse source
This commit is contained in:
qctecmdr 2020-09-14 23:12:54 -07:00 • committed by Gerrit - the friendly Code Review server
commit 3b1ff0a366
2 changed files with 8 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

3
drivers/soc/qcom/guestvm_loader.c
View file

@ -87,6 +87,7 @@ static int guestvm_loader_nb_handler(struct notifier_block *this,
complete_all(&priv->vm_start);
break;
case HH_RM_VM_STATUS_RUNNING:
dev_info(priv->dev, "vm(%d) started running\n", vm_status_payload->vmid);
break;
default:
dev_err(priv->dev, "Unknown notification receieved for vmid = %d vm_status = %d\n",
@ -138,7 +139,7 @@ static ssize_t guestvm_loader_start(struct kobject *kobj,
priv->vm_status = HH_RM_VM_STATUS_RUNNING;
ret = hh_rm_vm_start(priv->vmid);
if (ret)
dev_err(priv->dev, "VM start has failed for vmid = %d ret = %d\n",
dev_err(priv->dev, "VM start failed for vmid = %d ret = %d\n",
priv->vmid, ret);
}

14
drivers/virt/haven/hh_rm_iface.c
View file

@ -502,28 +502,26 @@ int hh_rm_vm_start(int vmid)
struct hh_vm_start_resp_payload *resp_payload;
struct hh_vm_start_req_payload req_payload = {0};
size_t resp_payload_size;
int err, reply_err_code;
int reply_err_code = 0;
req_payload.vmid = (hh_vmid_t) vmid;
resp_payload = hh_rm_call(HH_RM_RPC_MSG_ID_CALL_VM_START,
&req_payload, sizeof(req_payload),
&resp_payload_size, &reply_err_code);
if (reply_err_code || IS_ERR_OR_NULL(resp_payload)) {
err = PTR_ERR(resp_payload);
if (reply_err_code) {
pr_err("%s: VM_START failed with err: %d\n",
__func__, err);
return err;
__func__, reply_err_code);
return reply_err_code;
}
if (resp_payload_size != sizeof(*resp_payload)) {
if (resp_payload_size) {
pr_err("%s: Invalid size received for VM_START: %u\n",
__func__, resp_payload_size);
kfree(resp_payload);
return -EINVAL;
}
return resp_payload->response;
return 0;
}
EXPORT_SYMBOL(hh_rm_vm_start);