dm:replace perror with pr_err

use acrn-dm logger function instread of perror,
this helps the stability testing log capture.

Tracked-On: #4098
Signed-off-by: Mingqiang Chi <mingqiang.chi@intel.com>
This commit is contained in:
Mingqiang Chi 2020-01-06 16:08:46 +08:00 committed by wenlingz
parent 0e47f0a8f9
commit 5267a9775c
10 changed files with 45 additions and 44 deletions

View File

@ -175,7 +175,7 @@ static int open_hugetlbfs(struct vmctx *ctx, int level)
struct statfs fs; struct statfs fs;
if (level >= HUGETLB_LV_MAX) { if (level >= HUGETLB_LV_MAX) {
perror("exceed max hugetlb level"); pr_err("exceed max hugetlb level");
return -EINVAL; return -EINVAL;
} }
@ -186,7 +186,7 @@ static int open_hugetlbfs(struct vmctx *ctx, int level)
len = strnlen(path, MAX_PATH_LEN); len = strnlen(path, MAX_PATH_LEN);
/* UUID will use 32 bytes */ /* UUID will use 32 bytes */
if (len + 32 > MAX_PATH_LEN) { if (len + 32 > MAX_PATH_LEN) {
perror("PATH overflow"); pr_err("PATH overflow");
return -ENOMEM; return -ENOMEM;
} }
@ -206,13 +206,13 @@ static int open_hugetlbfs(struct vmctx *ctx, int level)
hugetlb_priv[level].fd = open(path, O_CREAT | O_RDWR, 0644); hugetlb_priv[level].fd = open(path, O_CREAT | O_RDWR, 0644);
if (hugetlb_priv[level].fd < 0) { if (hugetlb_priv[level].fd < 0) {
perror("Open hugtlbfs failed"); pr_err("Open hugtlbfs failed");
return -EINVAL; return -EINVAL;
} }
/* get the pagesize */ /* get the pagesize */
if (fstatfs(hugetlb_priv[level].fd, &fs) != 0) { if (fstatfs(hugetlb_priv[level].fd, &fs) != 0) {
perror("Failed to get statfs fo hugetlbfs"); pr_err("Failed to get statfs fo hugetlbfs");
return -EINVAL; return -EINVAL;
} }
@ -232,7 +232,7 @@ static int open_hugetlbfs(struct vmctx *ctx, int level)
static void close_hugetlbfs(int level) static void close_hugetlbfs(int level)
{ {
if (level >= HUGETLB_LV_MAX) { if (level >= HUGETLB_LV_MAX) {
perror("exceed max hugetlb level"); pr_err("exceed max hugetlb level");
return; return;
} }
@ -247,7 +247,7 @@ static void close_hugetlbfs(int level)
static bool should_enable_hugetlb_level(int level) static bool should_enable_hugetlb_level(int level)
{ {
if (level >= HUGETLB_LV_MAX) { if (level >= HUGETLB_LV_MAX) {
perror("exceed max hugetlb level"); pr_err("exceed max hugetlb level");
return false; return false;
} }
@ -270,7 +270,7 @@ static int mmap_hugetlbfs_from_level(struct vmctx *ctx, int level, size_t len,
int fd, i; int fd, i;
if (level >= HUGETLB_LV_MAX) { if (level >= HUGETLB_LV_MAX) {
perror("exceed max hugetlb level"); pr_err("exceed max hugetlb level");
return -EINVAL; return -EINVAL;
} }
@ -379,7 +379,7 @@ static int rm_hugetlb_dirs(int level)
char path[MAX_PATH_LEN]={0}; char path[MAX_PATH_LEN]={0};
if (level >= HUGETLB_LV_MAX) { if (level >= HUGETLB_LV_MAX) {
perror("exceed max hugetlb level"); pr_err("exceed max hugetlb level");
return -EINVAL; return -EINVAL;
} }
@ -387,7 +387,7 @@ static int rm_hugetlb_dirs(int level)
if (access(path, F_OK) == 0) { if (access(path, F_OK) == 0) {
if (rmdir(path) < 0) { if (rmdir(path) < 0) {
perror("rmdir failed"); pr_err("rmdir failed");
return -1; return -1;
} }
} }
@ -401,7 +401,7 @@ static int create_hugetlb_dirs(int level)
size_t len; size_t len;
if (level >= HUGETLB_LV_MAX) { if (level >= HUGETLB_LV_MAX) {
perror("exceed max hugetlb level"); pr_err("exceed max hugetlb level");
return -EINVAL; return -EINVAL;
} }
@ -413,7 +413,7 @@ static int create_hugetlb_dirs(int level)
path[i] = 0; path[i] = 0;
if (access(path, F_OK) != 0) { if (access(path, F_OK) != 0) {
if (mkdir(path, 0755) < 0) { if (mkdir(path, 0755) < 0) {
perror("mkdir failed"); pr_err("mkdir failed");
return -1; return -1;
} }
} }
@ -430,7 +430,7 @@ static int mount_hugetlbfs(int level)
char path[MAX_PATH_LEN]; char path[MAX_PATH_LEN];
if (level >= HUGETLB_LV_MAX) { if (level >= HUGETLB_LV_MAX) {
perror("exceed max hugetlb level"); pr_err("exceed max hugetlb level");
return -EINVAL; return -EINVAL;
} }
@ -453,7 +453,7 @@ static void umount_hugetlbfs(int level)
char path[MAX_PATH_LEN]; char path[MAX_PATH_LEN];
if (level >= HUGETLB_LV_MAX) { if (level >= HUGETLB_LV_MAX) {
perror("exceed max hugetlb level"); pr_err("exceed max hugetlb level");
return; return;
} }
@ -694,14 +694,14 @@ int hugetlb_setup_memory(struct vmctx *ctx)
bool has_gap; bool has_gap;
if (ctx->lowmem == 0) { if (ctx->lowmem == 0) {
perror("vm requests 0 memory"); pr_err("vm requests 0 memory");
goto err; goto err;
} }
/* open hugetlbfs and get pagesize for two level */ /* open hugetlbfs and get pagesize for two level */
for (level = HUGETLB_LV1; level < hugetlb_lv_max; level++) { for (level = HUGETLB_LV1; level < hugetlb_lv_max; level++) {
if (open_hugetlbfs(ctx, level) < 0) { if (open_hugetlbfs(ctx, level) < 0) {
perror("failed to open hugetlbfs"); pr_err("failed to open hugetlbfs");
goto err; goto err;
} }
} }
@ -772,7 +772,7 @@ int hugetlb_setup_memory(struct vmctx *ctx)
ptr = mmap(NULL, total_size, PROT_NONE, ptr = mmap(NULL, total_size, PROT_NONE,
MAP_ANONYMOUS | MAP_PRIVATE, -1, 0); MAP_ANONYMOUS | MAP_PRIVATE, -1, 0);
if (ptr == MAP_FAILED) { if (ptr == MAP_FAILED) {
perror("anony mmap fail"); pr_err("anony mmap fail");
goto err_lock; goto err_lock;
} }
@ -788,21 +788,21 @@ int hugetlb_setup_memory(struct vmctx *ctx)
/* mmap lowmem */ /* mmap lowmem */
if (mmap_hugetlbfs(ctx, 0, get_lowmem_param, adj_lowmem_param) < 0) { if (mmap_hugetlbfs(ctx, 0, get_lowmem_param, adj_lowmem_param) < 0) {
perror("lowmem mmap failed"); pr_err("lowmem mmap failed");
goto err_lock; goto err_lock;
} }
/* mmap highmem */ /* mmap highmem */
if (mmap_hugetlbfs(ctx, ctx->highmem_gpa_base, if (mmap_hugetlbfs(ctx, ctx->highmem_gpa_base,
get_highmem_param, adj_highmem_param) < 0) { get_highmem_param, adj_highmem_param) < 0) {
perror("highmem mmap failed"); pr_err("highmem mmap failed");
goto err_lock; goto err_lock;
} }
/* mmap biosmem */ /* mmap biosmem */
if (mmap_hugetlbfs(ctx, 4 * GB - ctx->biosmem, if (mmap_hugetlbfs(ctx, 4 * GB - ctx->biosmem,
get_biosmem_param, adj_biosmem_param) < 0) { get_biosmem_param, adj_biosmem_param) < 0) {
perror("biosmem mmap failed"); pr_err("biosmem mmap failed");
goto err_lock; goto err_lock;
} }

View File

@ -411,7 +411,7 @@ mevent_dispatch(void)
*/ */
ret = pipe2(mevent_pipefd, O_NONBLOCK); ret = pipe2(mevent_pipefd, O_NONBLOCK);
if (ret < 0) { if (ret < 0) {
perror("pipe"); pr_err("pipe");
exit(0); exit(0);
} }
@ -433,7 +433,7 @@ mevent_dispatch(void)
ret = epoll_wait(epoll_fd, eventlist, MEVENT_MAX, -1); ret = epoll_wait(epoll_fd, eventlist, MEVENT_MAX, -1);
if (ret == -1 && errno != EINTR) if (ret == -1 && errno != EINTR)
perror("Error return from epoll_wait"); pr_err("Error return from epoll_wait");
/* /*
* Handle reported events * Handle reported events

View File

@ -12,6 +12,7 @@
#include "vmmapi.h" #include "vmmapi.h"
#include "mevent.h" #include "mevent.h"
#include "timer.h" #include "timer.h"
#include "log.h"
/* We can use timerfd and epoll mechanism to emulate kinds of timers like /* We can use timerfd and epoll mechanism to emulate kinds of timers like
* PIT/RTC/WDT/PMTIMER/... in device model under Linux. * PIT/RTC/WDT/PMTIMER/... in device model under Linux.
@ -45,7 +46,7 @@ timer_handler(int fd __attribute__((unused)),
if (size < 0) { if (size < 0) {
if (errno != EAGAIN) { if (errno != EAGAIN) {
perror("acrn_timer read timerfd error"); pr_err("acrn_timer read timerfd error");
} }
return; return;
} }
@ -73,18 +74,18 @@ acrn_timer_init(struct acrn_timer *timer, void (*cb)(void *, uint64_t),
timer->fd = timerfd_create(timer->clockid, timer->fd = timerfd_create(timer->clockid,
TFD_NONBLOCK | TFD_CLOEXEC); TFD_NONBLOCK | TFD_CLOEXEC);
} else { } else {
perror("acrn_timer clockid is not supported.\n"); pr_err("acrn_timer clockid is not supported.\n");
} }
if (timer->fd <= 0) { if (timer->fd <= 0) {
perror("acrn_timer create failed.\n"); pr_err("acrn_timer create failed.\n");
return -1; return -1;
} }
timer->mevp = mevent_add(timer->fd, EVF_READ, timer_handler, timer, NULL, NULL); timer->mevp = mevent_add(timer->fd, EVF_READ, timer_handler, timer, NULL, NULL);
if (timer->mevp == NULL) { if (timer->mevp == NULL) {
close(timer->fd); close(timer->fd);
perror("acrn_timer mevent add failed.\n"); pr_err("acrn_timer mevent add failed.\n");
return -1; return -1;
} }

View File

@ -696,7 +696,7 @@ blockif_open(const char *optstr, const char *ident)
bc = calloc(1, sizeof(struct blockif_ctxt)); bc = calloc(1, sizeof(struct blockif_ctxt));
if (bc == NULL) { if (bc == NULL) {
perror("calloc"); pr_err("calloc");
goto err; goto err;
} }
@ -750,7 +750,7 @@ blockif_open(const char *optstr, const char *ident)
for (i = 0; i < BLOCKIF_NUMTHR; i++) { for (i = 0; i < BLOCKIF_NUMTHR; i++) {
if (snprintf(tname, sizeof(tname), "blk-%s-%d", if (snprintf(tname, sizeof(tname), "blk-%s-%d",
ident, i) >= sizeof(tname)) { ident, i) >= sizeof(tname)) {
perror("blk thread name too long"); pr_err("blk thread name too long");
} }
pthread_create(&bc->btid[i], NULL, blockif_thr, bc); pthread_create(&bc->btid[i], NULL, blockif_thr, bc);
pthread_setname_np(bc->btid[i], tname); pthread_setname_np(bc->btid[i], tname);

View File

@ -133,7 +133,7 @@ int create_mmio_rsvd_rgn(uint64_t start,
int i; int i;
if(bar_type == PCIBAR_IO){ if(bar_type == PCIBAR_IO){
perror("fail to create PCIBAR_IO bar_type\n"); pr_err("fail to create PCIBAR_IO bar_type\n");
return -1; return -1;
} }
@ -154,7 +154,7 @@ int create_mmio_rsvd_rgn(uint64_t start,
} }
} }
perror("reserved_bar_regions is overflow\n"); pr_err("reserved_bar_regions is overflow\n");
return -1; return -1;
} }

View File

@ -106,7 +106,7 @@ update_gvt_bar(struct vmctx *ctx)
bar_fd = open(bar_path, O_RDONLY); bar_fd = open(bar_path, O_RDONLY);
if(bar_fd == -1){ if(bar_fd == -1){
perror("failed to open sys bar info\n"); pr_err("failed to open sys bar info\n");
return; return;
} }
@ -115,7 +115,7 @@ update_gvt_bar(struct vmctx *ctx)
close(bar_fd); close(bar_fd);
if (ret < 76) { if (ret < 76) {
perror("failed to read sys bar info\n"); pr_err("failed to read sys bar info\n");
return; return;
} }
@ -174,7 +174,7 @@ gvt_init_config(struct pci_gvt *gvt)
gvt->addr.function); gvt->addr.function);
res_fd = open(res_name, O_RDONLY); res_fd = open(res_name, O_RDONLY);
if (res_fd == -1) { if (res_fd == -1) {
perror("gvt:open host pci resource failed\n"); pr_err("gvt:open host pci resource failed\n");
return -1; return -1;
} }
@ -183,7 +183,7 @@ gvt_init_config(struct pci_gvt *gvt)
close(res_fd); close(res_fd);
if (ret < 512) { if (ret < 512) {
perror("failed to read host device resource space\n"); pr_err("failed to read host device resource space\n");
return -1; return -1;
} }
@ -201,7 +201,7 @@ gvt_init_config(struct pci_gvt *gvt)
|| bar2_start_addr < ctx->lowmem_limit || bar2_start_addr < ctx->lowmem_limit
|| bar0_end_addr > PCI_EMUL_ECFG_BASE || bar0_end_addr > PCI_EMUL_ECFG_BASE
|| bar2_end_addr > PCI_EMUL_ECFG_BASE){ || bar2_end_addr > PCI_EMUL_ECFG_BASE){
perror("gvt pci bases are out of range\n"); pr_err("gvt pci bases are out of range\n");
return -1; return -1;
} }
@ -225,7 +225,7 @@ gvt_init_config(struct pci_gvt *gvt)
gvt->addr.function); gvt->addr.function);
gvt->host_config_fd = open(name, O_RDONLY); gvt->host_config_fd = open(name, O_RDONLY);
if (gvt->host_config_fd == -1) { if (gvt->host_config_fd == -1) {
perror("gvt:open host pci config failed\n"); pr_err("gvt:open host pci config failed\n");
return -1; return -1;
} }
@ -234,7 +234,7 @@ gvt_init_config(struct pci_gvt *gvt)
close(gvt->host_config_fd); close(gvt->host_config_fd);
if (ret <= PCI_REGMAX) { if (ret <= PCI_REGMAX) {
perror("failed to read host device config space\n"); pr_err("failed to read host device config space\n");
return -1; return -1;
} }
@ -368,7 +368,7 @@ pci_gvt_init(struct vmctx *ctx, struct pci_vdev *pi, char *opts)
gvt = calloc(1, sizeof(struct pci_gvt)); gvt = calloc(1, sizeof(struct pci_gvt));
if (!gvt) { if (!gvt) {
perror("gvt:calloc gvt failed\n"); pr_err("gvt:calloc gvt failed\n");
return -1; return -1;
} }
@ -396,7 +396,7 @@ pci_gvt_init(struct vmctx *ctx, struct pci_vdev *pi, char *opts)
fail: fail:
gvt_dev = NULL; gvt_dev = NULL;
ctx->gvt_enabled = false; ctx->gvt_enabled = false;
perror("GVT: init failed\n"); pr_err("GVT: init failed\n");
free(gvt); free(gvt);
return -1; return -1;
} }

View File

@ -471,7 +471,7 @@ virtio_blk_init(struct vmctx *ctx, struct pci_vdev *dev, char *opts)
} else { } else {
bctxt = blockif_open(opts, bident); bctxt = blockif_open(opts, bident);
if (bctxt == NULL) { if (bctxt == NULL) {
perror("Could not open backing file"); pr_err("Could not open backing file");
return -1; return -1;
} }
} }

View File

@ -187,7 +187,7 @@ start_wdt_timer(void)
timer_val.it_value.tv_sec = seconds; timer_val.it_value.tv_sec = seconds;
if (acrn_timer_settime(&wdt_state.timer, &timer_val) == -1) { if (acrn_timer_settime(&wdt_state.timer, &timer_val) == -1) {
perror("WDT timerfd_settime failed.\n"); pr_err("WDT timerfd_settime failed.\n");
wdt_state.wdt_armed = false; wdt_state.wdt_armed = false;
return; return;
} }
@ -331,7 +331,7 @@ pci_wdt_init(struct vmctx *ctx, struct pci_vdev *dev, char *opts)
{ {
/*the wdt just has one inistance */ /*the wdt just has one inistance */
if (wdt_state.reboot_enabled && wdt_state.timer1_val) { if (wdt_state.reboot_enabled && wdt_state.timer1_val) {
perror("wdt can't be initialized twice, please check!"); pr_err("wdt can't be initialized twice, please check!");
return -1; return -1;
} }

View File

@ -174,7 +174,7 @@ static void write_to_disk(const char *fmt, va_list args)
write_cnt = write(disk_fd, buffer, strnlen(buffer, DISK_LOG_MAX_LEN)); write_cnt = write(disk_fd, buffer, strnlen(buffer, DISK_LOG_MAX_LEN));
if (write_cnt < 0) { if (write_cnt < 0) {
perror(DISK_PREFIX"write disk failed"); pr_err(DISK_PREFIX"write disk failed");
close(disk_fd); close(disk_fd);
disk_fd = -1; disk_fd = -1;
return; return;

View File

@ -51,7 +51,7 @@ static int init_kmsg_logger(bool enable, uint8_t log_level)
kmsg_fd = open(KMSG_DEV_NODE, O_RDWR | O_APPEND | O_NONBLOCK); kmsg_fd = open(KMSG_DEV_NODE, O_RDWR | O_APPEND | O_NONBLOCK);
if (kmsg_fd < 0) { if (kmsg_fd < 0) {
kmsg_enabled = false; kmsg_enabled = false;
perror(KMSG_PREFIX"open kmsg dev failed"); pr_err(KMSG_PREFIX"open kmsg dev failed");
} }
return kmsg_fd; return kmsg_fd;
@ -85,7 +85,7 @@ static void write_to_kmsg(const char *fmt, va_list args)
write_cnt = write(kmsg_fd, kmsg_buf, strnlen(kmsg_buf, KMSG_MAX_LEN)); write_cnt = write(kmsg_fd, kmsg_buf, strnlen(kmsg_buf, KMSG_MAX_LEN));
if (write_cnt < 0) { if (write_cnt < 0) {
perror(KMSG_PREFIX"write kmsg failed"); pr_err(KMSG_PREFIX"write kmsg failed");
close(kmsg_fd); close(kmsg_fd);
kmsg_fd = -1; kmsg_fd = -1;
} }