github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-09-14 13:30:01 +00:00
Code Issues Projects Releases Wiki Activity

HV: modularization improve UEFI macro control code

Browse Source 
1. in UEFI bsp code, not need UEFI macro; it is controlled in makefile.
2. in vm/acpi/interrupt code, unify the API name for SBL & UEFI.
3. remove unnecessary header including and unused code.

Tracked-On: #1842
Signed-off-by: Minggui Cao <minggui.cao@intel.com>
Reviewed-by: Jason Chen CJ <jason.cj.chen@intel.com>
This commit is contained in:
Minggui Cao
2019-01-24 14:03:23 +08:00
committed by wenlingz
parent 2a25f4e9fc
commit 723ff1f4ee
17 changed files with 43 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
hypervisor/boot/acpi.c
View File

@@ -30,7 +30,6 @@
#include <hypervisor.h>
#include "acpi_priv.h"
#include "acpi.h"
#include <vm0_boot.h>
#define ACPI_SIG_RSDP "RSD PTR " /* Root System Description Ptr */
#define ACPI_OEM_ID_SIZE 6
@@ -138,9 +137,7 @@ static struct acpi_table_rsdp *get_rsdp(void)
struct acpi_table_rsdp *rsdp = NULL;
uint16_t *addr;
#ifdef CONFIG_EFI_STUB
rsdp = (struct acpi_table_rsdp *) get_rsdp_from_uefi();
#endif
rsdp = (struct acpi_table_rsdp *)bsp_get_rsdp();
if (rsdp == NULL) {
/* EBDA is addressed by the 16 bit pointer at 0x40E */
addr = (uint16_t *)hpa2hva(0x40eUL);

7
hypervisor/boot/uefi/uefi_boot.c
View File

@@ -7,9 +7,7 @@
#include <hypervisor.h>
#include <multiboot.h>
#include <boot_context.h>
#include <vm0_boot.h>
#ifdef CONFIG_EFI_STUB
#include <uefi.h>
static void efi_spurious_handler(int32_t vector)
{
@@ -54,11 +52,10 @@ static int32_t uefi_sw_loader(struct acrn_vm *vm)
return ret;
}
int32_t efi_boot_init(void)
int32_t init_vm_boot_info(__unused struct acrn_vm *vm)
{
vm_sw_loader = uefi_sw_loader;
spurious_handler = (spurious_handler_t)efi_spurious_handler;
return 0;
}
#endif