Eliminate qapi/qmp/types.h

qapi/qmp/types.h is a convenience header to include a number of
qapi/qmp/ headers. Since we rarely need all of the headers
qapi/qmp/types.h includes, we bypass it most of the time. Most of the
places that use it don't need all the headers, either.

Include the necessary headers directly, and drop qapi/qmp/types.h.

Backports commit 6b67395762a4c8b6ca94364e0a0f616a6470c46a from qemu

msvc/unicorn/unicorn/unicorn.vcxproj

@@ -321,13 +321,11 @@ copy $(SolutionDir)..\include\unicorn\*.h $(SolutionDir)distro\include\unicorn\
     <ClInclude Include="..\..\..\qemu\include\qapi\qmp\qbool.h" />
     <ClInclude Include="..\..\..\qemu\include\qapi\qmp\qdict.h" />
     <ClInclude Include="..\..\..\qemu\include\qapi\qmp\qerror.h" />
-    <ClInclude Include="..\..\..\qemu\include\qapi\qmp\qfloat.h" />
-    <ClInclude Include="..\..\..\qemu\include\qapi\qmp\qint.h" />
     <ClInclude Include="..\..\..\qemu\include\qapi\qmp\qjson.h" />
     <ClInclude Include="..\..\..\qemu\include\qapi\qmp\qlist.h" />
+    <ClInclude Include="..\..\..\qemu\include\qapi\qmp\qnum.h" />
     <ClInclude Include="..\..\..\qemu\include\qapi\qmp\qobject.h" />
     <ClInclude Include="..\..\..\qemu\include\qapi\qmp\qstring.h" />
-    <ClInclude Include="..\..\..\qemu\include\qapi\qmp\types.h" />
     <ClInclude Include="..\..\..\qemu\include\qapi\string-input-visitor.h" />
     <ClInclude Include="..\..\..\qemu\include\qapi\visitor-impl.h" />
     <ClInclude Include="..\..\..\qemu\include\qapi\visitor.h" />

msvc/unicorn/unicorn/unicorn.vcxproj.filters

@@ -406,27 +406,21 @@
     <ClInclude Include="..\..\..\qemu\include\qapi\qmp\qerror.h">
       <Filter>qemu\include\qapi\qmp</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\qemu\include\qapi\qmp\qfloat.h">
-      <Filter>qemu\include\qapi\qmp</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\qemu\include\qapi\qmp\qint.h">
-      <Filter>qemu\include\qapi\qmp</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\qemu\include\qapi\qmp\qjson.h">
       <Filter>qemu\include\qapi\qmp</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\qemu\include\qapi\qmp\qlist.h">
       <Filter>qemu\include\qapi\qmp</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\qemu\include\qapi\qmp\qnum.h">
+      <Filter>qemu\include\qapi\qmp</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\..\qemu\include\qapi\qmp\qobject.h">
       <Filter>qemu\include\qapi\qmp</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\qemu\include\qapi\qmp\qstring.h">
       <Filter>qemu\include\qapi\qmp</Filter>
-    </ClInclude>
+    </ClInclude
-    <ClInclude Include="..\..\..\qemu\include\qapi\qmp\types.h">
-      <Filter>qemu\include\qapi\qmp</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\qemu\include\qemu\atomic.h">
       <Filter>qemu\include\qemu</Filter>
     </ClInclude>

msvc/unicorn/unicorn_static/unicorn_static.vcxproj

@@ -141,7 +141,6 @@
     <ClInclude Include="..\..\..\qemu\include\qapi\qmp\qlist.h" />
     <ClInclude Include="..\..\..\qemu\include\qapi\qmp\qobject.h" />
     <ClInclude Include="..\..\..\qemu\include\qapi\qmp\qstring.h" />
-    <ClInclude Include="..\..\..\qemu\include\qapi\qmp\types.h" />
     <ClInclude Include="..\..\..\qemu\include\qapi\string-input-visitor.h" />
     <ClInclude Include="..\..\..\qemu\include\qapi\visitor-impl.h" />
     <ClInclude Include="..\..\..\qemu\include\qapi\visitor.h" />

msvc/unicorn/unicorn_static/unicorn_static.vcxproj.filters

@@ -396,27 +396,21 @@
     <ClInclude Include="..\..\..\qemu\include\qapi\qmp\qerror.h">
       <Filter>qemu\include\qapi\qmp</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\qemu\include\qapi\qmp\qfloat.h">
-      <Filter>qemu\include\qapi\qmp</Filter>
-    </ClInclude>
-    <ClInclude Include="..\..\..\qemu\include\qapi\qmp\qint.h">
-      <Filter>qemu\include\qapi\qmp</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\qemu\include\qapi\qmp\qjson.h">
       <Filter>qemu\include\qapi\qmp</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\qemu\include\qapi\qmp\qlist.h">
       <Filter>qemu\include\qapi\qmp</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\qemu\include\qapi\qmp\qnum.h">
+      <Filter>qemu\include\qapi\qmp</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\..\qemu\include\qapi\qmp\qobject.h">
       <Filter>qemu\include\qapi\qmp</Filter>
     </ClInclude>
     <ClInclude Include="..\..\..\qemu\include\qapi\qmp\qstring.h">
       <Filter>qemu\include\qapi\qmp</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\qemu\include\qapi\qmp\types.h">
-      <Filter>qemu\include\qapi\qmp</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\qemu\include\qemu\atomic.h">
       <Filter>qemu\include\qemu</Filter>
     </ClInclude>

qemu/include/qapi/qmp/types.h

@@ -1,24 +0,0 @@
-/*
- * Include all QEMU objects.
- *
- * Copyright (C) 2009 Red Hat Inc.
- *
- * Authors:
- *  Luiz Capitulino <lcapitulino@redhat.com>
- *
- * This work is licensed under the terms of the GNU LGPL, version 2.1 or later.
- * See the COPYING.LIB file in the top-level directory.
- */
-
-#ifndef QAPI_QMP_TYPES_H
-#define QAPI_QMP_TYPES_H
-
-#include "qapi/qmp/qobject.h"
-#include "qapi/qmp/qnum.h"
-#include "qapi/qmp/qbool.h"
-#include "qapi/qmp/qstring.h"
-#include "qapi/qmp/qdict.h"
-#include "qapi/qmp/qlist.h"
-#include "qapi/qmp/qjson.h"
-
-#endif /* QAPI_QMP_TYPES_H */

qemu/qapi/qapi-dealloc-visitor.c

@@ -16,7 +16,6 @@
 #include "qapi/dealloc-visitor.h"
 #include "qemu/queue.h"
 #include "qemu-common.h"
-#include "qapi/qmp/types.h"
 #include "qapi/visitor-impl.h"
 
 struct QapiDeallocVisitor

qemu/qapi/qobject-input-visitor.c

@@ -17,8 +17,11 @@
 #include "qapi/visitor-impl.h"
 #include "qemu/queue.h"
 #include "qemu-common.h"
-#include "qapi/qmp/types.h"
+#include "qapi/qmp/qbool.h"
+#include "qapi/qmp/qdict.h"
+#include "qapi/qmp/qlist.h"
 #include "qapi/qmp/qerror.h"
+#include "qapi/qmp/qstring.h"
 
 typedef struct StackObject {
     const char *name;            /* Name of @obj in its parent, if any */

qemu/qapi/qobject-output-visitor.c

@@ -17,7 +17,10 @@
 #include "qapi/visitor-impl.h"
 #include "qemu/queue.h"
 #include "qemu-common.h"
-#include "qapi/qmp/types.h"
+#include "qapi/qmp/qbool.h"
+#include "qapi/qmp/qdict.h"
+#include "qapi/qmp/qlist.h"
+#include "qapi/qmp/qstring.h"
 #include "qapi/qmp/qerror.h"
 
 typedef struct QStackEntry