hw/intc: Clean up includes

[mirror_qemu.git] / hw / intc / s390_flic.c

diff --git a/hw/intc/s390_flic.c b/hw/intc/s390_flic.c
index 03c5e89f4eae420d66fdf900f628d30b2deb7531..bc75fa7d95d7e17e3fcfa4097a7d3c6905e817ec 100644 (file)
--- a/hw/intc/s390_flic.c
+++ b/hw/intc/s390_flic.c
@@ -10,6 +10,7 @@
  * directory.
  */
 
+#include "qemu/osdep.h"
 #include "qemu/error-report.h"
 #include "hw/sysbus.h"
 #include "migration/qemu-file.h"
@@ -30,7 +31,6 @@ S390FLICState *s390_get_flic(void)
 void s390_flic_init(void)
 {
     DeviceState *dev;
-    int r;
 
     dev = s390_flic_kvm_create();
     if (!dev) {
@@ -38,10 +38,7 @@ void s390_flic_init(void)
         object_property_add_child(qdev_get_machine(), TYPE_QEMU_S390_FLIC,
                                   OBJECT(dev), NULL);
     }
-    r = qdev_init(dev);
-    if (r) {
-        error_report("flic: couldn't create qdev");
-    }
+    qdev_init_nofail(dev);
 }
 
 static int qemu_s390_register_io_adapter(S390FLICState *fs, uint32_t id,