lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

KVM: Remove pointer to rflags from realmode_set_cr parameters.

Browse Source 
Mov reg, cr instruction doesn't change flags in any meaningful way, so
no need to update rflags after instruction execution.

Signed-off-by: Gleb Natapov <gleb@redhat.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
This commit is contained in:
Gleb Natapov
2010-03-15 16:38:31 +02:00
committed by Avi Kivity
parent af5b4f7ff7
commit 49c6799a2c
3 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
arch/x86/include/asm/kvm_host.h
View File

@@ -587,8 +587,7 @@ void realmode_lmsw(struct kvm_vcpu *vcpu, unsigned long msw,
unsigned long *rflags); unsigned long *rflags);
unsigned long realmode_get_cr(struct kvm_vcpu *vcpu, int cr); unsigned long realmode_get_cr(struct kvm_vcpu *vcpu, int cr);
void realmode_set_cr(struct kvm_vcpu *vcpu, int cr, unsigned long value, void realmode_set_cr(struct kvm_vcpu *vcpu, int cr, unsigned long value);
unsigned long *rflags);
void kvm_enable_efer_bits(u64); void kvm_enable_efer_bits(u64);
int kvm_get_msr(struct kvm_vcpu *vcpu, u32 msr_index, u64 *data); int kvm_get_msr(struct kvm_vcpu *vcpu, u32 msr_index, u64 *data);
int kvm_set_msr(struct kvm_vcpu *vcpu, u32 msr_index, u64 data); int kvm_set_msr(struct kvm_vcpu *vcpu, u32 msr_index, u64 data);

3
arch/x86/kvm/emulate.c
View File

@@ -2534,8 +2534,7 @@ twobyte_insn:
case 0x22: /* mov reg, cr */ case 0x22: /* mov reg, cr */
if (c->modrm_mod != 3) if (c->modrm_mod != 3)
goto cannot_emulate; goto cannot_emulate;
realmode_set_cr(ctxt->vcpu, realmode_set_cr(ctxt->vcpu, c->modrm_reg, c->modrm_val);
c->modrm_reg, c->modrm_val, &ctxt->eflags);
c->dst.type = OP_NONE; c->dst.type = OP_NONE;
break; break;
case 0x23: /* mov from reg to dr */ case 0x23: /* mov from reg to dr */

4
arch/x86/kvm/x86.c
View File

@@ -4080,13 +4080,11 @@ unsigned long realmode_get_cr(struct kvm_vcpu *vcpu, int cr)
return value; return value;
} }
void realmode_set_cr(struct kvm_vcpu *vcpu, int cr, unsigned long val, void realmode_set_cr(struct kvm_vcpu *vcpu, int cr, unsigned long val)
unsigned long *rflags)
{ {
switch (cr) { switch (cr) {
case 0: case 0:
kvm_set_cr0(vcpu, mk_cr_64(kvm_read_cr0(vcpu), val)); kvm_set_cr0(vcpu, mk_cr_64(kvm_read_cr0(vcpu), val));
*rflags = kvm_get_rflags(vcpu);
break; break;
case 2: case 2:
vcpu->arch.cr2 = val; vcpu->arch.cr2 = val;