소스 검색

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>
Thomas Huth 2 년 전
부모
커밋
5feed38c21

+ 1 - 0
hw/display/vhost-user-gpu.c

@@ -11,6 +11,7 @@
  */
  */
 
 
 #include "qemu/osdep.h"
 #include "qemu/osdep.h"
+#include "qemu/error-report.h"
 #include "qemu/sockets.h"
 #include "qemu/sockets.h"
 #include "hw/qdev-properties.h"
 #include "hw/qdev-properties.h"
 #include "hw/virtio/virtio-gpu.h"
 #include "hw/virtio/virtio-gpu.h"

+ 1 - 0
hw/display/virtio-gpu-udmabuf.c

@@ -12,6 +12,7 @@
  */
  */
 
 
 #include "qemu/osdep.h"
 #include "qemu/osdep.h"
+#include "qemu/error-report.h"
 #include "qemu/units.h"
 #include "qemu/units.h"
 #include "qemu/iov.h"
 #include "qemu/iov.h"
 #include "ui/console.h"
 #include "ui/console.h"

+ 1 - 0
hw/display/virtio-gpu-virgl.c

@@ -12,6 +12,7 @@
  */
  */
 
 
 #include "qemu/osdep.h"
 #include "qemu/osdep.h"
+#include "qemu/error-report.h"
 #include "qemu/iov.h"
 #include "qemu/iov.h"
 #include "trace.h"
 #include "trace.h"
 #include "hw/virtio/virtio.h"
 #include "hw/virtio/virtio.h"

+ 1 - 0
hw/misc/applesmc.c

@@ -34,6 +34,7 @@
 #include "hw/isa/isa.h"
 #include "hw/isa/isa.h"
 #include "hw/qdev-properties.h"
 #include "hw/qdev-properties.h"
 #include "ui/console.h"
 #include "ui/console.h"
+#include "qemu/error-report.h"
 #include "qemu/module.h"
 #include "qemu/module.h"
 #include "qemu/timer.h"
 #include "qemu/timer.h"
 #include "qom/object.h"
 #include "qom/object.h"

+ 0 - 1
include/hw/arm/allwinner-a10.h

@@ -1,7 +1,6 @@
 #ifndef HW_ARM_ALLWINNER_A10_H
 #ifndef HW_ARM_ALLWINNER_A10_H
 #define HW_ARM_ALLWINNER_A10_H
 #define HW_ARM_ALLWINNER_A10_H
 
 
-#include "qemu/error-report.h"
 #include "hw/char/serial.h"
 #include "hw/char/serial.h"
 #include "hw/arm/boot.h"
 #include "hw/arm/boot.h"
 #include "hw/pci/pci_device.h"
 #include "hw/pci/pci_device.h"

+ 0 - 1
include/qemu/vhost-user-server.h

@@ -15,7 +15,6 @@
 #include "io/channel-socket.h"
 #include "io/channel-socket.h"
 #include "io/channel-file.h"
 #include "io/channel-file.h"
 #include "io/net-listener.h"
 #include "io/net-listener.h"
-#include "qemu/error-report.h"
 #include "qapi/error.h"
 #include "qapi/error.h"
 #include "standard-headers/linux/virtio_blk.h"
 #include "standard-headers/linux/virtio_blk.h"
 
 

+ 0 - 1
include/ui/console.h

@@ -4,7 +4,6 @@
 #include "ui/qemu-pixman.h"
 #include "ui/qemu-pixman.h"
 #include "qom/object.h"
 #include "qom/object.h"
 #include "qemu/notify.h"
 #include "qemu/notify.h"
-#include "qemu/error-report.h"
 #include "qapi/qapi-types-ui.h"
 #include "qapi/qapi-types-ui.h"
 
 
 #ifdef CONFIG_OPENGL
 #ifdef CONFIG_OPENGL

+ 1 - 0
ui/console.c

@@ -28,6 +28,7 @@
 #include "qapi/error.h"
 #include "qapi/error.h"
 #include "qapi/qapi-commands-ui.h"
 #include "qapi/qapi-commands-ui.h"
 #include "qemu/coroutine.h"
 #include "qemu/coroutine.h"
+#include "qemu/error-report.h"
 #include "qemu/fifo8.h"
 #include "qemu/fifo8.h"
 #include "qemu/main-loop.h"
 #include "qemu/main-loop.h"
 #include "qemu/module.h"
 #include "qemu/module.h"

+ 1 - 0
ui/dbus-clipboard.c

@@ -23,6 +23,7 @@
  */
  */
 #include "qemu/osdep.h"
 #include "qemu/osdep.h"
 #include "qemu/dbus.h"
 #include "qemu/dbus.h"
+#include "qemu/error-report.h"
 #include "qemu/main-loop.h"
 #include "qemu/main-loop.h"
 #include "qom/object_interfaces.h"
 #include "qom/object_interfaces.h"
 #include "sysemu/sysemu.h"
 #include "sysemu/sysemu.h"

+ 1 - 0
ui/dbus-console.c

@@ -22,6 +22,7 @@
  * THE SOFTWARE.
  * THE SOFTWARE.
  */
  */
 #include "qemu/osdep.h"
 #include "qemu/osdep.h"
+#include "qemu/error-report.h"
 #include "qapi/error.h"
 #include "qapi/error.h"
 #include "ui/input.h"
 #include "ui/input.h"
 #include "ui/kbd-state.h"
 #include "ui/kbd-state.h"

+ 1 - 0
ui/dbus-listener.c

@@ -22,6 +22,7 @@
  * THE SOFTWARE.
  * THE SOFTWARE.
  */
  */
 #include "qemu/osdep.h"
 #include "qemu/osdep.h"
+#include "qemu/error-report.h"
 #include "sysemu/sysemu.h"
 #include "sysemu/sysemu.h"
 #include "dbus.h"
 #include "dbus.h"
 #include <gio/gunixfdlist.h>
 #include <gio/gunixfdlist.h>

+ 1 - 0
ui/dbus.c

@@ -23,6 +23,7 @@
  */
  */
 #include "qemu/osdep.h"
 #include "qemu/osdep.h"
 #include "qemu/cutils.h"
 #include "qemu/cutils.h"
+#include "qemu/error-report.h"
 #include "qemu/dbus.h"
 #include "qemu/dbus.h"
 #include "qemu/main-loop.h"
 #include "qemu/main-loop.h"
 #include "qemu/option.h"
 #include "qemu/option.h"

+ 1 - 0
ui/egl-headless.c

@@ -1,4 +1,5 @@
 #include "qemu/osdep.h"
 #include "qemu/osdep.h"
+#include "qemu/error-report.h"
 #include "qemu/module.h"
 #include "qemu/module.h"
 #include "sysemu/sysemu.h"
 #include "sysemu/sysemu.h"
 #include "ui/console.h"
 #include "ui/console.h"

+ 1 - 0
ui/gtk.c

@@ -36,6 +36,7 @@
 #include "qapi/qapi-commands-machine.h"
 #include "qapi/qapi-commands-machine.h"
 #include "qapi/qapi-commands-misc.h"
 #include "qapi/qapi-commands-misc.h"
 #include "qemu/cutils.h"
 #include "qemu/cutils.h"
+#include "qemu/error-report.h"
 #include "qemu/main-loop.h"
 #include "qemu/main-loop.h"
 
 
 #include "ui/console.h"
 #include "ui/console.h"

+ 1 - 0
ui/spice-app.c

@@ -29,6 +29,7 @@
 #include "ui/console.h"
 #include "ui/console.h"
 #include "ui/spice-display.h"
 #include "ui/spice-display.h"
 #include "qemu/config-file.h"
 #include "qemu/config-file.h"
+#include "qemu/error-report.h"
 #include "qemu/option.h"
 #include "qemu/option.h"
 #include "qemu/cutils.h"
 #include "qemu/cutils.h"
 #include "qemu/module.h"
 #include "qemu/module.h"

+ 1 - 0
ui/spice-display.c

@@ -17,6 +17,7 @@
 
 
 #include "qemu/osdep.h"
 #include "qemu/osdep.h"
 #include "ui/qemu-spice.h"
 #include "ui/qemu-spice.h"
+#include "qemu/error-report.h"
 #include "qemu/timer.h"
 #include "qemu/timer.h"
 #include "qemu/lockable.h"
 #include "qemu/lockable.h"
 #include "qemu/main-loop.h"
 #include "qemu/main-loop.h"

+ 1 - 0
ui/udmabuf.c

@@ -7,6 +7,7 @@
 #include "qemu/osdep.h"
 #include "qemu/osdep.h"
 #include "qapi/error.h"
 #include "qapi/error.h"
 #include "ui/console.h"
 #include "ui/console.h"
+#include "qemu/error-report.h"
 
 
 #include <sys/ioctl.h>
 #include <sys/ioctl.h>
 
 

+ 1 - 0
ui/vdagent.c

@@ -2,6 +2,7 @@
 #include "qapi/error.h"
 #include "qapi/error.h"
 #include "chardev/char.h"
 #include "chardev/char.h"
 #include "qemu/buffer.h"
 #include "qemu/buffer.h"
+#include "qemu/error-report.h"
 #include "qemu/option.h"
 #include "qemu/option.h"
 #include "qemu/units.h"
 #include "qemu/units.h"
 #include "hw/qdev-core.h"
 #include "hw/qdev-core.h"

+ 1 - 0
util/vhost-user-server.c

@@ -8,6 +8,7 @@
  * later.  See the COPYING file in the top-level directory.
  * later.  See the COPYING file in the top-level directory.
  */
  */
 #include "qemu/osdep.h"
 #include "qemu/osdep.h"
+#include "qemu/error-report.h"
 #include "qemu/main-loop.h"
 #include "qemu/main-loop.h"
 #include "qemu/vhost-user-server.h"
 #include "qemu/vhost-user-server.h"
 #include "block/aio-wait.h"
 #include "block/aio-wait.h"