Include qapi/error.h exactly where needed

This cleanup makes the number of objects depending on qapi/error.h
drop from 1910 (out of 4743) to 1612 in my "build everything" tree.

While there, separate #include from file comment with a blank line,
and drop a useless comment on why qemu/osdep.h is included first.

Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20180201111846.21846-5-armbru@redhat.com>
[Semantic conflict with commit 34e304e975 resolved, OSX breakage fixed]

diff --git a/audio/wavcapture.c b/audio/wavcapture.c
index 5863803584baa2bc02d3b51331e9d47ade480866..cf31ed652c2baf4d7fd7a716e822ca3b7f6b2205 100644 (file)
--- a/audio/wavcapture.c
+++ b/audio/wavcapture.c
@@ -1,6 +1,7 @@
 #include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "monitor/monitor.h"
+#include "qapi/error.h"
 #include "qemu/error-report.h"
 #include "audio.h"
 

diff --git a/balloon.c b/balloon.c
index 1d720fff816e209797ff6fb94037b4bbb8f1b562..f8b5ca9870232d6e86f5ced3c841567f10337d3a 100644 (file)
--- a/balloon.c
+++ b/balloon.c
@@ -31,6 +31,7 @@
 #include "sysemu/balloon.h"
 #include "trace-root.h"
 #include "qmp-commands.h"
+#include "qapi/error.h"
 #include "qapi/qmp/qerror.h"
 #include "qapi/qmp/qjson.h"
 

diff --git a/block.c b/block.c
index a8da4f2b2558f96ea0c6fda37e6eb5ec076d9e6e..2a8bc276c7b030e5778dc86b1ef8422cf5d132ab 100644 (file)
--- a/block.c
+++ b/block.c
@@ -21,6 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
 #include "qemu/osdep.h"
 #include "block/trace.h"
 #include "block/block_int.h"
@@ -29,6 +30,7 @@
 #include "qemu/error-report.h"
 #include "module_block.h"
 #include "qemu/module.h"
+#include "qapi/error.h"
 #include "qapi/qmp/qerror.h"
 #include "qapi/qmp/qbool.h"
 #include "qapi/qmp/qjson.h"

diff --git a/block/block-backend.c b/block/block-backend.c
index f66349c2c9a18725eba0bda51e2e0d7878ea613b..532893c3bd5fc16562652f0e803b212a50dd496b 100644 (file)
--- a/block/block-backend.c
+++ b/block/block-backend.c
@@ -18,6 +18,7 @@
 #include "sysemu/blockdev.h"
 #include "sysemu/sysemu.h"
 #include "qapi-event.h"
+#include "qapi/error.h"
 #include "qemu/id.h"
 #include "trace.h"
 #include "migration/misc.h"

diff --git a/block/iscsi.c b/block/iscsi.c
index 6a1c53711a7ba2310d2c853035aadc3c289ceb58..9a1bf43cbcc786b90229055a1c32c837db9fa1f6 100644 (file)
--- a/block/iscsi.c
+++ b/block/iscsi.c
@@ -38,6 +38,7 @@
 #include "qemu/iov.h"
 #include "qemu/uuid.h"
 #include "qmp-commands.h"
+#include "qapi/error.h"
 #include "qapi/qmp/qstring.h"
 #include "crypto/secret.h"
 #include "scsi/utils.h"

diff --git a/block/qapi.c b/block/qapi.c
index fc10f0a56560935b562fbbbb53bebd742c88854e..4fc9fd8082c4c63830ec15032932d4efa52dc8b2 100644 (file)
--- a/block/qapi.c
+++ b/block/qapi.c
@@ -29,6 +29,7 @@
 #include "block/write-threshold.h"
 #include "qmp-commands.h"
 #include "qapi-visit.h"
+#include "qapi/error.h"
 #include "qapi/qobject-output-visitor.h"
 #include "qapi/qmp/types.h"
 #include "sysemu/block-backend.h"

diff --git a/block/qcow2-cluster.c b/block/qcow2-cluster.c
index a3fec27bf9a2c59ea96b7819306b56d0d465e796..3a979bcd82a13c5c3215886758df369509a910ae 100644 (file)
--- a/block/qcow2-cluster.c
+++ b/block/qcow2-cluster.c
@@ -25,7 +25,6 @@
 #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.c b/block/qcow2.c
index 1f80961e1b97bc315c04da298f1be02e893d6ef0..7645b3c6aeb9c167925c211e53b052bf49f620b1 100644 (file)
--- a/block/qcow2.c
+++ b/block/qcow2.c
@@ -21,6 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
 #include "qemu/osdep.h"
 #include "block/block_int.h"
 #include "sysemu/block-backend.h"
@@ -28,6 +29,7 @@
 #include <zlib.h>
 #include "block/qcow2.h"
 #include "qemu/error-report.h"
+#include "qapi/error.h"
 #include "qapi/qmp/qerror.h"
 #include "qapi/qmp/qbool.h"
 #include "qapi/qmp/types.h"

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

diff --git a/block/write-threshold.c b/block/write-threshold.c
index 0bd1a01c860289024079d06840093e5c3ee4e33c..db3de0fa6d31c1e8c906e445e825ffda40002b63 100644 (file)
--- a/block/write-threshold.c
+++ b/block/write-threshold.c
@@ -16,9 +16,9 @@
 #include "block/write-threshold.h"
 #include "qemu/notify.h"
 #include "qapi-event.h"
+#include "qapi/error.h"
 #include "qmp-commands.h"
 
-
 uint64_t bdrv_write_threshold_get(const BlockDriverState *bs)
 {
     return bs->write_threshold_offset;

diff --git a/blockdev-nbd.c b/blockdev-nbd.c
index a9f79c6778e8bc737514fcb951ccbf6a6c1d199e..e0f09824fdcbb1e2c0c07f7e7394dcdee1f226ad 100644 (file)
--- a/blockdev-nbd.c
+++ b/blockdev-nbd.c
@@ -13,6 +13,7 @@
 #include "sysemu/blockdev.h"
 #include "sysemu/block-backend.h"
 #include "hw/block/block.h"
+#include "qapi/error.h"
 #include "qapi/qmp/qerror.h"
 #include "sysemu/sysemu.h"
 #include "qmp-commands.h"

diff --git a/blockdev.c b/blockdev.c
index 8e977eef11f38a50acd736b9c9e37c4fade6cedb..ad82dbbeee55b4939ada42779d12deafc415b35d 100644 (file)
--- a/blockdev.c
+++ b/blockdev.c
@@ -42,6 +42,7 @@
 #include "qemu/config-file.h"
 #include "qapi/qmp/types.h"
 #include "qapi-visit.h"
+#include "qapi/error.h"
 #include "qapi/qmp/qerror.h"
 #include "qapi/qobject-output-visitor.h"
 #include "sysemu/sysemu.h"

diff --git a/blockjob.c b/blockjob.c
index f5cea84e7320cfd006145c3df68db32f0d592dc9..d766fdc4ce54d14c8a045a66bec2e19a0a7e8d08 100644 (file)
--- a/blockjob.c
+++ b/blockjob.c
@@ -29,6 +29,7 @@
 #include "block/blockjob_int.h"
 #include "block/block_int.h"
 #include "sysemu/block-backend.h"
+#include "qapi/error.h"
 #include "qapi/qmp/qerror.h"
 #include "qapi/qmp/qjson.h"
 #include "qemu/coroutine.h"

diff --git a/chardev/char-ringbuf.c b/chardev/char-ringbuf.c
index df52b04d2295c1298e97f951470c1bc796529f31..c1fa4c3f87ee8b8064de759462d1832caac245c4 100644 (file)
--- a/chardev/char-ringbuf.c
+++ b/chardev/char-ringbuf.c
@@ -21,9 +21,11 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
 #include "qemu/osdep.h"
 #include "chardev/char.h"
 #include "qmp-commands.h"
+#include "qapi/error.h"
 #include "qemu/base64.h"
 
 /* Ring buffer chardev */

diff --git a/chardev/char.c b/chardev/char.c
index 3e14de1920f79f86fc51e28dfcb13d35227c1ba1..51f269796a187d6045ef7ef3fb1db259e181ac7e 100644 (file)
--- a/chardev/char.c
+++ b/chardev/char.c
@@ -21,6 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
 #include "qemu/osdep.h"
 #include "qemu/cutils.h"
 #include "monitor/monitor.h"
@@ -30,6 +31,7 @@
 #include "chardev/char.h"
 #include "qmp-commands.h"
 #include "qapi-visit.h"
+#include "qapi/error.h"
 #include "sysemu/replay.h"
 #include "qemu/help_option.h"
 

diff --git a/chardev/spice.c b/chardev/spice.c
index a312078812ac2390bfe527ed9594596917b33ea7..bbdf64990492fcc04522dfa1776cc958e35dfb3f 100644 (file)
--- a/chardev/spice.c
+++ b/chardev/spice.c
@@ -2,6 +2,7 @@
 #include "trace.h"
 #include "ui/qemu-spice.h"
 #include "chardev/char.h"
+#include "qapi/error.h"
 #include "qemu/error-report.h"
 #include <spice.h>
 #include <spice/protocol.h>

diff --git a/cpus.c b/cpus.c
index 182caf764ec19f0e3c60fc9d3722bc8c722a9653..da5e3a6aa171217aa7c85f2601ac6594e9835859 100644 (file)
--- a/cpus.c
+++ b/cpus.c
@@ -22,12 +22,12 @@
  * THE SOFTWARE.
  */
 
-/* Needed early for CONFIG_BSD etc. */
 #include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "qemu/config-file.h"
 #include "cpu.h"
 #include "monitor/monitor.h"
+#include "qapi/error.h"
 #include "qapi/qmp/qerror.h"
 #include "qemu/error-report.h"
 #include "sysemu/sysemu.h"

diff --git a/crypto/hash.c b/crypto/hash.c
index 8dab25d9ea20ae88f953aada027a049a536043fa..b97323cf9016f9feba9aa88dcc7f05d717328d25 100644 (file)
--- a/crypto/hash.c
+++ b/crypto/hash.c
@@ -19,7 +19,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "qapi/error.h"
 #include "crypto/hash.h"
 #include "hashpriv.h"
 

diff --git a/crypto/hmac.c b/crypto/hmac.c
index f6c2d8db6067d57a33058b837d234604d6c61856..4de7e8c9cbbe1139b79af14086f15ef61b4a157d 100644 (file)
--- a/crypto/hmac.c
+++ b/crypto/hmac.c
@@ -10,7 +10,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "qapi/error.h"
 #include "crypto/hmac.h"
 #include "hmacpriv.h"
 

diff --git a/crypto/ivgen-essiv.c b/crypto/ivgen-essiv.c
index ad4d926c1927011b4a43f1a3d8091debe1468557..aeaa8fcd5b101dc5115949724f852e226981e6a3 100644 (file)
--- a/crypto/ivgen-essiv.c
+++ b/crypto/ivgen-essiv.c
@@ -19,7 +19,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "qapi/error.h"
 #include "qemu/bswap.h"
 #include "crypto/ivgen-essiv.h"
 

diff --git a/crypto/ivgen-plain.c b/crypto/ivgen-plain.c
index 9b9b4ad0bf89d183f5814e2b2613f1737922b5eb..bf2fb7aac40fa3f5240952d3ae79fcfa0bbbfafd 100644 (file)
--- a/crypto/ivgen-plain.c
+++ b/crypto/ivgen-plain.c
@@ -19,7 +19,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "qapi/error.h"
 #include "qemu/bswap.h"
 #include "crypto/ivgen-plain.h"
 

diff --git a/crypto/ivgen-plain64.c b/crypto/ivgen-plain64.c
index 6c6b1b44c36e16e60ab022fb3d5c3fd4270d74e3..e4679a1e6e7f4f58ee3a7bd6ab9ed6a224b9d0ca 100644 (file)
--- a/crypto/ivgen-plain64.c
+++ b/crypto/ivgen-plain64.c
@@ -19,7 +19,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "qapi/error.h"
 #include "qemu/bswap.h"
 #include "crypto/ivgen-plain.h"
 

diff --git a/crypto/random-gnutls.c b/crypto/random-gnutls.c
index 5350003a0baabf21dcbbe91a5a67c824572346c5..445fd6a30b840efe77e8958c50be263fdb495b17 100644 (file)
--- a/crypto/random-gnutls.c
+++ b/crypto/random-gnutls.c
@@ -21,6 +21,7 @@
 #include "qemu/osdep.h"
 
 #include "crypto/random.h"
+#include "qapi/error.h"
 
 #include <gnutls/gnutls.h>
 #include <gnutls/crypto.h>

diff --git a/crypto/random-platform.c b/crypto/random-platform.c
index 92eed0ee78296d4e0e612511f5b060c3eaef47bc..7541b4cae75200d60bca041acb8c4b601c52efca 100644 (file)
--- a/crypto/random-platform.c
+++ b/crypto/random-platform.c
@@ -21,6 +21,7 @@
 #include "qemu/osdep.h"
 
 #include "crypto/random.h"
+#include "qapi/error.h"
 
 #ifdef _WIN32
 #include <wincrypt.h>

diff --git a/docs/devel/qapi-code-gen.txt b/docs/devel/qapi-code-gen.txt
index 06ab6990663b2a9876f0b681c5edd2d6c46840e1..5900b39b91bc3d71cb4ca29b759d86f772d90e05 100644 (file)
--- a/docs/devel/qapi-code-gen.txt
+++ b/docs/devel/qapi-code-gen.txt
@@ -1170,7 +1170,6 @@ Example:
     #include "example-qapi-types.h"
     #include "qapi/qmp/qdict.h"
     #include "qapi/qmp/dispatch.h"
-    #include "qapi/error.h"
 
     void example_qmp_init_marshal(QmpCommandList *cmds);
     UserDefOne *qmp_my_command(UserDefOneList *arg1, Error **errp);
@@ -1263,7 +1262,6 @@ Example:
     #ifndef EXAMPLE_QAPI_EVENT_H
     #define EXAMPLE_QAPI_EVENT_H
 
-    #include "qapi/error.h"
     #include "qapi/qmp/qdict.h"
     #include "example-qapi-types.h"
 

diff --git a/dump.c b/dump.c
index e9dfed060a5cc477d146f2324747e1188cf08133..7b13baa41363228edad32c5bd003b57be847fdae 100644 (file)
--- a/dump.c
+++ b/dump.c
@@ -22,6 +22,7 @@
 #include "sysemu/sysemu.h"
 #include "sysemu/memory_mapping.h"
 #include "sysemu/cpus.h"
+#include "qapi/error.h"
 #include "qapi/qmp/qerror.h"
 #include "qmp-commands.h"
 #include "qapi-event.h"

diff --git a/fsdev/qemu-fsdev-throttle.h b/fsdev/qemu-fsdev-throttle.h
index e418643ccbeaef302753218aa58a3bbe006f3363..4e83bdac25feacc438c6045f576c7d161995b583 100644 (file)
--- a/fsdev/qemu-fsdev-throttle.h
+++ b/fsdev/qemu-fsdev-throttle.h
@@ -18,7 +18,6 @@
 #include "block/aio.h"
 #include "qemu/main-loop.h"
 #include "qemu/coroutine.h"
-#include "qapi/error.h"
 #include "qemu/throttle.h"
 
 typedef struct FsThrottle {

diff --git a/fsdev/qemu-fsdev.c b/fsdev/qemu-fsdev.c
index 941e3096574e18c05750c3cf4135a92288aef4a8..de819cf7a1b01acb3abfa79dce06b2a6d5ebad68 100644 (file)
--- a/fsdev/qemu-fsdev.c
+++ b/fsdev/qemu-fsdev.c
@@ -8,9 +8,10 @@
  *
  * This work is licensed under the terms of the GNU GPL, version 2.  See
  * the COPYING file in the top-level directory.
- *
  */
+
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "qemu-fsdev.h"
 #include "qemu/queue.h"
 #include "qemu-common.h"

diff --git a/hmp.c b/hmp.c
index b3de32d219b537c6fb44caee0f1169c289c8466f..13550b0191924fed4c7de2771a9608f428d7dc74 100644 (file)
--- a/hmp.c
+++ b/hmp.c
@@ -27,6 +27,7 @@
 #include "qemu/sockets.h"
 #include "monitor/monitor.h"
 #include "monitor/qdev.h"
+#include "qapi/error.h"
 #include "qapi/opts-visitor.h"
 #include "qapi/qmp/qerror.h"
 #include "qapi/string-input-visitor.h"

diff --git a/hw/9pfs/9p-local.c b/hw/9pfs/9p-local.c
index b25c185ff030204cfcdc6872b11e9d1c423a1079..fe85726c978b832e4caf39f0ff7641eb5c0246ae 100644 (file)
--- a/hw/9pfs/9p-local.c
+++ b/hw/9pfs/9p-local.c
@@ -8,7 +8,6 @@
  *
  * This work is licensed under the terms of the GNU GPL, version 2.  See
  * the COPYING file in the top-level directory.
- *
  */
 
 #include "qemu/osdep.h"
@@ -23,6 +22,7 @@
 #include <sys/socket.h>
 #include <sys/un.h>
 #include "qemu/xattr.h"
+#include "qapi/error.h"
 #include "qemu/cutils.h"
 #include "qemu/error-report.h"
 #include <libgen.h>

diff --git a/hw/9pfs/9p-proxy.c b/hw/9pfs/9p-proxy.c
index f030c6a42844dbf0e137b228fa41e6583aaee1c2..0f288b130056497c9af1c6a4bd793a30ba798127 100644 (file)
--- a/hw/9pfs/9p-proxy.c
+++ b/hw/9pfs/9p-proxy.c
@@ -9,10 +9,12 @@
  * This work is licensed under the terms of the GNU GPL, version 2.  See
  * the COPYING file in the top-level directory.
  */
+
 #include "qemu/osdep.h"
 #include <sys/socket.h>
 #include <sys/un.h>
 #include "9p.h"
+#include "qapi/error.h"
 #include "qemu/cutils.h"
 #include "qemu/error-report.h"
 #include "fsdev/qemu-fsdev.h"

diff --git a/hw/acpi/acpi-stub.c b/hw/acpi/acpi-stub.c
index 26bd22f7eccda1b4602dbbe84830498b571b3263..7dfc8af316ee9c3709b7ec56d1f19d43e31f6e0d 100644 (file)
--- a/hw/acpi/acpi-stub.c
+++ b/hw/acpi/acpi-stub.c
@@ -19,6 +19,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "qapi/qmp/qerror.h"
 #include "qmp-commands.h"
 #include "hw/acpi/acpi.h"

diff --git a/hw/acpi/core.c b/hw/acpi/core.c
index eb9b76f70b47d266892f633c74b0ef4cff264bde..5ee55414c1e74aa4013211f8c7a4f2eca082dad4 100644 (file)
--- a/hw/acpi/core.c
+++ b/hw/acpi/core.c
@@ -18,12 +18,14 @@
  * Contributions after 2012-01-13 are licensed under the terms of the
  * GNU GPL, version 2 or (at your option) any later version.
  */
+
 #include "qemu/osdep.h"
 #include "sysemu/sysemu.h"
 #include "hw/hw.h"
 #include "hw/acpi/acpi.h"
 #include "hw/nvram/fw_cfg.h"
 #include "qemu/config-file.h"
+#include "qapi/error.h"
 #include "qapi/opts-visitor.h"
 #include "qapi-visit.h"
 #include "qapi-event.h"

diff --git a/hw/acpi/memory_hotplug.c b/hw/acpi/memory_hotplug.c
index cda2c9dd0649b14a6358174efa6b5213e0592d97..ea958a0e9977607d5e272d74552a53128557751b 100644 (file)
--- a/hw/acpi/memory_hotplug.c
+++ b/hw/acpi/memory_hotplug.c
@@ -6,6 +6,7 @@
 #include "hw/qdev-core.h"
 #include "trace.h"
 #include "qapi-event.h"
+#include "qapi/error.h"
 
 #define MEMORY_SLOTS_NUMBER          "MDNR"
 #define MEMORY_HOTPLUG_IO_REGION     "HPMR"

diff --git a/hw/acpi/vmgenid.c b/hw/acpi/vmgenid.c
index ba6f47b67bfcbad32dbcc25631a3c0f6a0ed24ed..f25eafc0eca8628d8a32bb1d95bf384eae596146 100644 (file)
--- a/hw/acpi/vmgenid.c
+++ b/hw/acpi/vmgenid.c
@@ -11,6 +11,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "qmp-commands.h"
 #include "hw/acpi/acpi.h"
 #include "hw/acpi/aml-build.h"

diff --git a/hw/adc/stm32f2xx_adc.c b/hw/adc/stm32f2xx_adc.c
index 13f31ad2f743a427a6a9340afeb81f63eee8ba4e..329a8aa6732882122f2ab7790ccfcd8070d3d998 100644 (file)
--- a/hw/adc/stm32f2xx_adc.c
+++ b/hw/adc/stm32f2xx_adc.c
@@ -25,7 +25,6 @@
 #include "qemu/osdep.h"
 #include "hw/sysbus.h"
 #include "hw/hw.h"
-#include "qapi/error.h"
 #include "qemu/log.h"
 #include "hw/adc/stm32f2xx_adc.h"
 

diff --git a/hw/char/mcf_uart.c b/hw/char/mcf_uart.c
index 56fa402b5802ac5c08a1a0c88107639af2f8a0e6..faae083e782f3cfad1b23295456c4a16fad91571 100644 (file)
--- a/hw/char/mcf_uart.c
+++ b/hw/char/mcf_uart.c
@@ -11,7 +11,6 @@
 #include "hw/m68k/mcf.h"
 #include "chardev/char-fe.h"
 #include "exec/address-spaces.h"
-#include "qapi/error.h"
 
 typedef struct {
     SysBusDevice parent_obj;

diff --git a/hw/char/virtio-console.c b/hw/char/virtio-console.c
index 172c72d06ca2de36f1213c4455ca2d3db19e0283..4be5d4ee52481b68984ed45d54cbf8806f0e9086 100644 (file)
--- a/hw/char/virtio-console.c
+++ b/hw/char/virtio-console.c
@@ -16,6 +16,7 @@
 #include "trace.h"
 #include "hw/virtio/virtio-serial.h"
 #include "qapi-event.h"
+#include "qapi/error.h"
 
 #define TYPE_VIRTIO_CONSOLE_SERIAL_PORT "virtserialport"
 #define VIRTIO_CONSOLE(obj) \

diff --git a/hw/core/qdev.c b/hw/core/qdev.c
index 11f8a27a6981266ab19556d60b650cfa8e97be08..515cd505cd27989a115543f36f19032cbfc9b41e 100644 (file)
--- a/hw/core/qdev.c
+++ b/hw/core/qdev.c
@@ -28,6 +28,7 @@
 #include "qemu/osdep.h"
 #include "hw/qdev.h"
 #include "sysemu/sysemu.h"
+#include "qapi/error.h"
 #include "qapi/qmp/qerror.h"
 #include "qapi/visitor.h"
 #include "qapi/qmp/qjson.h"

diff --git a/hw/display/milkymist-tmu2.c b/hw/display/milkymist-tmu2.c
index 59120ddb67d8ecc1e14c236bb7c2e3a5770f7a37..3ce44fdfce4e84ad409bcf88d4d6c4c51c09eb50 100644 (file)
--- a/hw/display/milkymist-tmu2.c
+++ b/hw/display/milkymist-tmu2.c
@@ -28,6 +28,7 @@
 #include "hw/hw.h"
 #include "hw/sysbus.h"
 #include "trace.h"
+#include "qapi/error.h"
 #include "qemu/error-report.h"
 #include "qapi/error.h"
 

diff --git a/hw/display/qxl.c b/hw/display/qxl.c
index b9fa067f6e21500cbb3060b5c628af73b0e27760..a71714ccb44105cd8e68621342693a32ad494f3b 100644 (file)
--- a/hw/display/qxl.c
+++ b/hw/display/qxl.c
@@ -21,6 +21,7 @@
 #include "qemu/osdep.h"
 #include <zlib.h>
 
+#include "qapi/error.h"
 #include "qemu-common.h"
 #include "qemu/timer.h"
 #include "qemu/queue.h"

diff --git a/hw/display/virtio-gpu-3d.c b/hw/display/virtio-gpu-3d.c
index 8c106a662d9bf8cf8c9da3fc2a88807d2ef163d0..7db84efe8960804ca37bb2d02434a215c33de6ae 100644 (file)
--- a/hw/display/virtio-gpu-3d.c
+++ b/hw/display/virtio-gpu-3d.c
@@ -17,7 +17,6 @@
 #include "trace.h"
 #include "hw/virtio/virtio.h"
 #include "hw/virtio/virtio-gpu.h"
-#include "qapi/error.h"
 
 #ifdef CONFIG_VIRGL
 

diff --git a/hw/display/virtio-gpu-pci.c b/hw/display/virtio-gpu-pci.c
index 3519dc80b12e0e3b2ac104f11388c08e8d8e0c1b..cece4aa4956aaf936a105d4d2b9bd95fddcfb1f1 100644 (file)
--- a/hw/display/virtio-gpu-pci.c
+++ b/hw/display/virtio-gpu-pci.c
@@ -10,7 +10,9 @@
  * See the COPYING file in the top-level directory.
  *
  */
+
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "hw/pci/pci.h"
 #include "hw/virtio/virtio.h"
 #include "hw/virtio/virtio-bus.h"

diff --git a/hw/display/xlnx_dp.c b/hw/display/xlnx_dp.c
index ead4e1a0e4fa6f5e0e6599c06a74d8e4a2bd1551..6715b9cc2b9fca45fdd7db6949f0728c40b9929e 100644 (file)
--- a/hw/display/xlnx_dp.c
+++ b/hw/display/xlnx_dp.c
@@ -23,6 +23,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "qemu/log.h"
 #include "hw/display/xlnx_dp.h"
 

diff --git a/hw/i2c/ppc4xx_i2c.c b/hw/i2c/ppc4xx_i2c.c
index e873a445da60f2f3aa6a1fa234d48df124ee164b..ab64d196bea53666e4f543e39414f6bed901ae9e 100644 (file)
--- a/hw/i2c/ppc4xx_i2c.c
+++ b/hw/i2c/ppc4xx_i2c.c
@@ -25,7 +25,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "qapi/error.h"
 #include "qemu-common.h"
 #include "qemu/log.h"
 #include "cpu.h"

diff --git a/hw/i386/pc.c b/hw/i386/pc.c
index ccc50baa85e0bf3e4f2dd90555e3febea58b9e1c..f610253953cb71efcdadb5117d90ec3e8625b933 100644 (file)
--- a/hw/i386/pc.c
+++ b/hw/i386/pc.c
@@ -21,6 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
 #include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/i386/pc.h"
@@ -64,6 +65,7 @@
 #include "hw/pci/pci_host.h"
 #include "acpi-build.h"
 #include "hw/mem/pc-dimm.h"
+#include "qapi/error.h"
 #include "qapi/visitor.h"
 #include "qapi-visit.h"
 #include "qom/cpu.h"

diff --git a/hw/i386/pc_piix.c b/hw/i386/pc_piix.c
index a25619dfbf3ffb5a7f7cec3dcd2c27e07baacb2d..456dc9e9f0647f47a947adbf42769b39d3b9ecc5 100644 (file)
--- a/hw/i386/pc_piix.c
+++ b/hw/i386/pc_piix.c
@@ -47,6 +47,7 @@
 #include "exec/address-spaces.h"
 #include "hw/acpi/acpi.h"
 #include "cpu.h"
+#include "qapi/error.h"
 #include "qemu/error-report.h"
 #ifdef CONFIG_XEN
 #include <xen/hvm/hvm_info_table.h>

diff --git a/hw/i386/pc_q35.c b/hw/i386/pc_q35.c
index ed3a0b8ff79a9d7965ee2ce63d5190eea0d8c7ad..aba7541a82bb7fedcbe1b86778ab89592ca270a0 100644 (file)
--- a/hw/i386/pc_q35.c
+++ b/hw/i386/pc_q35.c
@@ -27,6 +27,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
 #include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/loader.h"
@@ -48,6 +49,7 @@
 #include "hw/ide/pci.h"
 #include "hw/ide/ahci.h"
 #include "hw/usb.h"
+#include "qapi/error.h"
 #include "qemu/error-report.h"
 #include "sysemu/numa.h"
 

diff --git a/hw/i386/xen/xen-hvm.c b/hw/i386/xen/xen-hvm.c
index 8028bed6fd2c052df9a409275168201f138e7a38..bfdbe5558011ae9b4040e8742472da0136766681 100644 (file)
--- a/hw/i386/xen/xen-hvm.c
+++ b/hw/i386/xen/xen-hvm.c
@@ -17,7 +17,7 @@
 #include "hw/xen/xen_common.h"
 #include "hw/xen/xen_backend.h"
 #include "qmp-commands.h"
-
+#include "qapi/error.h"
 #include "qemu/error-report.h"
 #include "qemu/range.h"
 #include "sysemu/xen-mapcache.h"

diff --git a/hw/ide/core.c b/hw/ide/core.c
index 5be72d41dccbf1379d3e4e64e19d82ab545a33b6..257b429381e011c43f95b4a85de3f34530e53499 100644 (file)
--- a/hw/ide/core.c
+++ b/hw/ide/core.c
@@ -22,6 +22,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
 #include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/pci/pci.h"
@@ -33,6 +34,7 @@
 #include "sysemu/dma.h"
 #include "hw/block/block.h"
 #include "sysemu/block-backend.h"
+#include "qapi/error.h"
 #include "qemu/cutils.h"
 
 #include "hw/ide/internal.h"

diff --git a/hw/intc/xics_pnv.c b/hw/intc/xics_pnv.c
index 2a955a8946786516a3e1648ed8f0bc623f56181c..c87de2189cf78ff145f2cca142e38a4c79e0b418 100644 (file)
--- a/hw/intc/xics_pnv.c
+++ b/hw/intc/xics_pnv.c
@@ -19,7 +19,6 @@
 
 #include "qemu/osdep.h"
 #include "sysemu/sysemu.h"
-#include "qapi/error.h"
 #include "qemu/log.h"
 #include "hw/ppc/xics.h"
 

diff --git a/hw/intc/xics_spapr.c b/hw/intc/xics_spapr.c
index 5a0967caf4306d53f7aaa70486174207018c3bc8..2e27b92b871a2a70633f6acfacb57d13356fdf47 100644 (file)
--- a/hw/intc/xics_spapr.c
+++ b/hw/intc/xics_spapr.c
@@ -34,7 +34,6 @@
 #include "hw/ppc/xics.h"
 #include "hw/ppc/fdt.h"
 #include "qapi/visitor.h"
-#include "qapi/error.h"
 
 /*
  * Guest interfaces

diff --git a/hw/ipmi/ipmi.c b/hw/ipmi/ipmi.c
index b27babd5047c71afba02485102c7bc5667ff3b3c..adbbf6e4a63c4203f02178d538b34aa919dba2c9 100644 (file)
--- a/hw/ipmi/ipmi.c
+++ b/hw/ipmi/ipmi.c
@@ -28,6 +28,7 @@
 #include "sysemu/sysemu.h"
 #include "qmp-commands.h"
 #include "qom/object_interfaces.h"
+#include "qapi/error.h"
 #include "qapi/visitor.h"
 
 static uint32_t ipmi_current_uuid = 1;

diff --git a/hw/mips/mips_jazz.c b/hw/mips/mips_jazz.c
index 596f3c210efc3bfc4ea9df626f5a24e742667033..b09871a814a6edde26c68c80821d2c8dbd2f0c95 100644 (file)
--- a/hw/mips/mips_jazz.c
+++ b/hw/mips/mips_jazz.c
@@ -45,6 +45,7 @@
 #include "hw/sysbus.h"
 #include "exec/address-spaces.h"
 #include "sysemu/qtest.h"
+#include "qapi/error.h"
 #include "qemu/error-report.h"
 #include "qemu/help_option.h"
 

diff --git a/hw/mips/mips_malta.c b/hw/mips/mips_malta.c
index 7ca8ba208629a11d2dcc0c3d1d627f1f1a25b381..6f0deb99e79506d67bdad61ae31cda58cf857158 100644 (file)
--- a/hw/mips/mips_malta.c
+++ b/hw/mips/mips_malta.c
@@ -51,6 +51,7 @@
 #include "hw/sysbus.h"             /* SysBusDevice */
 #include "qemu/host-utils.h"
 #include "sysemu/qtest.h"
+#include "qapi/error.h"
 #include "qemu/error-report.h"
 #include "hw/empty_slot.h"
 #include "sysemu/kvm.h"

diff --git a/hw/misc/exynos4210_rng.c b/hw/misc/exynos4210_rng.c
index 31ebe38e26cfd81855587d7539fe267fba8edcea..4ecbebd2d7585cc3deb632b138efa366e63451e6 100644 (file)
--- a/hw/misc/exynos4210_rng.c
+++ b/hw/misc/exynos4210_rng.c
@@ -20,6 +20,7 @@
 #include "qemu/osdep.h"
 #include "crypto/random.h"
 #include "hw/sysbus.h"
+#include "qapi/error.h"
 #include "qemu/log.h"
 
 #define DEBUG_EXYNOS_RNG 0

diff --git a/hw/misc/mips_cmgcr.c b/hw/misc/mips_cmgcr.c
index 211f6097fdda8f162d055594a05c1010997519d6..d019d41a3cd9c42073e6df3de4f569970c358b63 100644 (file)
--- a/hw/misc/mips_cmgcr.c
+++ b/hw/misc/mips_cmgcr.c
@@ -10,7 +10,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "qapi/error.h"
 #include "qemu/log.h"
 #include "hw/hw.h"
 #include "hw/sysbus.h"

diff --git a/hw/misc/mps2-scc.c b/hw/misc/mps2-scc.c
index 32be2a9df125f4fe0128d1848090b084295f32fb..6a9d251f1854a9293be4db82a116f3df1bcfd1b6 100644 (file)
--- a/hw/misc/mps2-scc.c
+++ b/hw/misc/mps2-scc.c
@@ -19,7 +19,6 @@
 
 #include "qemu/osdep.h"
 #include "qemu/log.h"
-#include "qapi/error.h"
 #include "trace.h"
 #include "hw/sysbus.h"
 #include "hw/registerfields.h"

diff --git a/hw/net/rocker/qmp-norocker.c b/hw/net/rocker/qmp-norocker.c
index 6acbcdb02b943e1a96635521020bf3cf2175f7d3..94c1e480aeda28cb511a436bf5c06bd099b119de 100644 (file)
--- a/hw/net/rocker/qmp-norocker.c
+++ b/hw/net/rocker/qmp-norocker.c
@@ -18,6 +18,7 @@
 #include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "qmp-commands.h"
+#include "qapi/error.h"
 #include "qapi/qmp/qerror.h"
 
 RockerSwitch *qmp_query_rocker(const char *name, Error **errp)

diff --git a/hw/net/rocker/rocker.c b/hw/net/rocker/rocker.c
index 823a29df03e2073172c64859ad95c0f02b29222e..a2a76c2a74605870346d9f84beacd4b2f5b41506 100644 (file)
--- a/hw/net/rocker/rocker.c
+++ b/hw/net/rocker/rocker.c
@@ -21,6 +21,7 @@
 #include "hw/pci/msix.h"
 #include "net/net.h"
 #include "net/eth.h"
+#include "qapi/error.h"
 #include "qemu/iov.h"
 #include "qemu/bitops.h"
 #include "qmp-commands.h"

diff --git a/hw/net/rocker/rocker_of_dpa.c b/hw/net/rocker/rocker_of_dpa.c
index 191a58e0a76d497c2bcaa7b5aedd61a98ce0fd48..9339df2d0931721cb41096d5405fa0d6e0c898ba 100644 (file)
--- a/hw/net/rocker/rocker_of_dpa.c
+++ b/hw/net/rocker/rocker_of_dpa.c
@@ -16,6 +16,7 @@
 
 #include "qemu/osdep.h"
 #include "net/eth.h"
+#include "qapi/error.h"
 #include "qemu/iov.h"
 #include "qemu/timer.h"
 #include "qmp-commands.h"

diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c
index 38674b08aa7ea09c15c6194a8a1ec9e7e3c4fa1d..0dd3cb8de4ca02751c51be0d0315936893d4e2ef 100644 (file)
--- a/hw/net/virtio-net.c
+++ b/hw/net/virtio-net.c
@@ -22,6 +22,7 @@
 #include "hw/virtio/virtio-net.h"
 #include "net/vhost_net.h"
 #include "hw/virtio/virtio-bus.h"
+#include "qapi/error.h"
 #include "qapi/qmp/qjson.h"
 #include "qapi-event.h"
 #include "hw/virtio/virtio-access.h"

diff --git a/hw/nios2/cpu_pic.c b/hw/nios2/cpu_pic.c
index 0f95987ef348b5ba2c6a9e2a4545b64318c836a2..6bccce2f3295304a9fb6698280c6ffeb5d3b5a48 100644 (file)
--- a/hw/nios2/cpu_pic.c
+++ b/hw/nios2/cpu_pic.c
@@ -19,7 +19,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "qapi/error.h"
 #include "qemu-common.h"
 #include "cpu.h"
 

diff --git a/hw/pci-bridge/i82801b11.c b/hw/pci-bridge/i82801b11.c
index cb522bf30c31f7ba02675453eaf8f0fe1337cf2e..f557b12f9098b75914a7d56cd8b99c0af252c244 100644 (file)
--- a/hw/pci-bridge/i82801b11.c
+++ b/hw/pci-bridge/i82801b11.c
@@ -44,8 +44,6 @@
 #include "qemu/osdep.h"
 #include "hw/pci/pci.h"
 #include "hw/i386/ich9.h"
-#include "qapi/error.h"
-
 
 /*****************************************************************************/
 /* ICH9 DMI-to-PCI bridge */

diff --git a/hw/pci-bridge/ioh3420.c b/hw/pci-bridge/ioh3420.c
index 5f56a2feb6ea0827e6770a2bb9a6fac40af8aa7b..79fa84d7b92d9797015b94084398a50fc66eef02 100644 (file)
--- a/hw/pci-bridge/ioh3420.c
+++ b/hw/pci-bridge/ioh3420.c
@@ -25,7 +25,6 @@
 #include "hw/pci/msi.h"
 #include "hw/pci/pcie.h"
 #include "ioh3420.h"
-#include "qapi/error.h"
 
 #define PCI_DEVICE_ID_IOH_EPORT         0x3420  /* D0:F0 express mode */
 #define PCI_DEVICE_ID_IOH_REV           0x2

diff --git a/hw/pci-bridge/xio3130_upstream.c b/hw/pci-bridge/xio3130_upstream.c
index 227997ce46fa199f4b8d69716c0eed8667788c16..df5692501b658291c8b03ae1319626825e29db70 100644 (file)
--- a/hw/pci-bridge/xio3130_upstream.c
+++ b/hw/pci-bridge/xio3130_upstream.c
@@ -24,7 +24,6 @@
 #include "hw/pci/msi.h"
 #include "hw/pci/pcie.h"
 #include "xio3130_upstream.h"
-#include "qapi/error.h"
 
 #define PCI_DEVICE_ID_TI_XIO3130U       0x8232  /* upstream port */
 #define XIO3130_REVISION                0x2

diff --git a/hw/pci-host/sabre.c b/hw/pci-host/sabre.c
index 2268a41dd9025e7c2cbf07717978970443c1a23e..e2f4ee480e431fb6a459e848d42ec46c4d2201c2 100644 (file)
--- a/hw/pci-host/sabre.c
+++ b/hw/pci-host/sabre.c
@@ -34,7 +34,6 @@
 #include "hw/pci-host/sabre.h"
 #include "sysemu/sysemu.h"
 #include "exec/address-spaces.h"
-#include "qapi/error.h"
 #include "qemu/log.h"
 #include "trace.h"
 

diff --git a/hw/pci/pci-stub.c b/hw/pci/pci-stub.c
index d5ce00748ed0800edf560ec896a27ac02b304e45..74ce7316da11c77a43226d844e99a153d0322ebd 100644 (file)
--- a/hw/pci/pci-stub.c
+++ b/hw/pci/pci-stub.c
@@ -21,6 +21,7 @@
 #include "qemu/osdep.h"
 #include "sysemu/sysemu.h"
 #include "monitor/monitor.h"
+#include "qapi/error.h"
 #include "qapi/qmp/qerror.h"
 #include "hw/pci/pci.h"
 #include "qmp-commands.h"

diff --git a/hw/pci/pci.c b/hw/pci/pci.c
index fc25cdecbaf82ece0ac98199c53c1f8ceba6385f..239f73d7117bdcf5416926a4c468999e7a48fa03 100644 (file)
--- a/hw/pci/pci.c
+++ b/hw/pci/pci.c
@@ -21,6 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
 #include "qemu/osdep.h"
 #include "hw/hw.h"
 #include "hw/pci/pci.h"
@@ -40,6 +41,7 @@
 #include "exec/address-spaces.h"
 #include "hw/hotplug.h"
 #include "hw/boards.h"
+#include "qapi/error.h"
 #include "qemu/cutils.h"
 
 //#define DEBUG_PCI

diff --git a/hw/ppc/fdt.c b/hw/ppc/fdt.c
index 38a7234b463346ed4a92c414401317a94f7465a4..2ffc5866e48de7900b5d08466c12449e41c1c186 100644 (file)
--- a/hw/ppc/fdt.c
+++ b/hw/ppc/fdt.c
@@ -8,7 +8,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "qapi/error.h"
 #include "target/ppc/cpu.h"
 
 #include "hw/ppc/fdt.h"

diff --git a/hw/ppc/pnv_bmc.c b/hw/ppc/pnv_bmc.c
index b2cf441ee7b2073ff37f87f4864e0434f90f785c..4b76d34f0a49643475a7f9f65e57ad4d65d7dc54 100644 (file)
--- a/hw/ppc/pnv_bmc.c
+++ b/hw/ppc/pnv_bmc.c
@@ -20,7 +20,6 @@
 #include "hw/hw.h"
 #include "sysemu/sysemu.h"
 #include "target/ppc/cpu.h"
-#include "qapi/error.h"
 #include "qemu/log.h"
 #include "hw/ipmi/ipmi.h"
 #include "hw/ppc/fdt.h"

diff --git a/hw/ppc/pnv_xscom.c b/hw/ppc/pnv_xscom.c
index 99c40efecdf9fd346e06115a9f894c33a2d99b98..46fae41f32b0ca086094e42c0b7b182dda77e919 100644 (file)
--- a/hw/ppc/pnv_xscom.c
+++ b/hw/ppc/pnv_xscom.c
@@ -17,7 +17,6 @@
  * 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 "qemu/log.h"
 #include "sysemu/hw_accel.h"

diff --git a/hw/ppc/ppc.c b/hw/ppc/ppc.c
index 7ec35de5aec744928411cd3e08b8ad078df9d008..ec4be25f499408cc8a8d9c72575687de97c89843 100644 (file)
--- a/hw/ppc/ppc.c
+++ b/hw/ppc/ppc.c
@@ -33,7 +33,6 @@
 #include "hw/timer/m48t59.h"
 #include "qemu/log.h"
 #include "qemu/error-report.h"
-#include "qapi/error.h"
 #include "hw/loader.h"
 #include "sysemu/kvm.h"
 #include "kvm_ppc.h"

diff --git a/hw/ppc/spapr_pci_vfio.c b/hw/ppc/spapr_pci_vfio.c
index 053efb03bd776dadecd0925bf3246da58e9984eb..71491dbd28e471e306a4805f0ff89be69baf9e4c 100644 (file)
--- a/hw/ppc/spapr_pci_vfio.c
+++ b/hw/ppc/spapr_pci_vfio.c
@@ -19,7 +19,6 @@
 
 #include "qemu/osdep.h"
 #include <linux/vfio.h>
-#include "qapi/error.h"
 #include "qemu-common.h"
 #include "cpu.h"
 #include "hw/ppc/spapr.h"

diff --git a/hw/ppc/spapr_rtc.c b/hw/ppc/spapr_rtc.c
index 9ec3078691a627fb84c86676172d4dee7f5047e5..cfdb274bfdf99383d63c4ff509635ec43db4cd98 100644 (file)
--- a/hw/ppc/spapr_rtc.c
+++ b/hw/ppc/spapr_rtc.c
@@ -23,14 +23,15 @@
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
- *
  */
+
 #include "qemu/osdep.h"
 #include "cpu.h"
 #include "qemu/timer.h"
 #include "sysemu/sysemu.h"
 #include "hw/ppc/spapr.h"
 #include "qapi-event.h"
+#include "qapi/error.h"
 #include "qemu/cutils.h"
 
 void spapr_rtc_read(sPAPRRTCState *rtc, struct tm *tm, uint32_t *ns)

diff --git a/hw/s390x/s390-skeys.c b/hw/s390x/s390-skeys.c
index 53ad5d38d449a749c327e41eb679bc70d7f2e77a..fd994f86b1f6a48ed424ec90e970ee3d556d7c6e 100644 (file)
--- a/hw/s390x/s390-skeys.c
+++ b/hw/s390x/s390-skeys.c
@@ -13,6 +13,7 @@
 #include "hw/boards.h"
 #include "qmp-commands.h"
 #include "hw/s390x/storage-keys.h"
+#include "qapi/error.h"
 #include "qemu/error-report.h"
 #include "sysemu/kvm.h"
 #include "migration/register.h"

diff --git a/hw/scsi/esp.c b/hw/scsi/esp.c
index ee586e7d6c9b88a3d6abc73a8652f78a97ba21d1..45975c21e8100f6a055b5994c735c3a81ad6ee51 100644 (file)
--- a/hw/scsi/esp.c
+++ b/hw/scsi/esp.c
@@ -27,7 +27,6 @@
 #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/vhost-scsi-common.c b/hw/scsi/vhost-scsi-common.c
index d434b3e99a750a3961495bba68b446cfd17f524e..77e98972447f6d608888c35a232b2caa20ebcc9c 100644 (file)
--- a/hw/scsi/vhost-scsi-common.c
+++ b/hw/scsi/vhost-scsi-common.c
@@ -16,7 +16,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "qapi/error.h"
 #include "qemu/error-report.h"
 #include "migration/migration.h"
 #include "hw/virtio/vhost.h"

diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c
index fac7fa5c725ea9c392417ffb08167ce62db183b3..37b217269b21362412eb4d2b18991215bbe3fbad 100644 (file)
--- a/hw/sd/sdhci.c
+++ b/hw/sd/sdhci.c
@@ -32,7 +32,6 @@
 #include "qemu/bitops.h"
 #include "hw/sd/sdhci.h"
 #include "sdhci-internal.h"
-#include "qapi/error.h"
 #include "qemu/log.h"
 #include "trace.h"
 

diff --git a/hw/smbios/smbios-stub.c b/hw/smbios/smbios-stub.c
index 308739410f07863357c3ad8271a3850182f850a9..61becef4ae0952ce75abafb4586304f1c6082073 100644 (file)
--- a/hw/smbios/smbios-stub.c
+++ b/hw/smbios/smbios-stub.c
@@ -21,6 +21,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "qapi/qmp/qerror.h"
 #include "qmp-commands.h"
 #include "hw/smbios/smbios.h"

diff --git a/hw/sparc64/niagara.c b/hw/sparc64/niagara.c
index 996ce2ada05cac3fad1e59a4e9b71059f5cb0114..1874477ef6a699d4534a8528cbb0cffd15b6d9df 100644 (file)
--- a/hw/sparc64/niagara.c
+++ b/hw/sparc64/niagara.c
@@ -23,7 +23,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "qapi/error.h"
 #include "qemu-common.h"
 #include "cpu.h"
 #include "hw/hw.h"

diff --git a/hw/sparc64/sun4u_iommu.c b/hw/sparc64/sun4u_iommu.c
index 4cf8e69be9ce36550bcc8b052763c2d63eb95f38..eb3aaa87e6472547e58f07bca9e9f40d60b4a63d 100644 (file)
--- a/hw/sparc64/sun4u_iommu.c
+++ b/hw/sparc64/sun4u_iommu.c
@@ -28,7 +28,6 @@
 #include "hw/sysbus.h"
 #include "hw/sparc/sun4u_iommu.h"
 #include "exec/address-spaces.h"
-#include "qapi/error.h"
 #include "qemu/log.h"
 #include "trace.h"
 

diff --git a/hw/ssi/stm32f2xx_spi.c b/hw/ssi/stm32f2xx_spi.c
index 69514da9fbb75fa3c790fe451ebb74edd7aea679..930c616de3e65aab8921f468e02b37ef9dc520af 100644 (file)
--- a/hw/ssi/stm32f2xx_spi.c
+++ b/hw/ssi/stm32f2xx_spi.c
@@ -23,7 +23,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "qapi/error.h"
 #include "qemu/log.h"
 #include "hw/ssi/stm32f2xx_spi.h"
 

diff --git a/hw/timer/m48t59.c b/hw/timer/m48t59.c
index 844aad540ef25d26ab2380565d504729f29dfb91..742c57644324972d9f3a91c930373e1fc898beca 100644 (file)
--- a/hw/timer/m48t59.c
+++ b/hw/timer/m48t59.c
@@ -25,7 +25,6 @@
 #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/timer/mc146818rtc.c b/hw/timer/mc146818rtc.c
index 35a05a64cc6f40e9a05e5aa429248f33f6c4913d..9d93a16e0fc50893cb9e7ffe3477daaf7ed114b4 100644 (file)
--- a/hw/timer/mc146818rtc.c
+++ b/hw/timer/mc146818rtc.c
@@ -21,6 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
 #include "qemu/osdep.h"
 #include "qemu/cutils.h"
 #include "qemu/bcd.h"
@@ -29,6 +30,7 @@
 #include "sysemu/sysemu.h"
 #include "sysemu/replay.h"
 #include "hw/timer/mc146818rtc.h"
+#include "qapi/error.h"
 #include "qapi/visitor.h"
 #include "qapi-event.h"
 #include "qmp-commands.h"

diff --git a/hw/usb/ccid-card-passthru.c b/hw/usb/ccid-card-passthru.c
index 085ed2c667a80cf33aeed0bda5fd572fff4e7ec9..b7dd3602dc7a9205ac475e29cd2832b35987f60e 100644 (file)
--- a/hw/usb/ccid-card-passthru.c
+++ b/hw/usb/ccid-card-passthru.c
@@ -9,7 +9,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "qapi/error.h"
 #include <cacard/vscard_common.h>
 #include "chardev/char-fe.h"
 #include "qemu/error-report.h"

diff --git a/hw/virtio/virtio-balloon.c b/hw/virtio/virtio-balloon.c
index 14e08d20d0ac408c554c9ca210ab8633d3c29f30..e05df206fc3883d0a6d667fdc550132d8cac1fd0 100644 (file)
--- a/hw/virtio/virtio-balloon.c
+++ b/hw/virtio/virtio-balloon.c
@@ -23,6 +23,7 @@
 #include "hw/virtio/virtio-balloon.h"
 #include "sysemu/kvm.h"
 #include "exec/address-spaces.h"
+#include "qapi/error.h"
 #include "qapi/visitor.h"
 #include "qapi-event.h"
 #include "trace.h"

diff --git a/hw/watchdog/watchdog.c b/hw/watchdog/watchdog.c
index 670114ecfe1ba6dbd279a3a3289e3639f4a527ec..25dcb25ff15e5e91150c8dce4d3e3ef97db59aa1 100644 (file)
--- a/hw/watchdog/watchdog.c
+++ b/hw/watchdog/watchdog.c
@@ -23,6 +23,7 @@
 #include "qemu/option.h"
 #include "qemu/config-file.h"
 #include "qemu/queue.h"
+#include "qapi/error.h"
 #include "qapi/qmp/types.h"
 #include "sysemu/sysemu.h"
 #include "sysemu/watchdog.h"

diff --git a/include/crypto/random.h b/include/crypto/random.h
index a07229ce965f39db5c8dad9b9560b806da012cbb..8764ca0562ac8f253047b31f1a17f5bb007b75ff 100644 (file)
--- a/include/crypto/random.h
+++ b/include/crypto/random.h
@@ -22,8 +22,6 @@
 #define QCRYPTO_RANDOM_H
 
 #include "qemu-common.h"
-#include "qapi/error.h"
-
 
 /**
  * qcrypto_random_bytes:

diff --git a/include/crypto/xts.h b/include/crypto/xts.h
index da32ab82b64c650dbb80a0604dae2038cf8fd3ea..3c8967ac6cf5e2453adb0a69a9e3b161d100d515 100644 (file)
--- a/include/crypto/xts.h
+++ b/include/crypto/xts.h
@@ -27,8 +27,6 @@
 #define QCRYPTO_XTS_H
 
 #include "qemu-common.h"
-#include "qapi/error.h"
-
 
 #define XTS_BLOCK_SIZE 16
 

diff --git a/include/hw/ide/internal.h b/include/hw/ide/internal.h
index 31851b44d1b8da2b31971b76a4a1f9bcc62494ca..88212f59dfadfda3e012cac085d4f994d66e6c03 100644 (file)
--- a/include/hw/ide/internal.h
+++ b/include/hw/ide/internal.h
@@ -12,7 +12,6 @@
 #include "sysemu/sysemu.h"
 #include "hw/block/block.h"
 #include "scsi/constants.h"
-#include "qapi/error.h"
 
 /* debug IDE devices */
 #define USE_DMA_CDROM

diff --git a/include/ui/console.h b/include/ui/console.h
index 2a5efa79edce7dbf2e2984ac7845d6764598334e..f3a1ec243dacb1a3c599b2f34c82221fe9097d0d 100644 (file)
--- a/include/ui/console.h
+++ b/include/ui/console.h
@@ -6,7 +6,6 @@
 #include "qapi/qmp/qdict.h"
 #include "qemu/notify.h"
 #include "qemu/error-report.h"
-#include "qapi/error.h"
 
 #ifdef CONFIG_OPENGL
 # include <epoxy/gl.h>

diff --git a/iothread.c b/iothread.c
index d8b6c1fb27b9499176da71229d88d2ad91c43265..4b9bbde4cdc80b1749fceb2e7e6ab521bfcc368d 100644 (file)
--- a/iothread.c
+++ b/iothread.c
@@ -19,6 +19,7 @@
 #include "block/block.h"
 #include "sysemu/iothread.h"
 #include "qmp-commands.h"
+#include "qapi/error.h"
 #include "qemu/error-report.h"
 #include "qemu/rcu.h"
 #include "qemu/main-loop.h"

diff --git a/migration/colo-failover.c b/migration/colo-failover.c
index 6563862b3628cfac6ec003eb5127f85d49e42bc3..891785cb6315ee8b7585562211ba0cec6ef15798 100644 (file)
--- a/migration/colo-failover.c
+++ b/migration/colo-failover.c
@@ -16,6 +16,7 @@
 #include "qemu/main-loop.h"
 #include "migration.h"
 #include "qmp-commands.h"
+#include "qapi/error.h"
 #include "qapi/qmp/qerror.h"
 #include "qemu/error-report.h"
 #include "trace.h"

diff --git a/migration/colo.c b/migration/colo.c
index dee3aa8bf763ed25f627c712fe5b3e899c3ef41d..245a46d59dea5eefaf189fb93393587fb243a4d4 100644 (file)
--- a/migration/colo.c
+++ b/migration/colo.c
@@ -12,6 +12,7 @@
 
 #include "qemu/osdep.h"
 #include "sysemu/sysemu.h"
+#include "qapi/error.h"
 #include "qemu-file-channel.h"
 #include "migration.h"
 #include "qemu-file.h"

diff --git a/migration/exec.c b/migration/exec.c
index c9537974ad3ceb3d1ae7918d75bb0af852abd891..0bc5a427dd6b4913ef8e1e44f07dc002e8d6858a 100644 (file)
--- a/migration/exec.c
+++ b/migration/exec.c
@@ -18,7 +18,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "qapi/error.h"
 #include "channel.h"
 #include "exec.h"
 #include "io/channel-command.h"

diff --git a/migration/fd.c b/migration/fd.c
index 6284a97cba37099447d754d04e1eb4b7157e06a6..cd06182d1ea5de77518822b8b1942673265ba629 100644 (file)
--- a/migration/fd.c
+++ b/migration/fd.c
@@ -15,7 +15,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "qapi/error.h"
 #include "channel.h"
 #include "fd.h"
 #include "monitor/monitor.h"

diff --git a/migration/migration.c b/migration/migration.c
index 0fdb2e410ddbb7da9adbef221ccf3899b1bc2841..274160e9700da78dd73ecd91e6571ec8c5008528 100644 (file)
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -30,6 +30,7 @@
 #include "qemu-file.h"
 #include "migration/vmstate.h"
 #include "block/block.h"
+#include "qapi/error.h"
 #include "qapi/qmp/qerror.h"
 #include "qemu/rcu.h"
 #include "block.h"

diff --git a/migration/ram.c b/migration/ram.c
index 5a109efedabdb59e4e86c2c2714f002e324dc98c..8333d8e35e0a302b305d1da9fa773e9a15cb00a1 100644 (file)
--- a/migration/ram.c
+++ b/migration/ram.c
@@ -25,6 +25,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
 #include "qemu/osdep.h"
 #include "cpu.h"
 #include <zlib.h>
@@ -42,6 +43,7 @@
 #include "postcopy-ram.h"
 #include "migration/page_cache.h"
 #include "qemu/error-report.h"
+#include "qapi/error.h"
 #include "qapi/qmp/qerror.h"
 #include "trace.h"
 #include "exec/ram_addr.h"

diff --git a/migration/savevm.c b/migration/savevm.c
index f202c3de3a1584350b2bf7620644b66647c0aa6b..3f611c02e8aa058ee37b1384c96020cec59dd120 100644 (file)
--- a/migration/savevm.c
+++ b/migration/savevm.c
@@ -40,6 +40,7 @@
 #include "qemu-file.h"
 #include "savevm.h"
 #include "postcopy-ram.h"
+#include "qapi/error.h"
 #include "qapi/qmp/qerror.h"
 #include "qemu/error-report.h"
 #include "sysemu/cpus.h"

diff --git a/monitor.c b/monitor.c
index b9da5e20d1e76d878e84632314e6837fe9ba0c62..2de69f648febca82fdf4ac30456857130f0e58b6 100644 (file)
--- a/monitor.c
+++ b/monitor.c
@@ -21,6 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
 #include "qemu/osdep.h"
 #include <dirent.h>
 #include "qemu-common.h"
@@ -70,6 +71,7 @@
 #include "hmp.h"
 #include "qemu/thread.h"
 #include "block/qapi.h"
+#include "qapi/error.h"
 #include "qapi/qmp-event.h"
 #include "qapi-event.h"
 #include "qmp-introspect.h"

diff --git a/nbd/common.c b/nbd/common.c
index 6047d717489b85be4e6d8984c46b4bf6887a904d..6295526dd14379b90ae846d07cc1e9000ed029c7 100644 (file)
--- a/nbd/common.c
+++ b/nbd/common.c
@@ -17,7 +17,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "qapi/error.h"
 #include "trace.h"
 #include "nbd-internal.h"
 

diff --git a/net/filter-replay.c b/net/filter-replay.c
index cff65f86e5387fcd2cf2ada1153d7a964c348210..09e68fd8f5dcd2f91faa1c99005928b008e9a8a3 100644 (file)
--- a/net/filter-replay.c
+++ b/net/filter-replay.c
@@ -11,7 +11,6 @@
 
 #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-rewriter.c b/net/filter-rewriter.c
index 2be388f53973d0fba91eda9a61092346d3549b5e..3ea3798276d381cfdb9f89b14191bbd73b07f859 100644 (file)
--- a/net/filter-rewriter.c
+++ b/net/filter-rewriter.c
@@ -15,7 +15,6 @@
 #include "net/filter.h"
 #include "net/net.h"
 #include "qemu-common.h"
-#include "qapi/error.h"
 #include "qapi/qmp/qerror.h"
 #include "qemu/error-report.h"
 #include "qapi-visit.h"

diff --git a/net/net.c b/net/net.c
index e1569e7d8996e391afec0e3a7eedd66ac850dac2..b36449dd65d94633a3a5aa5f486ad5607061b752 100644 (file)
--- a/net/net.c
+++ b/net/net.c
@@ -21,6 +21,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
 #include "qemu/osdep.h"
 
 #include "net/net.h"
@@ -43,6 +44,7 @@
 #include "qemu/iov.h"
 #include "qemu/main-loop.h"
 #include "qapi-visit.h"
+#include "qapi/error.h"
 #include "qapi/opts-visitor.h"
 #include "sysemu/sysemu.h"
 #include "sysemu/qtest.h"

diff --git a/net/vhost-user.c b/net/vhost-user.c
index c23927c912c3a92b3de35a0e1cb2da955aedd249..fd766504ab43008eb6afe8eb6b17762ac6a5ea01 100644 (file)
--- a/net/vhost-user.c
+++ b/net/vhost-user.c
@@ -13,6 +13,7 @@
 #include "net/vhost_net.h"
 #include "net/vhost-user.h"
 #include "chardev/char-fe.h"
+#include "qapi/error.h"
 #include "qemu/config-file.h"
 #include "qemu/error-report.h"
 #include "qmp-commands.h"

diff --git a/numa.c b/numa.c
index a9528aaa7d1a783f218843428d9cc9f6ea40811e..7e0e789b02dbaec3ddaeb749df387bd39f6e7cc9 100644 (file)
--- a/numa.c
+++ b/numa.c
@@ -30,6 +30,7 @@
 #include "qom/cpu.h"
 #include "qemu/error-report.h"
 #include "qapi-visit.h"
+#include "qapi/error.h"
 #include "qapi/opts-visitor.h"
 #include "hw/boards.h"
 #include "sysemu/hostmem.h"

diff --git a/qdev-monitor.c b/qdev-monitor.c
index c436616446c96dfc2a23601f2b55c7461d66d495..0aa8a6c60bd4a1aae4012ed586bafd0c2f731001 100644 (file)
--- a/qdev-monitor.c
+++ b/qdev-monitor.c
@@ -24,6 +24,7 @@
 #include "monitor/qdev.h"
 #include "qmp-commands.h"
 #include "sysemu/arch_init.h"
+#include "qapi/error.h"
 #include "qapi/qmp/qerror.h"
 #include "qemu/config-file.h"
 #include "qemu/error-report.h"

diff --git a/qga/commands-posix.c b/qga/commands-posix.c
index e809e382eb5362b2651803fe7d99d260e8491179..88807f3c7823488381a7804ab014b589f099d63d 100644 (file)
--- a/qga/commands-posix.c
+++ b/qga/commands-posix.c
@@ -18,6 +18,7 @@
 #include <dirent.h>
 #include "qga/guest-agent-core.h"
 #include "qga-qmp-commands.h"
+#include "qapi/error.h"
 #include "qapi/qmp/qerror.h"
 #include "qemu/queue.h"
 #include "qemu/host-utils.h"

diff --git a/qga/commands-win32.c b/qga/commands-win32.c
index d79974f2120626a62d9e95c160c9bf3c9e9925ec..bedae32957312b1e0b27d95f2a80561ad828143e 100644 (file)
--- a/qga/commands-win32.c
+++ b/qga/commands-win32.c
@@ -14,6 +14,7 @@
 #ifndef _WIN32_WINNT
 #   define _WIN32_WINNT 0x0600
 #endif
+
 #include "qemu/osdep.h"
 #include <wtypes.h>
 #include <powrprof.h>
@@ -34,6 +35,7 @@
 #include "qga/guest-agent-core.h"
 #include "qga/vss-win32.h"
 #include "qga-qmp-commands.h"
+#include "qapi/error.h"
 #include "qapi/qmp/qerror.h"
 #include "qemu/queue.h"
 #include "qemu/host-utils.h"

diff --git a/qga/commands.c b/qga/commands.c
index ff89e805cf6da56e1042e3d74d2b272e30f7c895..6d710dbb204247e1a17c1df37def4c6c936fa9d3 100644 (file)
--- a/qga/commands.c
+++ b/qga/commands.c
@@ -13,6 +13,7 @@
 #include "qemu/osdep.h"
 #include "qga/guest-agent-core.h"
 #include "qga-qmp-commands.h"
+#include "qapi/error.h"
 #include "qapi/qmp/qerror.h"
 #include "qemu/base64.h"
 #include "qemu/cutils.h"

diff --git a/qga/main.c b/qga/main.c
index 62a62755bdbc76424c0f108b09db9970c002cbc4..57083ca10c55499ecb0182523a456d5e8a53c633 100644 (file)
--- a/qga/main.c
+++ b/qga/main.c
@@ -10,6 +10,7 @@
  * This work is licensed under the terms of the GNU GPL, version 2 or later.
  * See the COPYING file in the top-level directory.
  */
+
 #include "qemu/osdep.h"
 #include <getopt.h>
 #include <glib/gstdio.h>
@@ -23,6 +24,7 @@
 #include "qga/guest-agent-core.h"
 #include "qemu/module.h"
 #include "qapi/qmp/qerror.h"
+#include "qapi/error.h"
 #include "qapi/qmp/dispatch.h"
 #include "qga/channel.h"
 #include "qemu/bswap.h"

diff --git a/qga/vss-win32.c b/qga/vss-win32.c
index dcb27567bb255161cd3509a0388a3b7eca8efa4a..0199c2a792255a167e7b6f987b088739e8ada092 100644 (file)
--- a/qga/vss-win32.c
+++ b/qga/vss-win32.c
@@ -12,6 +12,7 @@
 
 #include "qemu/osdep.h"
 #include <windows.h>
+#include "qapi/error.h"
 #include "qemu/error-report.h"
 #include "qga/guest-agent-core.h"
 #include "qga/vss-win32.h"

diff --git a/qmp.c b/qmp.c
index 52cfd2d81c0f8d58a41d4a8bdbb4983949c76633..a56faf1b9ac2a89c6913bbc96c729a9dfc208276 100644 (file)
--- a/qmp.c
+++ b/qmp.c
@@ -30,6 +30,7 @@
 #include "sysemu/blockdev.h"
 #include "sysemu/block-backend.h"
 #include "qom/qom-qobject.h"
+#include "qapi/error.h"
 #include "qapi/qmp/qerror.h"
 #include "qapi/qmp/qobject.h"
 #include "qapi/qobject-input-visitor.h"

diff --git a/qobject/qnum.c b/qobject/qnum.c
index 410686a611ad6a8cf4903cd103ea193cd2eaf8bc..517610d9da94069f469c2e124b38e40841a75ee9 100644 (file)
--- a/qobject/qnum.c
+++ b/qobject/qnum.c
@@ -13,7 +13,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "qapi/error.h"
 #include "qapi/qmp/qnum.h"
 #include "qapi/qmp/qobject.h"
 #include "qemu-common.h"

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

diff --git a/scripts/qapi-commands.py b/scripts/qapi-commands.py
index 974d0a4a80f55f300a8e3df07e7f8f0b3019a07d..dc7c418923701c8555af42eab80cd8653c9681a6 100644 (file)
--- a/scripts/qapi-commands.py
+++ b/scripts/qapi-commands.py
@@ -289,6 +289,7 @@ h_comment = '''
                             c_comment, h_comment)
 
 fdef.write(mcgen('''
+
 #include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "qemu/module.h"
@@ -297,6 +298,7 @@ fdef.write(mcgen('''
 #include "qapi/qobject-output-visitor.h"
 #include "qapi/qobject-input-visitor.h"
 #include "qapi/dealloc-visitor.h"
+#include "qapi/error.h"
 #include "%(prefix)sqapi-types.h"
 #include "%(prefix)sqapi-visit.h"
 #include "%(prefix)sqmp-commands.h"
@@ -308,7 +310,6 @@ fdecl.write(mcgen('''
 #include "%(prefix)sqapi-types.h"
 #include "qapi/qmp/qdict.h"
 #include "qapi/qmp/dispatch.h"
-#include "qapi/error.h"
 
 void %(c_prefix)sqmp_init_marshal(QmpCommandList *cmds);
 ''',

diff --git a/scripts/qapi-event.py b/scripts/qapi-event.py
index 07b4b7019908b022294bee9b593444070e522ae0..9d7134658d83eb2661e62cf0cb4b28614f2e330c 100644 (file)
--- a/scripts/qapi-event.py
+++ b/scripts/qapi-event.py
@@ -209,6 +209,7 @@ fdef.write(mcgen('''
 #include "qemu-common.h"
 #include "%(prefix)sqapi-event.h"
 #include "%(prefix)sqapi-visit.h"
+#include "qapi/error.h"
 #include "qapi/qobject-output-visitor.h"
 #include "qapi/qmp-event.h"
 
@@ -216,7 +217,6 @@ fdef.write(mcgen('''
                  prefix=prefix))
 
 fdecl.write(mcgen('''
-#include "qapi/error.h"
 #include "qapi/util.h"
 #include "qapi/qmp/qdict.h"
 #include "%(prefix)sqapi-types.h"

diff --git a/stubs/arch-query-cpu-def.c b/stubs/arch-query-cpu-def.c
index cefe4beb82529a76ef88438ef210c55ba95660cd..d436f953145b762d6271369bfedc86094613df79 100644 (file)
--- a/stubs/arch-query-cpu-def.c
+++ b/stubs/arch-query-cpu-def.c
@@ -1,6 +1,7 @@
 #include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "sysemu/arch_init.h"
+#include "qapi/error.h"
 #include "qapi/qmp/qerror.h"
 
 CpuDefinitionInfoList *arch_query_cpu_definitions(Error **errp)

diff --git a/stubs/arch-query-cpu-model-baseline.c b/stubs/arch-query-cpu-model-baseline.c
index 094ec13c2c369871bef554a653b5cdeba052aca7..0d066da3285e59bcae95da7455de9cc02d6f252c 100644 (file)
--- a/stubs/arch-query-cpu-model-baseline.c
+++ b/stubs/arch-query-cpu-model-baseline.c
@@ -1,6 +1,7 @@
 #include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "sysemu/arch_init.h"
+#include "qapi/error.h"
 #include "qapi/qmp/qerror.h"
 
 CpuModelBaselineInfo *arch_query_cpu_model_baseline(CpuModelInfo *modela,

diff --git a/stubs/arch-query-cpu-model-comparison.c b/stubs/arch-query-cpu-model-comparison.c
index d5486ae980c5dc4e3b6c1ac8b18a58173ab9ab76..8eb311a26cd19fda9bf0b748c5a48beceaed0dd1 100644 (file)
--- a/stubs/arch-query-cpu-model-comparison.c
+++ b/stubs/arch-query-cpu-model-comparison.c
@@ -1,6 +1,7 @@
 #include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "sysemu/arch_init.h"
+#include "qapi/error.h"
 #include "qapi/qmp/qerror.h"
 
 CpuModelCompareInfo *arch_query_cpu_model_comparison(CpuModelInfo *modela,

diff --git a/stubs/arch-query-cpu-model-expansion.c b/stubs/arch-query-cpu-model-expansion.c
index ae7cf554d17234de4433d35810d8e290359dfde2..26273a8b10b85f628ade66a94285d3d59c62f6f5 100644 (file)
--- a/stubs/arch-query-cpu-model-expansion.c
+++ b/stubs/arch-query-cpu-model-expansion.c
@@ -1,6 +1,7 @@
 #include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "sysemu/arch_init.h"
+#include "qapi/error.h"
 #include "qapi/qmp/qerror.h"
 
 CpuModelExpansionInfo *arch_query_cpu_model_expansion(CpuModelExpansionType type,

diff --git a/stubs/vmgenid.c b/stubs/vmgenid.c
index c64eb7a16e8409c58581429df3c43af1968c5d07..3c8fe55bdf3346c409a8009a2743ae7df4c88207 100644 (file)
--- a/stubs/vmgenid.c
+++ b/stubs/vmgenid.c
@@ -1,5 +1,6 @@
 #include "qemu/osdep.h"
 #include "qmp-commands.h"
+#include "qapi/error.h"
 #include "qapi/qmp/qerror.h"
 
 GuidInfo *qmp_query_vm_generation_id(Error **errp)

diff --git a/target/i386/cpu.c b/target/i386/cpu.c
index 6b4103cd27d1bf576f92d4422f25036cca9d7597..03781938284a8211e487ad6146f47159fc1a412e 100644 (file)
--- a/target/i386/cpu.c
+++ b/target/i386/cpu.c
@@ -16,6 +16,7 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
+
 #include "qemu/osdep.h"
 #include "qemu/cutils.h"
 
@@ -29,6 +30,7 @@
 #include "qemu/error-report.h"
 #include "qemu/option.h"
 #include "qemu/config-file.h"
+#include "qapi/error.h"
 #include "qapi/qmp/qerror.h"
 #include "qapi/qmp/types.h"
 

diff --git a/target/i386/xsave_helper.c b/target/i386/xsave_helper.c
index ca735eee77897a3052856bf46b87afd06aaa52e9..52ea7e654b6519327d29b16c4bf45588f01ffb7b 100644 (file)
--- a/target/i386/xsave_helper.c
+++ b/target/i386/xsave_helper.c
@@ -3,7 +3,6 @@
  * See the COPYING file in the top-level directory.
  */
 #include "qemu/osdep.h"
-#include "qapi/error.h"
 
 #include "qemu-common.h"
 #include "cpu.h"

diff --git a/target/nios2/helper.c b/target/nios2/helper.c
index a169c91eaaacc812845e197cb565b7e57ebbe2b8..a8b8ec662a578afdd45e03c998984f0329934409 100644 (file)
--- a/target/nios2/helper.c
+++ b/target/nios2/helper.c
@@ -22,7 +22,6 @@
 
 #include "cpu.h"
 #include "qemu/host-utils.h"
-#include "qapi/error.h"
 #include "exec/exec-all.h"
 #include "exec/log.h"
 #include "exec/helper-proto.h"

diff --git a/target/ppc/mmu-book3s-v3.c b/target/ppc/mmu-book3s-v3.c
index e7798b3582b0ac47f4a99ed8e60efdecf27b3a94..b60df4408f3bc3c958ccef932e3d10e085261284 100644 (file)
--- a/target/ppc/mmu-book3s-v3.c
+++ b/target/ppc/mmu-book3s-v3.c
@@ -18,7 +18,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "qapi/error.h"
 #include "cpu.h"
 #include "mmu-hash64.h"
 #include "mmu-book3s-v3.h"

diff --git a/target/ppc/mmu-hash64.c b/target/ppc/mmu-hash64.c
index 14d34e512f42b12266b2b1bf0e59b25164b1a8d8..c9b72b74295696c7f2c2ce3bce5bc35b9de25566 100644 (file)
--- a/target/ppc/mmu-hash64.c
+++ b/target/ppc/mmu-hash64.c
@@ -18,7 +18,6 @@
  * 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/exec-all.h"
 #include "exec/helper-proto.h"

diff --git a/target/ppc/mmu-radix64.c b/target/ppc/mmu-radix64.c
index bbd37e3c7d004e42928e62b209e29b3863be851d..ab76cbc83530cc9bcc31c046a039dad77a829ccb 100644 (file)
--- a/target/ppc/mmu-radix64.c
+++ b/target/ppc/mmu-radix64.c
@@ -18,7 +18,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "qapi/error.h"
 #include "cpu.h"
 #include "exec/exec-all.h"
 #include "exec/helper-proto.h"

diff --git a/target/ppc/mmu_helper.c b/target/ppc/mmu_helper.c
index 16ef5acaa28f1dba41969960be0a76b2eb2ce9f8..5568d1642b346c3a33635330f988fee1d2aa63d0 100644 (file)
--- a/target/ppc/mmu_helper.c
+++ b/target/ppc/mmu_helper.c
@@ -17,7 +17,6 @@
  * 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/ppc/translate_init.c b/target/ppc/translate_init.c
index e7b1044944cd68a5d81e0f0cf255e5de2da289a8..972f4caa7fc3ae12adf82a9a9e660b965c70fc80 100644 (file)
--- a/target/ppc/translate_init.c
+++ b/target/ppc/translate_init.c
@@ -29,6 +29,7 @@
 #include "mmu-hash32.h"
 #include "mmu-hash64.h"
 #include "qemu/error-report.h"
+#include "qapi/error.h"
 #include "qapi/visitor.h"
 #include "hw/qdev-properties.h"
 #include "hw/ppc/ppc.h"

diff --git a/target/s390x/excp_helper.c b/target/s390x/excp_helper.c
index e8f7a40c2b7f1eb5acb1fab006855c83ee6853cc..6967fbfa25c924fb4d2a6d315adea0dc7609ced5 100644 (file)
--- a/target/s390x/excp_helper.c
+++ b/target/s390x/excp_helper.c
@@ -19,7 +19,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "qapi/error.h"
 #include "cpu.h"
 #include "internal.h"
 #include "qemu/timer.h"

diff --git a/target/s390x/helper.c b/target/s390x/helper.c
index 35d974191860b3d87fb41cba65c19877b3bfec80..84aaef3a53a6516ed016efc0e72cfe01d8eed996 100644 (file)
--- a/target/s390x/helper.c
+++ b/target/s390x/helper.c
@@ -19,7 +19,6 @@
  */
 
 #include "qemu/osdep.h"
-#include "qapi/error.h"
 #include "cpu.h"
 #include "internal.h"
 #include "exec/gdbstub.h"

diff --git a/target/s390x/kvm.c b/target/s390x/kvm.c
index 87360011560e1d9e855776b303095804e4d947b6..63c531e028f9f7289ac444d7589022a7a5a1f1f0 100644 (file)
--- a/target/s390x/kvm.c
+++ b/target/s390x/kvm.c
@@ -31,6 +31,7 @@
 #include "cpu.h"
 #include "internal.h"
 #include "kvm_s390x.h"
+#include "qapi/error.h"
 #include "qemu/error-report.h"
 #include "qemu/timer.h"
 #include "sysemu/sysemu.h"

diff --git a/tests/check-qlist.c b/tests/check-qlist.c
index 894e9915e5fdb53955c99cbd61088ff365546b6e..259980d52391c11f140d67d0a606caf216e51f31 100644 (file)
--- a/tests/check-qlist.c
+++ b/tests/check-qlist.c
@@ -11,7 +11,6 @@
  */
 #include "qemu/osdep.h"
 
-#include "qapi/error.h"
 #include "qapi/qmp/qnum.h"
 #include "qapi/qmp/qlist.h"
 

diff --git a/tests/check-qnum.c b/tests/check-qnum.c
index d702d5da9c63d98d8fdc50b1ee1d339ad05f7e17..2b667f7ad7724113720b03547e36f0451f989203 100644 (file)
--- a/tests/check-qnum.c
+++ b/tests/check-qnum.c
@@ -15,7 +15,6 @@
 #include "qemu/osdep.h"
 
 #include "qapi/qmp/qnum.h"
-#include "qapi/error.h"
 #include "qemu-common.h"
 
 /*

diff --git a/tests/io-channel-helpers.c b/tests/io-channel-helpers.c
index 5430e1389db67a77f77563b534862a5980f56aa5..ab988ef4fe138f3a16f0402b113755954d9ada96 100644 (file)
--- a/tests/io-channel-helpers.c
+++ b/tests/io-channel-helpers.c
@@ -20,7 +20,6 @@
 
 #include "qemu/osdep.h"
 #include "io-channel-helpers.h"
-#include "qapi/error.h"
 #include "qemu/iov.h"
 
 struct QIOChannelTest {

diff --git a/tests/test-aio-multithread.c b/tests/test-aio-multithread.c
index c8bec81520e0dcb91e56838f025cd13312b2ca3b..6440d54ac36c7291463aefc0c0dce10a755afc99 100644 (file)
--- a/tests/test-aio-multithread.c
+++ b/tests/test-aio-multithread.c
@@ -12,7 +12,6 @@
 
 #include "qemu/osdep.h"
 #include "block/aio.h"
-#include "qapi/error.h"
 #include "qemu/coroutine.h"
 #include "qemu/thread.h"
 #include "qemu/error-report.h"

diff --git a/tests/test-qmp-commands.c b/tests/test-qmp-commands.c
index 904c89d4d49ed9187cad129e4995e80dcc5e5e31..52c1802eaf5d37fb00cfb73c6006bde219ba6657 100644 (file)
--- a/tests/test-qmp-commands.c
+++ b/tests/test-qmp-commands.c
@@ -2,6 +2,7 @@
 #include "qemu-common.h"
 #include "qapi/qmp/types.h"
 #include "test-qmp-commands.h"
+#include "qapi/error.h"
 #include "qapi/qmp/dispatch.h"
 #include "qemu/module.h"
 #include "qapi/qobject-input-visitor.h"

diff --git a/tests/test-qmp-event.c b/tests/test-qmp-event.c
index 46825b4f3f02e5dd266b0ec6375ac8d97d38df70..5be2d8efcf5863ed030f3542f18774b62afdcada 100644 (file)
--- a/tests/test-qmp-event.c
+++ b/tests/test-qmp-event.c
@@ -16,6 +16,7 @@
 #include "qemu-common.h"
 #include "test-qapi-visit.h"
 #include "test-qapi-event.h"
+#include "qapi/error.h"
 #include "qapi/qmp/types.h"
 #include "qapi/qmp/qobject.h"
 #include "qapi/qmp-event.h"

diff --git a/tests/test-x86-cpuid-compat.c b/tests/test-x86-cpuid-compat.c
index 58a2dd9fe85458a2935b9207dfd2ebeaf3d14cdc..c594b5bd97a422a20fc5aad734611edba26fd9d2 100644 (file)
--- a/tests/test-x86-cpuid-compat.c
+++ b/tests/test-x86-cpuid-compat.c
@@ -1,6 +1,5 @@
 #include "qemu/osdep.h"
 #include "qemu-common.h"
-#include "qapi/error.h"
 #include "qapi/qmp/qdict.h"
 #include "qapi/qmp/qnum.h"
 #include "qapi/qmp/qbool.h"

diff --git a/tpm.c b/tpm.c
index 61a434185abd69cffd6de2be80e21722ea78e621..d11b10bed86b0e76278950047facb2f26102f081 100644 (file)
--- a/tpm.c
+++ b/tpm.c
@@ -11,8 +11,10 @@
  *
  * Based on net.c
  */
+
 #include "qemu/osdep.h"
 
+#include "qapi/error.h"
 #include "qapi/qmp/qerror.h"
 #include "sysemu/tpm_backend.h"
 #include "sysemu/tpm.h"

diff --git a/trace/qmp.c b/trace/qmp.c
index ac777d154f45cbf42c8a9816bf002fe3bd41fb64..ccd35cd840ad65f5e7b9ecbf900ab052deea8b94 100644 (file)
--- a/trace/qmp.c
+++ b/trace/qmp.c
@@ -8,6 +8,7 @@
  */
 
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "qmp-commands.h"
 #include "trace/control.h"
 

diff --git a/ui/cocoa.m b/ui/cocoa.m
index 6be9848391c8e64a26fbd60d4e158c0026ae656d..51db47cd71bcbb43d0d6fa43b3daf0347662985e 100644 (file)
--- a/ui/cocoa.m
+++ b/ui/cocoa.m
@@ -31,6 +31,7 @@
 #include "ui/console.h"
 #include "ui/input.h"
 #include "sysemu/sysemu.h"
+#include "qapi/error.h"
 #include "qmp-commands.h"
 #include "sysemu/blockdev.h"
 #include "qemu-version.h"

diff --git a/ui/console.c b/ui/console.c
index c4c95abed7efe37cb48d2cea05e8580f508fe9db..f678979f86d623049c1bb37f34b734fa4b4bc9bf 100644 (file)
--- a/ui/console.c
+++ b/ui/console.c
@@ -21,10 +21,12 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
 #include "qemu/osdep.h"
 #include "qemu-common.h"
 #include "ui/console.h"
 #include "hw/qdev-core.h"
+#include "qapi/error.h"
 #include "qemu/timer.h"
 #include "qmp-commands.h"
 #include "chardev/char-fe.h"

diff --git a/ui/gtk.c b/ui/gtk.c
index f0ad63e43149f7be4898c065626bc13633517aed..1537751afae70d9d12b7fc333ae00bafc98746a7 100644 (file)
--- a/ui/gtk.c
+++ b/ui/gtk.c
@@ -36,6 +36,7 @@
 
 #include "qemu/osdep.h"
 #include "qemu-common.h"
+#include "qapi/error.h"
 #include "qemu/cutils.h"
 
 #include "ui/console.h"

diff --git a/ui/input.c b/ui/input.c
index ab22c8423fb7833e9b35a2a39362d405afda495e..a5f1cbb3ca479e9a0ebd00dab42edc3ccc3f378f 100644 (file)
--- a/ui/input.c
+++ b/ui/input.c
@@ -1,5 +1,6 @@
 #include "qemu/osdep.h"
 #include "sysemu/sysemu.h"
+#include "qapi/error.h"
 #include "qemu/error-report.h"
 #include "qmp-commands.h"
 #include "trace.h"

diff --git a/ui/spice-core.c b/ui/spice-core.c
index 2baf0c7120991f222b70fd56494c17d029173aeb..7a53db070c73202f50df68630ab96afcb2881a0e 100644 (file)
--- a/ui/spice-core.c
+++ b/ui/spice-core.c
@@ -30,6 +30,7 @@
 #include "qemu-x509.h"
 #include "qemu/sockets.h"
 #include "qmp-commands.h"
+#include "qapi/error.h"
 #include "qapi/qmp/qbool.h"
 #include "qapi/qmp/qstring.h"
 #include "qapi/qmp/qjson.h"

diff --git a/ui/vnc.c b/ui/vnc.c
index 93731accb6b4165352a8139582e6aa5a179beaff..b1388f06a4391cc3765c3455f82f9a7954bb05e0 100644 (file)
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -34,6 +34,7 @@
 #include "qemu/timer.h"
 #include "qemu/acl.h"
 #include "qemu/config-file.h"
+#include "qapi/error.h"
 #include "qapi/qmp/qerror.h"
 #include "qapi/qmp/types.h"
 #include "qmp-commands.h"

diff --git a/util/qemu-config.c b/util/qemu-config.c
index 029fec53a99e3c023410a08f2c8b44cd18635c59..26ea248062d86727a6fd333ef3ed9bd53b1141bf 100644 (file)
--- a/util/qemu-config.c
+++ b/util/qemu-config.c
@@ -1,4 +1,5 @@
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "qemu-common.h"
 #include "qemu/error-report.h"
 #include "qemu/option.h"

diff --git a/vl.c b/vl.c
index e4c24213535ce4e96d4b8d5972a8d25be3efb627..5570f1d72364fceeac93f9774a0d256a406ce1ba 100644 (file)
--- a/vl.c
+++ b/vl.c
@@ -21,7 +21,9 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
  * THE SOFTWARE.
  */
+
 #include "qemu/osdep.h"
+#include "qapi/error.h"
 #include "qemu-version.h"
 #include "qemu/cutils.h"
 #include "qemu/help_option.h"