Re: [PART2 PATCH v7 00/12] iommu/AMD: Introduce IOMMU AVIC support
From: Paolo Bonzini
Date: Mon Sep 05 2016 - 10:07:27 EST
On 05/09/2016 15:57, Joerg Roedel wrote:
> Hi Paolo,
>
> On Fri, Sep 02, 2016 at 12:46:28PM +0200, Paolo Bonzini wrote:
>> Joerg, if there's no other issues, could you apply the first 9 patches
>> to a branch based on 4.8-rc1 or similar, so that I can pull it into the
>> KVM tree?
>
> Find the branch at
>
> git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git x86/amd-avic
Pulled (I assume you will merge this into your iommu tree as well, so
that any conflicts are solved entirely on your side) and applied
Suravee's other 3 patches with this fixup on the third:
diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c
index 98b5d1261e02..db77c1ca9e76 100644
--- a/arch/x86/kvm/svm.c
+++ b/arch/x86/kvm/svm.c
@@ -4484,7 +4484,7 @@ get_pi_vcpu_info(struct kvm *kvm, struct kvm_kernel_irq_routing_entry *e,
struct kvm_lapic_irq irq;
struct kvm_vcpu *vcpu = NULL;
- kvm_set_msi_irq(e, &irq);
+ kvm_set_msi_irq(kvm, e, &irq);
if (!kvm_intr_is_single_vcpu(kvm, &irq, &vcpu)) {
pr_debug("SVM: %s: use legacy intr remap mode for irq %u\n",
Thanks!
Paolo