public inbox for kvm@vger.kernel.org
 help / color / mirror / Atom feed
From: benami@il.ibm.com
To: amit.shah@qumranet.com
Cc: weidong.han@intel.com, muli@il.ibm.com, raharper@us.ibm.com,
	kvm@vger.kernel.org, Ben-Ami Yassour <benami@il.ibm.com>
Subject: [PATCH] KVM: PCIPT: fix compilation errors
Date: Tue, 17 Jun 2008 22:05:23 +0300	[thread overview]
Message-ID: <1213729526-10410-2-git-send-email-benami@il.ibm.com> (raw)
In-Reply-To: <1213729526-10410-1-git-send-email-benami@il.ibm.com>

From: Han Weidong <weidong.han@intel.com>

This patch applies to the PCIPT vtd branch

Signed-off-by: Ben-Ami Yassour <benami@il.ibm.com>
---
 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


  reply	other threads:[~2008-06-17 19:05 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-06-17 19:05 Patches for vtd pci passthrough benami
2008-06-17 19:05 ` benami [this message]
2008-06-17 19:05   ` [PATCH] KVM: PCIPT: VT-d: fix guest unmap benami
2008-06-17 19:05     ` [PATCH] KVM: PCIPT: free device structure on vm destroy benami
2008-06-17 19:05       ` [PATCH] KVM: PCIPT: VT-d: fix context mapping benami
2008-06-17 19:25         ` KVM: PCIPT: temporary fix for pio (userspace part) benami
2008-06-17 19:25           ` [PATCH] " benami
2008-06-18 20:30         ` [PATCH] KVM: PCIPT: VT-d: fix context mapping Muli Ben-Yehuda
2008-06-19  8:59         ` Han, Weidong
2008-06-19 12:28           ` Ben-Ami Yassour
2008-06-19 14:18             ` Han, Weidong
2008-06-19 17:44               ` Ben-Ami Yassour1
2008-06-20  6:23                 ` Han, Weidong
2008-06-30 15:32                   ` Ben-Ami Yassour
2008-07-01  2:22                     ` Han, Weidong
2008-06-17 21:29     ` [PATCH] KVM: PCIPT: VT-d: fix guest unmap Anthony Liguori
2008-06-18 12:06       ` Ben-Ami Yassour
2008-06-18 20:48         ` Anthony Liguori
2008-06-18 21:23           ` Muli Ben-Yehuda
2008-06-18 21:41             ` Anthony Liguori
2008-06-20 18:59       ` Avi Kivity
2008-06-20 19:28         ` Anthony Liguori

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1213729526-10410-2-git-send-email-benami@il.ibm.com \
    --to=benami@il.ibm.com \
    --cc=amit.shah@qumranet.com \
    --cc=kvm@vger.kernel.org \
    --cc=muli@il.ibm.com \
    --cc=raharper@us.ibm.com \
    --cc=weidong.han@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox