From: Peter Maydell <peter.maydell@linaro.org>
Date: Fri, 29 Jan 2016 17:50:02 +0000 (+0000)
Subject: qom: Clean up includes
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=9bbc853bd4fc6e4cbdbfc8d52eab0730d3ba94ba;p=people%2Fliuw%2Flibxenctrl-split%2Fqemu-xen.git

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 62b1648ad..c9eb49b01 100644
--- 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 5ff97ab91..5904081ba 100644
--- 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 a66cd6026..f1218f0cc 100644
--- 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 964989065..9cbc4c69a 100644
--- 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"