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

hv:tiny cleanup

Browse Source 
-- remove some unnecessary includes
-- fix a typo
-- remove unnecessary void before launch_vms

Tracked-On: #1842
Signed-off-by: Mingqiang Chi <mingqiang.chi@intel.com>
This commit is contained in:
Mingqiang Chi 2019-09-03 13:53:18 +08:00 committed by ACRN System Integration
parent f15a3600ec
commit 38ca8db19f
8 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hypervisor/acpi_parser/acpi_ext.c
View File

@ -34,7 +34,6 @@
#include <logmsg.h> #include <logmsg.h>
#include <host_pm.h> #include <host_pm.h>
#include <acrn_common.h> #include <acrn_common.h>
#include <vcpu.h>
/* Per ACPI spec: /* Per ACPI spec:
* There are two fundamental types of ACPI tables: * There are two fundamental types of ACPI tables:

2
hypervisor/arch/x86/cpu.c
View File

@ -20,7 +20,7 @@
#include <cpuid.h> #include <cpuid.h>
#include <version.h> #include <version.h>
#include <vmx.h> #include <vmx.h>
#include <vm.h> #include <msr.h>
#include <ld_sym.h> #include <ld_sym.h>
#include <logmsg.h> #include <logmsg.h>
#include <cat.h> #include <cat.h>

4
hypervisor/arch/x86/guest/vcpu.c
View File

@ -30,7 +30,7 @@ struct stack_frame {
uint64_t rbx; uint64_t rbx;
uint64_t rflag; uint64_t rflag;
uint64_t rip; uint64_t rip;
uint64_t maigc; uint64_t magic;
}; };
uint64_t vcpu_get_gpreg(const struct acrn_vcpu *vcpu, uint32_t reg) uint64_t vcpu_get_gpreg(const struct acrn_vcpu *vcpu, uint32_t reg)
@ -615,7 +615,7 @@ static uint64_t build_stack_frame(struct acrn_vcpu *vcpu)
frame = (struct stack_frame *)stacktop; frame = (struct stack_frame *)stacktop;
frame -= 1; frame -= 1;
frame->maigc = SP_BOTTOM_MAGIC; frame->magic = SP_BOTTOM_MAGIC;
frame->rip = (uint64_t)run_sched_thread; /*return address*/ frame->rip = (uint64_t)run_sched_thread; /*return address*/
frame->rflag = 0UL; frame->rflag = 0UL;
frame->rbx = 0UL; frame->rbx = 0UL;

2
hypervisor/arch/x86/init.c
View File

@ -54,7 +54,7 @@ static void enter_guest_mode(uint16_t pcpu_id)
{ {
vmx_on(); vmx_on();
(void)launch_vms(pcpu_id); launch_vms(pcpu_id);
switch_to_idle(default_idle); switch_to_idle(default_idle);

1
hypervisor/include/arch/x86/multiboot.h
View File

@ -18,7 +18,6 @@
/* maximum lengt of the guest OS' command line parameter string */ /* maximum lengt of the guest OS' command line parameter string */
#define MAX_BOOTARGS_SIZE 2048U #define MAX_BOOTARGS_SIZE 2048U
struct acrn_vm;
struct multiboot_info { struct multiboot_info {
uint32_t mi_flags; uint32_t mi_flags;

1
hypervisor/include/arch/x86/security.h
View File

@ -28,7 +28,6 @@ struct stack_canary {
uint8_t reserved[40]; uint8_t reserved[40];
uint64_t canary; uint64_t canary;
}; };
void __stack_chk_fail(void);
void set_fs_base(void); void set_fs_base(void);
#endif #endif

2
hypervisor/include/dm/vacpi.h
View File

@ -46,7 +46,7 @@
#define ACPI_ASL_COMPILER_ID "INTL" #define ACPI_ASL_COMPILER_ID "INTL"
#define ACPI_ASL_COMPILER_VERSION 0x20190802U #define ACPI_ASL_COMPILER_VERSION 0x20190802U
struct acrn_vm;
struct acpi_table_info { struct acpi_table_info {
struct acpi_table_rsdp rsdp; struct acpi_table_rsdp rsdp;
struct acpi_table_xsdt xsdt; struct acpi_table_xsdt xsdt;

3
hypervisor/lib/stack_protector.c
View File

@ -4,7 +4,8 @@
* SPDX-License-Identifier: BSD-3-Clause * SPDX-License-Identifier: BSD-3-Clause
*/ */
#include <logmsg.h> #include <logmsg.h>
#include <security.h>
void __stack_chk_fail(void);
void __stack_chk_fail(void) void __stack_chk_fail(void)
{ {