github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2025-06-20 04:33:55 +00:00
Code Issues Projects Releases Wiki Activity

instr_emul: remove unnecessary params in __decode_instruction

Browse Source 
removed unused vcpu & gla params

Signed-off-by: Jason Chen CJ <jason.cj.chen@intel.com>
This commit is contained in:
Jason Chen CJ 2018-06-07 14:24:45 +08:00 committed by lijinxia
parent 570aef648a
commit 0d6218f980
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hypervisor/arch/x86/guest/instr_emul.c
View File

@ -2135,8 +2135,7 @@ decode_moffset(struct vie *vie)
} }
int int
__decode_instruction(__unused struct vcpu *vcpu, __unused uint64_t gla, __decode_instruction(enum vm_cpu_mode cpu_mode, int cs_d, struct vie *vie)
enum vm_cpu_mode cpu_mode, int cs_d, struct vie *vie)
{ {
if (decode_prefixes(vie, cpu_mode, cs_d)) if (decode_prefixes(vie, cpu_mode, cs_d))
return -1; return -1;

4
hypervisor/arch/x86/guest/instr_emul.h
View File

@ -86,8 +86,8 @@ int vie_init(struct vie *vie, struct vcpu *vcpu);
* in VIE_INVALID_GLA instead. * in VIE_INVALID_GLA instead.
*/ */
#define VIE_INVALID_GLA (1UL << 63) /* a non-canonical address */ #define VIE_INVALID_GLA (1UL << 63) /* a non-canonical address */
int __decode_instruction(struct vcpu *vcpu, uint64_t gla, int
enum vm_cpu_mode cpu_mode, int csd, struct vie *vie); __decode_instruction(enum vm_cpu_mode cpu_mode, int cs_d, struct vie *vie);
int emulate_instruction(struct vcpu *vcpu); int emulate_instruction(struct vcpu *vcpu);
int decode_instruction(struct vcpu *vcpu); int decode_instruction(struct vcpu *vcpu);

4
hypervisor/arch/x86/guest/instr_emul_wrapper.c
View File

@ -331,8 +331,8 @@ int decode_instruction(struct vcpu *vcpu)
csar = exec_vmread(VMX_GUEST_CS_ATTR); csar = exec_vmread(VMX_GUEST_CS_ATTR);
cpu_mode = get_vcpu_mode(vcpu); cpu_mode = get_vcpu_mode(vcpu);
retval = __decode_instruction(vcpu, guest_rip_gva, retval = __decode_instruction(cpu_mode, SEG_DESC_DEF32(csar),
cpu_mode, SEG_DESC_DEF32(csar), &emul_cnx->vie); &emul_cnx->vie);
if (retval != 0) { if (retval != 0) {
pr_err("decode instruction failed @ 0x%016llx:", pr_err("decode instruction failed @ 0x%016llx:",