qerror: Move #include out of qerror.h

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Luiz Capitulino <lcapitulino@redhat.com>

diff --git a/audio/spiceaudio.c b/audio/spiceaudio.c
index 5c6f72675789938f97d06d5a9aa5faad1dc498f2..42ae4a45f7bde246bfe99c15904a1a6e53ea407a 100644 (file)
--- a/audio/spiceaudio.c
+++ b/audio/spiceaudio.c
@@ -18,6 +18,7 @@
  */
 
 #include "hw/hw.h"
+#include "qemu/error-report.h"
 #include "qemu/timer.h"
 #include "ui/qemu-spice.h"
 

diff --git a/audio/wavcapture.c b/audio/wavcapture.c
index 6f6d79269113499852bd9211b5671cd3fe50fd8e..86e905627aee1f7e173a01654ccaf36e1bc2eefe 100644 (file)
--- a/audio/wavcapture.c
+++ b/audio/wavcapture.c
@@ -1,5 +1,6 @@
 #include "hw/hw.h"
 #include "monitor/monitor.h"
+#include "qemu/error-report.h"
 #include "audio.h"
 
 typedef struct {

diff --git a/block.c b/block.c
index 3bdc995d403708cfea8136b17392cb69361002f2..b07f987f368bfc217da52d84c9c06bd3cbd66ca1 100644 (file)
--- a/block.c
+++ b/block.c
@@ -26,6 +26,7 @@
 #include "trace.h"
 #include "block/block_int.h"
 #include "block/blockjob.h"
+#include "qemu/error-report.h"
 #include "qemu/module.h"
 #include "qapi/qmp/qjson.h"
 #include "sysemu/block-backend.h"

diff --git a/block/curl.c b/block/curl.c
index bbee3ca17929adc685b8f6285bbdc83e3df501bf..3a2b63e16e59b2fb54d4d5af1abbe9496837aa26 100644 (file)
--- a/block/curl.c
+++ b/block/curl.c
@@ -24,6 +24,7 @@
 #include "qemu-common.h"
 #include "block/block_int.h"
 #include "qapi/qmp/qbool.h"
+#include "qapi/qmp/qstring.h"
 #include <curl/curl.h>
 
 // #define DEBUG_CURL

diff --git a/block/dmg.c b/block/dmg.c
index 825c49d59a9493b8afed4268dbfe68741ca1582f..9f2528169ca03bd30d52d8aabd54490a4656bb25 100644 (file)
--- a/block/dmg.c
+++ b/block/dmg.c
@@ -24,6 +24,7 @@
 #include "qemu-common.h"
 #include "block/block_int.h"
 #include "qemu/bswap.h"
+#include "qemu/error-report.h"
 #include "qemu/module.h"
 #include <zlib.h>
 #ifdef CONFIG_BZIP2

diff --git a/block/io.c b/block/io.c
index bb4f78784e928a29193bede534b4665c1e1bf7e6..9cc729be7eeee9143c5a79f2bd611310b219e5c8 100644 (file)
--- a/block/io.c
+++ b/block/io.c
@@ -26,6 +26,7 @@
 #include "block/blockjob.h"
 #include "block/block_int.h"
 #include "block/throttle-groups.h"
+#include "qemu/error-report.h"
 
 #define NOT_DONE 0x7fffffff /* used while emulated sync operation in progress */
 

diff --git a/block/iscsi.c b/block/iscsi.c
index 14e97a6b48a34b28228722eddaa992b16b642f7b..5f7b60c99b24f23328bf10e91b600e4341ca592a 100644 (file)
--- a/block/iscsi.c
+++ b/block/iscsi.c
@@ -38,6 +38,7 @@
 #include "qemu/iov.h"
 #include "sysemu/sysemu.h"
 #include "qmp-commands.h"
+#include "qapi/qmp/qstring.h"
 
 #include <iscsi/iscsi.h>
 #include <iscsi/scsi-lowlevel.h>

diff --git a/block/qcow2-snapshot.c b/block/qcow2-snapshot.c
index 17bb2119b2c4d1070f985f062761e52658b4bcb3..b6f58c13e2d4485bfa392804da67e87124a029ff 100644 (file)
--- a/block/qcow2-snapshot.c
+++ b/block/qcow2-snapshot.c
@@ -25,6 +25,7 @@
 #include "qemu-common.h"
 #include "block/block_int.h"
 #include "block/qcow2.h"
+#include "qemu/error-report.h"
 
 void qcow2_free_snapshots(BlockDriverState *bs)
 {

diff --git a/block/raw-posix.c b/block/raw-posix.c
index 44ade8cf4e25bec9f47a8139f0e50bf9f98063aa..a967464000882e468b771f7f25438576abac23a7 100644 (file)
--- a/block/raw-posix.c
+++ b/block/raw-posix.c
@@ -22,6 +22,7 @@
  * THE SOFTWARE.
  */
 #include "qemu-common.h"
+#include "qemu/error-report.h"
 #include "qemu/timer.h"
 #include "qemu/log.h"
 #include "block/block_int.h"
@@ -31,6 +32,7 @@
 #include "qemu/iov.h"
 #include "raw-aio.h"
 #include "qapi/util.h"
+#include "qapi/qmp/qstring.h"
 
 #if defined(__APPLE__) && (__MACH__)
 #include <paths.h>

diff --git a/block/raw-win32.c b/block/raw-win32.c
index dae5d2fee922a34e92d20f3431e03ce4620dd217..68f2338acc43d00dc41055aa03cd6f6d1d179bd7 100644 (file)
--- a/block/raw-win32.c
+++ b/block/raw-win32.c
@@ -29,6 +29,7 @@
 #include "trace.h"
 #include "block/thread-pool.h"
 #include "qemu/iov.h"
+#include "qapi/qmp/qstring.h"
 #include <windows.h>
 #include <winioctl.h>
 

diff --git a/block/ssh.c b/block/ssh.c
index f466cbf396625e72ec33440ff92280d30145424a..aebb18cc8f75a3aeecff780c1b3c66bf21ed2885 100644 (file)
--- a/block/ssh.c
+++ b/block/ssh.c
@@ -30,9 +30,11 @@
 #include <libssh2_sftp.h>
 
 #include "block/block_int.h"
+#include "qemu/error-report.h"
 #include "qemu/sockets.h"
 #include "qemu/uri.h"
 #include "qapi/qmp/qint.h"
+#include "qapi/qmp/qstring.h"
 
 /* DEBUG_SSH=1 enables the DPRINTF (debugging printf) statements in
  * this block driver code.

diff --git a/block/vhdx-log.c b/block/vhdx-log.c
index 6547bec4040ecf9eb4ba2abe77f4ac3244b7c6b1..47fec63c616cc8431c12cb7313bb6efc50c3a8be 100644 (file)
--- a/block/vhdx-log.c
+++ b/block/vhdx-log.c
@@ -19,6 +19,7 @@
  */
 #include "qemu-common.h"
 #include "block/block_int.h"
+#include "qemu/error-report.h"
 #include "qemu/module.h"
 #include "block/vhdx.h"
 

diff --git a/block/vmdk.c b/block/vmdk.c
index f335bb769aefa41fd4541aa654b0242a8f001f5b..b7f3f213ea8111662f839173e1c583d10a652465 100644 (file)
--- a/block/vmdk.c
+++ b/block/vmdk.c
@@ -25,6 +25,7 @@
 
 #include "qemu-common.h"
 #include "block/block_int.h"
+#include "qemu/error-report.h"
 #include "qemu/module.h"
 #include "migration/migration.h"
 #include <zlib.h>

diff --git a/block/vvfat.c b/block/vvfat.c
index f3e3d49c23b3af57169a14c3bf12ef9b4efa4042..c35550cd41bbb05429553713f12c3d041df3fc1d 100644 (file)
--- a/block/vvfat.c
+++ b/block/vvfat.c
@@ -30,6 +30,7 @@
 #include "migration/migration.h"
 #include "qapi/qmp/qint.h"
 #include "qapi/qmp/qbool.h"
+#include "qapi/qmp/qstring.h"
 
 #ifndef S_IWGRP
 #define S_IWGRP 0

diff --git a/blockdev.c b/blockdev.c
index 80dabc3d123a435ec771ff42aa13c318f617e26b..fdc7768ce566e24b3b8e66eb6d702be643d35861 100644 (file)
--- a/blockdev.c
+++ b/blockdev.c
@@ -36,6 +36,7 @@
 #include "block/blockjob.h"
 #include "block/throttle-groups.h"
 #include "monitor/monitor.h"
+#include "qemu/error-report.h"
 #include "qemu/option.h"
 #include "qemu/config-file.h"
 #include "qapi/qmp/types.h"

diff --git a/cpus.c b/cpus.c
index a928f492dc88bf2b3393d9db4188092572081ad8..4f0e54d53c0736350a9991bc8957718f63533c2e 100644 (file)
--- a/cpus.c
+++ b/cpus.c
@@ -27,6 +27,7 @@
 
 #include "monitor/monitor.h"
 #include "qapi/qmp/qerror.h"
+#include "qemu/error-report.h"
 #include "sysemu/sysemu.h"
 #include "exec/gdbstub.h"
 #include "sysemu/dma.h"

diff --git a/hw/9pfs/virtio-9p.c b/hw/9pfs/virtio-9p.c
index 4964da0d7ecff00695b67bef614f1fe7d2235298..6ef8af3f649edd0cab757401d8b6605f93e5b74f 100644 (file)
--- a/hw/9pfs/virtio-9p.c
+++ b/hw/9pfs/virtio-9p.c
@@ -13,6 +13,7 @@
 
 #include "hw/virtio/virtio.h"
 #include "hw/i386/pc.h"
+#include "qemu/error-report.h"
 #include "qemu/sockets.h"
 #include "virtio-9p.h"
 #include "fsdev/qemu-fsdev.h"

diff --git a/hw/char/virtio-serial-bus.c b/hw/char/virtio-serial-bus.c
index d451b223862892f5cb24645ebed4a2def802df55..78c73e5abe01d06efdef5a713a5f9e23717019ac 100644 (file)
--- a/hw/char/virtio-serial-bus.c
+++ b/hw/char/virtio-serial-bus.c
@@ -20,6 +20,7 @@
 
 #include "qemu/iov.h"
 #include "monitor/monitor.h"
+#include "qemu/error-report.h"
 #include "qemu/queue.h"
 #include "hw/sysbus.h"
 #include "trace.h"

diff --git a/hw/core/qdev-properties.c b/hw/core/qdev-properties.c
index bb8345cb76553c06003ab97cde009fdf769e293c..47c1e8f3c59d87d8688b009aa76418e61b626c96 100644 (file)
--- a/hw/core/qdev-properties.c
+++ b/hw/core/qdev-properties.c
@@ -1,6 +1,7 @@
 #include "net/net.h"
 #include "hw/qdev.h"
 #include "qapi/qmp/qerror.h"
+#include "qemu/error-report.h"
 #include "sysemu/block-backend.h"
 #include "hw/block/block.h"
 #include "net/hub.h"

diff --git a/hw/core/qdev.c b/hw/core/qdev.c
index ac380d7fcfdeca4cb5bccf1b5799fca78b2b5bc6..b2f404a7656c3169ef06f4293bb2a38081734cb6 100644 (file)
--- a/hw/core/qdev.c
+++ b/hw/core/qdev.c
@@ -32,6 +32,7 @@
 #include "qapi/qmp/qerror.h"
 #include "qapi/visitor.h"
 #include "qapi/qmp/qjson.h"
+#include "qemu/error-report.h"
 #include "hw/hotplug.h"
 #include "hw/boards.h"
 #include "qapi-event.h"

diff --git a/hw/display/g364fb.c b/hw/display/g364fb.c
index 52a9733bfdfba62ae55fa1755d0365dc3558d44b..7f83a007b7046aa34d00fe6c773763e9ee395fbb 100644 (file)
--- a/hw/display/g364fb.c
+++ b/hw/display/g364fb.c
@@ -18,6 +18,7 @@
  */
 
 #include "hw/hw.h"
+#include "qemu/error-report.h"
 #include "ui/console.h"
 #include "ui/pixel_ops.h"
 #include "trace.h"

diff --git a/hw/display/tcx.c b/hw/display/tcx.c
index f3faf78bf8fff37fc2385e7cdcd935f4cd661c5f..a0b6bc58de03534fcf7399d9062fc541447def64 100644 (file)
--- a/hw/display/tcx.c
+++ b/hw/display/tcx.c
@@ -27,6 +27,7 @@
 #include "ui/pixel_ops.h"
 #include "hw/loader.h"
 #include "hw/sysbus.h"
+#include "qemu/error-report.h"
 
 #define TCX_ROM_FILE "QEMU,tcx.bin"
 #define FCODE_MAX_ROM_SIZE 0x10000

diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index 3f0d435da944fa26d4d4180158d852e886c6a07a..e715f7aacc162c4009c4ad0b4444b1d1bcabdfdf 100644 (file)
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -57,6 +57,7 @@
 #include "sysemu/arch_init.h"
 #include "qemu/bitmap.h"
 #include "qemu/config-file.h"
+#include "qemu/error-report.h"
 #include "hw/acpi/acpi.h"
 #include "hw/acpi/cpu_hotplug.h"
 #include "hw/cpu/icc_bus.h"

diff --git a/hw/ide/ahci.c b/hw/ide/ahci.c
index 9e5d86297cc4db6015bc236f6d2d2a1a175ac652..215c33f81c3b78dad54e4f718621d5dc96228f0a 100644 (file)
--- a/hw/ide/ahci.c
+++ b/hw/ide/ahci.c
@@ -27,6 +27,7 @@
 #include <hw/pci/pci.h>
 #include <hw/sysbus.h>
 
+#include "qemu/error-report.h"
 #include "monitor/monitor.h"
 #include "sysemu/block-backend.h"
 #include "sysemu/dma.h"

diff --git a/hw/misc/ivshmem.c b/hw/misc/ivshmem.c
index 231c35fdef1ceae04d84b2f8c420caf720610b27..53d19fcf1d1a4660dec3b805dd11f15c5dc047cb 100644 (file)
--- a/hw/misc/ivshmem.c
+++ b/hw/misc/ivshmem.c
@@ -23,6 +23,7 @@
 #include "sysemu/kvm.h"
 #include "migration/migration.h"
 #include "qapi/qmp/qerror.h"
+#include "qemu/error-report.h"
 #include "qemu/event_notifier.h"
 #include "qemu/fifo8.h"
 #include "sysemu/char.h"

diff --git a/hw/pci/pci.c b/hw/pci/pci.c
index 21580433d45c1780b9b560a5c7f9e2363c226374..45394cfe3289509fa9f80b8f967b638590111993 100644 (file)
--- a/hw/pci/pci.c
+++ b/hw/pci/pci.c
@@ -30,6 +30,7 @@
 #include "net/net.h"
 #include "sysemu/sysemu.h"
 #include "hw/loader.h"
+#include "qemu/error-report.h"
 #include "qemu/range.h"
 #include "qmp-commands.h"
 #include "trace.h"

diff --git a/hw/ppc/virtex_ml507.c b/hw/ppc/virtex_ml507.c
index 6ebd5bee8b469b8153c30cafb6bbd925801160de..6feb3c7c394314a3b4f4a3897aa46e4ae1d76c36 100644 (file)
--- a/hw/ppc/virtex_ml507.c
+++ b/hw/ppc/virtex_ml507.c
@@ -32,6 +32,7 @@
 #include "sysemu/device_tree.h"
 #include "hw/loader.h"
 #include "elf.h"
+#include "qemu/error-report.h"
 #include "qemu/log.h"
 #include "exec/address-spaces.h"
 

diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c
index e32ada9bf17640c270c6d0e9e973e7171e2bfa0e..9d91780847b0864ea6ff0c7780d8628f0759d316 100644 (file)
--- a/hw/s390x/virtio-ccw.c
+++ b/hw/s390x/virtio-ccw.c
@@ -21,6 +21,7 @@
 #include "hw/virtio/virtio-net.h"
 #include "hw/sysbus.h"
 #include "qemu/bitops.h"
+#include "qemu/error-report.h"
 #include "hw/virtio/virtio-bus.h"
 #include "hw/s390x/adapter.h"
 #include "hw/s390x/s390_flic.h"

diff --git a/hw/scsi/vhost-scsi.c b/hw/scsi/vhost-scsi.c
index 1c389c4d7efca5662a280d7a34410d2ae6a85973..52549f8beb1cb8d55484f5f09fed1e7a1e1c74a4 100644 (file)
--- a/hw/scsi/vhost-scsi.c
+++ b/hw/scsi/vhost-scsi.c
@@ -16,6 +16,7 @@
 
 #include <sys/ioctl.h>
 #include "config.h"
+#include "qemu/error-report.h"
 #include "qemu/queue.h"
 #include "monitor/monitor.h"
 #include "migration/migration.h"

diff --git a/hw/timer/hpet.c b/hw/timer/hpet.c
index b50071ef93193a04addbc5ca48360659238e5412..2bb62211c3664ae403e436bb8dc9ce91e3386dd0 100644 (file)
--- a/hw/timer/hpet.c
+++ b/hw/timer/hpet.c
@@ -27,6 +27,7 @@
 #include "hw/hw.h"
 #include "hw/i386/pc.h"
 #include "ui/console.h"
+#include "qemu/error-report.h"
 #include "qemu/timer.h"
 #include "hw/timer/hpet.h"
 #include "hw/sysbus.h"

diff --git a/hw/tpm/tpm_passthrough.c b/hw/tpm/tpm_passthrough.c
index 8d8523a535789d441513a5b369c7cbac000f8b52..79a8f98af027e5ea8b473153e886404449dc3fa3 100644 (file)
--- a/hw/tpm/tpm_passthrough.c
+++ b/hw/tpm/tpm_passthrough.c
@@ -26,6 +26,7 @@
 
 #include "qemu-common.h"
 #include "qapi/error.h"
+#include "qemu/error-report.h"
 #include "qemu/sockets.h"
 #include "sysemu/tpm_backend.h"
 #include "tpm_int.h"

diff --git a/hw/usb/bus.c b/hw/usb/bus.c
index 375167573d83c14116c52a8fdcb130777ed54a39..5f39e1e3acbb6855bf8e42690341c06abd792c31 100644 (file)
--- a/hw/usb/bus.c
+++ b/hw/usb/bus.c
@@ -1,6 +1,7 @@
 #include "hw/hw.h"
 #include "hw/usb.h"
 #include "hw/qdev.h"
+#include "qemu/error-report.h"
 #include "sysemu/sysemu.h"
 #include "monitor/monitor.h"
 #include "trace.h"

diff --git a/hw/usb/ccid-card-passthru.c b/hw/usb/ccid-card-passthru.c
index 10f1d309a65704a30079799395ed186507535694..51f3e6adc44f56d589ec48b6b71ccb00a29a508f 100644 (file)
--- a/hw/usb/ccid-card-passthru.c
+++ b/hw/usb/ccid-card-passthru.c
@@ -9,6 +9,7 @@
  */
 
 #include "sysemu/char.h"
+#include "qemu/error-report.h"
 #include "qemu/sockets.h"
 #include "monitor/monitor.h"
 #include "ccid.h"

diff --git a/hw/usb/dev-serial.c b/hw/usb/dev-serial.c
index 6ca3da9727deffa51ccdd11d5c7ecb8127ac882e..9c591f3a276f2a24220c8e45ed8d024689bf8a67 100644 (file)
--- a/hw/usb/dev-serial.c
+++ b/hw/usb/dev-serial.c
@@ -9,6 +9,7 @@
  */
 
 #include "qemu-common.h"
+#include "qemu/error-report.h"
 #include "monitor/monitor.h"
 #include "hw/usb.h"
 #include "hw/usb/desc.h"

diff --git a/hw/usb/dev-storage.c b/hw/usb/dev-storage.c
index abe0e1d6a1e1629291b566b8652bf83b8942a345..9a4e7dc0cb33cb9a382b1f5e30602da12e95e144 100644 (file)
--- a/hw/usb/dev-storage.c
+++ b/hw/usb/dev-storage.c
@@ -8,6 +8,7 @@
  */
 
 #include "qemu-common.h"
+#include "qemu/error-report.h"
 #include "qemu/option.h"
 #include "qemu/config-file.h"
 #include "hw/usb.h"

diff --git a/hw/usb/host-libusb.c b/hw/usb/host-libusb.c
index 10f4735ddff38dbec56f324cc494752049dc73f4..bc2944c6b2dd1e2945aa9e53a3e1612e552daeda 100644 (file)
--- a/hw/usb/host-libusb.c
+++ b/hw/usb/host-libusb.c
@@ -38,6 +38,7 @@
 
 #include "qemu-common.h"
 #include "monitor/monitor.h"
+#include "qemu/error-report.h"
 #include "sysemu/sysemu.h"
 #include "trace.h"
 

diff --git a/hw/usb/redirect.c b/hw/usb/redirect.c
index 23220676ad751a5995771d8cf7804afb586e6e09..110e0149b50bc4321df5d3e65abb8d4adcd6d779 100644 (file)
--- a/hw/usb/redirect.c
+++ b/hw/usb/redirect.c
@@ -29,6 +29,7 @@
 #include "qemu/timer.h"
 #include "monitor/monitor.h"
 #include "sysemu/sysemu.h"
+#include "qemu/error-report.h"
 #include "qemu/iov.h"
 #include "sysemu/char.h"
 

diff --git a/include/qapi/qmp/qerror.h b/include/qapi/qmp/qerror.h
index f8182c75f00aa1423b1503c89be47c3d932e2bd0..842b27ae11c92092bb7cff1e32a8884f99954063 100644 (file)
--- a/include/qapi/qmp/qerror.h
+++ b/include/qapi/qmp/qerror.h
@@ -12,9 +12,6 @@
 #ifndef QERROR_H
 #define QERROR_H
 
-#include "qapi/qmp/qstring.h"
-#include "qemu/error-report.h"
-
 /*
  * These macros will go away, please don't use in new code, and do not
  * add new ones!

diff --git a/migration/migration.c b/migration/migration.c
index a46deb2c40a82ac18909e9efa2057e246cca4d61..25f6830a778940160a8d3befc9cb98a5d689046e 100644 (file)
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -14,6 +14,7 @@
  */
 
 #include "qemu-common.h"
+#include "qemu/error-report.h"
 #include "qemu/main-loop.h"
 #include "migration/migration.h"
 #include "monitor/monitor.h"

diff --git a/migration/qemu-file-buf.c b/migration/qemu-file-buf.c
index 16a51a1e172601935c8ad5ce32b60d053340feff..2de9330ca5ee914e9fbab77c074d4788033506b2 100644 (file)
--- a/migration/qemu-file-buf.c
+++ b/migration/qemu-file-buf.c
@@ -26,6 +26,7 @@
  * THE SOFTWARE.
  */
 #include "qemu-common.h"
+#include "qemu/error-report.h"
 #include "qemu/iov.h"
 #include "qemu/sockets.h"
 #include "block/coroutine.h"

diff --git a/migration/qemu-file.c b/migration/qemu-file.c
index 965a757772f9018380c6839eaa05476e741f6b60..557c1c1a6205bddf5129af3360624c092350f202 100644 (file)
--- a/migration/qemu-file.c
+++ b/migration/qemu-file.c
@@ -23,6 +23,7 @@
  */
 #include <zlib.h>
 #include "qemu-common.h"
+#include "qemu/error-report.h"
 #include "qemu/iov.h"
 #include "qemu/sockets.h"
 #include "block/coroutine.h"

diff --git a/migration/rdma.c b/migration/rdma.c
index cf5de7e2ae30c2bd1034bb5eb2e0bdf2fa1cf65f..b777273b59681b79b03992da5fce17de63ca4084 100644 (file)
--- a/migration/rdma.c
+++ b/migration/rdma.c
@@ -15,6 +15,7 @@
 #include "migration/migration.h"
 #include "migration/qemu-file.h"
 #include "exec/cpu-common.h"
+#include "qemu/error-report.h"
 #include "qemu/main-loop.h"
 #include "qemu/sockets.h"
 #include "qemu/bitmap.h"

diff --git a/migration/savevm.c b/migration/savevm.c
index 1acf6ff58936f39bfd08c5624c45262970186d63..2b4e02f1a3494b57eda7b9bd945dabf6449f0a5c 100644 (file)
--- a/migration/savevm.c
+++ b/migration/savevm.c
@@ -37,6 +37,7 @@
 #include "qemu/timer.h"
 #include "audio/audio.h"
 #include "migration/migration.h"
+#include "qemu/error-report.h"
 #include "qemu/sockets.h"
 #include "qemu/queue.h"
 #include "sysemu/cpus.h"

diff --git a/net/net.c b/net/net.c
index a5e2da2976309759d3b752c00a6dd8fc7206bdca..19184e46bcdb834357481be3214aeed4104cdc0c 100644 (file)
--- a/net/net.c
+++ b/net/net.c
@@ -32,6 +32,7 @@
 
 #include "monitor/monitor.h"
 #include "qemu-common.h"
+#include "qemu/error-report.h"
 #include "qemu/sockets.h"
 #include "qemu/config-file.h"
 #include "qmp-commands.h"

diff --git a/net/slirp.c b/net/slirp.c
index 35338376f732a7e9485b6eb722c1456d976033a2..7657b38fdf9256ecc22e5658daf11ea3386ab28d 100644 (file)
--- a/net/slirp.c
+++ b/net/slirp.c
@@ -33,6 +33,7 @@
 #include "clients.h"
 #include "hub.h"
 #include "monitor/monitor.h"
+#include "qemu/error-report.h"
 #include "qemu/sockets.h"
 #include "slirp/libslirp.h"
 #include "sysemu/char.h"

diff --git a/qdev-monitor.c b/qdev-monitor.c
index 124956e9b11fb50846af8257633ffdf72a955867..66f6d0e26a003c6c3e80cc3b30c5a79197d3f5e9 100644 (file)
--- a/qdev-monitor.c
+++ b/qdev-monitor.c
@@ -24,6 +24,7 @@
 #include "qmp-commands.h"
 #include "sysemu/arch_init.h"
 #include "qemu/config-file.h"
+#include "qemu/error-report.h"
 
 /*
  * Aliases were a bad idea from the start.  Let's keep them

diff --git a/qemu-char.c b/qemu-char.c
index d0c1564306d268c4d488f5e53116e6f6ac115022..617e034455646422e6c5c679efbfe9027d8805e2 100644 (file)
--- a/qemu-char.c
+++ b/qemu-char.c
@@ -24,6 +24,7 @@
 #include "qemu-common.h"
 #include "monitor/monitor.h"
 #include "sysemu/sysemu.h"
+#include "qemu/error-report.h"
 #include "qemu/timer.h"
 #include "sysemu/char.h"
 #include "hw/usb.h"

diff --git a/qemu-io-cmds.c b/qemu-io-cmds.c
index 52dc6111bf814b5ce303c6aedea98a7461b473db..53477e1e176c73b0dc8142766cec07adecf9e1fb 100644 (file)
--- a/qemu-io-cmds.c
+++ b/qemu-io-cmds.c
@@ -13,6 +13,7 @@
 #include "block/block.h"
 #include "block/block_int.h" /* for info_f() */
 #include "block/qapi.h"
+#include "qemu/error-report.h"
 #include "qemu/main-loop.h"
 #include "qemu/timer.h"
 #include "sysemu/block-backend.h"

diff --git a/qemu-io.c b/qemu-io.c
index c24f6be24e3af7b6fb8a6d28baac31b1583905d4..f1e3a67135472af3f9c8b55ad24d78068e3a103d 100644 (file)
--- a/qemu-io.c
+++ b/qemu-io.c
@@ -15,10 +15,12 @@
 #include <libgen.h>
 
 #include "qemu-io.h"
+#include "qemu/error-report.h"
 #include "qemu/main-loop.h"
 #include "qemu/option.h"
 #include "qemu/config-file.h"
 #include "qemu/readline.h"
+#include "qapi/qmp/qstring.h"
 #include "sysemu/block-backend.h"
 #include "block/block_int.h"
 #include "trace/control.h"

diff --git a/qemu-nbd.c b/qemu-nbd.c
index 7a4bf1bc56e5e1b15a758433a2f8cf5a2e27494f..5106b802e6755f17055888b2088b82da6b1a4fd5 100644 (file)
--- a/qemu-nbd.c
+++ b/qemu-nbd.c
@@ -25,6 +25,7 @@
 #include "qemu/error-report.h"
 #include "block/snapshot.h"
 #include "qapi/util.h"
+#include "qapi/qmp/qstring.h"
 
 #include <stdarg.h>
 #include <stdio.h>

diff --git a/slirp/misc.c b/slirp/misc.c
index 6543dc777298463931ae82fbb94619c8b0ee5902..578e8b2c16a8cb054971730fb7ecfadd8a43ee2c 100644 (file)
--- a/slirp/misc.c
+++ b/slirp/misc.c
@@ -9,6 +9,7 @@
 #include <libslirp.h>
 
 #include "monitor/monitor.h"
+#include "qemu/error-report.h"
 #include "qemu/main-loop.h"
 
 #ifdef DEBUG

diff --git a/target-i386/cpu.c b/target-i386/cpu.c
index d4f4c8d687c8dfbbcdd636ee74d08a9b539beba9..36b07f99aac7c8e47df7b9571c5d4cc51689cd97 100644 (file)
--- a/target-i386/cpu.c
+++ b/target-i386/cpu.c
@@ -26,6 +26,7 @@
 #include "sysemu/cpus.h"
 #include "kvm_i386.h"
 
+#include "qemu/error-report.h"
 #include "qemu/option.h"
 #include "qemu/config-file.h"
 #include "qapi/qmp/qerror.h"

diff --git a/target-s390x/kvm.c b/target-s390x/kvm.c
index b02ff8d61d62f968ae5aab28804abbb076794b3c..b18946b440463f7f007fafba020706e890218ac8 100644 (file)
--- a/target-s390x/kvm.c
+++ b/target-s390x/kvm.c
@@ -29,6 +29,7 @@
 #include <asm/ptrace.h>
 
 #include "qemu-common.h"
+#include "qemu/error-report.h"
 #include "qemu/timer.h"
 #include "sysemu/sysemu.h"
 #include "sysemu/kvm.h"

diff --git a/tpm.c b/tpm.c
index c8889fae79e4f7e1caf83ee811633c709a87c648..5ca3eb5ed00523c3f72afc2390e8dcbd33765f47 100644 (file)
--- a/tpm.c
+++ b/tpm.c
@@ -18,6 +18,7 @@
 #include "sysemu/tpm_backend.h"
 #include "sysemu/tpm.h"
 #include "qemu/config-file.h"
+#include "qemu/error-report.h"
 #include "qmp-commands.h"
 
 static QLIST_HEAD(, TPMBackend) tpm_backends =

diff --git a/ui/input.c b/ui/input.c
index e96e1ea0f02fd2c50df54fb6ab6a7bae4601f0b0..1a552d1de1307c6a31f5e6b274f99067de4501dd 100644 (file)
--- a/ui/input.c
+++ b/ui/input.c
@@ -1,6 +1,7 @@
 #include "hw/qdev.h"
 #include "sysemu/sysemu.h"
 #include "qapi-types.h"
+#include "qemu/error-report.h"
 #include "qmp-commands.h"
 #include "trace.h"
 #include "ui/input.h"

diff --git a/ui/spice-core.c b/ui/spice-core.c
index a30da3cf9fdc9955e2cd906316a01a41db8d165a..bf4fd07499e29875339778de667b05276ee3470d 100644 (file)
--- a/ui/spice-core.c
+++ b/ui/spice-core.c
@@ -22,6 +22,7 @@
 
 #include "qemu-common.h"
 #include "ui/qemu-spice.h"
+#include "qemu/error-report.h"
 #include "qemu/thread.h"
 #include "qemu/timer.h"
 #include "qemu/queue.h"

diff --git a/ui/vnc.c b/ui/vnc.c
index b5e7906dfb85030bb30500775974a76c48ffce4b..af165845a3390939123be2f21efa39d4005e3fd6 100644 (file)
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -29,6 +29,7 @@
 #include "trace.h"
 #include "hw/qdev.h"
 #include "sysemu/sysemu.h"
+#include "qemu/error-report.h"
 #include "qemu/sockets.h"
 #include "qemu/timer.h"
 #include "qemu/acl.h"

diff --git a/util/osdep.c b/util/osdep.c
index f938b69466444295738a3fbcb6ab1b0cca50b34e..0092bb61b953da5a5f374bbc6b4b544a802bd892 100644 (file)
--- a/util/osdep.c
+++ b/util/osdep.c
@@ -47,6 +47,7 @@ extern int madvise(caddr_t, size_t, int);
 
 #include "qemu-common.h"
 #include "qemu/sockets.h"
+#include "qemu/error-report.h"
 #include "monitor/monitor.h"
 
 static bool fips_enabled = false;

diff --git a/util/qemu-error.c b/util/qemu-error.c
index 16d2d07649a470580975ed870c0f6eea56df05ce..77ea6c6145e7d60b50b28985bdf8e7d1cacb822b 100644 (file)
--- a/util/qemu-error.c
+++ b/util/qemu-error.c
@@ -12,6 +12,7 @@
 
 #include <stdio.h>
 #include "monitor/monitor.h"
+#include "qemu/error-report.h"
 
 /*
  * Print to current monitor if we have one, else to stderr.

diff --git a/vl.c b/vl.c
index 33b0d86fc3af7be14f33f178eb009bc2fde8520c..69ad90c87f7fd7f0c7be21305b04700040817c4a 100644 (file)
--- a/vl.c
+++ b/vl.c
@@ -58,6 +58,7 @@ int main(int argc, char **argv)
 
 #include <glib.h>
 
+#include "qemu/error-report.h"
 #include "qemu/sockets.h"
 #include "hw/hw.h"
 #include "hw/boards.h"