From: Han Weidong <[EMAIL PROTECTED]>
This patch applies to the PCIPT vtd branch
Signed-off-by: Ben-Ami Yassour <[EMAIL PROTECTED]>
---
arch/x86/kvm/x86.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index f3c5b11..89d9cda 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -307,9 +307,10 @@ static int kvm_vm_ioctl_pci_pt_dev(struct kvm *kvm,
}
if (kvm_intel_iommu_found()) {
- r = kvm_iommu_map_guest(kvm, &pci_pt_dev);
+ r = kvm_iommu_map_guest(kvm, pci_pt_dev);
if (r)
- goto out;
+ goto out_free;
+ }
write_lock_irqsave(&kvm_pci_pt_lock, flags);
@@ -1968,7 +1969,6 @@ long kvm_arch_vm_ioctl(struct file *filp,
r = kvm_vm_ioctl_pci_pt_dev(kvm, &pci_pt_dev);
if (r)
goto out;
- }
break;
}
case KVM_GET_PIT: {
--
1.5.5.1
--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html