On Tue, 12 Dec 2017 11:45:22 +0100 David Hildenbrand <da...@redhat.com> wrote:
> This is what it looks like now: > > commit dec1ff5cfc72fa0998e28a25dd23f0695ddfe21b > Author: David Hildenbrand <da...@redhat.com> > Date: Mon Nov 13 23:09:56 2017 +0100 > > s390x/flic: simplify flic initialization > > This makes it clearer, which device is used for which accelerator. > > We can directly attach both to /machine/s390-flic/ instead of two > different locations (/machine/s390x-flic[qemu|kvm]). Should not > harm migration. Not sure about libvirt usage, though. Let's keep it as-is? > > Reviewed-by: Christian Borntraeger <borntrae...@de.ibm.com> > Signed-off-by: David Hildenbrand <da...@redhat.com> > > diff --git a/hw/intc/s390_flic.c b/hw/intc/s390_flic.c > index 6eaf178d79..dd5b157392 100644 > --- a/hw/intc/s390_flic.c > +++ b/hw/intc/s390_flic.c > @@ -40,12 +40,13 @@ 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); > + } else { > dev = qdev_create(NULL, TYPE_QEMU_S390_FLIC); > - object_property_add_child(qdev_get_machine(), TYPE_QEMU_S390_FLIC, > - OBJECT(dev), NULL); > } > + object_property_add_child(qdev_get_machine(), TYPE_S390_FLIC_COMMON, > + OBJECT(dev), NULL); Dropping the check for tcg_enabled() is fine with me, though. > qdev_init_nofail(dev); > } > > ... >