github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-08-11 21:13:11 +00:00
Code Issues Projects Releases Wiki Activity

hv: mmio: move EPT operation out of register_mmio_emulation_handler

Browse Source 
register_mmio_emulation_handler should only register handler for mmio emulation.

Tracked-On: #3475
Signed-off-by: Li, Fei1 <fei1.li@intel.com>
This commit is contained in:
Li, Fei1 2019-10-30 18:43:33 +08:00 committed by wenlingz
parent 4f6653dc9c
commit 6f310d1ab2
2 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hypervisor/dm/io_req.c
View File

@ -6,7 +6,6 @@
#include <vm.h> #include <vm.h>
#include <irq.h> #include <irq.h>
#include <errno.h> #include <errno.h>
#include <ept.h>
#include <logmsg.h> #include <logmsg.h>
#define ACRN_DBG_IOREQUEST 6U #define ACRN_DBG_IOREQUEST 6U
@ -695,16 +694,6 @@ void register_mmio_emulation_handler(struct acrn_vm *vm,
mmio_node->handler_private_data = handler_private_data; mmio_node->handler_private_data = handler_private_data;
mmio_node->range_start = start; mmio_node->range_start = start;
mmio_node->range_end = end; mmio_node->range_end = end;
/*
* SOS would map all its memory at beginning, so we
* should unmap it. But UOS will not, so we shouldn't
* need to unmap it.
*/
if (is_sos_vm(vm)) {
ept_del_mr(vm, (uint64_t *)vm->arch_vm.nworld_eptp, start, end - start);
}
} }
} }

3
hypervisor/dm/vioapic.c
View File

@ -33,6 +33,7 @@
#include <vm.h> #include <vm.h>
#include <errno.h> #include <errno.h>
#include <irq.h> #include <irq.h>
#include <ept.h>
#include <assign.h> #include <assign.h>
#include <logmsg.h> #include <logmsg.h>
@ -472,6 +473,8 @@ vioapic_init(struct acrn_vm *vm)
(uint64_t)VIOAPIC_BASE, (uint64_t)VIOAPIC_BASE,
(uint64_t)VIOAPIC_BASE + VIOAPIC_SIZE, (uint64_t)VIOAPIC_BASE + VIOAPIC_SIZE,
vm); vm);
ept_del_mr(vm, (uint64_t *)vm->arch_vm.nworld_eptp,
(uint64_t)VIOAPIC_BASE, (uint64_t)VIOAPIC_SIZE);
vm->arch_vm.vioapic.ready = true; vm->arch_vm.vioapic.ready = true;
} }