Include qapi/qmp/qbool.h exactly where needed

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-15-armbru@redhat.com>

diff --git a/block.c b/block.c
index 43cc8bcf4a67deeb648b8d130a00bf331784bde5..fba6b270206e8c1412be488440aebb764a94e7a0 100644 (file)
--- a/block.c
+++ b/block.c
@@ -33,7 +33,6 @@
 #include "qapi/error.h"
 #include "qapi/qmp/qdict.h"
 #include "qapi/qmp/qerror.h"
-#include "qapi/qmp/qbool.h"
 #include "qapi/qmp/qjson.h"
 #include "qapi/qmp/qstring.h"
 #include "sysemu/block-backend.h"

diff --git a/block/blkdebug.c b/block/blkdebug.c
index e21669979da198ed47184fd606bf74d185a081fd..356538482d66421755789d9ca5d51b5606581096 100644 (file)
--- a/block/blkdebug.c
+++ b/block/blkdebug.c
@@ -29,7 +29,6 @@
 #include "qemu/config-file.h"
 #include "block/block_int.h"
 #include "qemu/module.h"
-#include "qapi/qmp/qbool.h"
 #include "qapi/qmp/qdict.h"
 #include "qapi/qmp/qstring.h"
 #include "sysemu/qtest.h"

diff --git a/block/curl.c b/block/curl.c
index eafa97cd72ae6ccf3a37e80347aa8da3ab244ee9..439481c8d48bf7e323475504913ba2adf5c22e0c 100644 (file)
--- a/block/curl.c
+++ b/block/curl.c
@@ -27,7 +27,6 @@
 #include "qemu-common.h"
 #include "qemu/error-report.h"
 #include "block/block_int.h"
-#include "qapi/qmp/qbool.h"
 #include "qapi/qmp/qdict.h"
 #include "qapi/qmp/qstring.h"
 #include "crypto/secret.h"

diff --git a/block/qcow2.c b/block/qcow2.c
index 700c06245bc25a5f8d167efe89384e9ec323b099..a64a572785d2934ee3a9fca0b25be1736b3b9760 100644 (file)
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -31,7 +31,6 @@
 #include "qemu/error-report.h"
 #include "qapi/error.h"
 #include "qapi/qmp/qerror.h"
-#include "qapi/qmp/qbool.h"
 #include "qapi/qmp/qdict.h"
 #include "qapi/qmp/qstring.h"
 #include "qapi-event.h"

diff --git a/block/quorum.c b/block/quorum.c
index ec427c39e7415b18314b84b358cf1e7b371856a4..980403f63ec8a2587a42cdf70178664f0ee63bbd 100644 (file)
--- a/block/quorum.c
+++ b/block/quorum.c
@@ -17,7 +17,6 @@
 #include "qemu/cutils.h"
 #include "block/block_int.h"
 #include "qapi/error.h"
-#include "qapi/qmp/qbool.h"
 #include "qapi/qmp/qdict.h"
 #include "qapi/qmp/qerror.h"
 #include "qapi/qmp/qjson.h"

diff --git a/block/vvfat.c b/block/vvfat.c
index 93e76580b066fcc159f4004f80b901f30ea9d8c4..5dca227311d130ddb9408781874dd3a72c8dd462 100644 (file)
--- a/block/vvfat.c
+++ b/block/vvfat.c
@@ -30,7 +30,6 @@
 #include "qemu/module.h"
 #include "qemu/bswap.h"
 #include "migration/blocker.h"
-#include "qapi/qmp/qbool.h"
 #include "qapi/qmp/qdict.h"
 #include "qapi/qmp/qstring.h"
 #include "qemu/cutils.h"

diff --git a/hw/usb/xen-usb.c b/hw/usb/xen-usb.c
index 3b678685e129faeb8ad67d01c396b602c63c83c1..e9eb1e902fe659aae4b17ceea2512fcda5bd96d6 100644 (file)
--- a/hw/usb/xen-usb.c
+++ b/hw/usb/xen-usb.c
@@ -29,7 +29,6 @@
 #include "hw/usb.h"
 #include "hw/xen/xen_backend.h"
 #include "monitor/qdev.h"
-#include "qapi/qmp/qbool.h"
 #include "qapi/qmp/qdict.h"
 #include "qapi/qmp/qstring.h"
 

diff --git a/monitor.c b/monitor.c
index d7f35498d589df8e57287965f0c68413f0b0b955..366ddfe5891a5a4ecc7bd16d721c2d692a2b2d63 100644 (file)
--- a/monitor.c
+++ b/monitor.c
@@ -54,7 +54,6 @@
 #include "sysemu/tpm.h"
 #include "qapi/qmp/qdict.h"
 #include "qapi/qmp/qerror.h"
-#include "qapi/qmp/qbool.h"
 #include "qapi/qmp/qnum.h"
 #include "qapi/qmp/qstring.h"
 #include "qapi/qmp/qjson.h"

diff --git a/qemu-img.c b/qemu-img.c
index a85eb3536eb3c5bf6e7a00750a9c8e325749352b..56edc152181de05e3dc20b2de4f6a3aaec187aa9 100644 (file)
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -30,7 +30,6 @@
 #include "qapi-visit.h"
 #include "qapi/qobject-output-visitor.h"
 #include "qapi/qmp/qjson.h"
-#include "qapi/qmp/qbool.h"
 #include "qapi/qmp/qdict.h"
 #include "qapi/qmp/qstring.h"
 #include "qemu/cutils.h"

diff --git a/qemu-io.c b/qemu-io.c
index 2e5737ce9c5c717139553d3b96790240473f3aba..f554ab614bb60e5ca28f8e6b87f710857343145c 100644 (file)
--- a/qemu-io.c
+++ b/qemu-io.c
@@ -21,7 +21,6 @@
 #include "qemu/readline.h"
 #include "qemu/log.h"
 #include "qapi/qmp/qstring.h"
-#include "qapi/qmp/qbool.h"
 #include "qapi/qmp/qdict.h"
 #include "qom/object_interfaces.h"
 #include "sysemu/block-backend.h"

diff --git a/target/s390x/cpu_models.c b/target/s390x/cpu_models.c
index 27201c4f91de02174aac081d67b7c0007306e3c6..584c409a1902a6515460a27067b00e1489f02251 100644 (file)
--- a/target/s390x/cpu_models.c
+++ b/target/s390x/cpu_models.c
@@ -20,7 +20,6 @@
 #include "qemu/error-report.h"
 #include "qapi/qmp/qerror.h"
 #include "qapi/qobject-input-visitor.h"
-#include "qapi/qmp/qbool.h"
 #include "qapi/qmp/qdict.h"
 #ifndef CONFIG_USER_ONLY
 #include "sysemu/arch_init.h"

diff --git a/tests/check-qlit.c b/tests/check-qlit.c
index b8b5016af7df4d265f037c4448b3c6e4dcd71e6a..f012885534a77ea52daa91d72c3ef88852dc4ac8 100644 (file)
--- a/tests/check-qlit.c
+++ b/tests/check-qlit.c
@@ -9,7 +9,6 @@
 
 #include "qemu/osdep.h"
 
-#include "qapi/qmp/qbool.h"
 #include "qapi/qmp/qdict.h"
 #include "qapi/qmp/qlist.h"
 #include "qapi/qmp/qlit.h"

diff --git a/tests/device-introspect-test.c b/tests/device-introspect-test.c
index 2b3d01174d0474ca597e0f4cb670ad06eccef7d7..b80058fe98889bb5a658ad10ab49c2a18f0ee317 100644 (file)
--- a/tests/device-introspect-test.c
+++ b/tests/device-introspect-test.c
@@ -20,7 +20,6 @@
 #include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "qapi/qmp/qstring.h"
-#include "qapi/qmp/qbool.h"
 #include "qapi/qmp/qdict.h"
 #include "qapi/qmp/qlist.h"
 #include "libqtest.h"

diff --git a/ui/spice-core.c b/ui/spice-core.c
index c4d67e678c4260c9d5adb749ae2a57013d71b7b2..03f9e83456e2b05b6d17dae1dba546c1b4934fbd 100644 (file)
--- a/ui/spice-core.c
+++ b/ui/spice-core.c
@@ -31,7 +31,6 @@
 #include "qemu/sockets.h"
 #include "qmp-commands.h"
 #include "qapi/error.h"
-#include "qapi/qmp/qbool.h"
 #include "qapi/qmp/qjson.h"
 #include "qemu/notify.h"
 #include "migration/misc.h"