Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8175e5b7 authored by Alexander Graf's avatar Alexander Graf
Browse files

KVM: Add KVM_IRQCHIP_NUM_PINS in addition to KVM_IOAPIC_NUM_PINS 



The concept of routing interrupt lines to an irqchip is nothing
that is IOAPIC specific. Every irqchip has a maximum number of pins
that can be linked to irq lines.

So let's add a new define that allows us to reuse generic code for
non-IOAPIC platforms.

Signed-off-by: default avatarAlexander Graf <agraf@suse.de>
Acked-by: default avatarMichael S. Tsirkin <mst@redhat.com>
parent c35635ef

arch/x86/include/asm/kvm_host.h

+2 −0
Original line number Diff line number Diff line
@@ -43,6 +43,8 @@ 
#define KVM_PIO_PAGE_OFFSET 1

#define KVM_COALESCED_MMIO_PAGE_OFFSET 2



#define KVM_IRQCHIP_NUM_PINS  KVM_IOAPIC_NUM_PINS



#define CR0_RESERVED_BITS                                               \

	(~(unsigned long)(X86_CR0_PE | X86_CR0_MP | X86_CR0_EM | X86_CR0_TS \

			  | X86_CR0_ET | X86_CR0_NE | X86_CR0_WP | X86_CR0_AM \

include/linux/kvm_host.h

+1 −1
Original line number Diff line number Diff line
@@ -307,7 +307,7 @@ struct kvm_kernel_irq_routing_entry { 
#ifdef __KVM_HAVE_IOAPIC



struct kvm_irq_routing_table {

	int chip[KVM_NR_IRQCHIPS][KVM_IOAPIC_NUM_PINS];

	int chip[KVM_NR_IRQCHIPS][KVM_IRQCHIP_NUM_PINS];

	struct kvm_kernel_irq_routing_entry *rt_entries;

	u32 nr_rt_entries;

	/*

virt/kvm/irq_comm.c

+1 −1
Original line number Diff line number Diff line
@@ -480,7 +480,7 @@ int kvm_set_irq_routing(struct kvm *kvm, 


	new->nr_rt_entries = nr_rt_entries;

	for (i = 0; i < 3; i++)

		for (j = 0; j < KVM_IOAPIC_NUM_PINS; j++)

		for (j = 0; j < KVM_IRQCHIP_NUM_PINS; j++)

			new->chip[i][j] = -1;



	for (i = 0; i < nr; ++i) {