diff options
-rw-r--r-- | arch/x86/kvm/paging_tmpl.h | 1 | ||||
-rw-r--r-- | virt/kvm/assigned-dev.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/kvm/paging_tmpl.h b/arch/x86/kvm/paging_tmpl.h index 1f7f5dd8306f..9308be2d5c02 100644 --- a/arch/x86/kvm/paging_tmpl.h +++ b/arch/x86/kvm/paging_tmpl.h | |||
@@ -444,6 +444,7 @@ static int FNAME(page_fault)(struct kvm_vcpu *vcpu, gva_t addr, | |||
444 | kvm_mmu_free_some_pages(vcpu); | 444 | kvm_mmu_free_some_pages(vcpu); |
445 | sptep = FNAME(fetch)(vcpu, addr, &walker, user_fault, write_fault, | 445 | sptep = FNAME(fetch)(vcpu, addr, &walker, user_fault, write_fault, |
446 | level, &write_pt, pfn); | 446 | level, &write_pt, pfn); |
447 | (void)sptep; | ||
447 | pgprintk("%s: shadow pte %p %llx ptwrite %d\n", __func__, | 448 | pgprintk("%s: shadow pte %p %llx ptwrite %d\n", __func__, |
448 | sptep, *sptep, write_pt); | 449 | sptep, *sptep, write_pt); |
449 | 450 | ||
diff --git a/virt/kvm/assigned-dev.c b/virt/kvm/assigned-dev.c index bf9d958d4d5b..7c98928b09d9 100644 --- a/virt/kvm/assigned-dev.c +++ b/virt/kvm/assigned-dev.c | |||
@@ -58,12 +58,10 @@ static int find_index_from_host_irq(struct kvm_assigned_dev_kernel | |||
58 | static void kvm_assigned_dev_interrupt_work_handler(struct work_struct *work) | 58 | static void kvm_assigned_dev_interrupt_work_handler(struct work_struct *work) |
59 | { | 59 | { |
60 | struct kvm_assigned_dev_kernel *assigned_dev; | 60 | struct kvm_assigned_dev_kernel *assigned_dev; |
61 | struct kvm *kvm; | ||
62 | int i; | 61 | int i; |
63 | 62 | ||
64 | assigned_dev = container_of(work, struct kvm_assigned_dev_kernel, | 63 | assigned_dev = container_of(work, struct kvm_assigned_dev_kernel, |
65 | interrupt_work); | 64 | interrupt_work); |
66 | kvm = assigned_dev->kvm; | ||
67 | 65 | ||
68 | spin_lock_irq(&assigned_dev->assigned_dev_lock); | 66 | spin_lock_irq(&assigned_dev->assigned_dev_lock); |
69 | if (assigned_dev->irq_requested_type & KVM_DEV_IRQ_HOST_MSIX) { | 67 | if (assigned_dev->irq_requested_type & KVM_DEV_IRQ_HOST_MSIX) { |