diff options
| author | Avi Kivity <avi@redhat.com> | 2012-07-26 11:54:21 +0300 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2012-07-26 11:54:21 +0300 |
| commit | e9bda6f6f902e6b55d9baceb5523468a048cbe56 (patch) | |
| tree | bf09cc165da1197cd34967da0593d08b9a37c0f3 /virt/kvm/irq_comm.c | |
| parent | bdc0077af574800d24318b6945cf2344e8dbb050 (diff) | |
| parent | 06e48c510aa37f6e791602e6420422ea7071fe94 (diff) | |
| download | op-kernel-dev-e9bda6f6f902e6b55d9baceb5523468a048cbe56.zip op-kernel-dev-e9bda6f6f902e6b55d9baceb5523468a048cbe56.tar.gz | |
Merge branch 'queue' into next
Merge patches queued during the run-up to the merge window.
* queue: (25 commits)
KVM: Choose better candidate for directed yield
KVM: Note down when cpu relax intercepted or pause loop exited
KVM: Add config to support ple or cpu relax optimzation
KVM: switch to symbolic name for irq_states size
KVM: x86: Fix typos in pmu.c
KVM: x86: Fix typos in lapic.c
KVM: x86: Fix typos in cpuid.c
KVM: x86: Fix typos in emulate.c
KVM: x86: Fix typos in x86.c
KVM: SVM: Fix typos
KVM: VMX: Fix typos
KVM: remove the unused parameter of gfn_to_pfn_memslot
KVM: remove is_error_hpa
KVM: make bad_pfn static to kvm_main.c
KVM: using get_fault_pfn to get the fault pfn
KVM: MMU: track the refcount when unmap the page
KVM: x86: remove unnecessary mark_page_dirty
KVM: MMU: Avoid handling same rmap_pde in kvm_handle_hva_range()
KVM: MMU: Push trace_kvm_age_page() into kvm_age_rmapp()
KVM: MMU: Add memslot parameter to hva handlers
...
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'virt/kvm/irq_comm.c')
| -rw-r--r-- | virt/kvm/irq_comm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/virt/kvm/irq_comm.c b/virt/kvm/irq_comm.c index 83402d7..7118be0 100644 --- a/virt/kvm/irq_comm.c +++ b/virt/kvm/irq_comm.c @@ -321,11 +321,11 @@ static int setup_routing_entry(struct kvm_irq_routing_table *rt, switch (ue->u.irqchip.irqchip) { case KVM_IRQCHIP_PIC_MASTER: e->set = kvm_set_pic_irq; - max_pin = 16; + max_pin = PIC_NUM_PINS; break; case KVM_IRQCHIP_PIC_SLAVE: e->set = kvm_set_pic_irq; - max_pin = 16; + max_pin = PIC_NUM_PINS; delta = 8; break; case KVM_IRQCHIP_IOAPIC: |
