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

Commit 84877d93 authored by Cornelia Huck's avatar Cornelia Huck Committed by Paolo Bonzini
Browse files

KVM: s390: register flic ops dynamically 



Using the new kvm_register_device_ops() interface makes us get rid of
an #ifdef in common code.

Cc: Gleb Natapov <gleb@kernel.org>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: default avatarCornelia Huck <cornelia.huck@de.ibm.com>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent c06a841b

arch/s390/kvm/kvm-s390.c

+2 −1
Original line number Diff line number Diff line
@@ -122,7 +122,8 @@ void kvm_arch_hardware_unsetup(void) 


int kvm_arch_init(void *opaque)

{

	return 0;

	/* Register floating interrupt controller interface. */

	return kvm_register_device_ops(&kvm_flic_ops, KVM_DEV_TYPE_FLIC);

}



/* Section: device related */

arch/s390/kvm/kvm-s390.h

+1 −0
Original line number Diff line number Diff line
@@ -227,6 +227,7 @@ int kvm_cpu_has_interrupt(struct kvm_vcpu *vcpu); 
int psw_extint_disabled(struct kvm_vcpu *vcpu);

void kvm_s390_destroy_adapters(struct kvm *kvm);

int kvm_s390_si_ext_call_pending(struct kvm_vcpu *vcpu);

extern struct kvm_device_ops kvm_flic_ops;



/* implemented in guestdbg.c */

void kvm_s390_backup_guest_per_regs(struct kvm_vcpu *vcpu);

include/linux/kvm_host.h

+0 −1
Original line number Diff line number Diff line
@@ -1069,7 +1069,6 @@ int kvm_register_device_ops(struct kvm_device_ops *ops, u32 type); 
extern struct kvm_device_ops kvm_mpic_ops;

extern struct kvm_device_ops kvm_xics_ops;

extern struct kvm_device_ops kvm_vfio_ops;

extern struct kvm_device_ops kvm_flic_ops;



#ifdef CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT

virt/kvm/kvm_main.c

+0 −4
Original line number Diff line number Diff line
@@ -2285,10 +2285,6 @@ static struct kvm_device_ops *kvm_device_ops_table[KVM_DEV_TYPE_MAX] = { 
#ifdef CONFIG_KVM_VFIO

	[KVM_DEV_TYPE_VFIO]		= &kvm_vfio_ops,

#endif



#ifdef CONFIG_S390

	[KVM_DEV_TYPE_FLIC]		= &kvm_flic_ops,

#endif

};



int kvm_register_device_ops(struct kvm_device_ops *ops, u32 type)