qom: Clean up includes

Clean up includes so that osdep.h is included first and headers
which it implies are not included manually.

This commit was created with scripts/clean-includes.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Message-id: 1454089805-5470-13-git-send-email-peter.maydell@linaro.org

diff --git a/qom/container.c b/qom/container.c
index 62b1648add8cf929d654cfd2699cf77f66563a37..c9eb49b01edb3a373366c159da0e57b318231933 100644 (file)
--- a/qom/container.c
+++ b/qom/container.c
@@ -10,9 +10,9 @@
  * See the COPYING file in the top-level directory.
  */
 
+#include "qemu/osdep.h"
 #include "qom/object.h"
 #include "qemu/module.h"
-#include <assert.h>
 
 static const TypeInfo container_info = {
     .name          = "container",

diff --git a/qom/object.c b/qom/object.c
index 5ff97ab91e6de02e2cac9c1228e593afe7ba9a6d..5904081ba9f79382b414d199a6218a254f113aeb 100644 (file)
--- a/qom/object.c
+++ b/qom/object.c
@@ -10,6 +10,7 @@
  * See the COPYING file in the top-level directory.
  */
 
+#include "qemu/osdep.h"
 #include "qom/object.h"
 #include "qom/object_interfaces.h"
 #include "qemu-common.h"

diff --git a/qom/object_interfaces.c b/qom/object_interfaces.c
index a66cd6026cf652b52188283b0dadf603d1f6dc9c..f1218f0cc15e7e7e4f9adae09c247e3642e82881 100644 (file)
--- a/qom/object_interfaces.c
+++ b/qom/object_interfaces.c
@@ -1,3 +1,4 @@
+#include "qemu/osdep.h"
 #include "qom/object_interfaces.h"
 #include "qemu/module.h"
 

diff --git a/qom/qom-qobject.c b/qom/qom-qobject.c
index 964989065b195a91f9d2a8227399862d77a11b21..9cbc4c69a6f23e7bcdfdf8d93c0ea639a0aca157 100644 (file)
--- a/qom/qom-qobject.c
+++ b/qom/qom-qobject.c
@@ -9,6 +9,7 @@
  * See the COPYING file in the top-level directory.
  */
 
+#include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "qom/object.h"
 #include "qom/qom-qobject.h"