diff options
| author |  Paolo Bonzini <pbonzini@redhat.com>
| 2021-11-16 08:08:19 -0500 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com>
| 2021-11-18 02:11:57 -0500 |
| commit | 817506df9dbaacf360e518d9ef26ca4075bbbacd (patch) | |
| tree | 28a60fdbb779419d9f0e74380fd78dbceb2049ca /arch/x86/kvm/x86.c | |
| parent | Merge branch 'kvm-selftest' into kvm-master (diff) | |
| parent | KVM: SEV: Fix typo in and tweak name of cmd_allowed_from_miror() (diff) | |
| download | linux-817506df9dbaacf360e518d9ef26ca4075bbbacd.tar.gz linux-817506df9dbaacf360e518d9ef26ca4075bbbacd.tar.bz2 linux-817506df9dbaacf360e518d9ef26ca4075bbbacd.zip | |
Merge branch 'kvm-5.16-fixes' into kvm-master
* Fixes for Xen emulation
* Kill kvm_map_gfn() / kvm_unmap_gfn() and broken gfn_to_pfn_cache
* Fixes for migration of 32-bit nested guests on 64-bit hypervisor
* Compilation fixes
* More SEV cleanups
Diffstat (limited to 'arch/x86/kvm/x86.c')
| -rw-r--r-- | arch/x86/kvm/x86.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index dc7eb5fddfd3..c85d70107057 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -3307,9 +3307,9 @@ static void record_steal_time(struct kvm_vcpu *vcpu) "xor %1, %1\n" "2:\n" _ASM_EXTABLE_UA(1b, 2b) - : "+r" (st_preempted), - "+&r" (err) - : "m" (st->preempted)); + : "+q" (st_preempted), + "+&r" (err), + "+m" (st->preempted)); if (err) goto out; @@ -9547,12 +9547,16 @@ static void vcpu_load_eoi_exitmap(struct kvm_vcpu *vcpu) if (!kvm_apic_hw_enabled(vcpu->arch.apic)) return; - if (to_hv_vcpu(vcpu)) + if (to_hv_vcpu(vcpu)) { bitmap_or((ulong *)eoi_exit_bitmap, vcpu->arch.ioapic_handled_vectors, to_hv_synic(vcpu)->vec_bitmap, 256); + static_call(kvm_x86_load_eoi_exitmap)(vcpu, eoi_exit_bitmap); + return; + } - static_call(kvm_x86_load_eoi_exitmap)(vcpu, eoi_exit_bitmap); + static_call(kvm_x86_load_eoi_exitmap)( + vcpu, (u64 *)vcpu->arch.ioapic_handled_vectors); } void kvm_arch_mmu_notifier_invalidate_range(struct kvm *kvm, |