include/qemu/osdep.h: Don't include qapi/error.h

Commit 57cb38b included qapi/error.h into qemu/osdep.h to get the
Error typedef.  Since then, we've moved to include qemu/osdep.h
everywhere.  Its file comment explains: "To avoid getting into
possible circular include dependencies, this file should not include
any other QEMU headers, with the exceptions of config-host.h,
compiler.h, os-posix.h and os-win32.h, all of which are doing a
similar job to this file and are under similar constraints."
qapi/error.h doesn't do a similar job, and it doesn't adhere to
similar constraints: it includes qapi-types.h.  That's in excess of
100KiB of crap most .c files don't actually need.

Add the typedef to qemu/typedefs.h, and include that instead of
qapi/error.h.  Include qapi/error.h in .c files that need it and don't
get it now.  Include qapi-types.h in qom/object.h for uint16List.

Update scripts/clean-includes accordingly.  Update it further to match
reality: replace config.h by config-target.h, add sysemu/os-posix.h,
sysemu/os-win32.h.  Update the list of includes in the qemu/osdep.h
comment quoted above similarly.

This reduces the number of objects depending on qapi/error.h from "all
of them" to less than a third.  Unfortunately, the number depending on
qapi-types.h shrinks only a little.  More work is needed for that one.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
[Fix compilation without the spice devel packages. - Paolo]
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>

diff --git a/async.c b/async.c
index d4dd2cc799283ecbbcad2ddd3a271e77685863dc..b4bf205a0ce64b493c623ef7c806dce012aa3b05 100644 (file)
--- a/async.c
+++ b/async.c
@@ -23,6 +23,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "qemu-common.h"
 #include "block/aio.h"
 #include "block/thread-pool.h"

diff --git a/backends/baum.c b/backends/baum.c
index eef3467c9f553ccaa2882964a8f4f3310fe45083..f95f7be8a5e982d66a17bc2c22dd34a528a01147 100644 (file)
--- a/backends/baum.c
+++ b/backends/baum.c
@@ -22,6 +22,7 @@
  * THE SOFTWARE.
  */
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "qemu-common.h"
 #include "sysemu/char.h"
 #include "qemu/timer.h"

diff --git a/backends/hostmem-file.c b/backends/hostmem-file.c
index fd594826938132ae410c29e516fc89db6516b4d0..c70f268d6fe80fd73918591ab3e0339e79875b1e 100644 (file)
--- a/backends/hostmem-file.c
+++ b/backends/hostmem-file.c
@@ -10,6 +10,7 @@
  * See the COPYING file in the top-level directory.
  */
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "qemu-common.h"
 #include "sysemu/hostmem.h"
 #include "sysemu/sysemu.h"

diff --git a/backends/hostmem-ram.c b/backends/hostmem-ram.c
index 44fb3902b8cbbd00467d872a794c158bd2a099cb..04a7ac362b0f068fa0928f4ee00820ab7d7ab43f 100644 (file)
--- a/backends/hostmem-ram.c
+++ b/backends/hostmem-ram.c
@@ -11,6 +11,7 @@
  */
 #include "qemu/osdep.h"
 #include "sysemu/hostmem.h"
+#include "qapi/error.h"
 #include "qom/object_interfaces.h"
 
 #define TYPE_MEMORY_BACKEND_RAM "memory-backend-ram"

diff --git a/backends/hostmem.c b/backends/hostmem.c
index 6c6f0da6d955f085412f510227196c6a9e21d56b..6e28be11ebee75c43e924347a9fd40bbbdcd1d96 100644 (file)
--- a/backends/hostmem.c
+++ b/backends/hostmem.c
@@ -12,6 +12,7 @@
 #include "qemu/osdep.h"
 #include "sysemu/hostmem.h"
 #include "hw/boards.h"
+#include "qapi/error.h"
 #include "qapi/visitor.h"
 #include "qapi-types.h"
 #include "qapi-visit.h"

diff --git a/backends/rng-egd.c b/backends/rng-egd.c
index 6e0ba222418d84f2c8f4a3407dffaa5f99acf4d0..7a1b9242d8d322cf81f7a68892d77d2320579d68 100644 (file)
--- a/backends/rng-egd.c
+++ b/backends/rng-egd.c
@@ -13,6 +13,7 @@
 #include "qemu/osdep.h"
 #include "sysemu/rng.h"
 #include "sysemu/char.h"
+#include "qapi/error.h"
 #include "qapi/qmp/qerror.h"
 #include "hw/qdev.h" /* just for DEFINE_PROP_CHR */
 

diff --git a/backends/rng-random.c b/backends/rng-random.c
index 122e8d494dc08702ce77885bdb7bf27dc7526670..2e44e251904376c78914bf202e91de81ddeffda0 100644 (file)
--- a/backends/rng-random.c
+++ b/backends/rng-random.c
@@ -13,6 +13,7 @@
 #include "qemu/osdep.h"
 #include "sysemu/rng-random.h"
 #include "sysemu/rng.h"
+#include "qapi/error.h"
 #include "qapi/qmp/qerror.h"
 #include "qemu/main-loop.h"
 

diff --git a/backends/rng.c b/backends/rng.c
index e57e2b4b52c8bef6794d229808634a246b1e1b48..398ebe4a7d09f9eabe0a11e3cff7f52d60016702 100644 (file)
--- a/backends/rng.c
+++ b/backends/rng.c
@@ -12,6 +12,7 @@
 
 #include "qemu/osdep.h"
 #include "sysemu/rng.h"
+#include "qapi/error.h"
 #include "qapi/qmp/qerror.h"
 #include "qom/object_interfaces.h"
 

diff --git a/backends/tpm.c b/backends/tpm.c
index d53da18627f2e161c747cbabf14456c5bfb43955..536f262bb7715a83af8e942416bffb5ce670d558 100644 (file)
--- a/backends/tpm.c
+++ b/backends/tpm.c
@@ -14,6 +14,7 @@
 
 #include "qemu/osdep.h"
 #include "sysemu/tpm_backend.h"
+#include "qapi/error.h"
 #include "qapi/qmp/qerror.h"
 #include "sysemu/tpm.h"
 #include "qemu/thread.h"

diff --git a/block/backup.c b/block/backup.c
index ab3e345e92696b08df7c774bb8fbe59fd0eec16e..77280c6b3583d24f062364a2c1c3599da2c35057 100644 (file)
--- a/block/backup.c
+++ b/block/backup.c
@@ -17,6 +17,7 @@
 #include "block/block.h"
 #include "block/block_int.h"
 #include "block/blockjob.h"
+#include "qapi/error.h"
 #include "qapi/qmp/qerror.h"
 #include "qemu/ratelimit.h"
 #include "sysemu/block-backend.h"

diff --git a/block/blkdebug.c b/block/blkdebug.c
index f85c54bdc8e14d7a1f3acba62399ff9d7416eb93..792d36b994944b84f61d86a5a8a38ce58b7edd39 100644 (file)
--- a/block/blkdebug.c
+++ b/block/blkdebug.c
@@ -23,6 +23,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "qemu-common.h"
 #include "qemu/config-file.h"
 #include "block/block_int.h"

diff --git a/block/blkverify.c b/block/blkverify.c
index 2a885cc08dd78e79d5141e5a8a44b666604068f0..41432e556525ed56bd60ba5eba766280fa0a2d6a 100644 (file)
--- a/block/blkverify.c
+++ b/block/blkverify.c
@@ -8,6 +8,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "qemu/sockets.h" /* for EINPROGRESS on Windows */
 #include "block/block_int.h"
 #include "qapi/qmp/qdict.h"

diff --git a/block/bochs.c b/block/bochs.c
index 8b953bb44c7afabcfb13b7d592ec09818381cadc..af8b7abdfdaf760a4d5d3b30269fc385bf40ca8b 100644 (file)
--- a/block/bochs.c
+++ b/block/bochs.c
@@ -23,6 +23,7 @@
  * THE SOFTWARE.
  */
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "qemu-common.h"
 #include "block/block_int.h"
 #include "qemu/module.h"

diff --git a/block/cloop.c b/block/cloop.c
index 41bdee8d7ffe91538becfe5b62fc0260fdd550d4..a84f14019c61346d11e9928f51e834a2c88935f5 100644 (file)
--- a/block/cloop.c
+++ b/block/cloop.c
@@ -22,6 +22,7 @@
  * THE SOFTWARE.
  */
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "qemu-common.h"
 #include "block/block_int.h"
 #include "qemu/module.h"

diff --git a/block/commit.c b/block/commit.c
index 446a3aeadd3388fd3737b9814a0e868cb27d651a..cba0e8c1e81b6f9f7745affab0b6b8e85a95dd4e 100644 (file)
--- a/block/commit.c
+++ b/block/commit.c
@@ -16,6 +16,7 @@
 #include "trace.h"
 #include "block/block_int.h"
 #include "block/blockjob.h"
+#include "qapi/error.h"
 #include "qapi/qmp/qerror.h"
 #include "qemu/ratelimit.h"
 #include "sysemu/block-backend.h"

diff --git a/block/curl.c b/block/curl.c
index c70bfb404d470bca6299ab3fd3730ecf521a2c6f..fe331ca1f559075e8d5985cad2cabe43c6251dc6 100644 (file)
--- a/block/curl.c
+++ b/block/curl.c
@@ -22,6 +22,7 @@
  * THE SOFTWARE.
  */
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "qemu-common.h"
 #include "qemu/error-report.h"
 #include "block/block_int.h"

diff --git a/block/dirty-bitmap.c b/block/dirty-bitmap.c
index 556e1d15c41741983e627f9de48d4a436b18e519..4902ca557f9aaba6e041a36095e02b2c22a0afd5 100644 (file)
--- a/block/dirty-bitmap.c
+++ b/block/dirty-bitmap.c
@@ -22,7 +22,7 @@
  * THE SOFTWARE.
  */
 #include "qemu/osdep.h"
-#include "config-host.h"
+#include "qapi/error.h"
 #include "qemu-common.h"
 #include "trace.h"
 #include "block/block_int.h"

diff --git a/block/dmg.c b/block/dmg.c
index 1018fd158efcd29d88a154e41e06b912c6a17694..a496eb7c9b0adc83d80ca68c4a1ab976e4a0ac58 100644 (file)
--- a/block/dmg.c
+++ b/block/dmg.c
@@ -22,6 +22,7 @@
  * THE SOFTWARE.
  */
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "qemu-common.h"
 #include "block/block_int.h"
 #include "qemu/bswap.h"

diff --git a/block/gluster.c b/block/gluster.c
index 65077a0d0a92bd9d70e217daffbceec5b13b8450..51e154c247ed1c20ba9badb39a7635b4b4fd1c9d 100644 (file)
--- a/block/gluster.c
+++ b/block/gluster.c
@@ -10,6 +10,7 @@
 #include "qemu/osdep.h"
 #include <glusterfs/api/glfs.h>
 #include "block/block_int.h"
+#include "qapi/error.h"
 #include "qemu/uri.h"
 
 typedef struct GlusterAIOCB {

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

diff --git a/block/mirror.c b/block/mirror.c
index 9635fa8e6238feccee8cb2ac95e9d19f9d2f5066..7bfd0d29961ef9554a42a7775ca49e5fe99f0f00 100644 (file)
--- a/block/mirror.c
+++ b/block/mirror.c
@@ -16,6 +16,7 @@
 #include "block/blockjob.h"
 #include "block/block_int.h"
 #include "sysemu/block-backend.h"
+#include "qapi/error.h"
 #include "qapi/qmp/qerror.h"
 #include "qemu/ratelimit.h"
 #include "qemu/bitmap.h"

diff --git a/block/nbd.c b/block/nbd.c
index 836424c88c6ee6e32e9538a3bd513cec02e951ae..d1038941200786d0a067cdbc9720da343e8aab78 100644 (file)
--- a/block/nbd.c
+++ b/block/nbd.c
@@ -28,6 +28,7 @@
 
 #include "qemu/osdep.h"
 #include "block/nbd-client.h"
+#include "qapi/error.h"
 #include "qemu/uri.h"
 #include "block/block_int.h"
 #include "qemu/module.h"

diff --git a/block/null.c b/block/null.c
index d90165dea7c40a6ef419c1d04277ea6edeebd78e..00bc6e478a975f0aaa2309fc50639674638ec802 100644 (file)
--- a/block/null.c
+++ b/block/null.c
@@ -11,6 +11,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "block/block_int.h"
 
 #define NULL_OPT_LATENCY "latency-ns"

diff --git a/block/parallels.c b/block/parallels.c
index b322d05c08fc18520bef59e7a49a25dfa556a550..9bba8b3d06b2b3cd531e74d8f244dbf2fee80127 100644 (file)
--- a/block/parallels.c
+++ b/block/parallels.c
@@ -28,6 +28,7 @@
  * THE SOFTWARE.
  */
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "qemu-common.h"
 #include "block/block_int.h"
 #include "sysemu/block-backend.h"

diff --git a/block/qcow.c b/block/qcow.c
index 73cf8a708178bacd10b515563d227b27df44ef58..8ea8e5ceef4fb1baaf00077628e6f572cfbadce3 100644 (file)
--- a/block/qcow.c
+++ b/block/qcow.c
@@ -22,6 +22,7 @@
  * THE SOFTWARE.
  */
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "qemu-common.h"
 #include "block/block_int.h"
 #include "sysemu/block-backend.h"

diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c
index 3e887e9ab0805ff3713ff229b87e7446d30eb4c4..31ecc1030452be1e536c468ab5ef3e6f12d6be1d 100644 (file)
--- a/block/qcow2-cluster.c
+++ b/block/qcow2-cluster.c
@@ -25,6 +25,7 @@
 #include "qemu/osdep.h"
 #include <zlib.h>
 
+#include "qapi/error.h"
 #include "qemu-common.h"
 #include "block/block_int.h"
 #include "block/qcow2.h"

diff --git a/block/qcow2-refcount.c b/block/qcow2-refcount.c
index 52a0a9ffc3596d00a5a0a87fafae9816cab1a380..ca6094ff5bb966790c027682757f15b2bab93413 100644 (file)
--- a/block/qcow2-refcount.c
+++ b/block/qcow2-refcount.c
@@ -23,6 +23,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "qemu-common.h"
 #include "block/block_int.h"
 #include "block/qcow2.h"

diff --git a/block/qcow2-snapshot.c b/block/qcow2-snapshot.c
index 13f88d1b8b6b931d15c6df9be8c430f9c58e408e..269acc2f4ef878035de42daf25eeda8274f1de61 100644 (file)
--- a/block/qcow2-snapshot.c
+++ b/block/qcow2-snapshot.c
@@ -23,6 +23,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "qemu-common.h"
 #include "block/block_int.h"
 #include "block/qcow2.h"

diff --git a/block/qed.c b/block/qed.c
index 5b24a9783fde1f0f1c762e9b8f1db8d7e3704760..20f05fe2b97db62ae8887706f471c5779161607d 100644 (file)
--- a/block/qed.c
+++ b/block/qed.c
@@ -13,6 +13,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "qemu/timer.h"
 #include "trace.h"
 #include "qed.h"

diff --git a/block/raw-posix.c b/block/raw-posix.c
index 8866121cf72fb91877ed1d899718dda8c77d2de0..29dc658e43ea9a1e758bbd83db9f5344f5b9e767 100644 (file)
--- a/block/raw-posix.c
+++ b/block/raw-posix.c
@@ -22,6 +22,7 @@
  * THE SOFTWARE.
  */
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "qemu-common.h"
 #include "qemu/error-report.h"
 #include "qemu/timer.h"

diff --git a/block/raw-win32.c b/block/raw-win32.c
index 21a6cb89d7b2398614b17f1658201ae802fbf8a4..bd07c93461db8d59274e2f8cbe9094e4e2a061ff 100644 (file)
--- a/block/raw-win32.c
+++ b/block/raw-win32.c
@@ -22,6 +22,7 @@
  * THE SOFTWARE.
  */
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "qemu-common.h"
 #include "qemu/timer.h"
 #include "block/block_int.h"

diff --git a/block/raw_bsd.c b/block/raw_bsd.c
index ea16a231c0dd853a0bd48c8402f6098f6475f8aa..41dddf8db33e9ed1a70ba4734f94bde8ac57fd0e 100644 (file)
--- a/block/raw_bsd.c
+++ b/block/raw_bsd.c
@@ -28,6 +28,7 @@
 
 #include "qemu/osdep.h"
 #include "block/block_int.h"
+#include "qapi/error.h"
 #include "qemu/option.h"
 
 static QemuOptsList raw_create_opts = {

diff --git a/block/rbd.c b/block/rbd.c
index abfea612ec2d1fa0e4f9c89e19a431d4cea4adf3..4f3fa304d525a1a462c8bd033b7cdd0b38c2e55c 100644 (file)
--- a/block/rbd.c
+++ b/block/rbd.c
@@ -13,6 +13,7 @@
 
 #include "qemu/osdep.h"
 
+#include "qapi/error.h"
 #include "qemu-common.h"
 #include "qemu/error-report.h"
 #include "block/block_int.h"

diff --git a/block/sheepdog.c b/block/sheepdog.c
index a3aeae4a671744d0b716f5332368bf48dc1cb459..a6b179b11d857dda693bb5ea33473024a108a405 100644 (file)
--- a/block/sheepdog.c
+++ b/block/sheepdog.c
@@ -13,6 +13,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "qemu-common.h"
 #include "qemu/uri.h"
 #include "qemu/error-report.h"

diff --git a/block/snapshot.c b/block/snapshot.c
index 17a27b57ad37985e2cd54e8a0bd740b6a80c33bd..e9d721df6868c1459bd780e401065f8a9045d3d5 100644 (file)
--- a/block/snapshot.c
+++ b/block/snapshot.c
@@ -25,6 +25,7 @@
 #include "qemu/osdep.h"
 #include "block/snapshot.h"
 #include "block/block_int.h"
+#include "qapi/error.h"
 #include "qapi/qmp/qerror.h"
 
 QemuOptsList internal_snapshot_opts = {

diff --git a/block/ssh.c b/block/ssh.c
index 04deeba1ad7e77ffa7cb015fc7ea653358635c52..06928ed93990e6456069e8066f75e608c5fad01d 100644 (file)
--- a/block/ssh.c
+++ b/block/ssh.c
@@ -28,6 +28,7 @@
 #include <libssh2_sftp.h>
 
 #include "block/block_int.h"
+#include "qapi/error.h"
 #include "qemu/error-report.h"
 #include "qemu/sockets.h"
 #include "qemu/uri.h"

diff --git a/block/stream.c b/block/stream.c
index cafaa07a0195c2751bf6eae6f386a60b5c143bd8..9b0b0f3573ca7e1dd1c43ade85c1968b566b9d60 100644 (file)
--- a/block/stream.c
+++ b/block/stream.c
@@ -15,6 +15,7 @@
 #include "trace.h"
 #include "block/block_int.h"
 #include "block/blockjob.h"
+#include "qapi/error.h"
 #include "qapi/qmp/qerror.h"
 #include "qemu/ratelimit.h"
 #include "sysemu/block-backend.h"

diff --git a/block/vdi.c b/block/vdi.c
index df9fa47db1fe5aced5dc38ea9c4a548c5386bdd4..cdf6b85216b20003121ff0fb9cbc72b612db6171 100644 (file)
--- a/block/vdi.c
+++ b/block/vdi.c
@@ -50,6 +50,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "qemu-common.h"
 #include "block/block_int.h"
 #include "sysemu/block-backend.h"

diff --git a/block/vhdx-log.c b/block/vhdx-log.c
index 369076126e49773b7e6724832cc2a4d909283f74..7ea7187fc4625ad2017729e6cac0fc5b4832b7f6 100644 (file)
--- a/block/vhdx-log.c
+++ b/block/vhdx-log.c
@@ -18,6 +18,7 @@
  *
  */
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "qemu-common.h"
 #include "block/block_int.h"
 #include "qemu/error-report.h"

diff --git a/block/vhdx.c b/block/vhdx.c
index 78fe56ca04c50e594a2051dddb827f089b951b43..59426d6c0fd01b28d0784c86e0cdb96c73d897ec 100644 (file)
--- a/block/vhdx.c
+++ b/block/vhdx.c
@@ -16,6 +16,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "qemu-common.h"
 #include "block/block_int.h"
 #include "sysemu/block-backend.h"

diff --git a/block/vmdk.c b/block/vmdk.c
index 29c8fc3d02c8212d5b199857c9cb4f47cc2579b2..5e341c678bc96d1a08f277ceaf3790d8472e9d5d 100644 (file)
--- a/block/vmdk.c
+++ b/block/vmdk.c
@@ -24,6 +24,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "qemu-common.h"
 #include "block/block_int.h"
 #include "sysemu/block-backend.h"

diff --git a/block/vpc.c b/block/vpc.c
index 8435205a0c585fb8e8f73115bbdf5d4f04a26919..912dfc1a829ee755975c19c0fe9a18d7dd3f4154 100644 (file)
--- a/block/vpc.c
+++ b/block/vpc.c
@@ -23,6 +23,7 @@
  * THE SOFTWARE.
  */
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "qemu-common.h"
 #include "block/block_int.h"
 #include "sysemu/block-backend.h"

diff --git a/block/vvfat.c b/block/vvfat.c
index b8d29e17cdca36537758e143ac276b7c7c397e14..bdce8da320fa121ddbf7aafbb282570e4dd46cc5 100644 (file)
--- a/block/vvfat.c
+++ b/block/vvfat.c
@@ -24,6 +24,7 @@
  */
 #include "qemu/osdep.h"
 #include <dirent.h>
+#include "qapi/error.h"
 #include "qemu-common.h"
 #include "block/block_int.h"
 #include "qemu/module.h"

diff --git a/bootdevice.c b/bootdevice.c
index dbc0159392bd8c614bd8216a3f4b626c260ec31a..2e83ff05ebc8af00af9058b1e6a11a7001c7eaef 100644 (file)
--- a/bootdevice.c
+++ b/bootdevice.c
@@ -23,6 +23,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "sysemu/sysemu.h"
 #include "qapi/visitor.h"
 #include "qemu/error-report.h"

diff --git a/contrib/ivshmem-server/main.c b/contrib/ivshmem-server/main.c
index cca1061f0e3b23554fdb67ea1719dc46ef02e26e..4c9a11f2c5ce2b9ccc7f6b08cd19c0460f0ad18f 100644 (file)
--- a/contrib/ivshmem-server/main.c
+++ b/contrib/ivshmem-server/main.c
@@ -7,6 +7,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "qemu-common.h"
 
 #include "ivshmem-server.h"

diff --git a/crypto/block-luks.c b/crypto/block-luks.c
index 58c1b940e18907248dc0462fb21c9d3610bb5730..439f89230c9f5a86a6d7217e3b8951a3b994e339 100644 (file)
--- a/crypto/block-luks.c
+++ b/crypto/block-luks.c
@@ -19,6 +19,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 
 #include "crypto/block-luks.h"
 

diff --git a/crypto/block-qcow.c b/crypto/block-qcow.c
index 9f378e8635212738f879330d8eeb87b5195f23e6..be88c6f0ef8a070df6beeb6b7a527739d5328ae2 100644 (file)
--- a/crypto/block-qcow.c
+++ b/crypto/block-qcow.c
@@ -25,6 +25,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 
 #include "crypto/block-qcow.h"
 #include "crypto/secret.h"

diff --git a/crypto/block.c b/crypto/block.c
index 524ed91db82a38340bb54d89107345c05e4acda0..da60eba85f2dbe03b88a2f1dbb5dee730cdc5ef2 100644 (file)
--- a/crypto/block.c
+++ b/crypto/block.c
@@ -19,6 +19,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "crypto/blockpriv.h"
 #include "crypto/block-qcow.h"
 #include "crypto/block-luks.h"

diff --git a/crypto/cipher.c b/crypto/cipher.c
index 5402d1852591d1fa9d2be217b8cce150d30f1bd2..cafb454363c4ea7cea61f5945531cbd5d8c90b9d 100644 (file)
--- a/crypto/cipher.c
+++ b/crypto/cipher.c
@@ -19,6 +19,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "crypto/cipher.h"
 
 

diff --git a/crypto/hash.c b/crypto/hash.c
index 4a8c0caea1ba2727f5b4228bfc6955b02d820456..b90af3495a02a3460eef0b67ffc9f24a4b68092f 100644 (file)
--- a/crypto/hash.c
+++ b/crypto/hash.c
@@ -19,6 +19,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "crypto/hash.h"
 
 #ifdef CONFIG_GNUTLS_HASH

diff --git a/crypto/init.c b/crypto/init.c
index 31eea19bc90c0bb7833c9a056c1b0f2c24086343..1e564d949289190d0fde7d68e0083da6f9ada5b5 100644 (file)
--- a/crypto/init.c
+++ b/crypto/init.c
@@ -20,6 +20,7 @@
 
 #include "qemu/osdep.h"
 #include "crypto/init.h"
+#include "qapi/error.h"
 #include "qemu/thread.h"
 
 #ifdef CONFIG_GNUTLS

diff --git a/crypto/ivgen-essiv.c b/crypto/ivgen-essiv.c
index 5649c01b8575b7f1f77abf1eead388b85dee0b60..2fd89def0fd165049ebd32cb3056763fe55e1ec3 100644 (file)
--- a/crypto/ivgen-essiv.c
+++ b/crypto/ivgen-essiv.c
@@ -19,6 +19,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "crypto/ivgen-essiv.h"
 
 typedef struct QCryptoIVGenESSIV QCryptoIVGenESSIV;

diff --git a/crypto/ivgen-plain.c b/crypto/ivgen-plain.c
index 6a85256cac029e619984ccc4b765dbff65f2bc74..a56675d5924b2acf59f115f393100cbffd783730 100644 (file)
--- a/crypto/ivgen-plain.c
+++ b/crypto/ivgen-plain.c
@@ -19,6 +19,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "crypto/ivgen-plain.h"
 
 static int qcrypto_ivgen_plain_init(QCryptoIVGen *ivgen,

diff --git a/crypto/ivgen-plain64.c b/crypto/ivgen-plain64.c
index 9ca6db9df28f1493792da4094af47770ab925f72..94d86730fbeb5bf3c1131c28d450a5cb3f3ae3fe 100644 (file)
--- a/crypto/ivgen-plain64.c
+++ b/crypto/ivgen-plain64.c
@@ -19,6 +19,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "crypto/ivgen-plain.h"
 
 static int qcrypto_ivgen_plain_init(QCryptoIVGen *ivgen,

diff --git a/crypto/ivgen.c b/crypto/ivgen.c
index 4ffc1eb886474c295ced4678678127ca00f93843..f66435112b6e9eaab2606b3c52b7965fb685cbdb 100644 (file)
--- a/crypto/ivgen.c
+++ b/crypto/ivgen.c
@@ -19,6 +19,8 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
+
 #include "crypto/ivgenpriv.h"
 #include "crypto/ivgen-plain.h"
 #include "crypto/ivgen-plain64.h"

diff --git a/crypto/pbkdf-gcrypt.c b/crypto/pbkdf-gcrypt.c
index 885614dfcca27e8c1f09d1938a72d8728587b19a..997b311d84f0da0e938f7986d28c749066cf6814 100644 (file)
--- a/crypto/pbkdf-gcrypt.c
+++ b/crypto/pbkdf-gcrypt.c
@@ -19,6 +19,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "crypto/pbkdf.h"
 #include "gcrypt.h"
 

diff --git a/crypto/pbkdf-nettle.c b/crypto/pbkdf-nettle.c
index 1aa7395ea5d9e918ed5a5e0abf3e777aa02cfe33..db9fc15780d2fe91a181eee8a6c9964bc241591a 100644 (file)
--- a/crypto/pbkdf-nettle.c
+++ b/crypto/pbkdf-nettle.c
@@ -19,6 +19,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "crypto/pbkdf.h"
 #include "nettle/pbkdf2.h"
 

diff --git a/crypto/pbkdf-stub.c b/crypto/pbkdf-stub.c
index cfc30d3c2a050addff026ea48e3cb655dd9d3614..266a5051b7a74c82b46804f2f300f88d04f5d6d1 100644 (file)
--- a/crypto/pbkdf-stub.c
+++ b/crypto/pbkdf-stub.c
@@ -19,6 +19,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "crypto/pbkdf.h"
 
 bool qcrypto_pbkdf2_supports(QCryptoHashAlgorithm hash G_GNUC_UNUSED)

diff --git a/crypto/pbkdf.c b/crypto/pbkdf.c
index 90721d85d63ca9f6d77588ebb7113b400e0c39f8..695cc35df1b80692b06e626ac48acf132ed0670b 100644 (file)
--- a/crypto/pbkdf.c
+++ b/crypto/pbkdf.c
@@ -19,6 +19,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "crypto/pbkdf.h"
 #ifndef _WIN32
 #include <sys/resource.h>

diff --git a/crypto/secret.c b/crypto/secret.c
index be736f2cd56ca48c6a4db714954e8d903279395e..285ab7a63c8f1f4b0f86fe30874580521eaca359 100644 (file)
--- a/crypto/secret.c
+++ b/crypto/secret.c
@@ -21,6 +21,7 @@
 #include "qemu/osdep.h"
 #include "crypto/secret.h"
 #include "crypto/cipher.h"
+#include "qapi/error.h"
 #include "qom/object_interfaces.h"
 #include "qemu/base64.h"
 #include "trace.h"

diff --git a/crypto/tlscreds.c b/crypto/tlscreds.c
index fc99589c222beb7b50867fdbad6ede413adc566a..1620e126aed85f00343b2d5c2323f6f19b72d0a3 100644 (file)
--- a/crypto/tlscreds.c
+++ b/crypto/tlscreds.c
@@ -19,6 +19,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "crypto/tlscredspriv.h"
 #include "trace.h"
 

diff --git a/crypto/tlscredsanon.c b/crypto/tlscredsanon.c
index f36a793d1672515f764b2058f53cf8a7885db237..14642200800413e811663a00df64638d4e8d84c1 100644 (file)
--- a/crypto/tlscredsanon.c
+++ b/crypto/tlscredsanon.c
@@ -21,6 +21,7 @@
 #include "qemu/osdep.h"
 #include "crypto/tlscredsanon.h"
 #include "crypto/tlscredspriv.h"
+#include "qapi/error.h"
 #include "qom/object_interfaces.h"
 #include "trace.h"
 

diff --git a/crypto/tlscredsx509.c b/crypto/tlscredsx509.c
index 99130433fd57c07dc11b2b3f38a88a01759af3e4..6a0179c2e163dd89ae2bd4e26e2ca3492f0fd388 100644 (file)
--- a/crypto/tlscredsx509.c
+++ b/crypto/tlscredsx509.c
@@ -22,6 +22,7 @@
 #include "crypto/tlscredsx509.h"
 #include "crypto/tlscredspriv.h"
 #include "crypto/secret.h"
+#include "qapi/error.h"
 #include "qom/object_interfaces.h"
 #include "trace.h"
 

diff --git a/crypto/tlssession.c b/crypto/tlssession.c
index e0d9658e8028acced7c024f310c435c03a4e3bf1..a543e5a576337f5492ac5265181a975fd361db86 100644 (file)
--- a/crypto/tlssession.c
+++ b/crypto/tlssession.c
@@ -22,6 +22,7 @@
 #include "crypto/tlssession.h"
 #include "crypto/tlscredsanon.h"
 #include "crypto/tlscredsx509.h"
+#include "qapi/error.h"
 #include "qemu/acl.h"
 #include "trace.h"
 

diff --git a/device_tree.c b/device_tree.c
index 6204af88c8fb0dce23779c57eb630f6d9108c669..ccba1fd4a4a15f7e729d795e222a576d3283c696 100644 (file)
--- a/device_tree.c
+++ b/device_tree.c
@@ -17,6 +17,7 @@
 #include <dirent.h>
 #endif
 
+#include "qapi/error.h"
 #include "qemu-common.h"
 #include "qemu/error-report.h"
 #include "sysemu/device_tree.h"

diff --git a/exec.c b/exec.c
index f398d212f63f1342bc0833975033b25e054231bf..151908ebdfe3c89a8327dc786b94b340cd7f0fd0 100644 (file)
--- a/exec.c
+++ b/exec.c
@@ -17,6 +17,7 @@
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #ifndef _WIN32
 #include <sys/mman.h>
 #endif

diff --git a/gdbstub.c b/gdbstub.c
index fdcb0eea8f54bd4ceae189593d45f231a9bc0177..e4e480f66811dfb8955c12722a5ce9a7c77ab164 100644 (file)
--- a/gdbstub.c
+++ b/gdbstub.c
@@ -17,6 +17,7 @@
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "qemu-common.h"
 #ifdef CONFIG_USER_ONLY
 

diff --git a/hw/9pfs/9p.c b/hw/9pfs/9p.c
index db5f4780dcd130347c27db65df05fb615d85f03a..f5e30125fcfd8fcf91c2eaa51d7ed49cc9d5ed76 100644 (file)
--- a/hw/9pfs/9p.c
+++ b/hw/9pfs/9p.c
@@ -14,6 +14,7 @@
 #include "qemu/osdep.h"
 #include "hw/virtio/virtio.h"
 #include "hw/i386/pc.h"
+#include "qapi/error.h"
 #include "qemu/error-report.h"
 #include "qemu/iov.h"
 #include "qemu/sockets.h"

diff --git a/hw/acpi/cpu_hotplug.c b/hw/acpi/cpu_hotplug.c
index 5a410a5287e5137e7a177a4a792ada3eeba811f3..4d86743fde1565be8fdb1ae5c5c2fbe36ff4c1e7 100644 (file)
--- a/hw/acpi/cpu_hotplug.c
+++ b/hw/acpi/cpu_hotplug.c
@@ -12,6 +12,7 @@
 #include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/acpi/cpu_hotplug.h"
+#include "qapi/error.h"
 #include "qom/cpu.h"
 
 static uint64_t cpu_status_read(void *opaque, hwaddr addr, unsigned int size)

diff --git a/hw/acpi/ich9.c b/hw/acpi/ich9.c
index 72202545e0925b431ace74fe2a490518aa66f397..27e978f5fdca6f7af886062d455487c5518b8fcd 100644 (file)
--- a/hw/acpi/ich9.c
+++ b/hw/acpi/ich9.c
@@ -25,6 +25,7 @@
  */
 #include "qemu/osdep.h"
 #include "hw/hw.h"
+#include "qapi/error.h"
 #include "qapi/visitor.h"
 #include "hw/i386/pc.h"
 #include "hw/pci/pci.h"

diff --git a/hw/acpi/pcihp.c b/hw/acpi/pcihp.c
index 3e338b5ec251050833a1b62078689f8e72e9d4ba..71f4c4e14b5fae95fdde337ccec9c53426fbb7a3 100644 (file)
--- a/hw/acpi/pcihp.c
+++ b/hw/acpi/pcihp.c
@@ -35,6 +35,7 @@
 #include "exec/ioport.h"
 #include "exec/address-spaces.h"
 #include "hw/pci/pci_bus.h"
+#include "qapi/error.h"
 #include "qom/qom-qobject.h"
 #include "qapi/qmp/qint.h"
 

diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c
index 9694e5238fe9230f9b95e3982772416b7a34a52d..16abdf1624097fd81d5bdc1f171c7ff946623f5c 100644 (file)
--- a/hw/acpi/piix4.c
+++ b/hw/acpi/piix4.c
@@ -26,6 +26,7 @@
 #include "hw/pci/pci.h"
 #include "hw/acpi/acpi.h"
 #include "sysemu/sysemu.h"
+#include "qapi/error.h"
 #include "qemu/range.h"
 #include "exec/ioport.h"
 #include "hw/nvram/fw_cfg.h"

diff --git a/hw/alpha/typhoon.c b/hw/alpha/typhoon.c
index b86ff5ea9b9dd2c8a83449549fd39c9191d0e6be..97721b535d840911e6018becc42de67e315d5c3a 100644 (file)
--- a/hw/alpha/typhoon.c
+++ b/hw/alpha/typhoon.c
@@ -7,6 +7,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "cpu.h"
 #include "hw/hw.h"
 #include "hw/devices.h"

diff --git a/hw/arm/allwinner-a10.c b/hw/arm/allwinner-a10.c
index 02c8caa1915790742ee58f17a05ec306d7cf6435..b4d3cf6d03100ba59efe41165dddcb45c15b4f10 100644 (file)
--- a/hw/arm/allwinner-a10.c
+++ b/hw/arm/allwinner-a10.c
@@ -16,6 +16,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "hw/sysbus.h"
 #include "hw/devices.h"
 #include "hw/arm/allwinner-a10.h"

diff --git a/hw/arm/armv7m.c b/hw/arm/armv7m.c
index ed7d97fc2161fdd6719a2dc0060892eac0100be9..c68d64458826d94151dcb53de385d078a7a25035 100644 (file)
--- a/hw/arm/armv7m.c
+++ b/hw/arm/armv7m.c
@@ -8,6 +8,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "hw/sysbus.h"
 #include "hw/arm/arm.h"
 #include "hw/loader.h"

diff --git a/hw/arm/ast2400.c b/hw/arm/ast2400.c
index daa5518c923a1c3dd296615eaede8ba4d127b76e..976b651a629030c786b0074edb023b2928e0b397 100644 (file)
--- a/hw/arm/ast2400.c
+++ b/hw/arm/ast2400.c
@@ -11,6 +11,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "exec/address-spaces.h"
 #include "hw/arm/ast2400.h"
 #include "hw/char/serial.h"

diff --git a/hw/arm/bcm2835_peripherals.c b/hw/arm/bcm2835_peripherals.c
index 8099a8a92ee506e4f7c72a5a96672ad4f78fdebe..234d5184300bcafda2a4a55e27c9c37c009cbebc 100644 (file)
--- a/hw/arm/bcm2835_peripherals.c
+++ b/hw/arm/bcm2835_peripherals.c
@@ -9,6 +9,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "hw/arm/bcm2835_peripherals.h"
 #include "hw/misc/bcm2835_mbox_defs.h"
 #include "hw/arm/raspi_platform.h"

diff --git a/hw/arm/bcm2836.c b/hw/arm/bcm2836.c
index 89a6b35b81476c90b4ebaa15a79d8c9d9d636bbf..d85f051af4c9e66ca3df3825afbdf78399a1b283 100644 (file)
--- a/hw/arm/bcm2836.c
+++ b/hw/arm/bcm2836.c
@@ -9,6 +9,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "hw/arm/bcm2836.h"
 #include "hw/arm/raspi_platform.h"
 #include "hw/sysbus.h"

diff --git a/hw/arm/boot.c b/hw/arm/boot.c
index 8ba0e4272aae543156bda308ce2c9ffdc09e67bd..5975fbfa8c2b9ea9b86572c5716ac5a9cec0d6d9 100644 (file)
--- a/hw/arm/boot.c
+++ b/hw/arm/boot.c
@@ -8,6 +8,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "hw/hw.h"
 #include "hw/arm/arm.h"
 #include "hw/arm/linux-boot-if.h"

diff --git a/hw/arm/cubieboard.c b/hw/arm/cubieboard.c
index 2382c591587a8ad50e1f53b011a7449bb5e1d244..69fdfc9eeb9d3d5a538f27d9004f8a3f100d94b4 100644 (file)
--- a/hw/arm/cubieboard.c
+++ b/hw/arm/cubieboard.c
@@ -16,6 +16,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "hw/sysbus.h"
 #include "hw/devices.h"
 #include "hw/boards.h"

diff --git a/hw/arm/digic.c b/hw/arm/digic.c
index 82087bacb8ec76df01621e27cf309cae2a076ee9..e0f9730325416927b1a2b6f76f6f3d00cd039626 100644 (file)
--- a/hw/arm/digic.c
+++ b/hw/arm/digic.c
@@ -21,6 +21,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "hw/arm/digic.h"
 
 #define DIGIC4_TIMER_BASE(n)    (0xc0210000 + (n) * 0x100)

diff --git a/hw/arm/digic_boards.c b/hw/arm/digic_boards.c
index e5308f47ab4e077b1182ebbe2d71abe7eae574f0..c4bec429ddd8035ab92fd48b760b7b69d69f1871 100644 (file)
--- a/hw/arm/digic_boards.c
+++ b/hw/arm/digic_boards.c
@@ -24,6 +24,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "hw/boards.h"
 #include "exec/address-spaces.h"
 #include "qemu/error-report.h"

diff --git a/hw/arm/exynos4210.c b/hw/arm/exynos4210.c
index 6a8f0b54ced9ccf1796b23b3078fddacad035939..e27a18274df795f35d13a9bb1fda6c1d17177ab3 100644 (file)
--- a/hw/arm/exynos4210.c
+++ b/hw/arm/exynos4210.c
@@ -22,6 +22,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "hw/boards.h"
 #include "sysemu/sysemu.h"
 #include "hw/sysbus.h"

diff --git a/hw/arm/fsl-imx25.c b/hw/arm/fsl-imx25.c
index 1fbc317b74ac9de90bfd5a3f189babc4823f826f..f47d47174409028e1e4500e60a0a7507e3eeebec 100644 (file)
--- a/hw/arm/fsl-imx25.c
+++ b/hw/arm/fsl-imx25.c
@@ -23,6 +23,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "hw/arm/fsl-imx25.h"
 #include "sysemu/sysemu.h"
 #include "exec/address-spaces.h"

diff --git a/hw/arm/fsl-imx31.c b/hw/arm/fsl-imx31.c
index 0d69a2c70b1e684f631421304f27cffd538feed6..2164e679f5e8288e23ea0d8d5ab6ebecbaeb5372 100644 (file)
--- a/hw/arm/fsl-imx31.c
+++ b/hw/arm/fsl-imx31.c
@@ -20,6 +20,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "hw/arm/fsl-imx31.h"
 #include "sysemu/sysemu.h"
 #include "exec/address-spaces.h"

diff --git a/hw/arm/highbank.c b/hw/arm/highbank.c
index e37378c69f4dd5f04c9a78a7bb02f3e420bec41c..d9930c0d34f4cdd5834ff0c47a9e049617df7128 100644 (file)
--- a/hw/arm/highbank.c
+++ b/hw/arm/highbank.c
@@ -18,6 +18,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "hw/sysbus.h"
 #include "hw/arm/arm.h"
 #include "hw/devices.h"

diff --git a/hw/arm/imx25_pdk.c b/hw/arm/imx25_pdk.c
index e3cffd190cb63b280094e4699b35639128977369..facd605bc828743ae6929e8641dc5f09d83607b9 100644 (file)
--- a/hw/arm/imx25_pdk.c
+++ b/hw/arm/imx25_pdk.c
@@ -24,6 +24,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "hw/arm/fsl-imx25.h"
 #include "hw/boards.h"
 #include "qemu/error-report.h"

diff --git a/hw/arm/integratorcp.c b/hw/arm/integratorcp.c
index c6656a817c704fe2fe881fff93e3e04a42d163fd..5a4540b3b75ca876af424e8861a9c7526937fbb0 100644 (file)
--- a/hw/arm/integratorcp.c
+++ b/hw/arm/integratorcp.c
@@ -8,6 +8,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "hw/sysbus.h"
 #include "hw/devices.h"
 #include "hw/boards.h"

diff --git a/hw/arm/kzm.c b/hw/arm/kzm.c
index 2eeb9d8973f59d16253c6709ed77506baa03ee0a..12cbd052bb66de7df6ddd139ee03bc5c2c7d8516 100644 (file)
--- a/hw/arm/kzm.c
+++ b/hw/arm/kzm.c
@@ -14,6 +14,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "hw/arm/fsl-imx31.h"
 #include "hw/boards.h"
 #include "qemu/error-report.h"

diff --git a/hw/arm/mainstone.c b/hw/arm/mainstone.c
index 98a892ff6216d3c170a7c56e8659b412b4cf24bb..454acc5d2beb33705c4e6d6669ec08cec7eb03a8 100644 (file)
--- a/hw/arm/mainstone.c
+++ b/hw/arm/mainstone.c
@@ -12,6 +12,7 @@
  * GNU GPL, version 2 or (at your option) any later version.
  */
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "hw/hw.h"
 #include "hw/arm/pxa.h"
 #include "hw/arm/arm.h"

diff --git a/hw/arm/musicpal.c b/hw/arm/musicpal.c
index 54548f38bb0d6155573ddbd4e16960f689294313..28d5af1d9b7674d3f197a6e1f955dab385886db5 100644 (file)
--- a/hw/arm/musicpal.c
+++ b/hw/arm/musicpal.c
@@ -10,6 +10,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "hw/sysbus.h"
 #include "hw/arm/arm.h"
 #include "hw/devices.h"

diff --git a/hw/arm/netduino2.c b/hw/arm/netduino2.c
index 49da6e360d66860dfd7dac5bd225850740c5b74e..23d792837f0f65c4b12a93e24196a022ef40a9fe 100644 (file)
--- a/hw/arm/netduino2.c
+++ b/hw/arm/netduino2.c
@@ -23,6 +23,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "hw/boards.h"
 #include "qemu/error-report.h"
 #include "hw/arm/stm32f205_soc.h"

diff --git a/hw/arm/nseries.c b/hw/arm/nseries.c
index 9a5f33bd8ae5fe54a5cfbeca05d5469099170493..4561d4a48381a2ee77006beb012f466aea775c27 100644 (file)
--- a/hw/arm/nseries.c
+++ b/hw/arm/nseries.c
@@ -19,6 +19,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "qemu-common.h"
 #include "sysemu/sysemu.h"
 #include "hw/arm/omap.h"

diff --git a/hw/arm/omap1.c b/hw/arm/omap1.c
index 6f681304198d7b8d6b03023db79aa14f5b246b60..387a776c839f26a4880bf8fe5473aa9320ae1204 100644 (file)
--- a/hw/arm/omap1.c
+++ b/hw/arm/omap1.c
@@ -18,6 +18,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "hw/boards.h"
 #include "hw/hw.h"
 #include "hw/arm/arm.h"

diff --git a/hw/arm/omap2.c b/hw/arm/omap2.c
index d11224e81e80f4880a9d6a68a3ff9c8b62ef2cf9..74d45baed89fd38f59475fe1ba615f38f6ec5316 100644 (file)
--- a/hw/arm/omap2.c
+++ b/hw/arm/omap2.c
@@ -19,6 +19,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "sysemu/block-backend.h"
 #include "sysemu/blockdev.h"
 #include "hw/boards.h"

diff --git a/hw/arm/omap_sx1.c b/hw/arm/omap_sx1.c
index cd50691d8bd14fd7085ab299db9e48302afb6dbe..5d74026cb26b46ca2df83d007e93cc818b5e703e 100644 (file)
--- a/hw/arm/omap_sx1.c
+++ b/hw/arm/omap_sx1.c
@@ -26,6 +26,7 @@
  * with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "hw/hw.h"
 #include "ui/console.h"
 #include "hw/arm/omap.h"

diff --git a/hw/arm/palm.c b/hw/arm/palm.c
index cae0a46561bedab7ec05369d92e237c5785fc2bb..7f460732e34b76618c05634d9a183f2e8223c911 100644 (file)
--- a/hw/arm/palm.c
+++ b/hw/arm/palm.c
@@ -17,6 +17,7 @@
  * with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "hw/hw.h"
 #include "audio/audio.h"
 #include "sysemu/sysemu.h"

diff --git a/hw/arm/palmetto-bmc.c b/hw/arm/palmetto-bmc.c
index 55d741918b969391c11c6e5e3c5210b3a3016f2d..6b3bb77a6d95f846440f2819c1d83f72e58f5f36 100644 (file)
--- a/hw/arm/palmetto-bmc.c
+++ b/hw/arm/palmetto-bmc.c
@@ -10,6 +10,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "exec/address-spaces.h"
 #include "hw/arm/arm.h"
 #include "hw/arm/ast2400.h"

diff --git a/hw/arm/pxa2xx.c b/hw/arm/pxa2xx.c
index ff6ac7a60a85f88f64d750d280e764cc4643edbf..24109091bff9d9ec8b0735d7b3ae5602f1907743 100644 (file)
--- a/hw/arm/pxa2xx.c
+++ b/hw/arm/pxa2xx.c
@@ -8,6 +8,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "hw/sysbus.h"
 #include "hw/arm/pxa.h"
 #include "sysemu/sysemu.h"

diff --git a/hw/arm/raspi.c b/hw/arm/raspi.c
index 83fe8097e58d98079e1f1441776d72dbc9d52abb..d2b02e6f2b6171f1a5cbf0f01bafd7acbb5f7c59 100644 (file)
--- a/hw/arm/raspi.c
+++ b/hw/arm/raspi.c
@@ -9,6 +9,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "hw/arm/bcm2836.h"
 #include "qemu/error-report.h"
 #include "hw/boards.h"

diff --git a/hw/arm/realview.c b/hw/arm/realview.c
index 481ae00fbc2c1af3b131cbe2fddf1d466e6d87b8..c45441aa34403071c05e22b5b931ed12e66c7556 100644 (file)
--- a/hw/arm/realview.c
+++ b/hw/arm/realview.c
@@ -8,6 +8,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "hw/sysbus.h"
 #include "hw/arm/arm.h"
 #include "hw/arm/primecell.h"

diff --git a/hw/arm/spitz.c b/hw/arm/spitz.c
index c3048f3ea6f5070a8ffd48b5682ddcd787c678ea..50949d06afcc34faef20d910f1996f85a4488b76 100644 (file)
--- a/hw/arm/spitz.c
+++ b/hw/arm/spitz.c
@@ -11,6 +11,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "hw/hw.h"
 #include "hw/arm/pxa.h"
 #include "hw/arm/arm.h"

diff --git a/hw/arm/stellaris.c b/hw/arm/stellaris.c
index c3c72f1b4912bb6340c2634fe5fe28ff1c1c1e29..3caeb0679b403ed9a0458d62f0f5d59ed807dd91 100644 (file)
--- a/hw/arm/stellaris.c
+++ b/hw/arm/stellaris.c
@@ -8,6 +8,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "hw/sysbus.h"
 #include "hw/ssi/ssi.h"
 #include "hw/arm/arm.h"

diff --git a/hw/arm/stm32f205_soc.c b/hw/arm/stm32f205_soc.c
index 79bfe6d10fa3eb5c5c06ed3c5a437bdd1588552a..6ce2fdcea7a5d5372d536681f1d92167e92060b4 100644 (file)
--- a/hw/arm/stm32f205_soc.c
+++ b/hw/arm/stm32f205_soc.c
@@ -23,6 +23,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "hw/arm/arm.h"
 #include "exec/address-spaces.h"
 #include "hw/arm/stm32f205_soc.h"

diff --git a/hw/arm/sysbus-fdt.c b/hw/arm/sysbus-fdt.c
index 49bd212d07715e53a8a2c842502b8d048b128959..5debb3348cd077f878e3ff5d616deb4833f9ff9a 100644 (file)
--- a/hw/arm/sysbus-fdt.c
+++ b/hw/arm/sysbus-fdt.c
@@ -22,6 +22,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include <libfdt.h>
 #include "qemu-common.h"
 #ifdef CONFIG_LINUX

diff --git a/hw/arm/tosa.c b/hw/arm/tosa.c
index d83c1e1785f9b5c89a02694f53fad82bdc610c16..4e9494f94c20f7d56281bc4af9d253d9180dd021 100644 (file)
--- a/hw/arm/tosa.c
+++ b/hw/arm/tosa.c
@@ -12,6 +12,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "hw/hw.h"
 #include "hw/arm/pxa.h"
 #include "hw/arm/arm.h"

diff --git a/hw/arm/versatilepb.c b/hw/arm/versatilepb.c
index 5f7523e355963ef7a914c6fc985712fcef5d0c53..43f429e951b902a036fe78033f4c614565aa3c8e 100644 (file)
--- a/hw/arm/versatilepb.c
+++ b/hw/arm/versatilepb.c
@@ -8,6 +8,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "hw/sysbus.h"
 #include "hw/arm/arm.h"
 #include "hw/devices.h"

diff --git a/hw/arm/vexpress.c b/hw/arm/vexpress.c
index 769390c6c1a6b3810d77aa61b9babceed083f57c..50832993a2b6d6ada9a3e55ba0ebf78a206cc042 100644 (file)
--- a/hw/arm/vexpress.c
+++ b/hw/arm/vexpress.c
@@ -22,6 +22,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "hw/sysbus.h"
 #include "hw/arm/arm.h"
 #include "hw/arm/primecell.h"

diff --git a/hw/arm/virt-acpi-build.c b/hw/arm/virt-acpi-build.c
index 6a86b2ca2ce55f4a79b98a1b510c9e63b311e30a..f51fe396ce9cc5655c53e296a43d59dfdf423f71 100644 (file)
--- a/hw/arm/virt-acpi-build.c
+++ b/hw/arm/virt-acpi-build.c
@@ -27,6 +27,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "qemu-common.h"
 #include "hw/arm/virt-acpi-build.h"
 #include "qemu/bitmap.h"

diff --git a/hw/arm/virt.c b/hw/arm/virt.c
index 95331a5662f1db55d1a6e0159d0fa8cf7bdf5b0c..a5e787dec6a194312902546613693052074596e2 100644 (file)
--- a/hw/arm/virt.c
+++ b/hw/arm/virt.c
@@ -29,6 +29,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "hw/sysbus.h"
 #include "hw/arm/arm.h"
 #include "hw/arm/primecell.h"

diff --git a/hw/arm/xilinx_zynq.c b/hw/arm/xilinx_zynq.c
index a35983a9ec1eb36086d8e314ae1f84f47129e1af..fa8bbe71006c8ae1bf5d551f6bf872b63e8916f2 100644 (file)
--- a/hw/arm/xilinx_zynq.c
+++ b/hw/arm/xilinx_zynq.c
@@ -16,6 +16,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "hw/sysbus.h"
 #include "hw/arm/arm.h"
 #include "net/net.h"

diff --git a/hw/arm/xlnx-ep108.c b/hw/arm/xlnx-ep108.c
index a1bd283a5250c35d1dda08842e44a473bedae6d5..3313ad0ed698326c555a307795714b8eb1fd188a 100644 (file)
--- a/hw/arm/xlnx-ep108.c
+++ b/hw/arm/xlnx-ep108.c
@@ -16,6 +16,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "hw/arm/xlnx-zynqmp.h"
 #include "hw/boards.h"
 #include "qemu/error-report.h"

diff --git a/hw/arm/xlnx-zynqmp.c b/hw/arm/xlnx-zynqmp.c
index 4fbb63550b95f6762b0c10df9ef36f84cf7b5367..0cff6deaba05e533bc4702ce916e2d480663bbfc 100644 (file)
--- a/hw/arm/xlnx-zynqmp.c
+++ b/hw/arm/xlnx-zynqmp.c
@@ -16,6 +16,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "hw/arm/xlnx-zynqmp.h"
 #include "hw/intc/arm_gic_common.h"
 #include "exec/address-spaces.h"

diff --git a/hw/audio/adlib.c b/hw/audio/adlib.c
index 1270b19cc6941c3b133798873f96b1b04980b7e2..355a2595d4e8a06ac1fc0f0a111f6a0299811c2c 100644 (file)
--- a/hw/audio/adlib.c
+++ b/hw/audio/adlib.c
@@ -23,6 +23,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "hw/hw.h"
 #include "hw/audio/audio.h"
 #include "audio/audio.h"

diff --git a/hw/audio/gus.c b/hw/audio/gus.c
index b416a5490902e0d80084bbe1dac0d71da48ba18d..9dd6947beec9c3c61b68782d616612b7f3574634 100644 (file)
--- a/hw/audio/gus.c
+++ b/hw/audio/gus.c
@@ -22,6 +22,7 @@
  * THE SOFTWARE.
  */
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "hw/hw.h"
 #include "hw/audio/audio.h"
 #include "audio/audio.h"

diff --git a/hw/block/block.c b/hw/block/block.c
index 960df2b9d02d3c182dc5f1590ff0efe91812649e..97a59d4fa2475839b72aa70e8e9e1da8a368a238 100644 (file)
--- a/hw/block/block.c
+++ b/hw/block/block.c
@@ -11,6 +11,7 @@
 #include "sysemu/blockdev.h"
 #include "sysemu/block-backend.h"
 #include "hw/block/block.h"
+#include "qapi/error.h"
 #include "qemu/error-report.h"
 
 void blkconf_serial(BlockConf *conf, char **serial)

diff --git a/hw/block/dataplane/virtio-blk.c b/hw/block/dataplane/virtio-blk.c
index 36f3d2b8133bb2202a3f65a3fc61a0b78fbf7c8f..e666dd4ff0e78ee82bf6cb56930a5ab7a758509c 100644 (file)
--- a/hw/block/dataplane/virtio-blk.c
+++ b/hw/block/dataplane/virtio-blk.c
@@ -13,6 +13,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "trace.h"
 #include "qemu/iov.h"
 #include "qemu/thread.h"

diff --git a/hw/block/fdc.c b/hw/block/fdc.c
index fc3aef9cd1ec88af39f82bd393ffa2a1b5a9b09c..72dc1484b18b9e28b54d61f83c8048676a38483a 100644 (file)
--- a/hw/block/fdc.c
+++ b/hw/block/fdc.c
@@ -30,6 +30,7 @@
 #include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/block/fdc.h"
+#include "qapi/error.h"
 #include "qemu/error-report.h"
 #include "qemu/timer.h"
 #include "hw/isa/isa.h"

diff --git a/hw/block/nand.c b/hw/block/nand.c
index f51e13fcace584997b34089a108d9cbd5db2f754..29c6596810bc33407563610673fd4a287cc728d3 100644 (file)
--- a/hw/block/nand.c
+++ b/hw/block/nand.c
@@ -23,6 +23,7 @@
 #include "hw/block/flash.h"
 #include "sysemu/block-backend.h"
 #include "hw/qdev.h"
+#include "qapi/error.h"
 #include "qemu/error-report.h"
 
 # define NAND_CMD_READ0                0x00

diff --git a/hw/block/nvme.c b/hw/block/nvme.c
index c68b62521a5c2785ef3439b7cf09231dae53b41e..173988ee842b606438332dc8014e56727fc481f0 100644 (file)
--- a/hw/block/nvme.c
+++ b/hw/block/nvme.c
@@ -26,6 +26,7 @@
 #include <hw/pci/msix.h>
 #include <hw/pci/pci.h>
 #include "sysemu/sysemu.h"
+#include "qapi/error.h"
 #include "qapi/visitor.h"
 #include "sysemu/block-backend.h"
 

diff --git a/hw/block/onenand.c b/hw/block/onenand.c
index 91896851f5b3324b9e7b17a624266227b6923029..883f4b1faae63771ec705cb27541ebc7e40cfb25 100644 (file)
--- a/hw/block/onenand.c
+++ b/hw/block/onenand.c
@@ -19,6 +19,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "qemu-common.h"
 #include "hw/hw.h"
 #include "hw/block/flash.h"

diff --git a/hw/block/pflash_cfi01.c b/hw/block/pflash_cfi01.c
index a4c4fa1c69e370298fab4e01f414fc96eb333107..c475c2aea75bdf21b1c3bdd8bf3469634775574c 100644 (file)
--- a/hw/block/pflash_cfi01.c
+++ b/hw/block/pflash_cfi01.c
@@ -40,6 +40,7 @@
 #include "hw/hw.h"
 #include "hw/block/flash.h"
 #include "sysemu/block-backend.h"
+#include "qapi/error.h"
 #include "qemu/timer.h"
 #include "qemu/bitops.h"
 #include "exec/address-spaces.h"

diff --git a/hw/block/pflash_cfi02.c b/hw/block/pflash_cfi02.c
index aaa697adbbfba545d4e3ae044edb03f6ac43fdd5..eadc61b7df2c3a97cb7f0dbca5b36de077073000 100644 (file)
--- a/hw/block/pflash_cfi02.c
+++ b/hw/block/pflash_cfi02.c
@@ -38,6 +38,7 @@
 #include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/block/flash.h"
+#include "qapi/error.h"
 #include "qemu/timer.h"
 #include "sysemu/block-backend.h"
 #include "exec/address-spaces.h"

diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c
index cb710f16fa47f5d6817321f2892af0536ee3142a..870d3452441b6fcad3bbb32cfff6188f93df99ee 100644 (file)
--- a/hw/block/virtio-blk.c
+++ b/hw/block/virtio-blk.c
@@ -12,6 +12,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "qemu-common.h"
 #include "qemu/iov.h"
 #include "qemu/error-report.h"

diff --git a/hw/block/xen_disk.c b/hw/block/xen_disk.c
index 635328fa696ccda38f49550d89584c1e359c18ce..e619a1f7d9f6d61a55be1613460d488a66cc9dbe 100644 (file)
--- a/hw/block/xen_disk.c
+++ b/hw/block/xen_disk.c
@@ -29,6 +29,7 @@
 #include "xen_blkif.h"
 #include "sysemu/blockdev.h"
 #include "sysemu/block-backend.h"
+#include "qapi/error.h"
 #include "qapi/qmp/qdict.h"
 #include "qapi/qmp/qstring.h"
 

diff --git a/hw/bt/hci.c b/hw/bt/hci.c
index 8bc33b50a5070ef7d9b72bf5850f363a5604c34d..1eaa442c38c9cf68518097747b14e8d5bee144cf 100644 (file)
--- a/hw/bt/hci.c
+++ b/hw/bt/hci.c
@@ -19,6 +19,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "qemu-common.h"
 #include "qemu/timer.h"
 #include "hw/usb.h"

diff --git a/hw/char/debugcon.c b/hw/char/debugcon.c
index 148632e686dd474136fad0b2bd9320592691c13e..e7f025ec671807ad33c50f054fc02e44655afd1e 100644 (file)
--- a/hw/char/debugcon.c
+++ b/hw/char/debugcon.c
@@ -25,6 +25,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "hw/hw.h"
 #include "sysemu/char.h"
 #include "hw/isa/isa.h"

diff --git a/hw/char/parallel.c b/hw/char/parallel.c
index f6ba76fd6028f9ad3d61e97045298b5f2ec75419..11c78fed88690fef32d55798f13bcb458094613a 100644 (file)
--- a/hw/char/parallel.c
+++ b/hw/char/parallel.c
@@ -23,6 +23,7 @@
  * THE SOFTWARE.
  */
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "hw/hw.h"
 #include "sysemu/char.h"
 #include "hw/isa/isa.h"

diff --git a/hw/char/serial-isa.c b/hw/char/serial-isa.c
index b9b5bc6db28a1b87ec89a69c6883906b1426869e..1594ec4db37b37982ba13395707333ba8dea35dd 100644 (file)
--- a/hw/char/serial-isa.c
+++ b/hw/char/serial-isa.c
@@ -24,6 +24,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "hw/char/serial.h"
 #include "hw/isa/isa.h"
 

diff --git a/hw/char/serial-pci.c b/hw/char/serial-pci.c
index 8f1b6f3d84b34c30d58be56a77b0a75503073029..303104dd19a435a83f2c738deeace198b15dff0b 100644 (file)
--- a/hw/char/serial-pci.c
+++ b/hw/char/serial-pci.c
@@ -26,6 +26,7 @@
 /* see docs/specs/pci-serial.txt */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "hw/char/serial.h"
 #include "hw/pci/pci.h"
 

diff --git a/hw/char/serial.c b/hw/char/serial.c
index 39e07db0883f21d06070c536a307a31f0599766e..6f89f2c9e6a33198565abb386253f1e3d395c8e4 100644 (file)
--- a/hw/char/serial.c
+++ b/hw/char/serial.c
@@ -26,6 +26,7 @@
 #include "qemu/osdep.h"
 #include "hw/char/serial.h"
 #include "sysemu/char.h"
+#include "qapi/error.h"
 #include "qemu/timer.h"
 #include "exec/address-spaces.h"
 #include "qemu/error-report.h"

diff --git a/hw/char/spapr_vty.c b/hw/char/spapr_vty.c
index 747c69d12d5a3cd4090aa3a634a4661808f43abf..f3aff5eeea44572baf96aa1854b7bf3f9f92644e 100644 (file)
--- a/hw/char/spapr_vty.c
+++ b/hw/char/spapr_vty.c
@@ -1,4 +1,5 @@
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "hw/qdev.h"
 #include "sysemu/char.h"
 #include "hw/ppc/spapr.h"

diff --git a/hw/char/virtio-serial-bus.c b/hw/char/virtio-serial-bus.c
index 99cb6836add183d2ae983055e6a639ee5b9dc9f3..6e5de6dec2ea0a55d1fdfc88109f1dd7148561a8 100644 (file)
--- a/hw/char/virtio-serial-bus.c
+++ b/hw/char/virtio-serial-bus.c
@@ -19,6 +19,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "qemu/iov.h"
 #include "monitor/monitor.h"
 #include "qemu/error-report.h"

diff --git a/hw/core/loader.c b/hw/core/loader.c
index 8e8031ca3cf12c9c3a01c8b32b81155879845e47..93410e35b53fa2b1156772702bc20cd20c6196f2 100644 (file)
--- a/hw/core/loader.c
+++ b/hw/core/loader.c
@@ -43,6 +43,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "hw/hw.h"
 #include "disas/disas.h"
 #include "monitor/monitor.h"

diff --git a/hw/core/machine.c b/hw/core/machine.c
index a8c4680b0c4716b775f55ccf7002a5903d86c7bb..136bf275bcc3732199f9cb4ca87633595fc97237 100644 (file)
--- a/hw/core/machine.c
+++ b/hw/core/machine.c
@@ -12,6 +12,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/boards.h"
+#include "qapi/error.h"
 #include "qapi-visit.h"
 #include "qapi/visitor.h"
 #include "hw/sysbus.h"

diff --git a/hw/core/nmi.c b/hw/core/nmi.c
index 6ca569bd7f964434ed6cf903dad05c6bad1c1fa5..e8bcc4177bcbd099587af607030fdcc1991aa700 100644 (file)
--- a/hw/core/nmi.c
+++ b/hw/core/nmi.c
@@ -21,6 +21,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/nmi.h"
+#include "qapi/error.h"
 #include "qapi/qmp/qerror.h"
 #include "monitor/monitor.h"
 

diff --git a/hw/core/qdev-properties-system.c b/hw/core/qdev-properties-system.c
index e10cede74965967f741c668cb746a86ca97bcbc6..891219ae05a05b670070fe940a12d08feab2c3e3 100644 (file)
--- a/hw/core/qdev-properties-system.c
+++ b/hw/core/qdev-properties-system.c
@@ -13,6 +13,7 @@
 #include "qemu/osdep.h"
 #include "net/net.h"
 #include "hw/qdev.h"
+#include "qapi/error.h"
 #include "qapi/qmp/qerror.h"
 #include "sysemu/block-backend.h"
 #include "sysemu/blockdev.h"

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

diff --git a/hw/cpu/a15mpcore.c b/hw/cpu/a15mpcore.c
index a221b8fe7b8ce592a15c517aaae089205b29091d..bc05152fd35b88bbf5f522396b56c958caae9fce 100644 (file)
--- a/hw/cpu/a15mpcore.c
+++ b/hw/cpu/a15mpcore.c
@@ -19,6 +19,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "hw/cpu/a15mpcore.h"
 #include "sysemu/kvm.h"
 #include "kvm_arm.h"

diff --git a/hw/cpu/a9mpcore.c b/hw/cpu/a9mpcore.c
index 23c882fe9afdeeeaec0d64847eb263cf4ab16a1d..5459ae8c1bc713c41b1c355fa8359070f84c0101 100644 (file)
--- a/hw/cpu/a9mpcore.c
+++ b/hw/cpu/a9mpcore.c
@@ -9,6 +9,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "hw/cpu/a9mpcore.h"
 
 static void a9mp_priv_set_irq(void *opaque, int irq, int level)

diff --git a/hw/cpu/arm11mpcore.c b/hw/cpu/arm11mpcore.c
index 5f4ca3192783c721e68ce64214cef1bc0003af7b..eb244658b902966535e4df09cd0e39b3e6cae385 100644 (file)
--- a/hw/cpu/arm11mpcore.c
+++ b/hw/cpu/arm11mpcore.c
@@ -8,6 +8,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "hw/cpu/arm11mpcore.h"
 #include "hw/intc/realview_gic.h"
 

diff --git a/hw/cpu/realview_mpcore.c b/hw/cpu/realview_mpcore.c
index c5c4dfced5791807ecd7f57f4d711aaa231e5b6e..39d4ebeb1d98bf32e10dc7fb793f400450195186 100644 (file)
--- a/hw/cpu/realview_mpcore.c
+++ b/hw/cpu/realview_mpcore.c
@@ -9,6 +9,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "hw/cpu/arm11mpcore.h"
 #include "hw/intc/realview_gic.h"
 

diff --git a/hw/cris/axis_dev88.c b/hw/cris/axis_dev88.c
index f2ba1d0775ada8dac12270a8f8fdc47044ddab6b..8cfa082acd8ca5f455d4e44fa5a5dc1712de9fb1 100644 (file)
--- a/hw/cris/axis_dev88.c
+++ b/hw/cris/axis_dev88.c
@@ -23,6 +23,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "hw/sysbus.h"
 #include "net/net.h"
 #include "hw/block/flash.h"

diff --git a/hw/display/bcm2835_fb.c b/hw/display/bcm2835_fb.c
index 779b56f07baad88d23f3118c9fab0cb6a6c07fb2..506f1d3d90697009ce706061a79a225bcd697462 100644 (file)
--- a/hw/display/bcm2835_fb.c
+++ b/hw/display/bcm2835_fb.c
@@ -24,6 +24,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "hw/display/bcm2835_fb.h"
 #include "hw/display/framebuffer.h"
 #include "ui/pixel_ops.h"

diff --git a/hw/display/cg3.c b/hw/display/cg3.c
index 321a25157bd8e0c2763f7adbbd0b09226711b187..fc0d97fa4b95c46cfe1df329ae41b126f7498f1a 100644 (file)
--- a/hw/display/cg3.c
+++ b/hw/display/cg3.c
@@ -24,6 +24,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "qemu-common.h"
 #include "qemu/error-report.h"
 #include "ui/console.h"

diff --git a/hw/display/cirrus_vga.c b/hw/display/cirrus_vga.c
index 57b91a77ca3856966479a4839bf8c51dac69eba7..3d712d592fff495e6c37152acbaceccf48841e82 100644 (file)
--- a/hw/display/cirrus_vga.c
+++ b/hw/display/cirrus_vga.c
@@ -27,6 +27,7 @@
  *   available at http://home.worldonline.dk/~finth/
  */
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "hw/hw.h"
 #include "hw/pci/pci.h"
 #include "ui/console.h"

diff --git a/hw/display/sm501.c b/hw/display/sm501.c
index 29572437e416e9c2d91444e6f8971cbe1e98bffc..183e1d2b60ed7be9b6db4d91ceccc87c63c13369 100644 (file)
--- a/hw/display/sm501.c
+++ b/hw/display/sm501.c
@@ -23,6 +23,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "hw/hw.h"
 #include "hw/char/serial.h"
 #include "ui/console.h"

diff --git a/hw/display/tc6393xb.c b/hw/display/tc6393xb.c
index 31043b178361c46b46f957e0575678c3fd6dcc74..da3ceceb0a83b5b825b8e0289930163ee51ce0d4 100644 (file)
--- a/hw/display/tc6393xb.c
+++ b/hw/display/tc6393xb.c
@@ -11,6 +11,7 @@
  * GNU GPL, version 2 or (at your option) any later version.
  */
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "hw/hw.h"
 #include "hw/devices.h"
 #include "hw/block/flash.h"

diff --git a/hw/display/tcx.c b/hw/display/tcx.c
index 8afc2f33c6d00bc32d75934e11badd089b47f430..cac9fe3d533e75ecaa812658e586e7466c2a1a5f 100644 (file)
--- a/hw/display/tcx.c
+++ b/hw/display/tcx.c
@@ -23,6 +23,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "qemu-common.h"
 #include "ui/console.h"
 #include "ui/pixel_ops.h"

diff --git a/hw/display/vga.c b/hw/display/vga.c
index 555cac64c7ddcd9de6043d3f40562810a4ec8492..25dc978b951962ed5b4f685e052c7a7ebac305af 100644 (file)
--- a/hw/display/vga.c
+++ b/hw/display/vga.c
@@ -22,6 +22,7 @@
  * THE SOFTWARE.
  */
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "hw/hw.h"
 #include "vga.h"
 #include "ui/console.h"

diff --git a/hw/display/vmware_vga.c b/hw/display/vmware_vga.c
index 17bba630eb149b3d851718b15815e15010df0abc..0c63fa851346795870b035c3760ab352b337053c 100644 (file)
--- a/hw/display/vmware_vga.c
+++ b/hw/display/vmware_vga.c
@@ -22,6 +22,7 @@
  * THE SOFTWARE.
  */
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "hw/hw.h"
 #include "hw/loader.h"
 #include "trace.h"

diff --git a/hw/dma/bcm2835_dma.c b/hw/dma/bcm2835_dma.c
index c7ce4e4881585e05b9e4e7bd774646c0c844eb1d..542117599820fec60669af330d8a35216cfc4a2c 100644 (file)
--- a/hw/dma/bcm2835_dma.c
+++ b/hw/dma/bcm2835_dma.c
@@ -4,6 +4,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "hw/dma/bcm2835_dma.h"
 
 /* DMA CS Control and Status bits */

diff --git a/hw/dma/pl330.c b/hw/dma/pl330.c
index 37ea7e41ffc09f4d05ac3291ac5edf3b12aee75f..ea89ecb00e3f9807ab75382cd0b73572cbadaf67 100644 (file)
--- a/hw/dma/pl330.c
+++ b/hw/dma/pl330.c
@@ -16,6 +16,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/sysbus.h"
+#include "qapi/error.h"
 #include "qemu/timer.h"
 #include "sysemu/dma.h"
 

diff --git a/hw/dma/xilinx_axidma.c b/hw/dma/xilinx_axidma.c
index ce5c1e6fbdf61b9aedc0b44c0f381d5b63ec94bc..a4753e55a2d3f7abcd54ae3e24d25b2b0860bc8a 100644 (file)
--- a/hw/dma/xilinx_axidma.c
+++ b/hw/dma/xilinx_axidma.c
@@ -24,6 +24,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/sysbus.h"
+#include "qapi/error.h"
 #include "qemu/timer.h"
 #include "hw/ptimer.h"
 #include "qemu/log.h"

diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index 325d8ce13cd03a196a59fb1a202f9fc760b5c358..35180efe0c6d7f422d31b1f837eb71c238df1340 100644 (file)
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -21,6 +21,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "acpi-build.h"
 #include <glib.h>
 #include "qemu-common.h"

diff --git a/hw/i386/kvm/i8254.c b/hw/i386/kvm/i8254.c
index e43b5c4461101152a43a8920c004418ec4517bd0..a4462e5ca9c9e5a04f845a5581d9e27d52f9dc2c 100644 (file)
--- a/hw/i386/kvm/i8254.c
+++ b/hw/i386/kvm/i8254.c
@@ -23,6 +23,7 @@
  * THE SOFTWARE.
  */
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "qemu/timer.h"
 #include "sysemu/sysemu.h"
 #include "hw/timer/i8254.h"

diff --git a/hw/i386/kvm/pci-assign.c b/hw/i386/kvm/pci-assign.c
index d4089e7cc22373adb1a70fb191b601231730d1e2..bf425a2b9f1e50490fdf7b32a0cc584ab4cf3068 100644 (file)
--- a/hw/i386/kvm/pci-assign.c
+++ b/hw/i386/kvm/pci-assign.c
@@ -21,6 +21,7 @@
  *  Copyright (C) 2008, IBM, Muli Ben-Yehuda (muli@il.ibm.com)
  */
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include <sys/mman.h>
 #include "hw/hw.h"
 #include "hw/i386/pc.h"

diff --git a/hw/i386/pc_sysfw.c b/hw/i386/pc_sysfw.c
index 2324e700b0ce086597f4dec6a945f704b54ecb03..f915ad0a360886f5e23fc2e92ae759f365051c13 100644 (file)
--- a/hw/i386/pc_sysfw.c
+++ b/hw/i386/pc_sysfw.c
@@ -24,6 +24,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "sysemu/block-backend.h"
 #include "qemu/error-report.h"
 #include "hw/sysbus.h"

diff --git a/hw/i386/pci-assign-load-rom.c b/hw/i386/pci-assign-load-rom.c
index bff979a4d0c838c14f9c478ea08fc900e87a5898..4bbb08c9555d746da1e8bd7e6ac66e0b6ab95a55 100644 (file)
--- a/hw/i386/pci-assign-load-rom.c
+++ b/hw/i386/pci-assign-load-rom.c
@@ -2,6 +2,7 @@
  * This is splited from hw/i386/kvm/pci-assign.c
  */
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "hw/hw.h"
 #include "hw/i386/pc.h"
 #include "qemu/error-report.h"

diff --git a/hw/i386/xen/xen_platform.c b/hw/i386/xen/xen_platform.c
index a2247b917ad1c1a00b077ef1f1593a346394f441..aa7839324cd568cbcc07e47bced1981aa0609ceb 100644 (file)
--- a/hw/i386/xen/xen_platform.c
+++ b/hw/i386/xen/xen_platform.c
@@ -24,6 +24,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "hw/hw.h"
 #include "hw/i386/pc.h"
 #include "hw/ide.h"

diff --git a/hw/i386/xen/xen_pvdevice.c b/hw/i386/xen/xen_pvdevice.c
index 1095c65d41b3471df729f9353685cba1991a9b1d..c093b34458d472d93cf474c276c879317c25765a 100644 (file)
--- a/hw/i386/xen/xen_pvdevice.c
+++ b/hw/i386/xen/xen_pvdevice.c
@@ -30,6 +30,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "hw/hw.h"
 #include "hw/pci/pci.h"
 #include "trace.h"

diff --git a/hw/ide/qdev.c b/hw/ide/qdev.c
index 2d14a768f10b2fc4f9267b90420f2769459b4d01..4bc74a32d2c6033b91b48e85cbd7f5d20fcfa188 100644 (file)
--- a/hw/ide/qdev.c
+++ b/hw/ide/qdev.c
@@ -19,6 +19,7 @@
 #include "qemu/osdep.h"
 #include <hw/hw.h>
 #include "sysemu/dma.h"
+#include "qapi/error.h"
 #include "qemu/error-report.h"
 #include <hw/ide/internal.h>
 #include "sysemu/block-backend.h"

diff --git a/hw/input/milkymist-softusb.c b/hw/input/milkymist-softusb.c
index 64b929281e1ba7735c5037b3d05e8dc88f16b751..40dfca157fdd79554b6e0e04427bd6a5f56e5ff9 100644 (file)
--- a/hw/input/milkymist-softusb.c
+++ b/hw/input/milkymist-softusb.c
@@ -22,6 +22,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "hw/hw.h"
 #include "hw/sysbus.h"
 #include "trace.h"

diff --git a/hw/input/virtio-input-host.c b/hw/input/virtio-input-host.c
index ddee54cb7ddd58e17719b9d0e6942cf4f39f4648..9e0f46d88f3235434b615b5578155692a6c521b5 100644 (file)
--- a/hw/input/virtio-input-host.c
+++ b/hw/input/virtio-input-host.c
@@ -5,6 +5,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "qemu-common.h"
 #include "qemu/sockets.h"
 

diff --git a/hw/input/virtio-input.c b/hw/input/virtio-input.c
index 5061f4cf7acbeef415e6b1056ae70884aeaf26ad..672c207eb58ff5224d41a33bb271e782db5d07aa 100644 (file)
--- a/hw/input/virtio-input.c
+++ b/hw/input/virtio-input.c
@@ -5,6 +5,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "qemu/iov.h"
 
 #include "hw/qdev.h"

diff --git a/hw/intc/apic_common.c b/hw/intc/apic_common.c
index 659f377e5523f580a4eaf7b7077f2618a978f349..4abe145c68ea2561b37d9e1897810a86eb59fc1d 100644 (file)
--- a/hw/intc/apic_common.c
+++ b/hw/intc/apic_common.c
@@ -18,6 +18,7 @@
  * License along with this library; if not, see <http://www.gnu.org/licenses/>
  */
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "hw/i386/apic.h"
 #include "hw/i386/apic_internal.h"
 #include "trace.h"

diff --git a/hw/intc/arm_gic.c b/hw/intc/arm_gic.c
index 0834c2f1a76da0235824ded8972cc6b56eb5646a..f55124174d312410b7f96e77a9844e1f14946efe 100644 (file)
--- a/hw/intc/arm_gic.c
+++ b/hw/intc/arm_gic.c
@@ -21,6 +21,7 @@
 #include "qemu/osdep.h"
 #include "hw/sysbus.h"
 #include "gic_internal.h"
+#include "qapi/error.h"
 #include "qom/cpu.h"
 
 //#define DEBUG_GIC

diff --git a/hw/intc/arm_gic_common.c b/hw/intc/arm_gic_common.c
index 707d00ded441dbc250bc875b40b7fa74b2196e86..0a1f56af191d3287c999bdfeb08154aa14acec79 100644 (file)
--- a/hw/intc/arm_gic_common.c
+++ b/hw/intc/arm_gic_common.c
@@ -19,6 +19,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "gic_internal.h"
 #include "hw/arm/linux-boot-if.h"
 

diff --git a/hw/intc/arm_gic_kvm.c b/hw/intc/arm_gic_kvm.c
index e61c5d9d471722c84e957ee1bf1497056b9f14db..bc85ab769f90ee0b301c68fdc3e26e57b8f2a78f 100644 (file)
--- a/hw/intc/arm_gic_kvm.c
+++ b/hw/intc/arm_gic_kvm.c
@@ -20,6 +20,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "hw/sysbus.h"
 #include "migration/migration.h"
 #include "sysemu/kvm.h"

diff --git a/hw/intc/arm_gicv2m.c b/hw/intc/arm_gicv2m.c
index ebd368bbadebbb302a34e77620012e5b518cdfdb..e8b5177dcc7d92af921c4098725e52f8aa425329 100644 (file)
--- a/hw/intc/arm_gicv2m.c
+++ b/hw/intc/arm_gicv2m.c
@@ -26,6 +26,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "hw/sysbus.h"
 #include "hw/pci/msi.h"
 

diff --git a/hw/intc/arm_gicv3_common.c b/hw/intc/arm_gicv3_common.c
index e4f0f5a58918d974e2ca9b728b3f74fb1b401d1c..b9d3824f2ba3ca372b90919d254b8ec54546f987 100644 (file)
--- a/hw/intc/arm_gicv3_common.c
+++ b/hw/intc/arm_gicv3_common.c
@@ -21,6 +21,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "hw/intc/arm_gicv3_common.h"
 
 static void gicv3_pre_save(void *opaque)

diff --git a/hw/intc/arm_gicv3_kvm.c b/hw/intc/arm_gicv3_kvm.c
index 90c79507047671ea95783e92d36d1fcd5c7808e1..acc173004824b11c1eb0ca6bb21fd5d6ad59281c 100644 (file)
--- a/hw/intc/arm_gicv3_kvm.c
+++ b/hw/intc/arm_gicv3_kvm.c
@@ -20,6 +20,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "hw/intc/arm_gicv3_common.h"
 #include "hw/sysbus.h"
 #include "sysemu/kvm.h"

diff --git a/hw/intc/armv7m_nvic.c b/hw/intc/armv7m_nvic.c
index 92f6a44eeccd0c56b172a635699024ef2e03ada9..3a23d3405465678159a7b16f01049267eaaffe56 100644 (file)
--- a/hw/intc/armv7m_nvic.c
+++ b/hw/intc/armv7m_nvic.c
@@ -11,6 +11,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "hw/sysbus.h"
 #include "qemu/timer.h"
 #include "hw/arm/arm.h"

diff --git a/hw/intc/ioapic_common.c b/hw/intc/ioapic_common.c
index 0a48de29b9b4b55b8be4a76591e653bc5426da9b..1b7ec5ec2046eab9573f8cf5fb849531aa5ecc45 100644 (file)
--- a/hw/intc/ioapic_common.c
+++ b/hw/intc/ioapic_common.c
@@ -20,6 +20,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "monitor/monitor.h"
 #include "hw/i386/ioapic.h"
 #include "hw/i386/ioapic_internal.h"

diff --git a/hw/intc/openpic.c b/hw/intc/openpic.c
index 7685250bf49dda35311f3fe7486ef2498810c1ff..2d3769310fbbe235aef9e40be5f45b2f39014a1f 100644 (file)
--- a/hw/intc/openpic.c
+++ b/hw/intc/openpic.c
@@ -41,6 +41,7 @@
 #include "hw/ppc/ppc_e500.h"
 #include "hw/sysbus.h"
 #include "hw/pci/msi.h"
+#include "qapi/error.h"
 #include "qemu/bitops.h"
 #include "qapi/qmp/qerror.h"
 

diff --git a/hw/intc/openpic_kvm.c b/hw/intc/openpic_kvm.c
index 778af4a7d4bba050fd71f55ae9ea736f8e31971d..e47e94f2cf02daba74e31062f6683bd2c29733b4 100644 (file)
--- a/hw/intc/openpic_kvm.c
+++ b/hw/intc/openpic_kvm.c
@@ -23,6 +23,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include <sys/ioctl.h>
 #include "exec/address-spaces.h"
 #include "hw/hw.h"

diff --git a/hw/intc/realview_gic.c b/hw/intc/realview_gic.c
index 291f1966374c73334ec14254e80d5ea2f025370d..50bbab66eed7f44a56731ff4918afc0babc0966c 100644 (file)
--- a/hw/intc/realview_gic.c
+++ b/hw/intc/realview_gic.c
@@ -8,6 +8,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "hw/intc/realview_gic.h"
 
 static void realview_gic_set_irq(void *opaque, int irq, int level)

diff --git a/hw/intc/xics.c b/hw/intc/xics.c
index 213a3709254c77bea17f1dc572d43c94922d168d..04a079cd550995ad8b73c94c968faa4b23801edf 100644 (file)
--- a/hw/intc/xics.c
+++ b/hw/intc/xics.c
@@ -26,6 +26,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "hw/hw.h"
 #include "trace.h"
 #include "qemu/timer.h"

diff --git a/hw/intc/xics_kvm.c b/hw/intc/xics_kvm.c
index 9fe06677f993042793ea97dd8ebfdb1605edd3e1..9bd85ac03c4b114aafd62f155a6dd11d66d2310d 100644 (file)
--- a/hw/intc/xics_kvm.c
+++ b/hw/intc/xics_kvm.c
@@ -26,6 +26,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "hw/hw.h"
 #include "trace.h"
 #include "hw/ppc/spapr.h"

diff --git a/hw/ipack/ipack.c b/hw/ipack/ipack.c
index 7c5c30de55cbb08e65649693ec5106357fba7909..5f99ed9a79a6cfae4b67a5b437350ec7c01214b4 100644 (file)
--- a/hw/ipack/ipack.c
+++ b/hw/ipack/ipack.c
@@ -9,6 +9,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "hw/ipack/ipack.h"
 
 IPackDevice *ipack_device_find(IPackBus *bus, int32_t slot)

diff --git a/hw/ipmi/ipmi_bmc_extern.c b/hw/ipmi/ipmi_bmc_extern.c
index c31a3a02c2d0abccdb29d3716024667150b41393..fe12112a2f397a7203ad2dee019487a1cd52f2bd 100644 (file)
--- a/hw/ipmi/ipmi_bmc_extern.c
+++ b/hw/ipmi/ipmi_bmc_extern.c
@@ -28,6 +28,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "qemu/timer.h"
 #include "sysemu/char.h"
 #include "sysemu/sysemu.h"

diff --git a/hw/ipmi/isa_ipmi_bt.c b/hw/ipmi/isa_ipmi_bt.c
index ace2dc0a809e779cfbf9794b04948a9a30e4bc69..aaea12ecdda60091f5a2b2a3738e17d35231f82f 100644 (file)
--- a/hw/ipmi/isa_ipmi_bt.c
+++ b/hw/ipmi/isa_ipmi_bt.c
@@ -22,6 +22,7 @@
  * THE SOFTWARE.
  */
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "hw/hw.h"
 #include "hw/ipmi/ipmi.h"
 #include "hw/isa/isa.h"

diff --git a/hw/ipmi/isa_ipmi_kcs.c b/hw/ipmi/isa_ipmi_kcs.c
index 9841b7f3d5e011cc0a9f24417a613b1fb185db11..2742ce06c4bef68138f8169c7a60d3bfb721db4e 100644 (file)
--- a/hw/ipmi/isa_ipmi_kcs.c
+++ b/hw/ipmi/isa_ipmi_kcs.c
@@ -22,6 +22,7 @@
  * THE SOFTWARE.
  */
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "hw/hw.h"
 #include "hw/ipmi/ipmi.h"
 #include "hw/isa/isa.h"

diff --git a/hw/isa/isa-bus.c b/hw/isa/isa-bus.c
index c3b73885298909a0f8aff27d2fbc01118763fb2c..7aa115caf2fef351902d62765d874ad4e638b703 100644 (file)
--- a/hw/isa/isa-bus.c
+++ b/hw/isa/isa-bus.c
@@ -17,6 +17,7 @@
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "hw/hw.h"
 #include "monitor/monitor.h"
 #include "hw/sysbus.h"

diff --git a/hw/isa/pc87312.c b/hw/isa/pc87312.c
index 6b5c7a2e02c66c3deb9c92090374f5aec49efcf6..c3ebf3e7a070ae3683022bd9b4686fd616821048 100644 (file)
--- a/hw/isa/pc87312.c
+++ b/hw/isa/pc87312.c
@@ -25,6 +25,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/isa/pc87312.h"
+#include "qapi/error.h"
 #include "qemu/error-report.h"
 #include "sysemu/block-backend.h"
 #include "sysemu/blockdev.h"

diff --git a/hw/m68k/an5206.c b/hw/m68k/an5206.c
index 85f72770d7c99a2d9c297dfef8e63b7d499e0abc..c00cc700b79005a56fb4b4394f7b588c5fec3b3b 100644 (file)
--- a/hw/m68k/an5206.c
+++ b/hw/m68k/an5206.c
@@ -7,6 +7,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "hw/hw.h"
 #include "hw/m68k/mcf.h"
 #include "hw/boards.h"

diff --git a/hw/m68k/mcf5208.c b/hw/m68k/mcf5208.c
index 4f49d34a8f625a8d24d6b3e97f370858d133686e..67c3bb681569c30fa9bcec9535b01ee36f2b8109 100644 (file)
--- a/hw/m68k/mcf5208.c
+++ b/hw/m68k/mcf5208.c
@@ -6,6 +6,7 @@
  * This code is licensed under the GPL
  */
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "hw/hw.h"
 #include "hw/m68k/mcf.h"
 #include "qemu/timer.h"

diff --git a/hw/mem/pc-dimm.c b/hw/mem/pc-dimm.c
index c4b44300eb7b07c2bf00a17ba85f6bf1b545fc65..9e7de5682986e13648a8fa4c32769491fe464a05 100644 (file)
--- a/hw/mem/pc-dimm.c
+++ b/hw/mem/pc-dimm.c
@@ -20,6 +20,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/mem/pc-dimm.h"
+#include "qapi/error.h"
 #include "qemu/config-file.h"
 #include "qapi/visitor.h"
 #include "qemu/range.h"

diff --git a/hw/microblaze/petalogix_ml605_mmu.c b/hw/microblaze/petalogix_ml605_mmu.c
index 85e974b72a3603ac42c0ba32040def9e26ef77ba..4505d183f2cdfc0027d477ad09a3d1d7ba8e2430 100644 (file)
--- a/hw/microblaze/petalogix_ml605_mmu.c
+++ b/hw/microblaze/petalogix_ml605_mmu.c
@@ -26,6 +26,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "hw/sysbus.h"
 #include "hw/hw.h"
 #include "net/net.h"

diff --git a/hw/microblaze/petalogix_s3adsp1800_mmu.c b/hw/microblaze/petalogix_s3adsp1800_mmu.c
index 606ba1f01a592f8e94c11709ef616705b77200b1..bf19ad730f33d20b0cf90ab893f676a3d7b9dfdb 100644 (file)
--- a/hw/microblaze/petalogix_s3adsp1800_mmu.c
+++ b/hw/microblaze/petalogix_s3adsp1800_mmu.c
@@ -24,6 +24,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "hw/sysbus.h"
 #include "hw/hw.h"
 #include "net/net.h"

diff --git a/hw/mips/mips_fulong2e.c b/hw/mips/mips_fulong2e.c
index 4e5581b167a11c86cf986830b161a0d144e7c0a9..bdb716e7256e1863ab615d4b2a6bc8a4872fbe2e 100644 (file)
--- a/hw/mips/mips_fulong2e.c
+++ b/hw/mips/mips_fulong2e.c
@@ -19,6 +19,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "hw/hw.h"
 #include "hw/i386/pc.h"
 #include "hw/char/serial.h"

diff --git a/hw/mips/mips_mipssim.c b/hw/mips/mips_mipssim.c
index 1ecff44a54c3341869384893b6038e874dc9e3b0..23b2dcabf0b6a6ce94dfc70c89a7d836e3d48fa3 100644 (file)
--- a/hw/mips/mips_mipssim.c
+++ b/hw/mips/mips_mipssim.c
@@ -25,6 +25,7 @@
  * THE SOFTWARE.
  */
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "hw/hw.h"
 #include "hw/mips/mips.h"
 #include "hw/mips/cpudevs.h"

diff --git a/hw/mips/mips_r4k.c b/hw/mips/mips_r4k.c
index 724b1e9d51ee4090f29c63ae81c6272ad80fb7ae..0ef2fb1655ddfdf5a8563296ffd277d3f957c139 100644 (file)
--- a/hw/mips/mips_r4k.c
+++ b/hw/mips/mips_r4k.c
@@ -8,6 +8,7 @@
  * the standard PC ISA addresses.
 */
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "hw/hw.h"
 #include "hw/mips/mips.h"
 #include "hw/mips/cpudevs.h"

diff --git a/hw/misc/bcm2835_mbox.c b/hw/misc/bcm2835_mbox.c
index 106585a7bff580f05aad28d67e64c5818690f430..263280fd49f802c4bdc909657d1a51f8473efb8d 100644 (file)
--- a/hw/misc/bcm2835_mbox.c
+++ b/hw/misc/bcm2835_mbox.c
@@ -9,6 +9,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "hw/misc/bcm2835_mbox.h"
 
 #define MAIL0_PEEK   0x90

diff --git a/hw/misc/bcm2835_property.c b/hw/misc/bcm2835_property.c
index 15dcc02f999dc4da3cec14dce05fd227dcebdf2c..530411f84113f3380e8059de5d2d23a9a231baba 100644 (file)
--- a/hw/misc/bcm2835_property.c
+++ b/hw/misc/bcm2835_property.c
@@ -4,6 +4,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "hw/misc/bcm2835_property.h"
 #include "hw/misc/bcm2835_mbox_defs.h"
 #include "sysemu/dma.h"

diff --git a/hw/misc/ivshmem.c b/hw/misc/ivshmem.c
index 1838bc8506bd480e8f19ede9d50bdd28a84c6c47..55071dc7678655d631e0c80a353cc03c046098f2 100644 (file)
--- a/hw/misc/ivshmem.c
+++ b/hw/misc/ivshmem.c
@@ -17,6 +17,7 @@
  * GNU GPL, version 2 or (at your option) any later version.
  */
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "hw/hw.h"
 #include "hw/i386/pc.h"
 #include "hw/pci/pci.h"

diff --git a/hw/misc/macio/macio.c b/hw/misc/macio/macio.c
index 42325bff5003818e82a33fc724090e7349dd4646..6e94e3b7cf81ba484488615239b79615e12a6bdf 100644 (file)
--- a/hw/misc/macio/macio.c
+++ b/hw/misc/macio/macio.c
@@ -23,6 +23,7 @@
  * THE SOFTWARE.
  */
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "hw/hw.h"
 #include "hw/ppc/mac.h"
 #include "hw/pci/pci.h"

diff --git a/hw/misc/tmp105.c b/hw/misc/tmp105.c
index b53f6babad6f2025078c28b23d8cf461b13efc1b..f5c2472b5b6e0fd71369d1ecbb225c7cc5a995e7 100644 (file)
--- a/hw/misc/tmp105.c
+++ b/hw/misc/tmp105.c
@@ -22,6 +22,7 @@
 #include "hw/hw.h"
 #include "hw/i2c/i2c.h"
 #include "tmp105.h"
+#include "qapi/error.h"
 #include "qapi/visitor.h"
 
 static void tmp105_interrupt_update(TMP105State *s)

diff --git a/hw/moxie/moxiesim.c b/hw/moxie/moxiesim.c
index d88c9428e02a3cf21e408fc07f7e0eda20e53a3f..800c7cc935b524d33f4a911f59362ae9dc8c3451 100644 (file)
--- a/hw/moxie/moxiesim.c
+++ b/hw/moxie/moxiesim.c
@@ -25,6 +25,7 @@
  * THE SOFTWARE.
  */
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "hw/sysbus.h"
 #include "hw/hw.h"
 #include "hw/i386/pc.h"

diff --git a/hw/net/dp8393x.c b/hw/net/dp8393x.c
index e847b77cf4e8385a8608ab1f11585f8200164f01..819743e117c4575e9a89ad510710d1393a46c1ae 100644 (file)
--- a/hw/net/dp8393x.c
+++ b/hw/net/dp8393x.c
@@ -21,6 +21,7 @@
 #include "hw/sysbus.h"
 #include "hw/devices.h"
 #include "net/net.h"
+#include "qapi/error.h"
 #include "qemu/timer.h"
 #include <zlib.h>
 

diff --git a/hw/net/milkymist-minimac2.c b/hw/net/milkymist-minimac2.c
index d35d39a0e5bad02ed950180d3a0b549a8e1659e7..f01e8042721d9b9e01a5cc6fa0a8d85e482e4243 100644 (file)
--- a/hw/net/milkymist-minimac2.c
+++ b/hw/net/milkymist-minimac2.c
@@ -23,6 +23,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "hw/hw.h"
 #include "hw/sysbus.h"
 #include "trace.h"

diff --git a/hw/net/ne2000-isa.c b/hw/net/ne2000-isa.c
index 8dca7c936bfabe60bfa9346a16a3521ad6c7db43..a7f5a9464d665ab19f158d1bf617c3b71e4c3719 100644 (file)
--- a/hw/net/ne2000-isa.c
+++ b/hw/net/ne2000-isa.c
@@ -29,6 +29,7 @@
 #include "net/net.h"
 #include "ne2000.h"
 #include "exec/address-spaces.h"
+#include "qapi/error.h"
 #include "qapi/visitor.h"
 
 #define TYPE_ISA_NE2000 "ne2k_isa"

diff --git a/hw/net/xilinx_axienet.c b/hw/net/xilinx_axienet.c
index 2deb8ce84b29cd2ac6921477ebd765556cab1c43..de23ab5dcd0038a09d24873c75fccbd3cc34ac02 100644 (file)
--- a/hw/net/xilinx_axienet.c
+++ b/hw/net/xilinx_axienet.c
@@ -24,6 +24,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/sysbus.h"
+#include "qapi/error.h"
 #include "qemu/log.h"
 #include "net/net.h"
 #include "net/checksum.h"

diff --git a/hw/nvram/spapr_nvram.c b/hw/nvram/spapr_nvram.c
index 32d5a361d0d3d63ff1de0b86a35d9252e458aadf..2ca427b5865394976eea24b3c900b0997b212b90 100644 (file)
--- a/hw/nvram/spapr_nvram.c
+++ b/hw/nvram/spapr_nvram.c
@@ -23,6 +23,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include <libfdt.h>
 
 #include "sysemu/block-backend.h"

diff --git a/hw/openrisc/openrisc_sim.c b/hw/openrisc/openrisc_sim.c
index 46418c30f74dd39f85be6c76ecd37c0998ac463e..7967cfbea9acaf4deebb48f7462d6e9620faff17 100644 (file)
--- a/hw/openrisc/openrisc_sim.c
+++ b/hw/openrisc/openrisc_sim.c
@@ -19,6 +19,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "hw/hw.h"
 #include "hw/boards.h"
 #include "elf.h"

diff --git a/hw/pci-bridge/pci_bridge_dev.c b/hw/pci-bridge/pci_bridge_dev.c
index 862a2366f237f455de85483241532f24b73bb089..7b582e96aca1d698cebda88adfdd78f8d6b848f3 100644 (file)
--- a/hw/pci-bridge/pci_bridge_dev.c
+++ b/hw/pci-bridge/pci_bridge_dev.c
@@ -20,6 +20,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "hw/pci/pci_bridge.h"
 #include "hw/pci/pci_ids.h"
 #include "hw/pci/msi.h"

diff --git a/hw/pci-host/piix.c b/hw/pci-host/piix.c
index 41aa66f82880a130f85b51b03ad132e4daa5bc94..df2b0e26f5581462a0638b65934e8784cd6c62e3 100644 (file)
--- a/hw/pci-host/piix.c
+++ b/hw/pci-host/piix.c
@@ -29,6 +29,7 @@
 #include "hw/pci/pci_host.h"
 #include "hw/isa/isa.h"
 #include "hw/sysbus.h"
+#include "qapi/error.h"
 #include "qemu/range.h"
 #include "hw/xen/xen.h"
 #include "hw/pci-host/pam.h"

diff --git a/hw/pci-host/prep.c b/hw/pci-host/prep.c
index 49cdaab36bf61297c65d5f368f18e8ba64f6b834..487e32ecbf0f17aaf9190c1a71f84b2cc9ec4e75 100644 (file)
--- a/hw/pci-host/prep.c
+++ b/hw/pci-host/prep.c
@@ -24,6 +24,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "hw/hw.h"
 #include "hw/pci/pci.h"
 #include "hw/pci/pci_bus.h"

diff --git a/hw/pci-host/q35.c b/hw/pci-host/q35.c
index 115fb8c04625bcf11c66d6bea470fba6c964542d..70f897e3a94530684cd854139d3a7c580f8a4a82 100644 (file)
--- a/hw/pci-host/q35.c
+++ b/hw/pci-host/q35.c
@@ -30,6 +30,7 @@
 #include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/pci-host/q35.h"
+#include "qapi/error.h"
 #include "qapi/visitor.h"
 
 /****************************************************************************

diff --git a/hw/pci/pcie.c b/hw/pci/pcie.c
index 4aca0c5912f742c3841baea733188dbc51b9631c..728386ada71392bc25403ecbc152fd7ee6737df7 100644 (file)
--- a/hw/pci/pcie.c
+++ b/hw/pci/pcie.c
@@ -19,6 +19,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "qemu-common.h"
 #include "hw/pci/pci_bridge.h"
 #include "hw/pci/pcie.h"

diff --git a/hw/pci/shpc.c b/hw/pci/shpc.c
index aef838415f61f7e6586b7b16fada36fe408646e2..3dcd472eba394e42297f21b4c7de143ad2f0bb9a 100644 (file)
--- a/hw/pci/shpc.c
+++ b/hw/pci/shpc.c
@@ -1,4 +1,5 @@
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "qemu-common.h"
 #include "qemu/range.h"
 #include "qemu/error-report.h"

diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c
index 09154fa8137ff1381fde2b3b40c3291621ea92e8..ee1c60b8208b48d6d2d08cb10ee9a72ab4946d49 100644 (file)
--- a/hw/ppc/e500.c
+++ b/hw/ppc/e500.c
@@ -15,6 +15,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "qemu-common.h"
 #include "e500.h"
 #include "e500-ccsr.h"

diff --git a/hw/ppc/mac_newworld.c b/hw/ppc/mac_newworld.c
index f0a36b3133e86ab8d2916c8a62f237ed9e3e0b63..1086f88d832863453534673763a06f3278330cac 100644 (file)
--- a/hw/ppc/mac_newworld.c
+++ b/hw/ppc/mac_newworld.c
@@ -47,6 +47,7 @@
  *
  */
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "hw/hw.h"
 #include "hw/ppc/ppc.h"
 #include "hw/ppc/mac.h"

diff --git a/hw/ppc/mac_oldworld.c b/hw/ppc/mac_oldworld.c
index d9527133138f83f4eba55447492ad8bf83ffda13..9bfa02e0976eb7e2070ebff3e9da38feca25bac5 100644 (file)
--- a/hw/ppc/mac_oldworld.c
+++ b/hw/ppc/mac_oldworld.c
@@ -24,6 +24,7 @@
  * THE SOFTWARE.
  */
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "hw/hw.h"
 #include "hw/ppc/ppc.h"
 #include "mac.h"

diff --git a/hw/ppc/ppc405_boards.c b/hw/ppc/ppc405_boards.c
index d8db3199c99ceae0abbf9591b6103def9f3be9bf..b430832fb36e913c4174b14ada5a236858abbcc0 100644 (file)
--- a/hw/ppc/ppc405_boards.c
+++ b/hw/ppc/ppc405_boards.c
@@ -22,6 +22,7 @@
  * THE SOFTWARE.
  */
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "hw/hw.h"
 #include "hw/ppc/ppc.h"
 #include "ppc405.h"

diff --git a/hw/ppc/ppc405_uc.c b/hw/ppc/ppc405_uc.c
index ec81f658c5c4bef1ccb9804c37df05c0ebb7df83..4f9aebc099f74159dce4211d51b9229044484540 100644 (file)
--- a/hw/ppc/ppc405_uc.c
+++ b/hw/ppc/ppc405_uc.c
@@ -22,6 +22,7 @@
  * THE SOFTWARE.
  */
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "hw/hw.h"
 #include "hw/ppc/ppc.h"
 #include "hw/boards.h"

diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
index d0bb42305bc9a17e347896694cdc7b9eedf10d4b..7e80f8ac3cdbfb8a4cbf6698326e44729839bffb 100644 (file)
--- a/hw/ppc/spapr.c
+++ b/hw/ppc/spapr.c
@@ -25,6 +25,7 @@
  *
  */
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "sysemu/sysemu.h"
 #include "sysemu/numa.h"
 #include "hw/hw.h"

diff --git a/hw/ppc/spapr_drc.c b/hw/ppc/spapr_drc.c
index ef063c05cf09c295a7a9a778b81266485bed399d..b94b44a7a1dd8c69b99404ba50524ad0c377469f 100644 (file)
--- a/hw/ppc/spapr_drc.c
+++ b/hw/ppc/spapr_drc.c
@@ -11,6 +11,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "hw/ppc/spapr_drc.h"
 #include "qom/object.h"
 #include "hw/qdev.h"

diff --git a/hw/ppc/spapr_events.c b/hw/ppc/spapr_events.c
index 39f4682f957f7c8feb9ec015ddc650bce7ada4d0..61204f0b6bbf2ddc3b16632895147101a7249cf7 100644 (file)
--- a/hw/ppc/spapr_events.c
+++ b/hw/ppc/spapr_events.c
@@ -25,6 +25,7 @@
  *
  */
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "cpu.h"
 #include "sysemu/sysemu.h"
 #include "sysemu/char.h"

diff --git a/hw/ppc/spapr_hcall.c b/hw/ppc/spapr_hcall.c
index b2b1b93cfd4ffe164a1dd98c5c340f7d2c952c95..2dcb676c6f57f514a9c97e5d9f16d63c5eede90f 100644 (file)
--- a/hw/ppc/spapr_hcall.c
+++ b/hw/ppc/spapr_hcall.c
@@ -1,4 +1,5 @@
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "sysemu/sysemu.h"
 #include "cpu.h"
 #include "helper_regs.h"

diff --git a/hw/ppc/spapr_pci.c b/hw/ppc/spapr_pci.c
index 79baa7b17705d057c9c8cf4e206a8cbe20e19a5f..12dbe902fc454448eec95db6a63e2b93a770b6f0 100644 (file)
--- a/hw/ppc/spapr_pci.c
+++ b/hw/ppc/spapr_pci.c
@@ -23,6 +23,7 @@
  * THE SOFTWARE.
  */
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "hw/hw.h"
 #include "hw/sysbus.h"
 #include "hw/pci/pci.h"

diff --git a/hw/ppc/spapr_pci_vfio.c b/hw/ppc/spapr_pci_vfio.c
index 9e15924f50d095c5f8ed7da7a0d922679789bca8..6f9a6731d6f8c6de82133e1890f884c22a5d1910 100644 (file)
--- a/hw/ppc/spapr_pci_vfio.c
+++ b/hw/ppc/spapr_pci_vfio.c
@@ -18,6 +18,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "hw/ppc/spapr.h"
 #include "hw/pci-host/spapr.h"
 #include "hw/pci/msix.h"

diff --git a/hw/ppc/spapr_rng.c b/hw/ppc/spapr_rng.c
index 02d6be49f58ecbf480f1d3337e044d83647caf04..f2f89908d466c3f4d68f88a8e3c5bacb7ad4c35c 100644 (file)
--- a/hw/ppc/spapr_rng.c
+++ b/hw/ppc/spapr_rng.c
@@ -18,6 +18,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "qemu/error-report.h"
 #include "sysemu/sysemu.h"
 #include "sysemu/device_tree.h"

diff --git a/hw/ppc/spapr_vio.c b/hw/ppc/spapr_vio.c
index 0f61a550cb2ed832911ada06f54db8a909d757bc..8aa021fde99c20ed81073b6e1275fd91806ddbbe 100644 (file)
--- a/hw/ppc/spapr_vio.c
+++ b/hw/ppc/spapr_vio.c
@@ -20,6 +20,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "hw/hw.h"
 #include "sysemu/sysemu.h"
 #include "hw/boards.h"

diff --git a/hw/s390x/event-facility.c b/hw/s390x/event-facility.c
index 85be24d3da6e7134ad581a2f75926f7e1de8907b..34b2faf01387f09729a2d001dd0708f40a7eb12f 100644 (file)
--- a/hw/s390x/event-facility.c
+++ b/hw/s390x/event-facility.c
@@ -16,6 +16,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "sysemu/sysemu.h"
 
 #include "hw/s390x/sclp.h"

diff --git a/hw/s390x/ipl.c b/hw/s390x/ipl.c
index 41ff002069412ed6a36d7851c2d756ddfa33c3a7..f1042002731139a10348339d5db977713c8deaa9 100644 (file)
--- a/hw/s390x/ipl.c
+++ b/hw/s390x/ipl.c
@@ -12,6 +12,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "sysemu/sysemu.h"
 #include "cpu.h"
 #include "elf.h"

diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c
index 4361c8a5dc691ec529ca69aaeb88eaa5cd5ca76b..01aeec90fe7bf0a03666ea5c878f898c877c06e4 100644 (file)
--- a/hw/s390x/s390-virtio-ccw.c
+++ b/hw/s390x/s390-virtio-ccw.c
@@ -10,6 +10,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "hw/boards.h"
 #include "exec/address-spaces.h"
 #include "s390-virtio.h"

diff --git a/hw/s390x/s390-virtio.c b/hw/s390x/s390-virtio.c
index 7c6e281af1be30cd1e6d6eefaceaf3935d43ee4e..544c61643d1ae0ca7ad3adae55f76794a7a4143d 100644 (file)
--- a/hw/s390x/s390-virtio.c
+++ b/hw/s390x/s390-virtio.c
@@ -22,6 +22,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "hw/hw.h"
 #include "qapi/qmp/qerror.h"
 #include "qemu/error-report.h"

diff --git a/hw/s390x/sclp.c b/hw/s390x/sclp.c
index c8cc732163507582ad0d499a31602ece098bbb12..85dbe1b600f368d855964e2001ab73f6964091b3 100644 (file)
--- a/hw/s390x/sclp.c
+++ b/hw/s390x/sclp.c
@@ -13,6 +13,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "cpu.h"
 #include "sysemu/kvm.h"
 #include "exec/memory.h"

diff --git a/hw/s390x/virtio-ccw.c b/hw/s390x/virtio-ccw.c
index cb887ba7e2b913338a5feedc9d23e3dff9b59c0f..d51642db0dfab9e12ca9593446fb77c31634c85b 100644 (file)
--- a/hw/s390x/virtio-ccw.c
+++ b/hw/s390x/virtio-ccw.c
@@ -11,6 +11,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "hw/hw.h"
 #include "sysemu/block-backend.h"
 #include "sysemu/blockdev.h"

diff --git a/hw/scsi/esp-pci.c b/hw/scsi/esp-pci.c
index 1de77066445d32aeafe0119868920588a9e1a7d0..595f88b3528f07582a67268aced72333d46f11d3 100644 (file)
--- a/hw/scsi/esp-pci.c
+++ b/hw/scsi/esp-pci.c
@@ -28,6 +28,7 @@
 #include "hw/nvram/eeprom93xx.h"
 #include "hw/scsi/esp.h"
 #include "trace.h"
+#include "qapi/error.h"
 #include "qemu/log.h"
 
 #define TYPE_AM53C974_DEVICE "am53c974"

diff --git a/hw/scsi/esp.c b/hw/scsi/esp.c
index e55c32c64273452090b7cfed8e0f987686a83a68..8961be2f34e1465ca04cfbafbcc20e274242f9f4 100644 (file)
--- a/hw/scsi/esp.c
+++ b/hw/scsi/esp.c
@@ -27,6 +27,7 @@
 #include "hw/sysbus.h"
 #include "hw/scsi/esp.h"
 #include "trace.h"
+#include "qapi/error.h"
 #include "qemu/log.h"
 
 /*

diff --git a/hw/scsi/scsi-bus.c b/hw/scsi/scsi-bus.c
index a21752b67eabd44a60f71ec265bb8d25bf214ead..a5ad3c7ae54ecc2b86e01ef72b5e8c2d87964aee 100644 (file)
--- a/hw/scsi/scsi-bus.c
+++ b/hw/scsi/scsi-bus.c
@@ -1,5 +1,6 @@
 #include "qemu/osdep.h"
 #include "hw/hw.h"
+#include "qapi/error.h"
 #include "qemu/error-report.h"
 #include "hw/scsi/scsi.h"
 #include "block/scsi.h"

diff --git a/hw/scsi/scsi-disk.c b/hw/scsi/scsi-disk.c
index 469aec283985551dbead644ba550015c49ffe39c..96c7953ecfe8c30035842a8ace1e1540c639e540 100644 (file)
--- a/hw/scsi/scsi-disk.c
+++ b/hw/scsi/scsi-disk.c
@@ -29,6 +29,7 @@ do { printf("scsi-disk: " fmt , ## __VA_ARGS__); } while (0)
 #endif
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "qemu-common.h"
 #include "qemu/error-report.h"
 #include "hw/scsi/scsi.h"

diff --git a/hw/scsi/scsi-generic.c b/hw/scsi/scsi-generic.c
index f8a1ff2cac9e031cdbaf46f1568c8ee02e16e39d..7459465f60eca378ea4f8f427cb8f7b5e68398f9 100644 (file)
--- a/hw/scsi/scsi-generic.c
+++ b/hw/scsi/scsi-generic.c
@@ -12,6 +12,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "qemu-common.h"
 #include "qemu/error-report.h"
 #include "hw/scsi/scsi.h"

diff --git a/hw/scsi/vhost-scsi.c b/hw/scsi/vhost-scsi.c
index c86622cfeb9492987f13e5a93e0857cd84d5bfef..97a0dd1c1d1b8b9b9ff410d699a7640c18188c77 100644 (file)
--- a/hw/scsi/vhost-scsi.c
+++ b/hw/scsi/vhost-scsi.c
@@ -15,6 +15,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include <sys/ioctl.h>
 #include "qemu/error-report.h"
 #include "qemu/queue.h"

diff --git a/hw/scsi/virtio-scsi.c b/hw/scsi/virtio-scsi.c
index 0c30d2e6927160bf63d3b7fcb3328b40189a2d36..ade49727d61d5efcbe8f26fef274972490d9970f 100644 (file)
--- a/hw/scsi/virtio-scsi.c
+++ b/hw/scsi/virtio-scsi.c
@@ -14,6 +14,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "standard-headers/linux/virtio_ids.h"
 #include "hw/virtio/virtio-scsi.h"
 #include "qemu/error-report.h"

diff --git a/hw/scsi/vmw_pvscsi.c b/hw/scsi/vmw_pvscsi.c
index 9abc08685185b7a0e2722906eadb02f3ef0c88d7..e690b4ec0860e65598848720db0400785f6ff90c 100644 (file)
--- a/hw/scsi/vmw_pvscsi.c
+++ b/hw/scsi/vmw_pvscsi.c
@@ -26,6 +26,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "hw/scsi/scsi.h"
 #include <block/scsi.h>
 #include "hw/pci/msi.h"

diff --git a/hw/sd/pxa2xx_mmci.c b/hw/sd/pxa2xx_mmci.c
index 9c3679b5dbda0ac1e1dc1023230bdbafe477571d..3deccf02c91c6b1d00be80305a847842da9acfa2 100644 (file)
--- a/hw/sd/pxa2xx_mmci.c
+++ b/hw/sd/pxa2xx_mmci.c
@@ -11,6 +11,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "hw/hw.h"
 #include "hw/sysbus.h"
 #include "hw/arm/pxa.h"

diff --git a/hw/sd/sd.c b/hw/sd/sd.c
index 1568057e4fa71a9e6306634fdffa703b015e27b9..b66e5d2dba20188b77d88b65cb17770861c3549c 100644 (file)
--- a/hw/sd/sd.c
+++ b/hw/sd/sd.c
@@ -34,6 +34,7 @@
 #include "hw/hw.h"
 #include "sysemu/block-backend.h"
 #include "hw/sd/sd.h"
+#include "qapi/error.h"
 #include "qemu/bitmap.h"
 #include "hw/qdev-properties.h"
 #include "qemu/error-report.h"

diff --git a/hw/sh4/r2d.c b/hw/sh4/r2d.c
index 7d9a1cd822bc5a88f5ff78d25394d9c5b633229f..90672ac35742e6ff54e2690694f03a158f8a62bb 100644 (file)
--- a/hw/sh4/r2d.c
+++ b/hw/sh4/r2d.c
@@ -24,6 +24,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "hw/sysbus.h"
 #include "hw/hw.h"
 #include "hw/sh4/sh.h"

diff --git a/hw/sh4/shix.c b/hw/sh4/shix.c
index 386a4854ea45b85d1845f1f5b4a39f4145f0f190..986bd2950eb05818f455fd5c51691b65a1c3dd12 100644 (file)
--- a/hw/sh4/shix.c
+++ b/hw/sh4/shix.c
@@ -28,6 +28,7 @@
    More information in target-sh4/README.sh4
 */
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "hw/hw.h"
 #include "hw/sh4/sh.h"
 #include "sysemu/sysemu.h"

diff --git a/hw/smbios/smbios.c b/hw/smbios/smbios.c
index 1362e79b9b22ca67f719ebfe0062ab5f609c3e21..cb8a1111029cfc140f4cc3b944ba28aac8fbe72e 100644 (file)
--- a/hw/smbios/smbios.c
+++ b/hw/smbios/smbios.c
@@ -16,6 +16,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "qemu/config-file.h"
 #include "qemu/error-report.h"
 #include "sysemu/sysemu.h"

diff --git a/hw/sparc/leon3.c b/hw/sparc/leon3.c
index c579f5b9eab62dd8a7d827f91dfbe3d581c26b2f..9f085ec61de8fc46df57a5287da0858607af0e39 100644 (file)
--- a/hw/sparc/leon3.c
+++ b/hw/sparc/leon3.c
@@ -22,6 +22,7 @@
  * THE SOFTWARE.
  */
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "hw/hw.h"
 #include "qemu/timer.h"
 #include "hw/ptimer.h"

diff --git a/hw/sparc/sun4m.c b/hw/sparc/sun4m.c
index 613ca7e332e50f948d44698c79c17fb091b0db9a..f251915fbdec4631f03a370762fb57a28eac9d70 100644 (file)
--- a/hw/sparc/sun4m.c
+++ b/hw/sparc/sun4m.c
@@ -22,6 +22,7 @@
  * THE SOFTWARE.
  */
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "hw/sysbus.h"
 #include "qemu/error-report.h"
 #include "qemu/timer.h"

diff --git a/hw/sparc64/sun4u.c b/hw/sparc64/sun4u.c
index 54d200300ce7cf280eb956b67182e8059d1fd16a..b77e8d2e11ec17f255778fa32d0773954a3b4279 100644 (file)
--- a/hw/sparc64/sun4u.c
+++ b/hw/sparc64/sun4u.c
@@ -22,6 +22,7 @@
  * THE SOFTWARE.
  */
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "hw/hw.h"
 #include "hw/pci/pci.h"
 #include "hw/pci-host/apb.h"

diff --git a/hw/timer/a9gtimer.c b/hw/timer/a9gtimer.c
index fa4602ca04877dd1b3e3d6ba9c65459051a541af..afe577c76af79fb36ceb159c0475f719876f4457 100644 (file)
--- a/hw/timer/a9gtimer.c
+++ b/hw/timer/a9gtimer.c
@@ -22,6 +22,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/timer/a9gtimer.h"
+#include "qapi/error.h"
 #include "qemu/timer.h"
 #include "qemu/bitops.h"
 #include "qemu/log.h"

diff --git a/hw/timer/arm_mptimer.c b/hw/timer/arm_mptimer.c
index 2bdaf42b72d75633713b9f543de7e093371d0d21..d66bbf01b4ce6a4ebbc458928b6ef7767661221d 100644 (file)
--- a/hw/timer/arm_mptimer.c
+++ b/hw/timer/arm_mptimer.c
@@ -21,6 +21,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/timer/arm_mptimer.h"
+#include "qapi/error.h"
 #include "qemu/timer.h"
 #include "qom/cpu.h"
 

diff --git a/hw/timer/hpet.c b/hw/timer/hpet.c
index 0ad542037a4d0dbf6e55343ae16a6d3df178f5b3..78140e609216f458f4ea351d84056745ccde4491 100644 (file)
--- a/hw/timer/hpet.c
+++ b/hw/timer/hpet.c
@@ -28,6 +28,7 @@
 #include "hw/hw.h"
 #include "hw/i386/pc.h"
 #include "ui/console.h"
+#include "qapi/error.h"
 #include "qemu/error-report.h"
 #include "qemu/timer.h"
 #include "hw/timer/hpet.h"

diff --git a/hw/timer/m48t59.c b/hw/timer/m48t59.c
index bbcfeb2192bfc78906b4a0ffe2fa36f396dcf4a4..c4db0e64622bfd25e8bac53ceeaadb89f8ab9710 100644 (file)
--- a/hw/timer/m48t59.c
+++ b/hw/timer/m48t59.c
@@ -25,6 +25,7 @@
 #include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/timer/m48t59.h"
+#include "qapi/error.h"
 #include "qemu/timer.h"
 #include "sysemu/sysemu.h"
 #include "hw/sysbus.h"

diff --git a/hw/tpm/tpm_tis.c b/hw/tpm/tpm_tis.c
index c1c3d4dcc385537537a605247b644eedd98f14fa..381e7266eada32db0e6938dc5a7ddd10b0035ca5 100644 (file)
--- a/hw/tpm/tpm_tis.c
+++ b/hw/tpm/tpm_tis.c
@@ -31,6 +31,7 @@
 #include "hw/i386/pc.h"
 #include "hw/pci/pci_ids.h"
 #include "tpm_tis.h"
+#include "qapi/error.h"
 #include "qemu-common.h"
 #include "qemu/main-loop.h"
 #include "sysemu/tpm_backend.h"

diff --git a/hw/tricore/tricore_testboard.c b/hw/tricore/tricore_testboard.c
index 3cadb6521c50c056e854a5848882297e4f3df04c..858040a0469a812b0b1d225f32c4868d99bf7c1f 100644 (file)
--- a/hw/tricore/tricore_testboard.c
+++ b/hw/tricore/tricore_testboard.c
@@ -19,6 +19,7 @@
 
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "hw/hw.h"
 #include "hw/devices.h"
 #include "net/net.h"

diff --git a/hw/unicore32/puv3.c b/hw/unicore32/puv3.c
index 4522fa263bf5276a5991e414c07101363922ef9b..d2933cb72a2fb0128290129e39bc5328f4d50d23 100644 (file)
--- a/hw/unicore32/puv3.c
+++ b/hw/unicore32/puv3.c
@@ -10,6 +10,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "qemu-common.h"
 #include "ui/console.h"
 #include "elf.h"

diff --git a/hw/usb/bus.c b/hw/usb/bus.c
index 4452bdbe206967c245b6c49b8c5893ecff5c65e6..a9a6f9e56dce804838f5e271089281b97cd6a599 100644 (file)
--- a/hw/usb/bus.c
+++ b/hw/usb/bus.c
@@ -2,6 +2,7 @@
 #include "hw/hw.h"
 #include "hw/usb.h"
 #include "hw/qdev.h"
+#include "qapi/error.h"
 #include "qemu/error-report.h"
 #include "sysemu/sysemu.h"
 #include "monitor/monitor.h"

diff --git a/hw/usb/dev-hid.c b/hw/usb/dev-hid.c
index 40f38ad45eec01d33299b0dee50c2146f9a71d34..24d05f76f90c559122198e4a49079a2160551166 100644 (file)
--- a/hw/usb/dev-hid.c
+++ b/hw/usb/dev-hid.c
@@ -27,6 +27,7 @@
 #include "ui/console.h"
 #include "hw/usb.h"
 #include "hw/usb/desc.h"
+#include "qapi/error.h"
 #include "qemu/timer.h"
 #include "hw/input/hid.h"
 

diff --git a/hw/usb/dev-hub.c b/hw/usb/dev-hub.c
index 64acdb0af02be44790c09a29e596d4d79f621910..a33f21cb382ea2591f91788872723dc193cce78b 100644 (file)
--- a/hw/usb/dev-hub.c
+++ b/hw/usb/dev-hub.c
@@ -22,6 +22,7 @@
  * THE SOFTWARE.
  */
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "qemu-common.h"
 #include "trace.h"
 #include "hw/usb.h"

diff --git a/hw/usb/dev-mtp.c b/hw/usb/dev-mtp.c
index 7391783193a0e8c0f04b82b9ff9800b2fa8da715..3e0bdc1bae154b5941499639fa210ce2ac4590ef 100644 (file)
--- a/hw/usb/dev-mtp.c
+++ b/hw/usb/dev-mtp.c
@@ -10,12 +10,14 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include <wchar.h>
 #include <dirent.h>
 
 #include <sys/statvfs.h>
 #ifdef __linux__
 #include <sys/inotify.h>
+#include "qapi/error.h"
 #include "qemu/main-loop.h"
 #endif
 

diff --git a/hw/usb/dev-network.c b/hw/usb/dev-network.c
index c6abd38c2aa2a534b5a4ac25fcfcd2478e83cd95..b183cafece4fd3ffe1b1e02d034e41d7fee058bd 100644 (file)
--- a/hw/usb/dev-network.c
+++ b/hw/usb/dev-network.c
@@ -24,6 +24,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "qemu-common.h"
 #include "hw/usb.h"
 #include "hw/usb/desc.h"

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

diff --git a/hw/usb/dev-smartcard-reader.c b/hw/usb/dev-smartcard-reader.c
index 96a1a138126b061d370bacd3932dd9fd467f82d0..af4b851356cc5e1dbf0434b29a3a1b4c324984a6 100644 (file)
--- a/hw/usb/dev-smartcard-reader.c
+++ b/hw/usb/dev-smartcard-reader.c
@@ -35,6 +35,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "qemu-common.h"
 #include "qemu/error-report.h"
 #include "hw/usb.h"

diff --git a/hw/usb/dev-storage.c b/hw/usb/dev-storage.c
index 5ae0424923da83575ad6a4d9ac52e09f677281a6..284024e6f499afabda959e84f5b1599572ca015c 100644 (file)
--- a/hw/usb/dev-storage.c
+++ b/hw/usb/dev-storage.c
@@ -8,6 +8,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "qemu-common.h"
 #include "qemu/error-report.h"
 #include "qemu/option.h"

diff --git a/hw/usb/hcd-ehci.c b/hw/usb/hcd-ehci.c
index 1b50601fc1c50b9e782dc3ce95f84e5cdab5069b..f598937099c169517a97f808ff38ee62204be2df 100644 (file)
--- a/hw/usb/hcd-ehci.c
+++ b/hw/usb/hcd-ehci.c
@@ -28,6 +28,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "hw/usb/ehci-regs.h"
 #include "hw/usb/hcd-ehci.h"
 #include "trace.h"

diff --git a/hw/usb/hcd-ohci.c b/hw/usb/hcd-ohci.c
index 17ed4617efd28ba6a61a94f7800ee203a71cad56..f3dc26bccaaa5064b0bf2f504833249bf5c3dd0c 100644 (file)
--- a/hw/usb/hcd-ohci.c
+++ b/hw/usb/hcd-ohci.c
@@ -27,6 +27,7 @@
 
 #include "qemu/osdep.h"
 #include "hw/hw.h"
+#include "qapi/error.h"
 #include "qemu/timer.h"
 #include "hw/usb.h"
 #include "hw/pci/pci.h"

diff --git a/hw/usb/hcd-uhci.c b/hw/usb/hcd-uhci.c
index c370240be298b833babe05f4ca1b775cbb3cea92..6521418681e57c886a8d06f32ca3a2f813b7405c 100644 (file)
--- a/hw/usb/hcd-uhci.c
+++ b/hw/usb/hcd-uhci.c
@@ -30,6 +30,7 @@
 #include "hw/usb.h"
 #include "hw/usb/uhci-regs.h"
 #include "hw/pci/pci.h"
+#include "qapi/error.h"
 #include "qemu/timer.h"
 #include "qemu/iov.h"
 #include "sysemu/dma.h"

diff --git a/hw/usb/host-libusb.c b/hw/usb/host-libusb.c
index 5e7ec453d0ca5a731f53f8328c2d8d0d55a55ca2..6458a94485accee53bc87428cf1786b68321712c 100644 (file)
--- a/hw/usb/host-libusb.c
+++ b/hw/usb/host-libusb.c
@@ -37,6 +37,7 @@
 #include <poll.h>
 #include <libusb.h>
 
+#include "qapi/error.h"
 #include "qemu-common.h"
 #include "monitor/monitor.h"
 #include "qemu/error-report.h"

diff --git a/hw/usb/redirect.c b/hw/usb/redirect.c
index 38a539311bdd48893f0217af9a3b217cc1f07d73..dbcc5a737fd01295884319d135a12e90a40aef2a 100644 (file)
--- a/hw/usb/redirect.c
+++ b/hw/usb/redirect.c
@@ -26,6 +26,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "qemu-common.h"
 #include "qemu/timer.h"
 #include "sysemu/sysemu.h"

diff --git a/hw/vfio/platform.c b/hw/vfio/platform.c
index a2ab75d3f23a434a9c0a4ad4f5b68e1fed8110e4..1798a00a3f3589116acccfa95e4c1de73ea7c810 100644 (file)
--- a/hw/vfio/platform.c
+++ b/hw/vfio/platform.c
@@ -15,6 +15,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include <sys/ioctl.h>
 #include <linux/vfio.h>
 

diff --git a/hw/virtio/vhost-user.c b/hw/virtio/vhost-user.c
index 7ed3dd9a13a04fc334c04a7402df0e87b15e4036..5914e85107011ec03373f1bbb86aec7d2120da97 100644 (file)
--- a/hw/virtio/vhost-user.c
+++ b/hw/virtio/vhost-user.c
@@ -9,6 +9,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "hw/virtio/vhost.h"
 #include "hw/virtio/vhost-backend.h"
 #include "hw/virtio/virtio-net.h"

diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c
index 392d848819a67152881113aa34b02485bb300303..440071815408a6392d64c53e952b4331f4a0c180 100644 (file)
--- a/hw/virtio/vhost.c
+++ b/hw/virtio/vhost.c
@@ -14,6 +14,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "hw/virtio/vhost.h"
 #include "hw/hw.h"
 #include "qemu/atomic.h"

diff --git a/hw/virtio/virtio-pci.c b/hw/virtio/virtio-pci.c
index 0dadb6687fe709d1c9cf1a39335f81c27a9bab52..bfedbbf17fad6c5e619e12b9225544041f53611c 100644 (file)
--- a/hw/virtio/virtio-pci.c
+++ b/hw/virtio/virtio-pci.c
@@ -26,6 +26,7 @@
 #include "hw/virtio/virtio-balloon.h"
 #include "hw/virtio/virtio-input.h"
 #include "hw/pci/pci.h"
+#include "qapi/error.h"
 #include "qemu/error-report.h"
 #include "hw/pci/msi.h"
 #include "hw/pci/msix.h"

diff --git a/hw/virtio/virtio-rng.c b/hw/virtio/virtio-rng.c
index d7134646e225474f1e5d3ebefad6188fd7b87007..6b991a7642934366aa6b111723a18b8d4b10e97b 100644 (file)
--- a/hw/virtio/virtio-rng.c
+++ b/hw/virtio/virtio-rng.c
@@ -10,6 +10,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "qemu/iov.h"
 #include "hw/qdev.h"
 #include "hw/virtio/virtio.h"

diff --git a/hw/virtio/virtio.c b/hw/virtio/virtio.c
index 08275a98482b831a35d32306ced865e77f34f182..8ce19a0979bdf597dbee3f35f62a781da07a28d7 100644 (file)
--- a/hw/virtio/virtio.c
+++ b/hw/virtio/virtio.c
@@ -12,6 +12,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 
 #include "trace.h"
 #include "exec/address-spaces.h"

diff --git a/hw/xen/xen-host-pci-device.c b/hw/xen/xen-host-pci-device.c
index 9666fff8c9678c1b7ce896b5487b4e7df020dcca..4005d6ae766d58d4cf7ad430c91909ef2bcd4975 100644 (file)
--- a/hw/xen/xen-host-pci-device.c
+++ b/hw/xen/xen-host-pci-device.c
@@ -7,6 +7,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "qemu-common.h"
 #include "xen-host-pci-device.h"
 

diff --git a/hw/xen/xen_pt.c b/hw/xen/xen_pt.c
index 657bf6cdc1304ee3fb09d46633b35cb485c50936..f593b046e580661cca3ee69d725b6c3b63e2bb36 100644 (file)
--- a/hw/xen/xen_pt.c
+++ b/hw/xen/xen_pt.c
@@ -53,6 +53,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include <sys/ioctl.h>
 
 #include "hw/pci/pci.h"

diff --git a/hw/xen/xen_pt_config_init.c b/hw/xen/xen_pt_config_init.c
index 1b48f1918319c0fef2f113ef1d382cc369de444e..9869ffda0178e36a387e18640bd804982a401ebd 100644 (file)
--- a/hw/xen/xen_pt_config_init.c
+++ b/hw/xen/xen_pt_config_init.c
@@ -13,6 +13,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "qemu/timer.h"
 #include "hw/xen/xen_backend.h"
 #include "xen_pt.h"

diff --git a/hw/xen/xen_pt_graphics.c b/hw/xen/xen_pt_graphics.c
index 71e745f8ca2077cdf75b17f97a4de2c489f81183..0f4c8d77e2a50232f0aca83b60ac0712f03eb2c6 100644 (file)
--- a/hw/xen/xen_pt_graphics.c
+++ b/hw/xen/xen_pt_graphics.c
@@ -2,6 +2,7 @@
  * graphics passthrough
  */
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "xen_pt.h"
 #include "xen-host-pci-device.h"
 #include "hw/xen/xen_backend.h"

diff --git a/hw/xtensa/sim.c b/hw/xtensa/sim.c
index 23050e8fb759ea926de3ebabb075739d6c573db8..0967aa6c46f738ff2b2a2a2eef811cac1d41e3c1 100644 (file)
--- a/hw/xtensa/sim.c
+++ b/hw/xtensa/sim.c
@@ -26,6 +26,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "sysemu/sysemu.h"
 #include "hw/boards.h"
 #include "hw/loader.h"

diff --git a/hw/xtensa/xtfpga.c b/hw/xtensa/xtfpga.c
index 54e7f46868c4a0cd16a15952d5681a67288c0f09..1aff056356042e83fad70f8288daf7514b02be27 100644 (file)
--- a/hw/xtensa/xtfpga.c
+++ b/hw/xtensa/xtfpga.c
@@ -26,6 +26,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "sysemu/sysemu.h"
 #include "hw/boards.h"
 #include "hw/loader.h"

diff --git a/include/qapi/error.h b/include/qapi/error.h
index 02e9dd20a7f8574ab59d765ce867593ec82b9a7a..11be2327c0b097e53e38e90d59fad8e98bc7c8c4 100644 (file)
--- a/include/qapi/error.h
+++ b/include/qapi/error.h
@@ -117,11 +117,6 @@
 
 #include "qapi-types.h"
 
-/*
- * Opaque error object.
- */
-typedef struct Error Error;
-
 /*
  * Overall category of an error.
  * Based on the qapi type QapiErrorClass, but reproduced here for nicer

diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h
index 4538fdca42c12a32e54532af06f0f7539885623c..1c0ce4a1c794435654422e3282a7f9aec7cfd535 100644 (file)
--- a/include/qemu/osdep.h
+++ b/include/qemu/osdep.h
@@ -7,8 +7,10 @@
  *
  * To avoid getting into possible circular include dependencies, this
  * file should not include any other QEMU headers, with the exceptions
- * of config-host.h, compiler.h, os-posix.h and os-win32.h, all of which
- * are doing a similar job to this file and are under similar constraints.
+ * of config-host.h, config-target.h, qemu/compiler.h,
+ * sysemu/os-posix.h, sysemu/os-win32.h, glib-compat.h and
+ * qemu/typedefs.h, all of which are doing a similar job to this file
+ * and are under similar constraints.
  *
  * This header also contains prototypes for functions defined in
  * os-*.c and util/oslib-*.c; those would probably be better split
@@ -98,8 +100,7 @@ extern int daemon(int, int);
 #endif
 
 #include "glib-compat.h"
-
-#include "qapi/error.h"
+#include "qemu/typedefs.h"
 
 #ifndef O_LARGEFILE
 #define O_LARGEFILE 0

diff --git a/include/qemu/typedefs.h b/include/qemu/typedefs.h
index fd039e0e8168f71bbff96b6ed18c32f8a3f0d7ef..c987db6ddf814e27ab28be368dc05257d7d2f81d 100644 (file)
--- a/include/qemu/typedefs.h
+++ b/include/qemu/typedefs.h
@@ -26,6 +26,7 @@ typedef struct DisplayChangeListener DisplayChangeListener;
 typedef struct DisplayState DisplayState;
 typedef struct DisplaySurface DisplaySurface;
 typedef struct DriveInfo DriveInfo;
+typedef struct Error Error;
 typedef struct EventNotifier EventNotifier;
 typedef struct FWCfgIoState FWCfgIoState;
 typedef struct FWCfgMemState FWCfgMemState;

diff --git a/include/qom/object.h b/include/qom/object.h
index eda16df005ca97299c59a93b149eaa5ef453811c..0eba22ef8324063689467052c0c3bdffc6e6e88e 100644 (file)
--- a/include/qom/object.h
+++ b/include/qom/object.h
@@ -15,6 +15,7 @@
 #define QEMU_OBJECT_H
 
 #include <glib.h>
+#include "qapi-types.h"
 #include "qemu/queue.h"
 #include "qemu/typedefs.h"
 

diff --git a/include/ui/qemu-spice.h b/include/ui/qemu-spice.h
index 2dabe49f4146eba088cb41647980cfcaebd6622c..aa2436355f4f10b41e8f63b28e7170ddd4ca0732 100644 (file)
--- a/include/ui/qemu-spice.h
+++ b/include/ui/qemu-spice.h
@@ -18,11 +18,11 @@
 #ifndef QEMU_SPICE_H
 #define QEMU_SPICE_H
 
+#include "qapi/error.h"
 
 #ifdef CONFIG_SPICE
 
 #include <spice.h>
-
 #include "qemu/option.h"
 #include "qemu/config-file.h"
 

diff --git a/io/channel-command.c b/io/channel-command.c
index 604514adfc58f49a30a2514ed32588a0b9b19b54..ad25313be141efe690eb1e5748fc20983da48cb4 100644 (file)
--- a/io/channel-command.c
+++ b/io/channel-command.c
@@ -21,6 +21,7 @@
 #include "qemu/osdep.h"
 #include "io/channel-command.h"
 #include "io/channel-watch.h"
+#include "qapi/error.h"
 #include "qemu/sockets.h"
 #include "trace.h"
 

diff --git a/io/channel-file.c b/io/channel-file.c
index f28e2b0a5caff96a294a8a1c78a0651628b7f888..e1da2435e649dbd76cc019ab61976ae61f9d68eb 100644 (file)
--- a/io/channel-file.c
+++ b/io/channel-file.c
@@ -21,6 +21,7 @@
 #include "qemu/osdep.h"
 #include "io/channel-file.h"
 #include "io/channel-watch.h"
+#include "qapi/error.h"
 #include "qemu/sockets.h"
 #include "trace.h"
 

diff --git a/io/channel-socket.c b/io/channel-socket.c
index d0050705841cdc735cc74cdd1cb2cf931f22b04e..ca8bc20b17a2d8a0172ed13c4153c0c6ebb63bde 100644 (file)
--- a/io/channel-socket.c
+++ b/io/channel-socket.c
@@ -19,6 +19,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "io/channel-socket.h"
 #include "io/channel-watch.h"
 #include "trace.h"

diff --git a/io/channel-tls.c b/io/channel-tls.c
index 7608fd9de09046b191bd90fa728c00a4e377d983..9a8525c816a10b64aa2602457729a2dc3e8f8670 100644 (file)
--- a/io/channel-tls.c
+++ b/io/channel-tls.c
@@ -19,6 +19,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "io/channel-tls.h"
 #include "trace.h"
 

diff --git a/io/channel-websock.c b/io/channel-websock.c
index 35860a27385de1f4d10db6a3bfe4e3c7c923c61b..708178779e736f8bd9ee2fb5096d9d8c482bf4dc 100644 (file)
--- a/io/channel-websock.c
+++ b/io/channel-websock.c
@@ -19,6 +19,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "io/channel-websock.h"
 #include "crypto/hash.h"
 #include "trace.h"

diff --git a/io/channel.c b/io/channel.c
index dd6fc0eb28898bc134d6e6e729ff5c6e23ca18d7..692eb179b3b3d7e5a50df138bd539802444bb6a7 100644 (file)
--- a/io/channel.c
+++ b/io/channel.c
@@ -20,6 +20,7 @@
 
 #include "qemu/osdep.h"
 #include "io/channel.h"
+#include "qapi/error.h"
 #include "qemu/coroutine.h"
 
 bool qio_channel_has_feature(QIOChannel *ioc,

diff --git a/io/task.c b/io/task.c
index bf1a3339b2651080401cc4472bc4411527e85d40..c7f97a9b16e926c293a2390da75f59577e9cec3a 100644 (file)
--- a/io/task.c
+++ b/io/task.c
@@ -20,6 +20,7 @@
 
 #include "qemu/osdep.h"
 #include "io/task.h"
+#include "qapi/error.h"
 #include "qemu/thread.h"
 #include "trace.h"
 

diff --git a/iohandler.c b/iohandler.c
index 0abb4a7e7a5c4c298cdd686aba78094bbd3b98b4..3f23433b5a901efc26afa85d2e877dbd169e4215 100644 (file)
--- a/iohandler.c
+++ b/iohandler.c
@@ -23,6 +23,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "qemu-common.h"
 #include "qemu/queue.h"
 #include "block/aio.h"

diff --git a/main-loop.c b/main-loop.c
index 3a7f4cdbb211d9ed223ca54eef32736dc9daac78..9598c5f4c722d3348c482c9f2e8b736b7cec5d5f 100644 (file)
--- a/main-loop.c
+++ b/main-loop.c
@@ -23,6 +23,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "qemu-common.h"
 #include "qemu/timer.h"
 #include "qemu/sockets.h"      // struct in_addr needed for libslirp.h

diff --git a/memory.c b/memory.c
index 95f720964b86fe3c2a5bc48b722841f8086c3d1f..f76f85df95eea6a31ccf99ff168b91ad12842820 100644 (file)
--- a/memory.c
+++ b/memory.c
@@ -14,6 +14,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "exec/memory.h"
 #include "exec/address-spaces.h"
 #include "exec/ioport.h"

diff --git a/memory_mapping.c b/memory_mapping.c
index c8855de92b10c1db0302b3833bfd4bd80b58e9a8..2354b2b7f32b5ef8fd13f35271a652f0adee59fa 100644 (file)
--- a/memory_mapping.c
+++ b/memory_mapping.c
@@ -12,6 +12,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include <glib.h>
 
 #include "qemu-common.h"

diff --git a/migration/block.c b/migration/block.c
index 72883d7c64b2c40580f823e2109fdcd98c754f76..af8e16dfc7abb6eb93a109d8ed8a3d1d67b7e4a8 100644 (file)
--- a/migration/block.c
+++ b/migration/block.c
@@ -14,6 +14,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "qemu-common.h"
 #include "block/block.h"
 #include "qemu/error-report.h"

diff --git a/migration/exec.c b/migration/exec.c
index 62f892d4d9564d4f41e456a0782eb1e950a06817..559420969b02e368b2c6d6d3ba21e55c2a9c0527 100644 (file)
--- a/migration/exec.c
+++ b/migration/exec.c
@@ -16,6 +16,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "qemu-common.h"
 #include "qemu/sockets.h"
 #include "qemu/main-loop.h"

diff --git a/migration/fd.c b/migration/fd.c
index 085dd7c51e6473966468574fc3bab3beb7ae5c6d..3d788bb297139656e5c5eb2dcbeebcca458e8b62 100644 (file)
--- a/migration/fd.c
+++ b/migration/fd.c
@@ -14,6 +14,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "qemu-common.h"
 #include "qemu/main-loop.h"
 #include "qemu/sockets.h"

diff --git a/migration/rdma.c b/migration/rdma.c
index bcae1e81b3e34fcd8cff3c41341ff92993b3a4cf..0601d528bcc0a3b71f44367676e0cbb4c9124d35 100644 (file)
--- a/migration/rdma.c
+++ b/migration/rdma.c
@@ -12,6 +12,7 @@
  *
  */
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "qemu-common.h"
 #include "migration/migration.h"
 #include "migration/qemu-file.h"

diff --git a/nbd/client.c b/nbd/client.c
index 9e5b651082631a2e337f03f9c2fc076dd4512b09..f89c0a16ae130dc97a54a23d90e7f1ef2930a3c8 100644 (file)
--- a/nbd/client.c
+++ b/nbd/client.c
@@ -17,6 +17,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "nbd-internal.h"
 
 static int nbd_errno_to_system_errno(int err)

diff --git a/nbd/common.c b/nbd/common.c
index bde673a04a236062c3036afa34d20c08eac5cb03..a44718ce587ebec6c9f5a94e1b7407fad249c6ac 100644 (file)
--- a/nbd/common.c
+++ b/nbd/common.c
@@ -17,6 +17,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "nbd-internal.h"
 
 ssize_t nbd_wr_syncv(QIOChannel *ioc,

diff --git a/nbd/server.c b/nbd/server.c
index d4225cdb557cea9a9f28249505047dd78f3c231a..b95571bdf5259688b99ad6540e5bd7681f2a00b2 100644 (file)
--- a/nbd/server.c
+++ b/nbd/server.c
@@ -17,6 +17,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "nbd-internal.h"
 
 static int system_errno_to_nbd_errno(int err)

diff --git a/net/dump.c b/net/dump.c
index 94ac32a39f826b8ec997e57cb27dcefe19ff7d5e..41f7673efdb8ec41627729e6d8c1f1de17a46343 100644 (file)
--- a/net/dump.c
+++ b/net/dump.c
@@ -24,6 +24,7 @@
 
 #include "qemu/osdep.h"
 #include "clients.h"
+#include "qapi/error.h"
 #include "qemu-common.h"
 #include "qemu/error-report.h"
 #include "qemu/iov.h"

diff --git a/net/filter-buffer.c b/net/filter-buffer.c
index 972177b45328251ed52fc1ec785ff5587dd9863e..cc6bd94445505e7097d3f7176926e115ec4eae7e 100644 (file)
--- a/net/filter-buffer.c
+++ b/net/filter-buffer.c
@@ -9,6 +9,7 @@
 #include "qemu/osdep.h"
 #include "net/filter.h"
 #include "net/queue.h"
+#include "qapi/error.h"
 #include "qemu-common.h"
 #include "qemu/timer.h"
 #include "qemu/iov.h"

diff --git a/net/filter.c b/net/filter.c
index a08ef68ae6658081e24934e3576526fc0fff50fc..1c4fc5a2c79236d9663d8fb59012d8f865cc1ac3 100644 (file)
--- a/net/filter.c
+++ b/net/filter.c
@@ -7,6 +7,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "qemu-common.h"
 #include "qapi/qmp/qerror.h"
 #include "qemu/error-report.h"

diff --git a/net/socket.c b/net/socket.c
index 9826efb46f02c165d78179b2550bdc225db3ddd9..9fa2cd8d516775e92d4150cc9fd0cc9214bbf8cb 100644 (file)
--- a/net/socket.c
+++ b/net/socket.c
@@ -26,6 +26,7 @@
 #include "net/net.h"
 #include "clients.h"
 #include "monitor/monitor.h"
+#include "qapi/error.h"
 #include "qemu-common.h"
 #include "qemu/error-report.h"
 #include "qemu/option.h"

diff --git a/net/tap-aix.c b/net/tap-aix.c
index 9d830b7a3277a73c107043780fd4403c7436190e..0e6da639637a24ddb94780d879ca2a714078e20a 100644 (file)
--- a/net/tap-aix.c
+++ b/net/tap-aix.c
@@ -23,6 +23,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "tap_int.h"
 
 int tap_open(char *ifname, int ifname_size, int *vnet_hdr,

diff --git a/net/tap-bsd.c b/net/tap-bsd.c
index 83de19a64654a888483dc767c9d295af9aa7c6d9..33642ae518f1e2805d0e9a41abc51e1595f05621 100644 (file)
--- a/net/tap-bsd.c
+++ b/net/tap-bsd.c
@@ -23,6 +23,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "tap_int.h"
 #include "qemu-common.h"
 #include "sysemu/sysemu.h"

diff --git a/net/tap-haiku.c b/net/tap-haiku.c
index 397e53235e5bcab05fe55ad4b480780d6661ef75..b27e57e9552d317ee364db5834bee530dddfdca8 100644 (file)
--- a/net/tap-haiku.c
+++ b/net/tap-haiku.c
@@ -23,6 +23,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "tap_int.h"
 
 int tap_open(char *ifname, int ifname_size, int *vnet_hdr,

diff --git a/net/tap-linux.c b/net/tap-linux.c
index 0929cf76f5b680ec07d59a6c4b35f20dbdadbe71..8077d2b5759b2339a94254bd92597fdaf0fe2025 100644 (file)
--- a/net/tap-linux.c
+++ b/net/tap-linux.c
@@ -32,6 +32,7 @@
 #include <sys/ioctl.h>
 
 #include "sysemu/sysemu.h"
+#include "qapi/error.h"
 #include "qemu-common.h"
 #include "qemu/error-report.h"
 

diff --git a/net/tap-solaris.c b/net/tap-solaris.c
index e3907a8218e97893363ccab66e9515b20f3dc0fa..26d204292213466c13deb4672811508930ec7d27 100644 (file)
--- a/net/tap-solaris.c
+++ b/net/tap-solaris.c
@@ -23,6 +23,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "tap_int.h"
 #include "sysemu/sysemu.h"
 

diff --git a/net/tap.c b/net/tap.c
index 8f790d15ff52f98d55f06ca2bc8e6f9fe4e589ce..3ddf9ecd7d5e7cb6b87bf1958f94501818dbef62 100644 (file)
--- a/net/tap.c
+++ b/net/tap.c
@@ -36,6 +36,7 @@
 #include "clients.h"
 #include "monitor/monitor.h"
 #include "sysemu/sysemu.h"
+#include "qapi/error.h"
 #include "qemu-common.h"
 #include "qemu/error-report.h"
 

diff --git a/qapi/opts-visitor.c b/qapi/opts-visitor.c
index 73e4acea7b4bfa724b69c6a818572f83e1d51574..5e2b8832a820971b99ffc2398d6ca27ee077b168 100644 (file)
--- a/qapi/opts-visitor.c
+++ b/qapi/opts-visitor.c
@@ -11,6 +11,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "qemu-common.h"
 #include "qapi/qmp/qerror.h"
 #include "qapi/opts-visitor.h"

diff --git a/qapi/qapi-util.c b/qapi/qapi-util.c
index 8afb12eb43e97f2c8484115befa50559a32b38f8..818730a660323a38bdf760f05db84df1aa7bd9b6 100644 (file)
--- a/qapi/qapi-util.c
+++ b/qapi/qapi-util.c
@@ -11,6 +11,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "qemu-common.h"
 #include "qapi/util.h"
 

diff --git a/qapi/qapi-visit-core.c b/qapi/qapi-visit-core.c
index 856606b2538dc1cfc864c6007adbbbdb0252e327..fa680c9991d686b313a409d112b7819cb170996b 100644 (file)
--- a/qapi/qapi-visit-core.c
+++ b/qapi/qapi-visit-core.c
@@ -13,6 +13,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "qemu-common.h"
 #include "qapi/qmp/qobject.h"
 #include "qapi/qmp/qerror.h"

diff --git a/qapi/qmp-dispatch.c b/qapi/qmp-dispatch.c
index 8f27c3456d3a39eea271d393b286c51a74b3dcb0..510a1aead8ae7826619a46e5f3c716cf0eeb88b6 100644 (file)
--- a/qapi/qmp-dispatch.c
+++ b/qapi/qmp-dispatch.c
@@ -12,6 +12,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "qapi/qmp/types.h"
 #include "qapi/qmp/dispatch.h"
 #include "qapi/qmp/json-parser.h"

diff --git a/qapi/qmp-input-visitor.c b/qapi/qmp-input-visitor.c
index e6598327c32ee35e37aa3ad9cc54fcceae951141..7cd1b777a08fb1381f06def76d6a6dae73707f84 100644 (file)
--- a/qapi/qmp-input-visitor.c
+++ b/qapi/qmp-input-visitor.c
@@ -13,6 +13,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "qapi/qmp-input-visitor.h"
 #include "qapi/visitor-impl.h"
 #include "qemu/queue.h"

diff --git a/qapi/string-input-visitor.c b/qapi/string-input-visitor.c
index 59eb5dc4e3b5b25075fcbdac9900c58c9fae2f8c..ab129536e47bcef52522d6d008a4b69e548287d8 100644 (file)
--- a/qapi/string-input-visitor.c
+++ b/qapi/string-input-visitor.c
@@ -11,6 +11,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "qemu-common.h"
 #include "qapi/string-input-visitor.h"
 #include "qapi/visitor-impl.h"

diff --git a/qemu-img.c b/qemu-img.c
index 29eae2a24b4e1ba6f5d8ee088e6570878ea711d3..8b54d0548697b810931becfca00da06a38a78f2f 100644 (file)
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -22,6 +22,7 @@
  * THE SOFTWARE.
  */
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "qapi-visit.h"
 #include "qapi/qmp-output-visitor.h"
 #include "qapi/qmp/qerror.h"

diff --git a/qemu-io-cmds.c b/qemu-io-cmds.c
index e929d24a490fbd1f895c1d637a53fdbec9402f95..13fbb5944c330a16a7c00f2f947465a097a2e9b5 100644 (file)
--- a/qemu-io-cmds.c
+++ b/qemu-io-cmds.c
@@ -9,6 +9,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "qemu-io.h"
 #include "sysemu/block-backend.h"
 #include "block/block.h"

diff --git a/qemu-io.c b/qemu-io.c
index d7c2f26bbbc5463b9344b551cb77521315fec38a..bc129536e4dd6d94d9d9655b92cf304a04fce6ea 100644 (file)
--- a/qemu-io.c
+++ b/qemu-io.c
@@ -11,6 +11,7 @@
 #include <getopt.h>
 #include <libgen.h>
 
+#include "qapi/error.h"
 #include "qemu-io.h"
 #include "qemu/error-report.h"
 #include "qemu/main-loop.h"

diff --git a/qemu-nbd.c b/qemu-nbd.c
index f3528c8c0497aab69a4cae53d91213be0517d1b2..2963c56df77ce852f8f9826c7370f79174c95004 100644 (file)
--- a/qemu-nbd.c
+++ b/qemu-nbd.c
@@ -17,6 +17,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "qemu-common.h"
 #include "sysemu/block-backend.h"
 #include "block/block_int.h"

diff --git a/qga/channel-posix.c b/qga/channel-posix.c
index 7ad3c007653eb63cac34c2b1506653750e2f1fbe..63458c6632f7bbdf567319672bd3f4e683db0364 100644 (file)
--- a/qga/channel-posix.c
+++ b/qga/channel-posix.c
@@ -1,6 +1,7 @@
 #include "qemu/osdep.h"
 #include <glib.h>
 #include <termios.h>
+#include "qapi/error.h"
 #include "qemu/sockets.h"
 #include "qga/channel.h"
 

diff --git a/qobject/json-parser.c b/qobject/json-parser.c
index 6c05f6cc7088da47d302979c8fe236fd48f3c52a..6e65b8226404d978163275e90216f0f5a32fa3de 100644 (file)
--- a/qobject/json-parser.c
+++ b/qobject/json-parser.c
@@ -13,6 +13,7 @@
 
 #include "qemu/osdep.h"
 
+#include "qapi/error.h"
 #include "qemu-common.h"
 #include "qapi/qmp/qstring.h"
 #include "qapi/qmp/qint.h"

diff --git a/qom/cpu.c b/qom/cpu.c
index c45d0bb6de5e8878ac749be7d4b8662f083f81c5..c9007d3d06e217a62d03878ebb5d0d14b22b3eb2 100644 (file)
--- a/qom/cpu.c
+++ b/qom/cpu.c
@@ -19,6 +19,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "qemu-common.h"
 #include "qom/cpu.h"
 #include "sysemu/kvm.h"

diff --git a/qom/object.c b/qom/object.c
index 844ae7a0fda1f8720437b347d25afedd79dba198..6a1f03019b87f69846183725536920a20e9ab925 100644 (file)
--- a/qom/object.c
+++ b/qom/object.c
@@ -11,6 +11,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "qom/object.h"
 #include "qom/object_interfaces.h"
 #include "qemu-common.h"

diff --git a/qom/object_interfaces.c b/qom/object_interfaces.c
index c2f6e2998e454e96985372547db5f15f1d3fdc69..ab5da35e4fa48dd2ac8aea497562bddd8385bc94 100644 (file)
--- a/qom/object_interfaces.c
+++ b/qom/object_interfaces.c
@@ -1,4 +1,5 @@
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "qom/object_interfaces.h"
 #include "qemu/module.h"
 #include "qapi-visit.h"

diff --git a/qom/qom-qobject.c b/qom/qom-qobject.c
index 9cbc4c69a6f23e7bcdfdf8d93c0ea639a0aca157..e6b17c1f1b2750fd0465d9db48ed4aeddec88dad 100644 (file)
--- a/qom/qom-qobject.c
+++ b/qom/qom-qobject.c
@@ -10,6 +10,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "qemu-common.h"
 #include "qom/object.h"
 #include "qom/qom-qobject.h"

diff --git a/qtest.c b/qtest.c
index 58a7732ef3e90c5bf850846054f60dba9e3e4ac2..87575bc0b45d38ee3c4506596592b20fef9e198c 100644 (file)
--- a/qtest.c
+++ b/qtest.c
@@ -12,6 +12,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "sysemu/qtest.h"
 #include "hw/qdev.h"
 #include "sysemu/char.h"

diff --git a/replay/replay-input.c b/replay/replay-input.c
index 2d5d9191caccd8edbf7adc50840d0c08c5ecd356..06babe0ecc25d1806e7132b50e55151d2d669770 100644 (file)
--- a/replay/replay-input.c
+++ b/replay/replay-input.c
@@ -10,6 +10,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "qemu-common.h"
 #include "sysemu/replay.h"
 #include "replay-internal.h"

diff --git a/replay/replay.c b/replay/replay.c
index fcfde4fc93d307854e0453d141d70f228a3419a3..ec32c81072a7d242788c1a2e406bd663bd57ad30 100644 (file)
--- a/replay/replay.c
+++ b/replay/replay.c
@@ -10,6 +10,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "qemu-common.h"
 #include "sysemu/replay.h"
 #include "replay-internal.h"

diff --git a/scripts/clean-includes b/scripts/clean-includes
index 177d253eb9340db7c76343ec81d58c5597c9aa56..8052bbd3b43a0068ee7959bbff8de353acf28027 100755 (executable)
--- a/scripts/clean-includes
+++ b/scripts/clean-includes
@@ -139,12 +139,13 @@ for f in "$@"; do
   # Remove includes that osdep.h already provides
   perl -n -i -e 'print if !/\s*#\s*include\s*(["<][^>"]*[">])/ ||
                           ! (grep { $_ eq $1 } qw (
-           "config-host.h" "qemu/compiler.h" "config.h"
+           "config-host.h" "config-target.h" "qemu/compiler.h"
            <stdarg.h> <stddef.h> <stdbool.h> <stdint.h> <sys/types.h>
            <stdlib.h> <stdio.h> <string.h> <strings.h> <inttypes.h>
            <limits.h> <unistd.h> <time.h> <ctype.h> <errno.h> <fcntl.h>
            <sys/stat.h> <sys/time.h> <assert.h> <signal.h>
-           "glib-compat.h" "qapi/error.h"
+           "sysemu/os-posix.h, sysemu/os-win32.h "glib-compat.h"
+           "qemu/typedefs.h"
             ))' "$f"
 
 done

diff --git a/scripts/qapi-visit.py b/scripts/qapi-visit.py
index c147990efe9368739d945e1144d9d797a03d22ee..31d23303566adbc563734b47f2fc811b02272f5f 100644 (file)
--- a/scripts/qapi-visit.py
+++ b/scripts/qapi-visit.py
@@ -355,6 +355,7 @@ h_comment = '''
 fdef.write(mcgen('''
 #include "qemu/osdep.h"
 #include "qemu-common.h"
+#include "qapi/error.h"
 #include "%(prefix)sqapi-visit.h"
 ''',
                  prefix=prefix))

diff --git a/stubs/get-fd.c b/stubs/get-fd.c
index 85881fb678e4247dea0a616d1e39520275254a88..7dfdfb55f745beec1455071113be0340c95ff45c 100644 (file)
--- a/stubs/get-fd.c
+++ b/stubs/get-fd.c
@@ -1,4 +1,5 @@
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "qemu-common.h"
 #include "monitor/monitor.h"
 

diff --git a/target-alpha/cpu.c b/target-alpha/cpu.c
index 2eab0609e47227ef1cf78dbce977eaa285ca1c96..8a155cae900072c5cf1cbb395dedc75bab5cb136 100644 (file)
--- a/target-alpha/cpu.c
+++ b/target-alpha/cpu.c
@@ -20,6 +20,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "cpu.h"
 #include "qemu-common.h"
 #include "migration/vmstate.h"

diff --git a/target-arm/cpu.c b/target-arm/cpu.c
index 352d9f883d0feffb18de86ff5d0da9d27c94206c..e48e83acbbf159188abf3dd467f5a95e01729a70 100644 (file)
--- a/target-arm/cpu.c
+++ b/target-arm/cpu.c
@@ -19,6 +19,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "cpu.h"
 #include "internals.h"
 #include "qemu-common.h"

diff --git a/target-arm/cpu64.c b/target-arm/cpu64.c
index fa5eda2cd158d898e50220efce1d8f2d884fd4cd..1635debc1a2baed13f9e399f336f23f6f50f236b 100644 (file)
--- a/target-arm/cpu64.c
+++ b/target-arm/cpu64.c
@@ -19,6 +19,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "cpu.h"
 #include "qemu-common.h"
 #if !defined(CONFIG_USER_ONLY)

diff --git a/target-cris/cpu.c b/target-cris/cpu.c
index b2c8624dbf54a0d53857f13f4927d14c2aed255c..1cb79dd9771707af4ea8dd79412e61ad0be00f3b 100644 (file)
--- a/target-cris/cpu.c
+++ b/target-cris/cpu.c
@@ -22,6 +22,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "cpu.h"
 #include "qemu-common.h"
 #include "mmu.h"

diff --git a/target-i386/kvm.c b/target-i386/kvm.c
index 08d644474138cfd5fd1c719fa242455944f5dc8d..87ab969ae11d447879d54fb8e40b6caab98f752a 100644 (file)
--- a/target-i386/kvm.c
+++ b/target-i386/kvm.c
@@ -13,6 +13,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include <sys/ioctl.h>
 #include <sys/mman.h>
 #include <sys/utsname.h>

diff --git a/target-lm32/cpu.c b/target-lm32/cpu.c
index f93bb5d0dd3d7a07e3a3619efcb3753ec900e734..6e7e1b8e6350ff04d36f819bf47c7aac234d0d4c 100644 (file)
--- a/target-lm32/cpu.c
+++ b/target-lm32/cpu.c
@@ -19,6 +19,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "cpu.h"
 #include "qemu-common.h"
 

diff --git a/target-m68k/cpu.c b/target-m68k/cpu.c
index 6de74bf28eea297ab6c0801e660aa6a885e00670..0b5f9a581e7ab966754f5151eca800b6088dd85c 100644 (file)
--- a/target-m68k/cpu.c
+++ b/target-m68k/cpu.c
@@ -19,6 +19,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "cpu.h"
 #include "qemu-common.h"
 #include "migration/vmstate.h"

diff --git a/target-microblaze/cpu.c b/target-microblaze/cpu.c
index 7a42897a0045ca73861ed1a505e89d0f5979762b..fdfb01917f9a48d3f5ada45f2beba53ddca230cb 100644 (file)
--- a/target-microblaze/cpu.c
+++ b/target-microblaze/cpu.c
@@ -22,6 +22,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "cpu.h"
 #include "qemu-common.h"
 #include "hw/qdev-properties.h"

diff --git a/target-mips/cpu.c b/target-mips/cpu.c
index 7dc3a44a159778a73ee87be9acb54d0ba42c4613..0e2ecbebec3343f003f086f0d5228b168c1d65d2 100644 (file)
--- a/target-mips/cpu.c
+++ b/target-mips/cpu.c
@@ -19,6 +19,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "cpu.h"
 #include "kvm_mips.h"
 #include "qemu-common.h"

diff --git a/target-moxie/cpu.c b/target-moxie/cpu.c
index b33c2b3741a8c133eb2f6cf2065b0c37bec03f95..b4ee84e906a11cabd2065cef77b8f151a16345e4 100644 (file)
--- a/target-moxie/cpu.c
+++ b/target-moxie/cpu.c
@@ -18,6 +18,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "cpu.h"
 #include "qemu-common.h"
 #include "migration/vmstate.h"

diff --git a/target-openrisc/cpu.c b/target-openrisc/cpu.c
index cafc07f7889787ae5f425ef8e6d80bba1eef3c09..ae6ed9e92c68e33ad8a245fbae6031e5642815c8 100644 (file)
--- a/target-openrisc/cpu.c
+++ b/target-openrisc/cpu.c
@@ -18,6 +18,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "cpu.h"
 #include "qemu-common.h"
 

diff --git a/target-ppc/mmu-hash64.c b/target-ppc/mmu-hash64.c
index d175fdad45c30d28d3b1c32a5c54ccbc263ecf53..72c4ab5d751c6be84a0a1a23f4ae3b670bff0c99 100644 (file)
--- a/target-ppc/mmu-hash64.c
+++ b/target-ppc/mmu-hash64.c
@@ -18,6 +18,7 @@
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "cpu.h"
 #include "exec/helper-proto.h"
 #include "qemu/error-report.h"

diff --git a/target-ppc/mmu_helper.c b/target-ppc/mmu_helper.c
index fcb2cc5c79f50bb79d6b9ea4e87de08e85b8e6d8..ff217941b5a77ad09ed9e37b0ffc6f1e8291f27f 100644 (file)
--- a/target-ppc/mmu_helper.c
+++ b/target-ppc/mmu_helper.c
@@ -17,6 +17,7 @@
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "cpu.h"
 #include "exec/helper-proto.h"
 #include "sysemu/kvm.h"

diff --git a/target-s390x/cpu.c b/target-s390x/cpu.c
index 1cbf70355d25ca9e4e2efea608ef4e68e9b3a4de..9746b1ddfef0b9316ffcd6dec20591767714ddaa 100644 (file)
--- a/target-s390x/cpu.c
+++ b/target-s390x/cpu.c
@@ -24,6 +24,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "cpu.h"
 #include "qemu-common.h"
 #include "qemu/timer.h"

diff --git a/target-s390x/helper.c b/target-s390x/helper.c
index 76d5fbebe8284038170bdbaf70a7c714a7383fe7..92abe7e6769567adb68d35944a3182a29c099258 100644 (file)
--- a/target-s390x/helper.c
+++ b/target-s390x/helper.c
@@ -19,6 +19,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "cpu.h"
 #include "exec/gdbstub.h"
 #include "qemu/timer.h"

diff --git a/target-sh4/cpu.c b/target-sh4/cpu.c
index 8621d70d4dab5088e4f1c0be33e88cd0d48f3be3..86ba38808b981040b8fa088c8f57488ee456a031 100644 (file)
--- a/target-sh4/cpu.c
+++ b/target-sh4/cpu.c
@@ -20,6 +20,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "cpu.h"
 #include "qemu-common.h"
 #include "migration/vmstate.h"

diff --git a/target-sparc/cpu.c b/target-sparc/cpu.c
index ce903f8dfd643d480bcc0469dbe69e68cf5630bc..fe4119e2bc93661338244a3ff65d62b3efe78511 100644 (file)
--- a/target-sparc/cpu.c
+++ b/target-sparc/cpu.c
@@ -18,6 +18,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "cpu.h"
 #include "qemu/error-report.h"
 

diff --git a/target-tilegx/cpu.c b/target-tilegx/cpu.c
index eceeb2c997684e6f4adb2f986737cf5ab28234ea..d2d09120348addb3e783e7c270224f9444f4776f 100644 (file)
--- a/target-tilegx/cpu.c
+++ b/target-tilegx/cpu.c
@@ -19,6 +19,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "cpu.h"
 #include "qemu-common.h"
 #include "hw/qdev-properties.h"

diff --git a/target-tricore/cpu.c b/target-tricore/cpu.c
index f8b8518558fa0a7ea26903e502783e42048fe0d4..69fca8c068d170d15f703fd630dcccbd04109279 100644 (file)
--- a/target-tricore/cpu.c
+++ b/target-tricore/cpu.c
@@ -18,6 +18,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "cpu.h"
 #include "qemu-common.h"
 

diff --git a/target-unicore32/cpu.c b/target-unicore32/cpu.c
index c92ccc4251f0463fed400bf25edcef30213b17be..66f43acfff84626adce0a657da7b5d83c447138f 100644 (file)
--- a/target-unicore32/cpu.c
+++ b/target-unicore32/cpu.c
@@ -13,6 +13,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "cpu.h"
 #include "qemu-common.h"
 #include "migration/vmstate.h"

diff --git a/target-xtensa/cpu.c b/target-xtensa/cpu.c
index d572d56795c56e5ad028a8d3d7feae422f47735d..01b251fdc7ff48c5d87c803a12d61390a4c1202d 100644 (file)
--- a/target-xtensa/cpu.c
+++ b/target-xtensa/cpu.c
@@ -29,6 +29,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "cpu.h"
 #include "qemu-common.h"
 #include "migration/vmstate.h"

diff --git a/tests/check-qom-proplist.c b/tests/check-qom-proplist.c
index a2bb556906d4fcae610f0b5900d28339e66b79ea..ffffd872f240092335a0903deb4ee2143791531e 100644 (file)
--- a/tests/check-qom-proplist.c
+++ b/tests/check-qom-proplist.c
@@ -21,6 +21,7 @@
 #include "qemu/osdep.h"
 #include <glib.h>
 
+#include "qapi/error.h"
 #include "qom/object.h"
 #include "qemu/module.h"
 

diff --git a/tests/io-channel-helpers.c b/tests/io-channel-helpers.c
index a4dedbe0ad4e6081cdc4146653464ce1a912dcb6..05e5579cf8f8663d6c1d4226f0acefb6709754d0 100644 (file)
--- a/tests/io-channel-helpers.c
+++ b/tests/io-channel-helpers.c
@@ -20,6 +20,7 @@
 
 #include "qemu/osdep.h"
 #include "io-channel-helpers.h"
+#include "qapi/error.h"
 
 struct QIOChannelTest {
     QIOChannel *src;

diff --git a/tests/test-aio.c b/tests/test-aio.c
index a109bd0c421bc7bfba9c38e877a4f0f343d5641a..687dfa062e616f0cdf8a65c9c8a640083cc6bdbc 100644 (file)
--- a/tests/test-aio.c
+++ b/tests/test-aio.c
@@ -13,6 +13,7 @@
 #include "qemu/osdep.h"
 #include <glib.h>
 #include "block/aio.h"
+#include "qapi/error.h"
 #include "qemu/timer.h"
 #include "qemu/sockets.h"
 #include "qemu/error-report.h"

diff --git a/tests/test-base64.c b/tests/test-base64.c
index ae0c107c7d37cdeb9c1b9605da7a54d8d4dfb402..922e839dd65df34b9cb9bd12f3f4fa67bfd06e9b 100644 (file)
--- a/tests/test-base64.c
+++ b/tests/test-base64.c
@@ -21,9 +21,9 @@
 #include "qemu/osdep.h"
 #include <glib.h>
 
+#include "qapi/error.h"
 #include "qemu/base64.h"
 
-
 static void test_base64_good(void)
 {
     const char input[] =

diff --git a/tests/test-blockjob-txn.c b/tests/test-blockjob-txn.c
index c866da66c884782049f24b73a94757c96b2adfbb..55fad9507ad6cbadd3d5e024eaf0415a460fb4f0 100644 (file)
--- a/tests/test-blockjob-txn.c
+++ b/tests/test-blockjob-txn.c
@@ -12,6 +12,7 @@
 
 #include "qemu/osdep.h"
 #include <glib.h>
+#include "qapi/error.h"
 #include "qemu/main-loop.h"
 #include "block/blockjob.h"
 

diff --git a/tests/test-crypto-afsplit.c b/tests/test-crypto-afsplit.c
index ceaac0a06debd06aa1549da2c7eb58b67aca2742..f9f2fcd417c1a3275604b326f39db4bd0f2f7a66 100644 (file)
--- a/tests/test-crypto-afsplit.c
+++ b/tests/test-crypto-afsplit.c
@@ -19,6 +19,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "crypto/init.h"
 #include "crypto/afsplit.h"
 

diff --git a/tests/test-crypto-block.c b/tests/test-crypto-block.c
index cdbe09d4eddf872c259955885806b5f4182ea586..a38110d3ffb6f294570a0f0acaa05f2f829a8b87 100644 (file)
--- a/tests/test-crypto-block.c
+++ b/tests/test-crypto-block.c
@@ -19,6 +19,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "crypto/init.h"
 #include "crypto/block.h"
 #include "qemu/buffer.h"

diff --git a/tests/test-crypto-cipher.c b/tests/test-crypto-cipher.c
index e52b741f873f70acada4013598980eb6cd7d52f1..66d1c63fd5cdd749a92623a6c4394ca3f9fa866a 100644 (file)
--- a/tests/test-crypto-cipher.c
+++ b/tests/test-crypto-cipher.c
@@ -23,6 +23,7 @@
 
 #include "crypto/init.h"
 #include "crypto/cipher.h"
+#include "qapi/error.h"
 
 typedef struct QCryptoCipherTestData QCryptoCipherTestData;
 struct QCryptoCipherTestData {

diff --git a/tests/test-crypto-ivgen.c b/tests/test-crypto-ivgen.c
index 96129da3675a8994bcd11a3215ead52ec058a9eb..a5ff5d3da640e70fbe9d52c5a89fe53e3d5916c3 100644 (file)
--- a/tests/test-crypto-ivgen.c
+++ b/tests/test-crypto-ivgen.c
@@ -19,6 +19,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "crypto/ivgen.h"
 
 

diff --git a/tests/test-crypto-pbkdf.c b/tests/test-crypto-pbkdf.c
index bb9c14c110cd3e329cff93b4ad0f4c84d8724239..8ceceb18279a601893cf120c995cfefeaf37bb07 100644 (file)
--- a/tests/test-crypto-pbkdf.c
+++ b/tests/test-crypto-pbkdf.c
@@ -19,6 +19,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "crypto/init.h"
 #ifndef _WIN32
 #include <sys/resource.h>

diff --git a/tests/test-crypto-secret.c b/tests/test-crypto-secret.c
index 2bbc4d9e3ca8f3fb2db6726e66038b35d6f43a93..43e295240cf73886389dd32a2c9d2f209f123c32 100644 (file)
--- a/tests/test-crypto-secret.c
+++ b/tests/test-crypto-secret.c
@@ -23,6 +23,7 @@
 
 #include "crypto/init.h"
 #include "crypto/secret.h"
+#include "qapi/error.h"
 
 static void test_secret_direct(void)
 {

diff --git a/tests/test-crypto-tlscredsx509.c b/tests/test-crypto-tlscredsx509.c
index 7ca387db65ad8569e58e3c0d441001c27d4a0091..af2f80e89c2a306c756dde9c3679a381397724b6 100644 (file)
--- a/tests/test-crypto-tlscredsx509.c
+++ b/tests/test-crypto-tlscredsx509.c
@@ -22,6 +22,7 @@
 
 #include "crypto-tls-x509-helpers.h"
 #include "crypto/tlscredsx509.h"
+#include "qapi/error.h"
 
 #ifdef QCRYPTO_HAVE_TLS_TEST_SUPPORT
 

diff --git a/tests/test-crypto-tlssession.c b/tests/test-crypto-tlssession.c
index 036a86b0c386579d94039b4c76cfa4534e86ffd1..1a4a066d76c8597bfd06ca091e8082e35e4da916 100644 (file)
--- a/tests/test-crypto-tlssession.c
+++ b/tests/test-crypto-tlssession.c
@@ -24,6 +24,7 @@
 #include "crypto/tlscredsx509.h"
 #include "crypto/tlssession.h"
 #include "qom/object_interfaces.h"
+#include "qapi/error.h"
 #include "qemu/sockets.h"
 #include "qemu/acl.h"
 

diff --git a/tests/test-io-channel-command.c b/tests/test-io-channel-command.c
index 885543760a534fa0a5a75e98019e738f260db4ea..1d1f461bed82fe3c7db6733a192b90e089287c17 100644 (file)
--- a/tests/test-io-channel-command.c
+++ b/tests/test-io-channel-command.c
@@ -21,6 +21,7 @@
 #include "qemu/osdep.h"
 #include "io/channel-command.h"
 #include "io-channel-helpers.h"
+#include "qapi/error.h"
 
 #ifndef WIN32
 static void test_io_channel_command_fifo(bool async)

diff --git a/tests/test-io-channel-file.c b/tests/test-io-channel-file.c
index 1e7f3c7f125da33acdb125deb4bccc4bc9b72548..6bfede6bb78de417bcc8324571d59a97740ed500 100644 (file)
--- a/tests/test-io-channel-file.c
+++ b/tests/test-io-channel-file.c
@@ -22,7 +22,7 @@
 #include "io/channel-file.h"
 #include "io/channel-util.h"
 #include "io-channel-helpers.h"
-
+#include "qapi/error.h"
 
 static void test_io_channel_file(void)
 {

diff --git a/tests/test-io-channel-socket.c b/tests/test-io-channel-socket.c
index be0c3003d4853698143ee05c05fb676d2de68264..9d94adb9acf90150599def6e9af60dccba28d097 100644 (file)
--- a/tests/test-io-channel-socket.c
+++ b/tests/test-io-channel-socket.c
@@ -22,6 +22,7 @@
 #include "io/channel-socket.h"
 #include "io/channel-util.h"
 #include "io-channel-helpers.h"
+#include "qapi/error.h"
 
 #ifndef AI_ADDRCONFIG
 # define AI_ADDRCONFIG 0

diff --git a/tests/test-io-task.c b/tests/test-io-task.c
index ae46c56a471e455e6472a16048905572ba4dafc8..5a9775086c85e66fd61f707bfba7016e5b1354b6 100644 (file)
--- a/tests/test-io-task.c
+++ b/tests/test-io-task.c
@@ -22,6 +22,7 @@
 #include <glib.h>
 
 #include "io/task.h"
+#include "qapi/error.h"
 
 #define TYPE_DUMMY "qemu:dummy"
 

diff --git a/tests/test-opts-visitor.c b/tests/test-opts-visitor.c
index 297a02d6a2806fd7826e33f729d8f67cdac984b2..008e6773880dda68af686c1517627f4263227717 100644 (file)
--- a/tests/test-opts-visitor.c
+++ b/tests/test-opts-visitor.c
@@ -15,6 +15,7 @@
 
 #include "qemu/config-file.h"     /* qemu_add_opts() */
 #include "qemu/option.h"          /* qemu_opts_parse() */
+#include "qapi/error.h"
 #include "qapi/opts-visitor.h"    /* opts_visitor_new() */
 #include "test-qapi-visit.h"      /* visit_type_UserDefOptions() */
 

diff --git a/tests/test-qemu-opts.c b/tests/test-qemu-opts.c
index 848374e2bd078facae637a70ad8799ae3dc455cb..32abed5ea1dd92852702f8027246017d35dcbf2b 100644 (file)
--- a/tests/test-qemu-opts.c
+++ b/tests/test-qemu-opts.c
@@ -8,6 +8,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "qapi/qmp/qstring.h"
 #include "qemu/config-file.h"
 

diff --git a/tests/test-qmp-input-strict.c b/tests/test-qmp-input-strict.c
index 6a33aa41e552bfa711ba86f35296f6e6e91a66a7..d71727e27243ee67df76984333d9f4199cc276ef 100644 (file)
--- a/tests/test-qmp-input-strict.c
+++ b/tests/test-qmp-input-strict.c
@@ -15,6 +15,7 @@
 #include <glib.h>
 
 #include "qemu-common.h"
+#include "qapi/error.h"
 #include "qapi/qmp-input-visitor.h"
 #include "test-qapi-types.h"
 #include "test-qapi-visit.h"

diff --git a/tests/test-qmp-input-visitor.c b/tests/test-qmp-input-visitor.c
index 5941e90b35a25dc52267fab0c9ec312d5c37d548..80527eb850c474674ecebdaab63967c9104222b4 100644 (file)
--- a/tests/test-qmp-input-visitor.c
+++ b/tests/test-qmp-input-visitor.c
@@ -14,6 +14,7 @@
 #include <glib.h>
 
 #include "qemu-common.h"
+#include "qapi/error.h"
 #include "qapi/qmp-input-visitor.h"
 #include "test-qapi-types.h"
 #include "test-qapi-visit.h"

diff --git a/tests/test-qmp-output-visitor.c b/tests/test-qmp-output-visitor.c
index dc3575296994b48e831f22060b20fbad59bc2f0e..c70926793a59ba6d35ce02d1d7180b3e255b1b8f 100644 (file)
--- a/tests/test-qmp-output-visitor.c
+++ b/tests/test-qmp-output-visitor.c
@@ -14,6 +14,7 @@
 #include <glib.h>
 
 #include "qemu-common.h"
+#include "qapi/error.h"
 #include "qapi/qmp-output-visitor.h"
 #include "test-qapi-types.h"
 #include "test-qapi-visit.h"

diff --git a/tests/test-string-input-visitor.c b/tests/test-string-input-visitor.c
index 4b48ec25d31c3192298f1609dc3d2b52363578fb..9e6906a5676f09c70adbca2e49ee8710c3aa979e 100644 (file)
--- a/tests/test-string-input-visitor.c
+++ b/tests/test-string-input-visitor.c
@@ -14,6 +14,7 @@
 #include <glib.h>
 
 #include "qemu-common.h"
+#include "qapi/error.h"
 #include "qapi/string-input-visitor.h"
 #include "test-qapi-types.h"
 #include "test-qapi-visit.h"

diff --git a/tests/test-string-output-visitor.c b/tests/test-string-output-visitor.c
index 0beccf98c729d5e0adc3e26fd1aef975ffa09b18..1ecd75b8532d16a251f9c77b80e9db6442c96aaa 100644 (file)
--- a/tests/test-string-output-visitor.c
+++ b/tests/test-string-output-visitor.c
@@ -14,6 +14,7 @@
 #include <glib.h>
 
 #include "qemu-common.h"
+#include "qapi/error.h"
 #include "qapi/string-output-visitor.h"
 #include "test-qapi-types.h"
 #include "test-qapi-visit.h"

diff --git a/tests/test-thread-pool.c b/tests/test-thread-pool.c
index 40600b40bb92dc993061edaf2f75725d19f1bc48..88dc7316b3fd0b7731ad24337d7d3ffa6cf1c506 100644 (file)
--- a/tests/test-thread-pool.c
+++ b/tests/test-thread-pool.c
@@ -4,6 +4,7 @@
 #include "block/aio.h"
 #include "block/thread-pool.h"
 #include "block/block.h"
+#include "qapi/error.h"
 #include "qemu/timer.h"
 #include "qemu/error-report.h"
 

diff --git a/tests/test-throttle.c b/tests/test-throttle.c
index 59675fa57bf9eef2e390dfb1b220bcc803653279..744a524368bce61898c11f80e87459aaff234dd4 100644 (file)
--- a/tests/test-throttle.c
+++ b/tests/test-throttle.c
@@ -16,6 +16,7 @@
 #include <glib.h>
 #include <math.h>
 #include "block/aio.h"
+#include "qapi/error.h"
 #include "qemu/throttle.h"
 #include "qemu/error-report.h"
 #include "block/throttle-groups.h"

diff --git a/tests/test-visitor-serialization.c b/tests/test-visitor-serialization.c
index ef4dac5e01c6fb1523847167d6bb8392106a8e3a..9adbc30a41c53c961ee023eaaad8d45697d4234b 100644 (file)
--- a/tests/test-visitor-serialization.c
+++ b/tests/test-visitor-serialization.c
@@ -18,6 +18,7 @@
 #include "qemu-common.h"
 #include "test-qapi-types.h"
 #include "test-qapi-visit.h"
+#include "qapi/error.h"
 #include "qapi/qmp/types.h"
 #include "qapi/qmp-input-visitor.h"
 #include "qapi/qmp-output-visitor.h"

diff --git a/ui/input-linux.c b/ui/input-linux.c
index 2cf5d4990cb1303adb3cdefedadb28b6bd474be1..84c52d3292db8dfc03fb351829112511921072d8 100644 (file)
--- a/ui/input-linux.c
+++ b/ui/input-linux.c
@@ -5,6 +5,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "qemu-common.h"
 #include "qemu/config-file.h"
 #include "qemu/sockets.h"

diff --git a/ui/vnc-auth-sasl.c b/ui/vnc-auth-sasl.c
index 56e45e3473799bb2d4b92a911d0843cf52160f6c..5ae29c14cf7dc434a2bf37f7102cb22a1744dcfa 100644 (file)
--- a/ui/vnc-auth-sasl.c
+++ b/ui/vnc-auth-sasl.c
@@ -23,6 +23,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "vnc.h"
 
 /* Max amount of data we send/recv for SASL steps to prevent DOS */

diff --git a/ui/vnc-auth-vencrypt.c b/ui/vnc-auth-vencrypt.c
index 8f3bb11cea31fb05537ba57edc4540537813c950..11c8c9a819fce621eeabe6b020c8e4d90b3677f9 100644 (file)
--- a/ui/vnc-auth-vencrypt.c
+++ b/ui/vnc-auth-vencrypt.c
@@ -26,6 +26,7 @@
 
 #include "qemu/osdep.h"
 #include "vnc.h"
+#include "qapi/error.h"
 #include "qemu/main-loop.h"
 
 static void start_auth_vencrypt_subauth(VncState *vs)

diff --git a/ui/vnc-ws.c b/ui/vnc-ws.c
index 1d3ecc23303cfd0841bfb058ed1bedd06c34c1cc..7c79a4c3724d67aeb94447734ed28e272e87ca67 100644 (file)
--- a/ui/vnc-ws.c
+++ b/ui/vnc-ws.c
@@ -19,6 +19,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "vnc.h"
 #include "io/channel-websock.h"
 

diff --git a/util/base64.c b/util/base64.c
index d4bf2a61f99e8d6257a9547eb86cd317ebd0add9..9d3c46cbcc15d0c7c4e5a6350af9323d2776e44e 100644 (file)
--- a/util/base64.c
+++ b/util/base64.c
@@ -19,6 +19,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "qemu/base64.h"
 
 static const char *base64_valid_chars =

diff --git a/util/error.c b/util/error.c
index 47f93afe5f628092f100fae9df1bb0afd1ab60d6..cae2511732b93b50470a8439d7d3aaa31db79af1 100644 (file)
--- a/util/error.c
+++ b/util/error.c
@@ -13,6 +13,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "qemu-common.h"
 #include "qemu/error-report.h"
 

diff --git a/util/oslib-posix.c b/util/oslib-posix.c
index 7615be4e7a9fdab889930f32a92c5d6509668417..dcc3c7ea01e53f5032f83bf71f302d3a046f26ac 100644 (file)
--- a/util/oslib-posix.c
+++ b/util/oslib-posix.c
@@ -46,6 +46,7 @@
 
 #include "sysemu/sysemu.h"
 #include "trace.h"
+#include "qapi/error.h"
 #include "qemu/sockets.h"
 #include <sys/mman.h>
 #include <libgen.h>

diff --git a/util/oslib-win32.c b/util/oslib-win32.c
index a3f0664763a4defb6e7ccdbf650e10d43ac3795e..4ef4a9a13bf0a890982efa66ff43087a262bd28b 100644 (file)
--- a/util/oslib-win32.c
+++ b/util/oslib-win32.c
@@ -32,6 +32,7 @@
 #include "qemu/osdep.h"
 #include <windows.h>
 #include <glib.h>
+#include "qapi/error.h"
 #include "sysemu/sysemu.h"
 #include "qemu/main-loop.h"
 #include "trace.h"

diff --git a/util/qemu-option.c b/util/qemu-option.c
index e7aa43f857da87a0b879fec1b677ca72a1f4c43e..98967ffde92c3ee7f5e201ff8877e4e8c4b50d82 100644 (file)
--- a/util/qemu-option.c
+++ b/util/qemu-option.c
@@ -25,6 +25,7 @@
 
 #include "qemu/osdep.h"
 
+#include "qapi/error.h"
 #include "qemu-common.h"
 #include "qemu/error-report.h"
 #include "qapi/qmp/types.h"

diff --git a/util/qemu-sockets.c b/util/qemu-sockets.c
index 540649a7affcda3a33b03f0041d6f60d84a2ec3c..6f344d4405a83eec378f9201f39225f6aa3c2b9a 100644 (file)
--- a/util/qemu-sockets.c
+++ b/util/qemu-sockets.c
@@ -18,6 +18,7 @@
 #include "qemu/osdep.h"
 
 #include "monitor/monitor.h"
+#include "qapi/error.h"
 #include "qemu/sockets.h"
 #include "qemu/main-loop.h"
 #include "qapi/qmp-input-visitor.h"

diff --git a/util/throttle.c b/util/throttle.c
index 371c76945598afe3019d4dada859b4fb87a21dd0..71246b2343f050b1de6474cb5689bd3e0330d015 100644 (file)
--- a/util/throttle.c
+++ b/util/throttle.c
@@ -23,6 +23,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "qemu/throttle.h"
 #include "qemu/timer.h"
 #include "block/aio.h"