github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-06-23 05:57:33 +00:00
Code Issues Projects Releases Wiki Activity

dm: ioc: 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-28 06:55:14 +00:00 committed by wenlingz
parent 2807487273
commit ebca2d5ac1
2 changed files with 6 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
devicemodel/hw/platform/ioc.c
View File

@ -69,22 +69,12 @@
#include "ioc.h" #include "ioc.h"
#include "vmmapi.h" #include "vmmapi.h"
#include "monitor.h" #include "monitor.h"
#include "log.h"
/* For debugging log to a file */
static int ioc_debug; static int ioc_debug;
static FILE *dbg_file;
#define IOC_LOG_INIT do { if (ioc_debug) {\
dbg_file = fopen("/tmp/ioc_log", "w+");\
if (!dbg_file)\
printf("ioc log open failed\r\n"); else cbc_set_log_file(dbg_file);\
} } while (0)
#define IOC_LOG_DEINIT do { if (dbg_file) fclose(dbg_file); dbg_file = NULL;\
cbc_set_log_file(dbg_file);\
} while (0)
#define DPRINTF(format, arg...) \ #define DPRINTF(format, arg...) \
do { if (ioc_debug && dbg_file) { fprintf(dbg_file, format, arg);\ do { if (ioc_debug) { pr_dbg(format, arg); } } while (0)
fflush(dbg_file); } } while (0) #define WPRINTF(format, arg...) pr_err(format, ##arg)
#define WPRINTF(format, arg...) printf(format, ##arg)
/* /*
* For debugging only, to generate lifecycle, signal and oem-raw data * For debugging only, to generate lifecycle, signal and oem-raw data
@ -1528,8 +1518,6 @@ ioc_init(struct vmctx *ctx)
int rc; int rc;
struct ioc_dev *ioc; struct ioc_dev *ioc;
IOC_LOG_INIT;
if (ioc_is_platform_supported() != 0) if (ioc_is_platform_supported() != 0)
goto ioc_err; goto ioc_err;
@ -1695,7 +1683,6 @@ alloc_err:
free(ioc->pool); free(ioc->pool);
free(ioc); free(ioc);
ioc_err: ioc_err:
IOC_LOG_DEINIT;
DPRINTF("%s", "ioc mediator startup failed!!\r\n"); DPRINTF("%s", "ioc mediator startup failed!!\r\n");
return -1; return -1;
} }
@ -1720,7 +1707,6 @@ ioc_deinit(struct vmctx *ctx)
free(ioc->evts); free(ioc->evts);
free(ioc->pool); free(ioc->pool);
free(ioc); free(ioc);
IOC_LOG_DEINIT;
ctx->ioc_dev = NULL; ctx->ioc_dev = NULL;
} }

16
devicemodel/hw/platform/ioc_cbc.c
View File

@ -13,16 +13,15 @@
#include "ioc.h" #include "ioc.h"
#include "monitor.h" #include "monitor.h"
#include "log.h"
/* /*
* Debug printf * Debug printf
*/ */
static int ioc_cbc_debug; static int ioc_cbc_debug;
static FILE *dbg_file;
#define DPRINTF(format, arg...) \ #define DPRINTF(format, arg...) \
do { if (ioc_cbc_debug && dbg_file) { fprintf(dbg_file, format, arg);\ do { if (ioc_cbc_debug) { pr_dbg(format, arg); } } while (0)
fflush(dbg_file); } } while (0) #define WPRINTF(format, arg...) pr_err(format, ##arg)
#define WPRINTF(format, arg...) printf(format, ##arg)
static void cbc_send_pkt(struct cbc_pkt *pkt); static void cbc_send_pkt(struct cbc_pkt *pkt);
@ -1018,12 +1017,3 @@ wlist_init_signal(struct cbc_signal *cbc_tbl, size_t cbc_size,
} }
} }
} }
/*
* Share log file with IOC.
*/
void
cbc_set_log_file(FILE *f)
{
dbg_file = f;
}