s390x/flic: simplify flic initialization
This makes it clearer, which device is used for which accelerator. Reviewed-by: Christian Borntraeger <borntraeger@de.ibm.com> Signed-off-by: David Hildenbrand <david@redhat.com> Message-Id: <20180129125623.21729-3-david@redhat.com> Signed-off-by: Cornelia Huck <cohuck@redhat.com>
This commit is contained in:
parent
ce204cba74
commit
e2ac12f014
|
@ -40,8 +40,11 @@ void s390_flic_init(void)
|
||||||
{
|
{
|
||||||
DeviceState *dev;
|
DeviceState *dev;
|
||||||
|
|
||||||
dev = s390_flic_kvm_create();
|
if (kvm_enabled()) {
|
||||||
if (!dev) {
|
dev = qdev_create(NULL, TYPE_KVM_S390_FLIC);
|
||||||
|
object_property_add_child(qdev_get_machine(), TYPE_KVM_S390_FLIC,
|
||||||
|
OBJECT(dev), NULL);
|
||||||
|
} else {
|
||||||
dev = qdev_create(NULL, TYPE_QEMU_S390_FLIC);
|
dev = qdev_create(NULL, TYPE_QEMU_S390_FLIC);
|
||||||
object_property_add_child(qdev_get_machine(), TYPE_QEMU_S390_FLIC,
|
object_property_add_child(qdev_get_machine(), TYPE_QEMU_S390_FLIC,
|
||||||
OBJECT(dev), NULL);
|
OBJECT(dev), NULL);
|
||||||
|
|
|
@ -35,18 +35,6 @@ typedef struct KVMS390FLICState {
|
||||||
bool clear_io_supported;
|
bool clear_io_supported;
|
||||||
} KVMS390FLICState;
|
} 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
|
* flic_get_all_irqs - store all pending irqs in buffer
|
||||||
* @buf: pointer to buffer which is passed to kernel
|
* @buf: pointer to buffer which is passed to kernel
|
||||||
|
|
|
@ -91,13 +91,4 @@ void s390_flic_init(void);
|
||||||
S390FLICState *s390_get_flic(void);
|
S390FLICState *s390_get_flic(void);
|
||||||
bool ais_needed(void *opaque);
|
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 */
|
#endif /* HW_S390_FLIC_H */
|
||||||
|
|
Loading…
Reference in a new issue