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

HV: config: adapt to the generated config.h

Browse Source 
This patch drops "#include <bsp_cfg.h>" and include the generated config.h in
CFLAGS for the configuration data.

Also make sure that all configuration data have the 'CONFIG_' prefix.

v4 -> v5:

    * No changes.

v3 -> v4:

    * Add '-include config.h' to hypervisor/bsp/uefi/efi/Makefile.
    * Update comments mentioning bsp_cfg.h.

v2 -> v3:

    * Include config.h on the command line instead of in any header or source to
      avoid including config.h multiple times.
    * Add config.h as an additional dependency for source compilation.

v1 -> v2:

    * No changes.

Signed-off-by: Junjie Mao <junjie.mao@intel.com>
Reviewed-by: Kevin Tian <kevin.tian@intel.com>
Reviewed-by: Zhao Yakui <yakui.zhao@intel.com>
This commit is contained in:
Junjie Mao
2018-05-22 23:24:07 +08:00
committed by lijinxia
parent f9bb2024cc
commit c849bff850
17 changed files with 46 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
hypervisor/debug/dump.c
View File

@@ -238,7 +238,7 @@ static void show_host_call_trace(uint64_t rsp, uint64_t rbp, uint32_t cpu_id)
printf("Host Call Trace:\r\n");
if (rsp >
(uint64_t)&per_cpu(stack, cpu_id)[STACK_SIZE - 1]
(uint64_t)&per_cpu(stack, cpu_id)[CONFIG_STACK_SIZE - 1]
|| rsp < (uint64_t)&per_cpu(stack, cpu_id)[0]) {
return;
}
@@ -257,7 +257,7 @@ static void show_host_call_trace(uint64_t rsp, uint64_t rbp, uint32_t cpu_id)
* if the address is invalid, it will cause hv page fault
* then halt system */
while ((rbp <=
(uint64_t)&per_cpu(stack, cpu_id)[STACK_SIZE - 1])
(uint64_t)&per_cpu(stack, cpu_id)[CONFIG_STACK_SIZE - 1])
&& (rbp >= (uint64_t)&per_cpu(stack, cpu_id)[0])
&& (cb_hierarchy++ < CALL_TRACE_HIERARCHY_MAX)) {
printf("----> 0x%016llx\r\n",

8
hypervisor/debug/shell_internal.c
View File

@@ -30,11 +30,11 @@
/* The initial log level*/
uint32_t console_loglevel;
uint32_t mem_loglevel;
#ifdef CONSOLE_LOGLEVEL_DEFAULT
uint32_t console_loglevel = CONSOLE_LOGLEVEL_DEFAULT;
#ifdef CONFIG_CONSOLE_LOGLEVEL_DEFAULT
uint32_t console_loglevel = CONFIG_CONSOLE_LOGLEVEL_DEFAULT;
#endif
#ifdef MEM_LOGLEVEL_DEFAULT
uint32_t mem_loglevel = MEM_LOGLEVEL_DEFAULT;
#ifdef CONFIG_MEM_LOGLEVEL_DEFAULT
uint32_t mem_loglevel = CONFIG_MEM_LOGLEVEL_DEFAULT;
#endif
static int string_to_argv(char *argv_str, void *p_argv_mem,