Skip to content

Commit 295701c

Browse files
donshengwenlingz
authored andcommitted
hv: remove mptable code for pre-launched VMs
Now that ACPI is enabled for pre-launched VMs, we can remove all mptable code. Tracked-On: #3601 Signed-off-by: dongshen <dongsheng.x.zhang@intel.com> Reviewed-by: Eddie Dong <eddie.dong@intel.com>
1 parent b447ce3 commit 295701c

File tree

5 files changed

+0
-296
lines changed

5 files changed

+0
-296
lines changed

hypervisor/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,6 @@ VP_BASE_C_SRCS += arch/x86/guest/ucode.c
245245
VP_BASE_C_SRCS += boot/guest/vboot_info.c
246246
VP_BASE_C_SRCS += common/hv_main.c
247247
VP_BASE_C_SRCS += common/vm_load.c
248-
VP_BASE_C_SRCS += arch/x86/configs/vmptable.c
249248
VP_BASE_C_SRCS += arch/x86/configs/pci_dev.c
250249
VP_BASE_C_SRCS += arch/x86/configs/vacpi.c
251250
VP_BASE_C_SRCS += arch/x86/configs/$(CONFIG_BOARD)/ve820.c

hypervisor/arch/x86/configs/vmptable.c

Lines changed: 0 additions & 142 deletions
This file was deleted.

hypervisor/arch/x86/guest/vm.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -742,7 +742,6 @@ void prepare_vm(uint16_t vm_id, struct acrn_vm_config *vm_config)
742742

743743
if (err == 0) {
744744
if (is_prelaunched_vm(vm)) {
745-
(void)mptable_build(vm);
746745
build_vacpi(vm);
747746
}
748747

hypervisor/include/arch/x86/vm_config.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
#include <pci.h>
1212
#include <multiboot.h>
1313
#include <acrn_common.h>
14-
#include <mptable.h>
1514
#include <vacpi.h>
1615
#include <vm_configurations.h>
1716
#include <sgx.h>

hypervisor/include/dm/mptable.h

Lines changed: 0 additions & 151 deletions
This file was deleted.

0 commit comments

Comments
 (0)