diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-07-15 20:30:12 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-07-15 20:30:12 (GMT) |
| commit | df14a68d633c362b6aae57947d5c57fac0393a1e (patch) | |
| tree | 04a56a2705df8ac9cf0b55b200ff5025514bf128 /arch/x86/kvm/iommu.c | |
| parent | bec33cd2ebddde3be3123a672d0fbb77e9657d65 (diff) | |
| parent | ee4100da1616d6d151f97862b87e8a4e43d14b4c (diff) | |
| download | linux-df14a68d633c362b6aae57947d5c57fac0393a1e.tar.xz | |
Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm
Pull KVM fixes from Paolo Bonzini:
- Fix FPU refactoring ("kvm: x86: fix load xsave feature warning")
- Fix eager FPU mode (Cc stable)
- AMD bits of MTRR virtualization
* tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm:
kvm: x86: fix load xsave feature warning
KVM: x86: apply guest MTRR virtualization on host reserved pages
KVM: SVM: Sync g_pat with guest-written PAT value
KVM: SVM: use NPT page attributes
KVM: count number of assigned devices
KVM: VMX: fix vmwrite to invalid VMCS
KVM: x86: reintroduce kvm_is_mmio_pfn
x86: hyperv: add CPUID bit for crash handlers
Diffstat (limited to 'arch/x86/kvm/iommu.c')
| -rw-r--r-- | arch/x86/kvm/iommu.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/kvm/iommu.c b/arch/x86/kvm/iommu.c index 7dbced3..5c520eb 100644 --- a/arch/x86/kvm/iommu.c +++ b/arch/x86/kvm/iommu.c @@ -200,6 +200,7 @@ int kvm_assign_device(struct kvm *kvm, struct pci_dev *pdev) goto out_unmap; } + kvm_arch_start_assignment(kvm); pci_set_dev_assigned(pdev); dev_info(&pdev->dev, "kvm assign device\n"); @@ -224,6 +225,7 @@ int kvm_deassign_device(struct kvm *kvm, struct pci_dev *pdev) iommu_detach_device(domain, &pdev->dev); pci_clear_dev_assigned(pdev); + kvm_arch_end_assignment(kvm); dev_info(&pdev->dev, "kvm deassign device\n"); |