11
11
* bsp/uefi/clearlinux/acrn.conf: hvlog=2M@0x1FE00000
12
12
*/
13
13
14
- struct logmsg {
14
+ struct acrn_logmsg_ctl {
15
15
uint32_t flags ;
16
16
int32_t seq ;
17
17
spinlock_t lock ;
18
18
};
19
19
20
- static struct logmsg logmsg ;
20
+ static struct acrn_logmsg_ctl logmsg_ctl ;
21
21
22
22
void init_logmsg (uint32_t flags )
23
23
{
24
- logmsg .flags = flags ;
25
- logmsg .seq = 0 ;
24
+ logmsg_ctl .flags = flags ;
25
+ logmsg_ctl .seq = 0 ;
26
26
}
27
27
28
28
void do_logmsg (uint32_t severity , const char * fmt , ...)
@@ -35,12 +35,9 @@ void do_logmsg(uint32_t severity, const char *fmt, ...)
35
35
bool do_npk_log ;
36
36
char * buffer ;
37
37
38
- do_console_log = (((logmsg .flags & LOG_FLAG_STDOUT ) != 0U ) &&
39
- (severity <= console_loglevel ));
40
- do_mem_log = (((logmsg .flags & LOG_FLAG_MEMORY ) != 0U ) &&
41
- (severity <= mem_loglevel ));
42
- do_npk_log = ((logmsg .flags & LOG_FLAG_NPK ) != 0U &&
43
- (severity <= npk_loglevel ));
38
+ do_console_log = (((logmsg_ctl .flags & LOG_FLAG_STDOUT ) != 0U ) && (severity <= console_loglevel ));
39
+ do_mem_log = (((logmsg_ctl .flags & LOG_FLAG_MEMORY ) != 0U ) && (severity <= mem_loglevel ));
40
+ do_npk_log = ((logmsg_ctl .flags & LOG_FLAG_NPK ) != 0U && (severity <= npk_loglevel ));
44
41
45
42
if (!do_console_log && !do_mem_log && !do_npk_log ) {
46
43
return ;
@@ -58,10 +55,8 @@ void do_logmsg(uint32_t severity, const char *fmt, ...)
58
55
59
56
(void )memset (buffer , 0U , LOG_MESSAGE_MAX_SIZE );
60
57
/* Put time-stamp, CPU ID and severity into buffer */
61
- snprintf (buffer , LOG_MESSAGE_MAX_SIZE ,
62
- "[%lluus][cpu=%hu][sev=%u][seq=%u]:" ,
63
- timestamp , pcpu_id , severity ,
64
- atomic_inc_return (& logmsg .seq ));
58
+ snprintf (buffer , LOG_MESSAGE_MAX_SIZE , "[%lluus][cpu=%hu][sev=%u][seq=%u]:" ,
59
+ timestamp , pcpu_id , severity , atomic_inc_return (& logmsg_ctl .seq ));
65
60
66
61
/* Put message into remaining portion of local buffer */
67
62
va_start (args , fmt );
@@ -77,12 +72,12 @@ void do_logmsg(uint32_t severity, const char *fmt, ...)
77
72
78
73
/* Check if flags specify to output to stdout */
79
74
if (do_console_log ) {
80
- spinlock_irqsave_obtain (& (logmsg .lock ), & rflags );
75
+ spinlock_irqsave_obtain (& (logmsg_ctl .lock ), & rflags );
81
76
82
77
/* Send buffer to stdout */
83
78
printf ("%s\n\r" , buffer );
84
79
85
- spinlock_irqrestore_release (& (logmsg .lock ), rflags );
80
+ spinlock_irqrestore_release (& (logmsg_ctl .lock ), rflags );
86
81
}
87
82
88
83
/* Check if flags specify to output to memory */
0 commit comments