Do not include "qemu/error-report.h" in headers that do not need it

Include it in the .c files instead that use the error reporting
functions.

Message-Id: <20230210111931.1115489-1-thuth@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>

diff --git a/hw/display/vhost-user-gpu.c b/hw/display/vhost-user-gpu.c
index 4380a5e672645b1866f1bf09775e0876c8c22179..71dfd956b802ab990e2740fe6f861ad4f12ba61b 100644 (file)
--- a/hw/display/vhost-user-gpu.c
+++ b/hw/display/vhost-user-gpu.c
@@ -11,6 +11,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qemu/error-report.h"
 #include "qemu/sockets.h"
 #include "hw/qdev-properties.h"
 #include "hw/virtio/virtio-gpu.h"

diff --git a/hw/display/virtio-gpu-udmabuf.c b/hw/display/virtio-gpu-udmabuf.c
index 847fa4c0cc3214a4b1ba68325d12d45e4eefda2a..69e2cf0bd65d1c5ab746dc1f12dfc98e916698d4 100644 (file)
--- a/hw/display/virtio-gpu-udmabuf.c
+++ b/hw/display/virtio-gpu-udmabuf.c
@@ -12,6 +12,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qemu/error-report.h"
 #include "qemu/units.h"
 #include "qemu/iov.h"
 #include "ui/console.h"

diff --git a/hw/display/virtio-gpu-virgl.c b/hw/display/virtio-gpu-virgl.c
index 73cb92c8d5c6f00726cb27199b3e93da04754a4c..1c47603d40a21f9b4d04742a4a0e73eb92a70f31 100644 (file)
--- a/hw/display/virtio-gpu-virgl.c
+++ b/hw/display/virtio-gpu-virgl.c
@@ -12,6 +12,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qemu/error-report.h"
 #include "qemu/iov.h"
 #include "trace.h"
 #include "hw/virtio/virtio.h"

diff --git a/hw/misc/applesmc.c b/hw/misc/applesmc.c
index 5f9c742e504b5ca39423a338fdb633ffb9b98a99..72300d0cbc38b66cd530582684f1a0c5023639b4 100644 (file)
--- a/hw/misc/applesmc.c
+++ b/hw/misc/applesmc.c
@@ -34,6 +34,7 @@
 #include "hw/isa/isa.h"
 #include "hw/qdev-properties.h"
 #include "ui/console.h"
+#include "qemu/error-report.h"
 #include "qemu/module.h"
 #include "qemu/timer.h"
 #include "qom/object.h"

diff --git a/include/hw/arm/allwinner-a10.h b/include/hw/arm/allwinner-a10.h
index e0f2f7ab198284dfaef12375deb0b50ed04eb2b0..79e0c80568ec8db0d9a97a607bcba854a46162c7 100644 (file)
--- a/include/hw/arm/allwinner-a10.h
+++ b/include/hw/arm/allwinner-a10.h
@@ -1,7 +1,6 @@
 #ifndef HW_ARM_ALLWINNER_A10_H
 #define HW_ARM_ALLWINNER_A10_H
 
-#include "qemu/error-report.h"
 #include "hw/char/serial.h"
 #include "hw/arm/boot.h"
 #include "hw/pci/pci_device.h"

diff --git a/include/qemu/vhost-user-server.h b/include/qemu/vhost-user-server.h
index cd43193b809d9a09c1a6c1f8ed3b9435f91d0519..25c72433cab03fc49ba711288a4609f56ceb8a9a 100644 (file)
--- a/include/qemu/vhost-user-server.h
+++ b/include/qemu/vhost-user-server.h
@@ -15,7 +15,6 @@
 #include "io/channel-socket.h"
 #include "io/channel-file.h"
 #include "io/net-listener.h"
-#include "qemu/error-report.h"
 #include "qapi/error.h"
 #include "standard-headers/linux/virtio_blk.h"
 

diff --git a/include/ui/console.h b/include/ui/console.h
index 8e6cf782a11988709ea995ee2a5dbdb55dbc99ad..1cb53acc33088db07452ca6bb31306cc94e5fc00 100644 (file)
--- a/include/ui/console.h
+++ b/include/ui/console.h
@@ -4,7 +4,6 @@
 #include "ui/qemu-pixman.h"
 #include "qom/object.h"
 #include "qemu/notify.h"
-#include "qemu/error-report.h"
 #include "qapi/qapi-types-ui.h"
 
 #ifdef CONFIG_OPENGL

diff --git a/ui/console.c b/ui/console.c
index ab43561fe152cee7a5a4839e1cbdeeb8e6b9fae7..98b701f5a312224c47d51631d0d6e507ce2af452 100644 (file)
--- a/ui/console.c
+++ b/ui/console.c
@@ -28,6 +28,7 @@
 #include "qapi/error.h"
 #include "qapi/qapi-commands-ui.h"
 #include "qemu/coroutine.h"
+#include "qemu/error-report.h"
 #include "qemu/fifo8.h"
 #include "qemu/main-loop.h"
 #include "qemu/module.h"

diff --git a/ui/dbus-clipboard.c b/ui/dbus-clipboard.c
index 5843d26cd2cb6b681c1f85cda4fe7cdf707904f2..df9a754a8dc5555dd953b4a45ef406d019720682 100644 (file)
--- a/ui/dbus-clipboard.c
+++ b/ui/dbus-clipboard.c
@@ -23,6 +23,7 @@
  */
 #include "qemu/osdep.h"
 #include "qemu/dbus.h"
+#include "qemu/error-report.h"
 #include "qemu/main-loop.h"
 #include "qom/object_interfaces.h"
 #include "sysemu/sysemu.h"

diff --git a/ui/dbus-console.c b/ui/dbus-console.c
index 898a4ac8a5bae944c6b221d2229cf0bdf0443483..0bfaa2298d2e55c6f19dce2247b6f45d7e365496 100644 (file)
--- a/ui/dbus-console.c
+++ b/ui/dbus-console.c
@@ -22,6 +22,7 @@
  * THE SOFTWARE.
  */
 #include "qemu/osdep.h"
+#include "qemu/error-report.h"
 #include "qapi/error.h"
 #include "ui/input.h"
 #include "ui/kbd-state.h"

diff --git a/ui/dbus-listener.c b/ui/dbus-listener.c
index f9fc8eda519ac90cc739ab2cc03491be3311a738..57d4e401db5b837403592ca6c994b67ea540d3a2 100644 (file)
--- a/ui/dbus-listener.c
+++ b/ui/dbus-listener.c
@@ -22,6 +22,7 @@
  * THE SOFTWARE.
  */
 #include "qemu/osdep.h"
+#include "qemu/error-report.h"
 #include "sysemu/sysemu.h"
 #include "dbus.h"
 #include <gio/gunixfdlist.h>

diff --git a/ui/dbus.c b/ui/dbus.c
index 32d88dc94a7e253ffbb5f7555bc807d1c70c073f..f2dcba03d08884b0f2d88c6f3f2cee1fa409992a 100644 (file)
--- a/ui/dbus.c
+++ b/ui/dbus.c
@@ -23,6 +23,7 @@
  */
 #include "qemu/osdep.h"
 #include "qemu/cutils.h"
+#include "qemu/error-report.h"
 #include "qemu/dbus.h"
 #include "qemu/main-loop.h"
 #include "qemu/option.h"

diff --git a/ui/egl-headless.c b/ui/egl-headless.c
index 7a30fd9777654931c55e0b66bbdfa7c98480831d..ae07e9130247f395f36c56dea2b608ddbef0da39 100644 (file)
--- a/ui/egl-headless.c
+++ b/ui/egl-headless.c
@@ -1,4 +1,5 @@
 #include "qemu/osdep.h"
+#include "qemu/error-report.h"
 #include "qemu/module.h"
 #include "sysemu/sysemu.h"
 #include "ui/console.h"

diff --git a/ui/gtk.c b/ui/gtk.c
index 7f752d8b7d6ad95b5475c60a8f226e5ad22cdf80..fd82e9b1cae11e135306ac881f8da762defd35d1 100644 (file)
--- a/ui/gtk.c
+++ b/ui/gtk.c
@@ -36,6 +36,7 @@
 #include "qapi/qapi-commands-machine.h"
 #include "qapi/qapi-commands-misc.h"
 #include "qemu/cutils.h"
+#include "qemu/error-report.h"
 #include "qemu/main-loop.h"
 
 #include "ui/console.h"

diff --git a/ui/spice-app.c b/ui/spice-app.c
index 7e71e18da9ada83170b426b64f4ad0e4ded1a582..ad7f0551ad613004d72cd846154b91be5f262a7d 100644 (file)
--- a/ui/spice-app.c
+++ b/ui/spice-app.c
@@ -29,6 +29,7 @@
 #include "ui/console.h"
 #include "ui/spice-display.h"
 #include "qemu/config-file.h"
+#include "qemu/error-report.h"
 #include "qemu/option.h"
 #include "qemu/cutils.h"
 #include "qemu/module.h"

diff --git a/ui/spice-display.c b/ui/spice-display.c
index 0616a6982f1f5955358c1239bf707eac904c10f4..16802f99cbcb13dfda0f392f8a28b4db0675e85f 100644 (file)
--- a/ui/spice-display.c
+++ b/ui/spice-display.c
@@ -17,6 +17,7 @@
 
 #include "qemu/osdep.h"
 #include "ui/qemu-spice.h"
+#include "qemu/error-report.h"
 #include "qemu/timer.h"
 #include "qemu/lockable.h"
 #include "qemu/main-loop.h"

diff --git a/ui/udmabuf.c b/ui/udmabuf.c
index cbf4357bb1c2eb5cc82974c6483fbd15a7862f00..6a0a11a85defb6c6e65c0f11e5f8f44269c30ff3 100644 (file)
--- a/ui/udmabuf.c
+++ b/ui/udmabuf.c
@@ -7,6 +7,7 @@
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "ui/console.h"
+#include "qemu/error-report.h"
 
 #include <sys/ioctl.h>
 

diff --git a/ui/vdagent.c b/ui/vdagent.c
index 1f51a78da186fe97373f7ffca3ce71c667d31a52..8a651492f0955290886d57ed1a313cdf5730187c 100644 (file)
--- a/ui/vdagent.c
+++ b/ui/vdagent.c
@@ -2,6 +2,7 @@
 #include "qapi/error.h"
 #include "chardev/char.h"
 #include "qemu/buffer.h"
+#include "qemu/error-report.h"
 #include "qemu/option.h"
 #include "qemu/units.h"
 #include "hw/qdev-core.h"

diff --git a/util/vhost-user-server.c b/util/vhost-user-server.c
index 145eb17c086a585cd2219191c55298c97bf0deb7..40f36ea214b26c2a057e6fc22af6890f141db587 100644 (file)
--- a/util/vhost-user-server.c
+++ b/util/vhost-user-server.c
@@ -8,6 +8,7 @@
  * later.  See the COPYING file in the top-level directory.
  */
 #include "qemu/osdep.h"
+#include "qemu/error-report.h"
 #include "qemu/main-loop.h"
 #include "qemu/vhost-user-server.h"
 #include "block/aio-wait.h"