github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-09-12 20:39:59 +00:00
Code Issues Projects Releases Wiki Activity

dm: core: Convert print output to acrn-dm logger

Browse Source 
Unifies the logs to pr_* interfaces instead of printf for better log management.

Tracked-On: #5267
Signed-off-by: Sun Peng <peng.p.sun@intel.com>
Reviewed-by: Chi Mingqiang <mingqiang.chi@intel.com>
Acked-by: Wang, Yu1 <yu1.wang@intel.com>
This commit is contained in:
Sun Peng
2020-08-26 10:54:19 +00:00
committed by wenlingz
parent d7e34acfe1
commit a567cbf12f
7 changed files with 21 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
devicemodel/core/sw_load_vsbl.c
View File

@@ -149,8 +149,7 @@ acrn_prepare_guest_part_info(struct vmctx *ctx)
fp = fopen(guest_part_info_path, "r");
if (fp == NULL) {
fprintf(stderr,
"SW_LOAD ERR: could not open partition blob %s\n",
pr_err("SW_LOAD ERR: could not open partition blob %s\n",
guest_part_info_path);
return -1;
}
@@ -159,15 +158,13 @@ acrn_prepare_guest_part_info(struct vmctx *ctx)
len = ftell(fp);
if (len != guest_part_info_size) {
fprintf(stderr,
"SW_LOAD ERR: partition blob changed\n");
pr_err("SW_LOAD ERR: partition blob changed\n");
fclose(fp);
return -1;
}
if ((len + GUEST_PART_INFO_OFF(ctx)) > BOOTARGS_OFF(ctx)) {
fprintf(stderr,
"SW_LOAD ERR: too large partition blob\n");
pr_err("SW_LOAD ERR: too large partition blob\n");
fclose(fp);
return -1;
}
@@ -176,13 +173,12 @@ acrn_prepare_guest_part_info(struct vmctx *ctx)
read = fread(ctx->baseaddr + GUEST_PART_INFO_OFF(ctx),
sizeof(char), len, fp);
if (read < len) {
fprintf(stderr,
"SW_LOAD ERR: could not read whole partition blob\n");
pr_err("SW_LOAD ERR: could not read whole partition blob\n");
fclose(fp);
return -1;
}
fclose(fp);
printf("SW_LOAD: partition blob %s size %lu copy to guest 0x%lx\n",
pr_info("SW_LOAD: partition blob %s size %lu copy to guest 0x%lx\n",
guest_part_info_path, guest_part_info_size,
GUEST_PART_INFO_OFF(ctx));
@@ -199,7 +195,7 @@ acrn_parse_vsbl(char *arg)
strncpy(vsbl_path, arg, len + 1);
if (check_image(vsbl_path, 8 * MB, &vsbl_size) == 0) {
vsbl_file_name = vsbl_path;
printf("SW_LOAD: get vsbl path %s\n", vsbl_path);
pr_notice("SW_LOAD: get vsbl path %s\n", vsbl_path);
error = 0;
}
}