From mboxrd@z Thu Jan 1 00:00:00 1970 From: Paolo Bonzini Subject: Re: [PATCH] kvm: x86: move ioapic.c and irq_comm.c back to arch/x86/ Date: Fri, 21 Nov 2014 17:27:33 +0100 Message-ID: <546F67F5.2070500@redhat.com> References: <1416490931-21724-1-git-send-email-pbonzini@redhat.com> <20141121161956.GA16941@potion.brq.redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: linux-kernel@vger.kernel.org, kvm@vger.kernel.org To: =?UTF-8?B?UmFkaW0gS3LEjW3DocWZ?= Return-path: In-Reply-To: <20141121161956.GA16941@potion.brq.redhat.com> Sender: linux-kernel-owner@vger.kernel.org List-Id: kvm.vger.kernel.org On 21/11/2014 17:19, Radim Kr=C4=8Dm=C3=A1=C5=99 wrote: > 2014-11-20 14:42+0100, Paolo Bonzini: >> ia64 does not need them anymore. >=20 > (Similar for device assignment and iommu, should I prepare patches?) Sure! Feel free to join the party. ;) Paolo >> Signed-off-by: Paolo Bonzini >> --- >=20 > At least one compile-breaker on arches without IOAPIC, >=20 >> diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h >> index ea53b04993f2..d2d42709d6f4 100644 >> --- a/include/linux/kvm_host.h >> +++ b/include/linux/kvm_host.h >> +#ifdef __KVM_HAVE_IOAPIC >> +void kvm_vcpu_request_scan_ioapic(struct kvm *kvm); >> +#else >> +static inline void kvm_vcpu_request-scan_ioapic(struct kvm *kvm) > ^_- >> +{ >> +} >> +#endif >> + >=20 > Reviewed-by: Radim Kr=C4=8Dm=C3=A1=C5=99 >=20 > And we could clean them up as well: Will squash in next monday. Paolo > ---8<--- > KVM: x86: remove IA64 from ioapic.c and irq_comm.c >=20 > They won't get compiled in x86 tree. >=20 > Signed-off-by: Radim Kr=C4=8Dm=C3=A1=C5=99 > --- > arch/x86/kvm/ioapic.c | 12 ------------ > arch/x86/kvm/irq_comm.c | 41 ++-------------------------------------= -- > 2 files changed, 2 insertions(+), 51 deletions(-) >=20 > diff --git a/arch/x86/kvm/ioapic.c b/arch/x86/kvm/ioapic.c > index 0ba4057..b1947e0 100644 > --- a/arch/x86/kvm/ioapic.c > +++ b/arch/x86/kvm/ioapic.c > @@ -270,7 +270,6 @@ void kvm_ioapic_scan_entry(struct kvm_vcpu *vcpu,= u64 *eoi_exit_bitmap, > spin_unlock(&ioapic->lock); > } > =20 > -#ifdef CONFIG_X86 > void kvm_vcpu_request_scan_ioapic(struct kvm *kvm) > { > struct kvm_ioapic *ioapic =3D kvm->arch.vioapic; > @@ -279,12 +278,6 @@ void kvm_vcpu_request_scan_ioapic(struct kvm *kv= m) > return; > kvm_make_scan_ioapic_request(kvm); > } > -#else > -void kvm_vcpu_request_scan_ioapic(struct kvm *kvm) > -{ > - return; > -} > -#endif > =20 > static void ioapic_write_indirect(struct kvm_ioapic *ioapic, u32 val= ) > { > @@ -586,11 +579,6 @@ static int ioapic_mmio_write(struct kvm_io_devic= e *this, gpa_t addr, int len, > case IOAPIC_REG_WINDOW: > ioapic_write_indirect(ioapic, data); > break; > -#ifdef CONFIG_IA64 > - case IOAPIC_REG_EOI: > - __kvm_ioapic_update_eoi(NULL, ioapic, data, IOAPIC_LEVEL_TRIG); > - break; > -#endif > =20 > default: > break; > diff --git a/arch/x86/kvm/irq_comm.c b/arch/x86/kvm/irq_comm.c > index a8f988c..72298b3 100644 > --- a/arch/x86/kvm/irq_comm.c > +++ b/arch/x86/kvm/irq_comm.c > @@ -26,9 +26,6 @@ > #include > =20 > #include > -#ifdef CONFIG_IA64 > -#include > -#endif > =20 > #include "irq.h" > =20 > @@ -38,12 +35,8 @@ static int kvm_set_pic_irq(struct kvm_kernel_irq_r= outing_entry *e, > struct kvm *kvm, int irq_source_id, int level, > bool line_status) > { > -#ifdef CONFIG_X86 > struct kvm_pic *pic =3D pic_irqchip(kvm); > return kvm_pic_set_irq(pic, e->irqchip.pin, irq_source_id, level); > -#else > - return -1; > -#endif > } > =20 > static int kvm_set_ioapic_irq(struct kvm_kernel_irq_routing_entry *e= , > @@ -57,12 +50,7 @@ static int kvm_set_ioapic_irq(struct kvm_kernel_ir= q_routing_entry *e, > =20 > inline static bool kvm_is_dm_lowest_prio(struct kvm_lapic_irq *irq) > { > -#ifdef CONFIG_IA64 > - return irq->delivery_mode =3D=3D > - (IOSAPIC_LOWEST_PRIORITY << IOSAPIC_DELIVERY_SHIFT); > -#else > return irq->delivery_mode =3D=3D APIC_DM_LOWEST; > -#endif > } > =20 > int kvm_irq_delivery_to_apic(struct kvm *kvm, struct kvm_lapic *src, > @@ -202,9 +190,7 @@ int kvm_request_irq_source_id(struct kvm *kvm) > } > =20 > ASSERT(irq_source_id !=3D KVM_USERSPACE_IRQ_SOURCE_ID); > -#ifdef CONFIG_X86 > ASSERT(irq_source_id !=3D KVM_IRQFD_RESAMPLE_IRQ_SOURCE_ID); > -#endif > set_bit(irq_source_id, bitmap); > unlock: > mutex_unlock(&kvm->irq_lock); > @@ -215,9 +201,7 @@ unlock: > void kvm_free_irq_source_id(struct kvm *kvm, int irq_source_id) > { > ASSERT(irq_source_id !=3D KVM_USERSPACE_IRQ_SOURCE_ID); > -#ifdef CONFIG_X86 > ASSERT(irq_source_id !=3D KVM_IRQFD_RESAMPLE_IRQ_SOURCE_ID); > -#endif > =20 > mutex_lock(&kvm->irq_lock); > if (irq_source_id < 0 || > @@ -230,9 +214,7 @@ void kvm_free_irq_source_id(struct kvm *kvm, int = irq_source_id) > goto unlock; > =20 > kvm_ioapic_clear_all(kvm->arch.vioapic, irq_source_id); > -#ifdef CONFIG_X86 > kvm_pic_clear_all(pic_irqchip(kvm), irq_source_id); > -#endif > unlock: > mutex_unlock(&kvm->irq_lock); > } > @@ -322,16 +304,11 @@ out: > .u.irqchip =3D { .irqchip =3D KVM_IRQCHIP_IOAPIC, .pin =3D (irq) = } } > #define ROUTING_ENTRY1(irq) IOAPIC_ROUTING_ENTRY(irq) > =20 > -#ifdef CONFIG_X86 > -# define PIC_ROUTING_ENTRY(irq) \ > +#define PIC_ROUTING_ENTRY(irq) \ > { .gsi =3D irq, .type =3D KVM_IRQ_ROUTING_IRQCHIP, \ > .u.irqchip =3D { .irqchip =3D SELECT_PIC(irq), .pin =3D (irq) % 8= } } > -# define ROUTING_ENTRY2(irq) \ > +#define ROUTING_ENTRY2(irq) \ > IOAPIC_ROUTING_ENTRY(irq), PIC_ROUTING_ENTRY(irq) > -#else > -# define ROUTING_ENTRY2(irq) \ > - IOAPIC_ROUTING_ENTRY(irq) > -#endif > =20 > static const struct kvm_irq_routing_entry default_routing[] =3D { > ROUTING_ENTRY2(0), ROUTING_ENTRY2(1), > @@ -346,20 +323,6 @@ static const struct kvm_irq_routing_entry defaul= t_routing[] =3D { > ROUTING_ENTRY1(18), ROUTING_ENTRY1(19), > ROUTING_ENTRY1(20), ROUTING_ENTRY1(21), > ROUTING_ENTRY1(22), ROUTING_ENTRY1(23), > -#ifdef CONFIG_IA64 > - ROUTING_ENTRY1(24), ROUTING_ENTRY1(25), > - ROUTING_ENTRY1(26), ROUTING_ENTRY1(27), > - ROUTING_ENTRY1(28), ROUTING_ENTRY1(29), > - ROUTING_ENTRY1(30), ROUTING_ENTRY1(31), > - ROUTING_ENTRY1(32), ROUTING_ENTRY1(33), > - ROUTING_ENTRY1(34), ROUTING_ENTRY1(35), > - ROUTING_ENTRY1(36), ROUTING_ENTRY1(37), > - ROUTING_ENTRY1(38), ROUTING_ENTRY1(39), > - ROUTING_ENTRY1(40), ROUTING_ENTRY1(41), > - ROUTING_ENTRY1(42), ROUTING_ENTRY1(43), > - ROUTING_ENTRY1(44), ROUTING_ENTRY1(45), > - ROUTING_ENTRY1(46), ROUTING_ENTRY1(47), > -#endif > }; > =20 > int kvm_setup_default_irq_routing(struct kvm *kvm) >=20