On 12/11/2017 02:47 PM, David Hildenbrand wrote:
> This makes it clearer, which device is used for which accelerator.
>
> Signed-off-by: David Hildenbrand <da...@redhat.com>
nice.
Reviewed-by: Christian Borntraeger <borntrae...@de.ibm.com>
> ---
> hw/intc/s390_flic.c | 9 +++++++--
> hw/intc/s390_flic_kvm.c | 12 ------------
> include/hw/s390x/s390_flic.h | 9 ---------
> 3 files changed, 7 insertions(+), 23 deletions(-)
>
> diff --git a/hw/intc/s390_flic.c b/hw/intc/s390_flic.c
> index 6eaf178d79..a78bdf1d90 100644
> --- a/hw/intc/s390_flic.c
> +++ b/hw/intc/s390_flic.c
> @@ -40,11 +40,16 @@ void s390_flic_init(void)
> {
> DeviceState *dev;
>
> - dev = s390_flic_kvm_create();
> - if (!dev) {
> + if (kvm_enabled()) {
> + dev = qdev_create(NULL, TYPE_KVM_S390_FLIC);
> + object_property_add_child(qdev_get_machine(), TYPE_KVM_S390_FLIC,
> + OBJECT(dev), NULL);
> + } else if (tcg_enabled()) {
> dev = qdev_create(NULL, TYPE_QEMU_S390_FLIC);
> object_property_add_child(qdev_get_machine(), TYPE_QEMU_S390_FLIC,
> OBJECT(dev), NULL);
> + } else {
> + g_assert_not_reached();
> }
> qdev_init_nofail(dev);
> }
> diff --git a/hw/intc/s390_flic_kvm.c b/hw/intc/s390_flic_kvm.c
> index d208cb81c4..0cb5feab0c 100644
> --- a/hw/intc/s390_flic_kvm.c
> +++ b/hw/intc/s390_flic_kvm.c
> @@ -35,18 +35,6 @@ typedef struct KVMS390FLICState {
> bool clear_io_supported;
> } KVMS390FLICState;
>
> -DeviceState *s390_flic_kvm_create(void)
> -{
> - DeviceState *dev = NULL;
> -
> - if (kvm_enabled()) {
> - dev = qdev_create(NULL, TYPE_KVM_S390_FLIC);
> - object_property_add_child(qdev_get_machine(), TYPE_KVM_S390_FLIC,
> - OBJECT(dev), NULL);
> - }
> - return dev;
> -}
> -
> /**
> * flic_get_all_irqs - store all pending irqs in buffer
> * @buf: pointer to buffer which is passed to kernel
> diff --git a/include/hw/s390x/s390_flic.h b/include/hw/s390x/s390_flic.h
> index 7aab6ef7f0..5b00e936fa 100644
> --- a/include/hw/s390x/s390_flic.h
> +++ b/include/hw/s390x/s390_flic.h
> @@ -91,13 +91,4 @@ void s390_flic_init(void);
> S390FLICState *s390_get_flic(void);
> bool ais_needed(void *opaque);
>
> -#ifdef CONFIG_KVM
> -DeviceState *s390_flic_kvm_create(void);
> -#else
> -static inline DeviceState *s390_flic_kvm_create(void)
> -{
> - return NULL;
> -}
> -#endif
> -
> #endif /* HW_S390_FLIC_H */
>
