Skip to content

Commit a5fd552

Browse files
KaigeFulijinxia
authored andcommitted
debug: rename struct logmsg to struct acrn_logmsg_ctl
For data structure types "struct logmsg", its name is identical with variable name in the same scope. This is a MISRA C violation. This patch fix it. Tracked-On: #1801 Signed-off-by: Kaige Fu <kaige.fu@intel.com> Acked-by: Eddie Dong <eddie.dong@intel.com>
1 parent e555f75 commit a5fd552

File tree

1 file changed

+11
-16
lines changed

1 file changed

+11
-16
lines changed

hypervisor/debug/logmsg.c

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,18 @@
1111
* bsp/uefi/clearlinux/acrn.conf: hvlog=2M@0x1FE00000
1212
*/
1313

14-
struct logmsg {
14+
struct acrn_logmsg_ctl {
1515
uint32_t flags;
1616
int32_t seq;
1717
spinlock_t lock;
1818
};
1919

20-
static struct logmsg logmsg;
20+
static struct acrn_logmsg_ctl logmsg_ctl;
2121

2222
void init_logmsg(uint32_t flags)
2323
{
24-
logmsg.flags = flags;
25-
logmsg.seq = 0;
24+
logmsg_ctl.flags = flags;
25+
logmsg_ctl.seq = 0;
2626
}
2727

2828
void do_logmsg(uint32_t severity, const char *fmt, ...)
@@ -35,12 +35,9 @@ void do_logmsg(uint32_t severity, const char *fmt, ...)
3535
bool do_npk_log;
3636
char *buffer;
3737

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));
4441

4542
if (!do_console_log && !do_mem_log && !do_npk_log) {
4643
return;
@@ -58,10 +55,8 @@ void do_logmsg(uint32_t severity, const char *fmt, ...)
5855

5956
(void)memset(buffer, 0U, LOG_MESSAGE_MAX_SIZE);
6057
/* 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));
6560

6661
/* Put message into remaining portion of local buffer */
6762
va_start(args, fmt);
@@ -77,12 +72,12 @@ void do_logmsg(uint32_t severity, const char *fmt, ...)
7772

7873
/* Check if flags specify to output to stdout */
7974
if (do_console_log) {
80-
spinlock_irqsave_obtain(&(logmsg.lock), &rflags);
75+
spinlock_irqsave_obtain(&(logmsg_ctl.lock), &rflags);
8176

8277
/* Send buffer to stdout */
8378
printf("%s\n\r", buffer);
8479

85-
spinlock_irqrestore_release(&(logmsg.lock), rflags);
80+
spinlock_irqrestore_release(&(logmsg_ctl.lock), rflags);
8681
}
8782

8883
/* Check if flags specify to output to memory */

0 commit comments

Comments
 (0)