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

hv: guest_memory: Move guest_memory header to common scope

Browse Source 
This header can be moved directly to common scope without logic change.

Tracked-On: #8830
Signed-off-by: Yifan Liu <yifan1.liu@intel.com>
Reviewed-by: Fei Li <fei1.li@intel.com>
Acked-by: Wang Yu1 <yu1.wang@intel.com>
This commit is contained in:
Yifan Liu
2025-09-27 05:27:03 +00:00
committed by acrnsi-robot
parent 61afe9e51a
commit 0db8c93506
5 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
hypervisor/arch/x86/guest/guest_memory.c
View File

@@ -7,7 +7,7 @@
#include <types.h>
#include <errno.h>
#include <asm/vmx.h>
#include <asm/guest/guest_memory.h>
#include <guest_memory.h>
#include <vcpu.h>
#include <vm.h>
#include <asm/guest/vmcs.h>

2
hypervisor/arch/x86/guest/ucode.c
View File

@@ -11,7 +11,7 @@
#include <asm/msr.h>
#include <asm/cpuid.h>
#include <asm/guest/ucode.h>
#include <asm/guest/guest_memory.h>
#include <guest_memory.h>
#include <asm/guest/virq.h>
#include <logmsg.h>

2
hypervisor/include/arch/x86/asm/guest/instr_emul.h
View File

@@ -31,7 +31,7 @@
#include <types.h>
#include <asm/cpu.h>
#include <asm/guest/guest_memory.h>
#include <guest_memory.h>
struct acrn_vcpu;
struct instr_emul_vie_op {

2
hypervisor/include/arch/x86/asm/guest/vcpu.h
View File

@@ -17,7 +17,7 @@
#ifndef ASSEMBLER
#include <acrn_common.h>
#include <asm/guest/guest_memory.h>
#include <guest_memory.h>
#include <asm/guest/virtual_cr.h>
#include <asm/guest/vlapic.h>
#include <asm/guest/vmtrr.h>

15
hypervisor/include/arch/x86/asm/guest/guest_memory.h → hypervisor/include/common/guest_memory.h
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2018-2022 Intel Corporation.
* Copyright (C) 2018-2025 Intel Corporation.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
@@ -8,8 +8,8 @@
*
* @brief ACRN Memory Management
*/
#ifndef GUEST_H
#define GUEST_H
#ifndef GUEST_MEM_H
#define GUEST_MEM_H
#ifndef ASSEMBLER
@@ -17,12 +17,13 @@
struct acrn_vcpu;
struct acrn_vm;
/* Use # of paging level to identify paging mode */
enum vm_paging_mode {
PAGING_MODE_0_LEVEL = 0U, /* Flat */
PAGING_MODE_2_LEVEL = 2U, /* 32bit paging, 2-level */
PAGING_MODE_3_LEVEL = 3U, /* PAE paging, 3-level */
PAGING_MODE_4_LEVEL = 4U, /* 64bit paging, 4-level */
PAGING_MODE_2_LEVEL = 2U, /* 2-level paging */
PAGING_MODE_3_LEVEL = 3U, /* 3-level paging */
PAGING_MODE_4_LEVEL = 4U, /* 4-level paging */
PAGING_MODE_NUM,
};
@@ -115,4 +116,4 @@ int32_t copy_to_gva(struct acrn_vcpu *vcpu, void *h_ptr, uint64_t gva,
*/
#endif /* !ASSEMBLER */
#endif /* GUEST_H*/
#endif /* GUEST_MEM_H */