Include qapi/qmp/qlist.h exactly where needed

This cleanup makes the number of objects depending on qapi/qmp/qlist.h
drop from 4551 (out of 4743) to 16 in my "build everything" tree.

While there, separate #include from file comment with a blank line.

Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20180201111846.21846-12-armbru@redhat.com>

diff --git a/block/qapi.c b/block/qapi.c
index 1e0cb2743d2770a5ee0520e1902cd61d354dfc78..12a8cb5a8242e1572114bd6205889a7355f0b847 100644 (file)
--- a/block/qapi.c
+++ b/block/qapi.c
@@ -32,6 +32,7 @@
 #include "qapi/error.h"
 #include "qapi/qobject-output-visitor.h"
 #include "qapi/qmp/qbool.h"
+#include "qapi/qmp/qlist.h"
 #include "qapi/qmp/qnum.h"
 #include "qapi/qmp/qstring.h"
 #include "sysemu/block-backend.h"

diff --git a/block/rbd.c b/block/rbd.c
index a76a5e8755b3be568d4cf3891b182f7c33595dc9..76b9e83cea7d184caf43f5eba65056921b2c9bee 100644 (file)
--- a/block/rbd.c
+++ b/block/rbd.c
@@ -21,6 +21,7 @@
 #include "qemu/cutils.h"
 #include "qapi/qmp/qstring.h"
 #include "qapi/qmp/qjson.h"
+#include "qapi/qmp/qlist.h"
 
 /*
  * When specifying the image filename use:

diff --git a/blockdev.c b/blockdev.c
index c487cf0e4b72fa75c4bc4b97773e4de0e6e5875a..90ef3166de4377067f1000c41e72aeacfc0623e2 100644 (file)
--- a/blockdev.c
+++ b/blockdev.c
@@ -45,6 +45,7 @@
 #include "qapi-visit.h"
 #include "qapi/error.h"
 #include "qapi/qmp/qerror.h"
+#include "qapi/qmp/qlist.h"
 #include "qapi/qobject-output-visitor.h"
 #include "sysemu/sysemu.h"
 #include "sysemu/iothread.h"

diff --git a/include/qapi/qmp/json-parser.h b/include/qapi/qmp/json-parser.h
index 9987f8ca85083a82c4cfd061570074734c395b12..102f5c006837e2733e389b9856bbabaae1542456 100644 (file)
--- a/include/qapi/qmp/json-parser.h
+++ b/include/qapi/qmp/json-parser.h
@@ -15,7 +15,6 @@
 #define QEMU_JSON_PARSER_H
 
 #include "qemu-common.h"
-#include "qapi/qmp/qlist.h"
 
 QObject *json_parser_parse(GQueue *tokens, va_list *ap);
 QObject *json_parser_parse_err(GQueue *tokens, va_list *ap, Error **errp);

diff --git a/include/qapi/qmp/qdict.h b/include/qapi/qmp/qdict.h
index 3c1def00f736d5be0219b4b4d2ae86289e8d8176..ff6f7842c34d23a1208a9a53ebd1d520a7807b95 100644 (file)
--- a/include/qapi/qmp/qdict.h
+++ b/include/qapi/qmp/qdict.h
@@ -14,7 +14,6 @@
 #define QDICT_H
 
 #include "qapi/qmp/qobject.h"
-#include "qapi/qmp/qlist.h"
 #include "qemu/queue.h"
 
 #define QDICT_BUCKET_MAX 512

diff --git a/qapi/qobject-input-visitor.c b/qapi/qobject-input-visitor.c
index 31183dcb6290080d8db3c7df70d2e5d24d8bb694..3e235a1eeefda7a10082becd2af8fd8a7e1b7a6c 100644 (file)
--- a/qapi/qobject-input-visitor.c
+++ b/qapi/qobject-input-visitor.c
@@ -22,6 +22,7 @@
 #include "qapi/qmp/qjson.h"
 #include "qapi/qmp/qbool.h"
 #include "qapi/qmp/qerror.h"
+#include "qapi/qmp/qlist.h"
 #include "qapi/qmp/qnull.h"
 #include "qapi/qmp/qnum.h"
 #include "qemu/cutils.h"

diff --git a/qapi/qobject-output-visitor.c b/qapi/qobject-output-visitor.c
index f0cc46b3cf82dcb8bd87a52aede2c12bf1a0d875..52634b97256d4e138c89a2b0f3d5506252544f87 100644 (file)
--- a/qapi/qobject-output-visitor.c
+++ b/qapi/qobject-output-visitor.c
@@ -18,6 +18,7 @@
 #include "qemu/queue.h"
 #include "qemu-common.h"
 #include "qapi/qmp/qbool.h"
+#include "qapi/qmp/qlist.h"
 #include "qapi/qmp/qnull.h"
 #include "qapi/qmp/qnum.h"
 #include "qapi/qmp/qstring.h"

diff --git a/qobject/json-parser.c b/qobject/json-parser.c
index 8f4badc6d9957eab2e1385799855fff23d2ba501..ee0cbba6a5ea96a5618b4fc7507b5f218ad6fc46 100644 (file)
--- a/qobject/json-parser.c
+++ b/qobject/json-parser.c
@@ -16,6 +16,7 @@
 #include "qapi/error.h"
 #include "qemu-common.h"
 #include "qapi/qmp/qbool.h"
+#include "qapi/qmp/qlist.h"
 #include "qapi/qmp/qnull.h"
 #include "qapi/qmp/qnum.h"
 #include "qapi/qmp/qstring.h"

diff --git a/qobject/qdict.c b/qobject/qdict.c
index 88f87d25272b8a3783068a1591f5aedf3349419e..23df84f9cdf33ea8c7fdb09da131f92efb0716be 100644 (file)
--- a/qobject/qdict.c
+++ b/qobject/qdict.c
@@ -14,6 +14,7 @@
 #include "qapi/qmp/qnum.h"
 #include "qapi/qmp/qdict.h"
 #include "qapi/qmp/qbool.h"
+#include "qapi/qmp/qlist.h"
 #include "qapi/qmp/qnull.h"
 #include "qapi/qmp/qstring.h"
 #include "qapi/error.h"

diff --git a/qobject/qjson.c b/qobject/qjson.c
index 7fbb68b6ba5ef029cb314440212c94ed59f79848..527b5bb5711cd05fad9b447464c65d2e84719baa 100644 (file)
--- a/qobject/qjson.c
+++ b/qobject/qjson.c
@@ -18,6 +18,7 @@
 #include "qapi/qmp/json-streamer.h"
 #include "qapi/qmp/qjson.h"
 #include "qapi/qmp/qbool.h"
+#include "qapi/qmp/qlist.h"
 #include "qapi/qmp/qnum.h"
 #include "qemu/unicode.h"
 

diff --git a/qobject/qlit.c b/qobject/qlit.c
index c2d0303425d179a93385eb51849e513fb84a49c7..948e0b860cd929f1eb7527ae594b69e33d8a43ae 100644 (file)
--- a/qobject/qlit.c
+++ b/qobject/qlit.c
@@ -17,6 +17,7 @@
 
 #include "qapi/qmp/qlit.h"
 #include "qapi/qmp/qbool.h"
+#include "qapi/qmp/qlist.h"
 #include "qapi/qmp/qnum.h"
 #include "qapi/qmp/qdict.h"
 #include "qapi/qmp/qstring.h"

diff --git a/qobject/qobject.c b/qobject/qobject.c
index 5bbcd0481283ee530138e66d26e1df9b08186767..23600aa1c1f07513075cd3a9e1ae3c6288015bfa 100644 (file)
--- a/qobject/qobject.c
+++ b/qobject/qobject.c
@@ -13,6 +13,7 @@
 #include "qapi/qmp/qnull.h"
 #include "qapi/qmp/qnum.h"
 #include "qapi/qmp/qdict.h"
+#include "qapi/qmp/qlist.h"
 #include "qapi/qmp/qstring.h"
 
 static void (*qdestroy[QTYPE__MAX])(QObject *) = {

diff --git a/tests/check-qdict.c b/tests/check-qdict.c
index 1b1173634f3c447fe7586366f6ee3b1c3860e45b..ec628f3453e19a87f6a05b17909fdac28b42a92a 100644 (file)
--- a/tests/check-qdict.c
+++ b/tests/check-qdict.c
@@ -9,9 +9,10 @@
  * 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.
  */
-#include "qemu/osdep.h"
 
+#include "qemu/osdep.h"
 #include "qapi/qmp/qdict.h"
+#include "qapi/qmp/qlist.h"
 #include "qapi/qmp/qnum.h"
 #include "qapi/qmp/qstring.h"
 #include "qapi/error.h"

diff --git a/tests/check-qlit.c b/tests/check-qlit.c
index c59ec1ab882d34fda11a8d069e2b64dcc0394bf5..b8b5016af7df4d265f037c4448b3c6e4dcd71e6a 100644 (file)
--- a/tests/check-qlit.c
+++ b/tests/check-qlit.c
@@ -11,6 +11,7 @@
 
 #include "qapi/qmp/qbool.h"
 #include "qapi/qmp/qdict.h"
+#include "qapi/qmp/qlist.h"
 #include "qapi/qmp/qlit.h"
 #include "qapi/qmp/qnum.h"
 #include "qapi/qmp/qstring.h"

diff --git a/tests/check-qobject.c b/tests/check-qobject.c
index 9e1e82045fe463955295d00e44bb95e353a4aa4d..885d0e3de688f522a94dbeb571fc87586a1f015e 100644 (file)
--- a/tests/check-qobject.c
+++ b/tests/check-qobject.c
@@ -6,9 +6,10 @@
  * 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.
  */
-#include "qemu/osdep.h"
 
+#include "qemu/osdep.h"
 #include "qapi/qmp/qbool.h"
+#include "qapi/qmp/qlist.h"
 #include "qapi/qmp/qnull.h"
 #include "qapi/qmp/qnum.h"
 #include "qapi/qmp/qstring.h"

diff --git a/tests/device-introspect-test.c b/tests/device-introspect-test.c
index f7162c023f5cfcfe23b9b5ce3d9c4dc7187661e8..2b3d01174d0474ca597e0f4cb670ad06eccef7d7 100644 (file)
--- a/tests/device-introspect-test.c
+++ b/tests/device-introspect-test.c
@@ -22,6 +22,7 @@
 #include "qapi/qmp/qstring.h"
 #include "qapi/qmp/qbool.h"
 #include "qapi/qmp/qdict.h"
+#include "qapi/qmp/qlist.h"
 #include "libqtest.h"
 
 const char common_args[] = "-nodefaults -machine none";

diff --git a/tests/libqtest.c b/tests/libqtest.c
index 0ec8af2923717270736074b95417b4bcdabec6b8..16d60818a785dd3ef5c503fb221f9f193b6682cc 100644 (file)
--- a/tests/libqtest.c
+++ b/tests/libqtest.c
@@ -12,8 +12,8 @@
  *
  * This work is licensed under the terms of the GNU GPL, version 2 or later.
  * See the COPYING file in the top-level directory.
- *
  */
+
 #include "qemu/osdep.h"
 #include "libqtest.h"
 
@@ -25,6 +25,7 @@
 #include "qapi/qmp/json-parser.h"
 #include "qapi/qmp/json-streamer.h"
 #include "qapi/qmp/qjson.h"
+#include "qapi/qmp/qlist.h"
 
 #define MAX_IRQ 256
 #define SOCKET_TIMEOUT 50

diff --git a/tests/numa-test.c b/tests/numa-test.c
index e1b6152244e681325cec1d090658eb08f90d64e5..8158854e1706fbebf4f433b92d7cd83e5c764f25 100644 (file)
--- a/tests/numa-test.c
+++ b/tests/numa-test.c
@@ -11,6 +11,7 @@
 
 #include "qemu/osdep.h"
 #include "libqtest.h"
+#include "qapi/qmp/qlist.h"
 
 static char *make_cli(const char *generic_cli, const char *test_cli)
 {

diff --git a/tests/qmp-test.c b/tests/qmp-test.c
index 36feb2204bc526e2f2caf057da3e819746c983eb..cc9661af47efcda8fc519c8c87a3bc56ac5c2245 100644 (file)
--- a/tests/qmp-test.c
+++ b/tests/qmp-test.c
@@ -14,6 +14,7 @@
 #include "libqtest.h"
 #include "qapi-visit.h"
 #include "qapi/error.h"
+#include "qapi/qmp/qlist.h"
 #include "qapi/qobject-input-visitor.h"
 #include "qapi/util.h"
 #include "qapi/visitor.h"

diff --git a/tests/qom-test.c b/tests/qom-test.c
index 0ee990710cc3e798af8231afe57aebfa748d2066..847703cb149206dfae908fb93b8c54b9a78f5723 100644 (file)
--- a/tests/qom-test.c
+++ b/tests/qom-test.c
@@ -10,6 +10,7 @@
 #include "qemu/osdep.h"
 
 #include "qemu-common.h"
+#include "qapi/qmp/qlist.h"
 #include "qemu/cutils.h"
 #include "libqtest.h"
 

diff --git a/tests/test-keyval.c b/tests/test-keyval.c
index baf7e339abbac0ecb6845c4cabb94ef8a868c6ad..d0c4bf2b9df0163f30f1c5bebc8c909f81881870 100644 (file)
--- a/tests/test-keyval.c
+++ b/tests/test-keyval.c
@@ -12,6 +12,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
+#include "qapi/qmp/qlist.h"
 #include "qapi/qmp/qstring.h"
 #include "qapi/qobject-input-visitor.h"
 #include "test-qapi-visit.h"

diff --git a/tests/test-qga.c b/tests/test-qga.c
index fd6bc7690f025d64ee85c544dfb3259bffc5cc16..e67c7289ebbd3506a0c94ae62b989d4975a3f351 100644 (file)
--- a/tests/test-qga.c
+++ b/tests/test-qga.c
@@ -5,6 +5,7 @@
 #include <sys/un.h>
 
 #include "libqtest.h"
+#include "qapi/qmp/qlist.h"
 
 typedef struct {
     char *test_dir;

diff --git a/tests/test-qobject-output-visitor.c b/tests/test-qobject-output-visitor.c
index 4a24e12121c84a55925a6f7e631650db4ed697fd..7cf86707ec9d8fc1097b3c64a9fb2d6565860da1 100644 (file)
--- a/tests/test-qobject-output-visitor.c
+++ b/tests/test-qobject-output-visitor.c
@@ -17,6 +17,7 @@
 #include "qapi/qobject-output-visitor.h"
 #include "test-qapi-visit.h"
 #include "qapi/qmp/qbool.h"
+#include "qapi/qmp/qlist.h"
 #include "qapi/qmp/qnull.h"
 #include "qapi/qmp/qnum.h"
 #include "qapi/qmp/qjson.h"

diff --git a/tests/test-x86-cpuid-compat.c b/tests/test-x86-cpuid-compat.c
index c594b5bd97a422a20fc5aad734611edba26fd9d2..495dd1e7ef3fc5906d3e28fa7a51e82fdeccfa79 100644 (file)
--- a/tests/test-x86-cpuid-compat.c
+++ b/tests/test-x86-cpuid-compat.c
@@ -1,6 +1,7 @@
 #include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "qapi/qmp/qdict.h"
+#include "qapi/qmp/qlist.h"
 #include "qapi/qmp/qnum.h"
 #include "qapi/qmp/qbool.h"
 #include "libqtest.h"

diff --git a/ui/vnc-palette.h b/ui/vnc-palette.h
index 1bd4318f5365994dd09967344804ad980f45d239..e9f0eaf73b85482998fa957e924a6ff602e987ba 100644 (file)
--- a/ui/vnc-palette.h
+++ b/ui/vnc-palette.h
@@ -29,7 +29,6 @@
 #ifndef VNC_PALETTE_H
 #define VNC_PALETTE_H
 
-#include "qapi/qmp/qlist.h"
 #include "qemu/queue.h"
 
 #define VNC_PALETTE_HASH_SIZE 256

diff --git a/util/keyval.c b/util/keyval.c
index 7dfc75cf0121680480859147a62638e4439f05dd..4085282a7a5cdf034170adc53e139626a02dcedb 100644 (file)
--- a/util/keyval.c
+++ b/util/keyval.c
@@ -81,6 +81,7 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
+#include "qapi/qmp/qlist.h"
 #include "qapi/qmp/qstring.h"
 #include "qemu/cutils.h"
 #include "qemu/option.h"

diff --git a/util/qemu-config.c b/util/qemu-config.c
index 26ea248062d86727a6fd333ef3ed9bd53b1141bf..230c699a513e6d117ff5abf3c5d1f44a33faedd6 100644 (file)
--- a/util/qemu-config.c
+++ b/util/qemu-config.c
@@ -1,5 +1,6 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
+#include "qapi/qmp/qlist.h"
 #include "qemu-common.h"
 #include "qemu/error-report.h"
 #include "qemu/option.h"