Skip to content

Commit 0d6218f

Browse files
JasonChenCJlijinxia
authored andcommitted
instr_emul: remove unnecessary params in __decode_instruction
removed unused vcpu & gla params Signed-off-by: Jason Chen CJ <jason.cj.chen@intel.com>
1 parent 570aef6 commit 0d6218f

File tree

3 files changed

+5
-6
lines changed

3 files changed

+5
-6
lines changed

hypervisor/arch/x86/guest/instr_emul.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2135,8 +2135,7 @@ decode_moffset(struct vie *vie)
21352135
}
21362136

21372137
int
2138-
__decode_instruction(__unused struct vcpu *vcpu, __unused uint64_t gla,
2139-
enum vm_cpu_mode cpu_mode, int cs_d, struct vie *vie)
2138+
__decode_instruction(enum vm_cpu_mode cpu_mode, int cs_d, struct vie *vie)
21402139
{
21412140
if (decode_prefixes(vie, cpu_mode, cs_d))
21422141
return -1;

hypervisor/arch/x86/guest/instr_emul.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,8 @@ int vie_init(struct vie *vie, struct vcpu *vcpu);
8686
* in VIE_INVALID_GLA instead.
8787
*/
8888
#define VIE_INVALID_GLA (1UL << 63) /* a non-canonical address */
89-
int __decode_instruction(struct vcpu *vcpu, uint64_t gla,
90-
enum vm_cpu_mode cpu_mode, int csd, struct vie *vie);
89+
int
90+
__decode_instruction(enum vm_cpu_mode cpu_mode, int cs_d, struct vie *vie);
9191

9292
int emulate_instruction(struct vcpu *vcpu);
9393
int decode_instruction(struct vcpu *vcpu);

hypervisor/arch/x86/guest/instr_emul_wrapper.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -331,8 +331,8 @@ int decode_instruction(struct vcpu *vcpu)
331331
csar = exec_vmread(VMX_GUEST_CS_ATTR);
332332
cpu_mode = get_vcpu_mode(vcpu);
333333

334-
retval = __decode_instruction(vcpu, guest_rip_gva,
335-
cpu_mode, SEG_DESC_DEF32(csar), &emul_cnx->vie);
334+
retval = __decode_instruction(cpu_mode, SEG_DESC_DEF32(csar),
335+
&emul_cnx->vie);
336336

337337
if (retval != 0) {
338338
pr_err("decode instruction failed @ 0x%016llx:",

0 commit comments

Comments
 (0)