KVM: Replace read accesses of vcpu->arch.cr0 by an accessor
Since we'd like to allow the guest to own a few bits of cr0 at times, we need to know when we access those bits. Signed-off-by: Avi Kivity <avi@redhat.com>
This commit is contained in:

committed by
Marcelo Tosatti

parent
a1f83a74fe
commit
4d4ec08745
@@ -1515,7 +1515,7 @@ emulate_syscall(struct x86_emulate_ctxt *ctxt)
|
||||
|
||||
/* syscall is not available in real mode */
|
||||
if (c->lock_prefix || ctxt->mode == X86EMUL_MODE_REAL
|
||||
|| !(ctxt->vcpu->arch.cr0 & X86_CR0_PE))
|
||||
|| !kvm_read_cr0_bits(ctxt->vcpu, X86_CR0_PE))
|
||||
return -1;
|
||||
|
||||
setup_syscalls_segments(ctxt, &cs, &ss);
|
||||
@@ -1569,7 +1569,7 @@ emulate_sysenter(struct x86_emulate_ctxt *ctxt)
|
||||
|
||||
/* inject #GP if in real mode or paging is disabled */
|
||||
if (ctxt->mode == X86EMUL_MODE_REAL ||
|
||||
!(ctxt->vcpu->arch.cr0 & X86_CR0_PE)) {
|
||||
!kvm_read_cr0_bits(ctxt->vcpu, X86_CR0_PE)) {
|
||||
kvm_inject_gp(ctxt->vcpu, 0);
|
||||
return -1;
|
||||
}
|
||||
@@ -1635,7 +1635,7 @@ emulate_sysexit(struct x86_emulate_ctxt *ctxt)
|
||||
|
||||
/* inject #GP if in real mode or paging is disabled */
|
||||
if (ctxt->mode == X86EMUL_MODE_REAL
|
||||
|| !(ctxt->vcpu->arch.cr0 & X86_CR0_PE)) {
|
||||
|| !kvm_read_cr0_bits(ctxt->vcpu, X86_CR0_PE)) {
|
||||
kvm_inject_gp(ctxt->vcpu, 0);
|
||||
return -1;
|
||||
}
|
||||
|
Reference in New Issue
Block a user