diff options
| author | Luis Claudio R. Goncalves <lgoncalv@redhat.com> | 2021-07-05 17:58:22 -0300 |
|---|---|---|
| committer | Luis Claudio R. Goncalves <lgoncalv@redhat.com> | 2021-07-05 17:58:22 -0300 |
| commit | 35155e70f37271dcd971b2f5067b022f728d3a83 (patch) | |
| tree | 0e259729d11677b016a47dcdf16d561912dd0ccf /arch/x86 | |
| parent | f11e2b11b6871c031fac201cd2625de4696a63bf (diff) | |
| parent | d98bf8b949c03b840010c5a4f2671b7c79019d76 (diff) | |
| download | linux-rt-35155e70f37271dcd971b2f5067b022f728d3a83.tar.gz | |
Merge tag 'v4.9.272' into v4.9-rt
Signed-off-by: Luis Claudio R. Goncalves <lgoncalv@redhat.com>
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/kvm/svm.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c index 29078eaf18c9..cbc7f177bbd8 100644 --- a/arch/x86/kvm/svm.c +++ b/arch/x86/kvm/svm.c @@ -3412,7 +3412,7 @@ static int cr_interception(struct vcpu_svm *svm) err = 0; if (cr >= 16) { /* mov to cr */ cr -= 16; - val = kvm_register_read(&svm->vcpu, reg); + val = kvm_register_readl(&svm->vcpu, reg); switch (cr) { case 0: if (!check_selective_cr0_intercepted(svm, val)) @@ -3457,7 +3457,7 @@ static int cr_interception(struct vcpu_svm *svm) kvm_queue_exception(&svm->vcpu, UD_VECTOR); return 1; } - kvm_register_write(&svm->vcpu, reg, val); + kvm_register_writel(&svm->vcpu, reg, val); } kvm_complete_insn_gp(&svm->vcpu, err); @@ -3489,13 +3489,13 @@ static int dr_interception(struct vcpu_svm *svm) if (dr >= 16) { /* mov to DRn */ if (!kvm_require_dr(&svm->vcpu, dr - 16)) return 1; - val = kvm_register_read(&svm->vcpu, reg); + val = kvm_register_readl(&svm->vcpu, reg); kvm_set_dr(&svm->vcpu, dr - 16, val); } else { if (!kvm_require_dr(&svm->vcpu, dr)) return 1; kvm_get_dr(&svm->vcpu, dr, &val); - kvm_register_write(&svm->vcpu, reg, val); + kvm_register_writel(&svm->vcpu, reg, val); } skip_emulated_instruction(&svm->vcpu); |