From 801dbfce3d53962fc05b96b4e71f45b9127039fe Mon Sep 17 00:00:00 2001
From: Markus Armbruster <armbru@redhat.com>
Date: Thu, 8 Mar 2018 08:48:16 -0500
Subject: [PATCH] Include qapi/qmp/qobject.h exactly where needed

Backports commit 5ee9d2fe9e1e15d6e4a112220da3ad8a3512819b from qemu
---
 qemu/include/qapi/visitor.h | 2 +-
 qemu/qapi/qapi-visit-core.c | 1 -
 qemu/qobject/qbool.c        | 1 -
 qemu/qobject/qdict.c        | 1 -
 qemu/qobject/qlist.c        | 1 -
 qemu/qobject/qnum.c         | 1 -
 qemu/qobject/qstring.c      | 1 -
 qemu/qom/object.c           | 1 -
 8 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/qemu/include/qapi/visitor.h b/qemu/include/qapi/visitor.h
index 6394096a..62d0346d 100644
--- a/qemu/include/qapi/visitor.h
+++ b/qemu/include/qapi/visitor.h
@@ -15,7 +15,7 @@
 #define QAPI_VISITOR_H
 
 #include "qemu/typedefs.h"
-#include "qapi/qmp/qobject.h"
+#include "qapi-types.h"
 #include "qapi/error.h"
 #include <stdlib.h>
 
diff --git a/qemu/qapi/qapi-visit-core.c b/qemu/qapi/qapi-visit-core.c
index beaa128d..0e9cfd57 100644
--- a/qemu/qapi/qapi-visit-core.c
+++ b/qemu/qapi/qapi-visit-core.c
@@ -16,7 +16,6 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "qemu-common.h"
-#include "qapi/qmp/qobject.h"
 #include "qapi/qmp/qerror.h"
 #include "qapi/visitor.h"
 #include "qapi/visitor-impl.h"
diff --git a/qemu/qobject/qbool.c b/qemu/qobject/qbool.c
index ac825fc5..e5a7a538 100644
--- a/qemu/qobject/qbool.c
+++ b/qemu/qobject/qbool.c
@@ -13,7 +13,6 @@
 
 #include "qemu/osdep.h"
 #include "qapi/qmp/qbool.h"
-#include "qapi/qmp/qobject.h"
 #include "qemu-common.h"
 
 /**
diff --git a/qemu/qobject/qdict.c b/qemu/qobject/qdict.c
index ef0cd17c..9e546f94 100644
--- a/qemu/qobject/qdict.c
+++ b/qemu/qobject/qdict.c
@@ -16,7 +16,6 @@
 #include "qapi/qmp/qbool.h"
 #include "qapi/qmp/qnull.h"
 #include "qapi/qmp/qstring.h"
-#include "qapi/qmp/qobject.h"
 #include "qapi/error.h"
 #include "qemu/queue.h"
 #include "qemu-common.h"
diff --git a/qemu/qobject/qlist.c b/qemu/qobject/qlist.c
index 46dde3c7..e6da9995 100644
--- a/qemu/qobject/qlist.c
+++ b/qemu/qobject/qlist.c
@@ -15,7 +15,6 @@
 #include "qapi/qmp/qlist.h"
 #include "qapi/qmp/qnull.h"
 #include "qapi/qmp/qnum.h"
-#include "qapi/qmp/qobject.h"
 #include "qapi/qmp/qstring.h"
 #include "qemu/queue.h"
 #include "qemu-common.h"
diff --git a/qemu/qobject/qnum.c b/qemu/qobject/qnum.c
index 517610d9..60c395c1 100644
--- a/qemu/qobject/qnum.c
+++ b/qemu/qobject/qnum.c
@@ -14,7 +14,6 @@
 
 #include "qemu/osdep.h"
 #include "qapi/qmp/qnum.h"
-#include "qapi/qmp/qobject.h"
 #include "qemu-common.h"
 
 /**
diff --git a/qemu/qobject/qstring.c b/qemu/qobject/qstring.c
index 940b2c8d..06f0da80 100644
--- a/qemu/qobject/qstring.c
+++ b/qemu/qobject/qstring.c
@@ -11,7 +11,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "qapi/qmp/qobject.h"
 #include "qapi/qmp/qstring.h"
 #include "qemu-common.h"
 
diff --git a/qemu/qom/object.c b/qemu/qom/object.c
index 593a1d23..c8eb892d 100644
--- a/qemu/qom/object.c
+++ b/qemu/qom/object.c
@@ -22,7 +22,6 @@
 /* TODO: replace QObject with a simpler visitor to avoid a dependency
  * of the QOM core on QObject?  */
 #include "qom/qom-qobject.h"
-#include "qapi/qmp/qobject.h"
 #include "qapi/qmp/qbool.h"
 #include "qapi/qmp/qnum.h"
 #include "qapi/qmp/qstring.h"