From 57dd6786328052fcdfa71500684508ebcf1c678b Mon Sep 17 00:00:00 2001 From: Sun Peng Date: Fri, 28 Aug 2020 02:59:46 +0000 Subject: [PATCH] dm: rbmp: Convert print output to acrn-dm logger Refine the DPRINTF/WPRINTF to pr_* based log interface for better log management. Tracked-On: #5267 Signed-off-by: Sun Peng Reviewed-by: Chi Mingqiang Acked-by: Wang, Yu1 --- devicemodel/hw/platform/rpmb/rpmb_backend.c | 5 +++-- devicemodel/hw/platform/rpmb/rpmb_sim.c | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/devicemodel/hw/platform/rpmb/rpmb_backend.c b/devicemodel/hw/platform/rpmb/rpmb_backend.c index fe38104db..d28540314 100644 --- a/devicemodel/hw/platform/rpmb/rpmb_backend.c +++ b/devicemodel/hw/platform/rpmb/rpmb_backend.c @@ -37,10 +37,11 @@ #include "rpmb_sim.h" #include "vrpmb.h" #include "rpmb_backend.h" +#include "log.h" static int virtio_rpmb_debug = 1; -#define DPRINTF(params) do { if (virtio_rpmb_debug) printf params; } while (0) -#define WPRINTF(params) (printf params) +#define DPRINTF(params) do { if (virtio_rpmb_debug) pr_dbg params; } while (0) +#define WPRINTF(params) (pr_err params) #define READ_STR_LEN 10 #define WRITE_STR_LEN 11 diff --git a/devicemodel/hw/platform/rpmb/rpmb_sim.c b/devicemodel/hw/platform/rpmb/rpmb_sim.c index f8e0e4ae4..fe69cab39 100644 --- a/devicemodel/hw/platform/rpmb/rpmb_sim.c +++ b/devicemodel/hw/platform/rpmb/rpmb_sim.c @@ -35,6 +35,7 @@ #include "rpmb.h" #include "rpmb_sim.h" +#include "log.h" static FILE *rpmb_fd = NULL; @@ -58,8 +59,8 @@ static FILE *rpmb_fd = NULL; #define offsetof(s, m) (size_t) &(((s *) 0)->m) static int virtio_rpmb_debug = 1; -#define DPRINTF(params) do { if (virtio_rpmb_debug) printf params; } while (0) -#define WPRINTF(params) (printf params) +#define DPRINTF(params) do { if (virtio_rpmb_debug) pr_dbg params; } while (0) +#define WPRINTF(params) (pr_err params) /* Make rpmb_mac compatible for different openssl versions */ #if OPENSSL_VERSION_NUMBER < 0x10100000L