Skip to content

Commit 38ca8db

Browse files
mingqiangchiacrnsi
authored andcommitted
hv:tiny cleanup
-- 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>
1 parent f15a360 commit 38ca8db

File tree

8 files changed

+7
-9
lines changed

8 files changed

+7
-9
lines changed

hypervisor/acpi_parser/acpi_ext.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
#include <logmsg.h>
3535
#include <host_pm.h>
3636
#include <acrn_common.h>
37-
#include <vcpu.h>
3837

3938
/* Per ACPI spec:
4039
* There are two fundamental types of ACPI tables:

hypervisor/arch/x86/cpu.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include <cpuid.h>
2121
#include <version.h>
2222
#include <vmx.h>
23-
#include <vm.h>
23+
#include <msr.h>
2424
#include <ld_sym.h>
2525
#include <logmsg.h>
2626
#include <cat.h>

hypervisor/arch/x86/guest/vcpu.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ struct stack_frame {
3030
uint64_t rbx;
3131
uint64_t rflag;
3232
uint64_t rip;
33-
uint64_t maigc;
33+
uint64_t magic;
3434
};
3535

3636
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)
615615
frame = (struct stack_frame *)stacktop;
616616
frame -= 1;
617617

618-
frame->maigc = SP_BOTTOM_MAGIC;
618+
frame->magic = SP_BOTTOM_MAGIC;
619619
frame->rip = (uint64_t)run_sched_thread; /*return address*/
620620
frame->rflag = 0UL;
621621
frame->rbx = 0UL;

hypervisor/arch/x86/init.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ static void enter_guest_mode(uint16_t pcpu_id)
5454
{
5555
vmx_on();
5656

57-
(void)launch_vms(pcpu_id);
57+
launch_vms(pcpu_id);
5858

5959
switch_to_idle(default_idle);
6060

hypervisor/include/arch/x86/multiboot.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
/* maximum lengt of the guest OS' command line parameter string */
1919
#define MAX_BOOTARGS_SIZE 2048U
2020

21-
struct acrn_vm;
2221
struct multiboot_info {
2322
uint32_t mi_flags;
2423

hypervisor/include/arch/x86/security.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ struct stack_canary {
2828
uint8_t reserved[40];
2929
uint64_t canary;
3030
};
31-
void __stack_chk_fail(void);
3231
void set_fs_base(void);
3332
#endif
3433

hypervisor/include/dm/vacpi.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
#define ACPI_ASL_COMPILER_ID "INTL"
4747
#define ACPI_ASL_COMPILER_VERSION 0x20190802U
4848

49-
49+
struct acrn_vm;
5050
struct acpi_table_info {
5151
struct acpi_table_rsdp rsdp;
5252
struct acpi_table_xsdt xsdt;

hypervisor/lib/stack_protector.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
* SPDX-License-Identifier: BSD-3-Clause
55
*/
66
#include <logmsg.h>
7-
#include <security.h>
7+
8+
void __stack_chk_fail(void);
89

910
void __stack_chk_fail(void)
1011
{

0 commit comments

Comments
 (0)