Include qapi/qmp/qerror.h exactly where needed

In particular, don't include it into headers.

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

diff --git a/backends/hostmem.c b/backends/hostmem.c
index 7d74be04c34a0630143c36ed0de7ec20f42cdac5..61c1ac0843ff08d27626b8fea012c2f1efdada00 100644 (file)
--- a/backends/hostmem.c
+++ b/backends/hostmem.c
@@ -13,7 +13,6 @@
 #include "qapi/visitor.h"
 #include "qapi-types.h"
 #include "qapi-visit.h"
-#include "qapi/qmp/qerror.h"
 #include "qemu/config-file.h"
 #include "qom/object_interfaces.h"
 

diff --git a/balloon.c b/balloon.c
index 5f5202c25e1e8f2edf40c1a39a6e76873ba604ae..617187adf3c072e191f8b1bea1ae27a82224e8af 100644 (file)
--- a/balloon.c
+++ b/balloon.c
@@ -30,6 +30,7 @@
 #include "sysemu/balloon.h"
 #include "trace.h"
 #include "qmp-commands.h"
+#include "qapi/qmp/qerror.h"
 #include "qapi/qmp/qjson.h"
 
 static QEMUBalloonEvent *balloon_event_fn;

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

diff --git a/block/backup.c b/block/backup.c
index 35145cbe0318a6869c2e367df6ec4ffc4927725c..4a1af68c327d0497953f44dd37d4d4deeb723747 100644 (file)
--- a/block/backup.c
+++ b/block/backup.c
@@ -19,6 +19,7 @@
 #include "block/block.h"
 #include "block/block_int.h"
 #include "block/blockjob.h"
+#include "qapi/qmp/qerror.h"
 #include "qemu/ratelimit.h"
 
 #define BACKUP_CLUSTER_BITS 16

diff --git a/block/commit.c b/block/commit.c
index 6c01feaa064e21d121be97c894ec19b3e013ea66..7312a5bdc0221953f4ac1de2ef85cb85ec3288de 100644 (file)
--- a/block/commit.c
+++ b/block/commit.c
@@ -15,6 +15,7 @@
 #include "trace.h"
 #include "block/block_int.h"
 #include "block/blockjob.h"
+#include "qapi/qmp/qerror.h"
 #include "qemu/ratelimit.h"
 
 enum {

diff --git a/block/mirror.c b/block/mirror.c
index e3e51a2ccedea639a03a0216a8bd63e8e24a43cb..048e452d17c1570731410a23f468789241218a81 100644 (file)
--- a/block/mirror.c
+++ b/block/mirror.c
@@ -14,6 +14,7 @@
 #include "trace.h"
 #include "block/blockjob.h"
 #include "block/block_int.h"
+#include "qapi/qmp/qerror.h"
 #include "qemu/ratelimit.h"
 #include "qemu/bitmap.h"
 

diff --git a/block/qcow.c b/block/qcow.c
index 54152f99740e651f1a212a1544b0f13594b4c04a..733627fbf24d4a1d7ca2eae0c35e972285de2821 100644 (file)
--- a/block/qcow.c
+++ b/block/qcow.c
@@ -25,6 +25,7 @@
 #include "block/block_int.h"
 #include "qemu/module.h"
 #include <zlib.h>
+#include "qapi/qmp/qerror.h"
 #include "qemu/aes.h"
 #include "migration/migration.h"
 

diff --git a/block/quorum.c b/block/quorum.c
index 9aceabd1b3fe6de345d92d0711a5fcdbf6b8a72c..a7df17c185df85d711eda4809a39506941aea59d 100644 (file)
--- a/block/quorum.c
+++ b/block/quorum.c
@@ -18,6 +18,7 @@
 #include "block/block_int.h"
 #include "qapi/qmp/qbool.h"
 #include "qapi/qmp/qdict.h"
+#include "qapi/qmp/qerror.h"
 #include "qapi/qmp/qint.h"
 #include "qapi/qmp/qjson.h"
 #include "qapi/qmp/qlist.h"

diff --git a/block/snapshot.c b/block/snapshot.c
index 7cd960cda78dd2943d96f684043a82dfae59e767..19395ae01413df3c85615a900540deedbb65ef85 100644 (file)
--- a/block/snapshot.c
+++ b/block/snapshot.c
@@ -24,6 +24,7 @@
 
 #include "block/snapshot.h"
 #include "block/block_int.h"
+#include "qapi/qmp/qerror.h"
 
 QemuOptsList internal_snapshot_opts = {
     .name = "snapshot",

diff --git a/block/stream.c b/block/stream.c
index f17efdb90f1162066b4ba1951fde92d73799e3f9..ab0bd057f7533f5f5eb5dcfa0ef56b18e1dcf323 100644 (file)
--- a/block/stream.c
+++ b/block/stream.c
@@ -14,6 +14,7 @@
 #include "trace.h"
 #include "block/block_int.h"
 #include "block/blockjob.h"
+#include "qapi/qmp/qerror.h"
 #include "qemu/ratelimit.h"
 
 enum {

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

diff --git a/blockdev.c b/blockdev.c
index fdc7768ce566e24b3b8e66eb6d702be643d35861..b35467646eeb4e1cde394f18be99e2bb33d35033 100644 (file)
--- a/blockdev.c
+++ b/blockdev.c
@@ -41,6 +41,7 @@
 #include "qemu/config-file.h"
 #include "qapi/qmp/types.h"
 #include "qapi-visit.h"
+#include "qapi/qmp/qerror.h"
 #include "qapi/qmp-output-visitor.h"
 #include "qapi/util.h"
 #include "sysemu/sysemu.h"

diff --git a/blockjob.c b/blockjob.c
index b033f6855e44ac019caa709b971a1fa2d02a70b2..ec46fad2f11d73cd7f1cdbb0cbab4a26ea232113 100644 (file)
--- a/blockjob.c
+++ b/blockjob.c
@@ -29,6 +29,7 @@
 #include "block/block.h"
 #include "block/blockjob.h"
 #include "block/block_int.h"
+#include "qapi/qmp/qerror.h"
 #include "qapi/qmp/qjson.h"
 #include "block/coroutine.h"
 #include "qmp-commands.h"

diff --git a/dump.c b/dump.c
index 9a02b51a1f0c7d5b2aae8c70aad0ca119a53606f..78b7d843ceb292db45c43bf94ff64b6eeb608681 100644 (file)
--- a/dump.c
+++ b/dump.c
@@ -23,6 +23,7 @@
 #include "sysemu/memory_mapping.h"
 #include "sysemu/cpus.h"
 #include "qapi/error.h"
+#include "qapi/qmp/qerror.h"
 #include "qmp-commands.h"
 
 #include <zlib.h>

diff --git a/hmp.c b/hmp.c
index fd10ab51b4f828e967ead4c7cec6acde20793f26..070aaf814f569996bbf464d240e024b2f74a5d5f 100644 (file)
--- a/hmp.c
+++ b/hmp.c
@@ -25,6 +25,7 @@
 #include "monitor/monitor.h"
 #include "monitor/qdev.h"
 #include "qapi/opts-visitor.h"
+#include "qapi/qmp/qerror.h"
 #include "qapi/string-output-visitor.h"
 #include "qapi-visit.h"
 #include "ui/console.h"

diff --git a/hw/char/serial-pci.c b/hw/char/serial-pci.c
index 653064fadf0852fe938a1769fd2e5e66371ac9c5..1c8b9be5cc8b61ffed72cf564233e01d0abb9f7a 100644 (file)
--- a/hw/char/serial-pci.c
+++ b/hw/char/serial-pci.c
@@ -27,7 +27,6 @@
 
 #include "hw/char/serial.h"
 #include "hw/pci/pci.h"
-#include "qapi/qmp/qerror.h"
 
 #define PCI_SERIAL_MAX_PORTS 4
 

diff --git a/hw/dma/xilinx_axidma.c b/hw/dma/xilinx_axidma.c
index d06002dde87f789d3825db415e5bbccaeddf27df..cf842a3cc7b3c267ce15e2af8ea85d6fea6a0116 100644 (file)
--- a/hw/dma/xilinx_axidma.c
+++ b/hw/dma/xilinx_axidma.c
@@ -26,7 +26,6 @@
 #include "qemu/timer.h"
 #include "hw/ptimer.h"
 #include "qemu/log.h"
-#include "qapi/qmp/qerror.h"
 #include "qemu/main-loop.h"
 
 #include "hw/stream.h"

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

diff --git a/hw/net/xilinx_axienet.c b/hw/net/xilinx_axienet.c
index 21efedfc3ea8e637167a8c2f236d08631e104ff6..92057707e02357b3ad2bd51220eeac89f5e15ca7 100644 (file)
--- a/hw/net/xilinx_axienet.c
+++ b/hw/net/xilinx_axienet.c
@@ -26,7 +26,6 @@
 #include "qemu/log.h"
 #include "net/net.h"
 #include "net/checksum.h"
-#include "qapi/qmp/qerror.h"
 
 #include "hw/stream.h"
 

diff --git a/hw/pci/pci-stub.c b/hw/pci/pci-stub.c
index 9b51d3782f6a65a10802ba32728b7e8d158aaf0e..063a7c2427add3edd9fd87e0fd7d5c6737b5f9dd 100644 (file)
--- a/hw/pci/pci-stub.c
+++ b/hw/pci/pci-stub.c
@@ -20,6 +20,7 @@
 
 #include "sysemu/sysemu.h"
 #include "monitor/monitor.h"
+#include "qapi/qmp/qerror.h"
 #include "hw/pci/pci.h"
 #include "qmp-commands.h"
 

diff --git a/hw/pci/pcie.c b/hw/pci/pcie.c
index 1463e65b5d12d0c39395defd95a5009cc8a7cd3c..14c77117f68c62659b2711695e83d9c9213950f1 100644 (file)
--- a/hw/pci/pcie.c
+++ b/hw/pci/pcie.c
@@ -26,7 +26,6 @@
 #include "hw/pci/pci_bus.h"
 #include "hw/pci/pcie_regs.h"
 #include "qemu/range.h"
-#include "qapi/qmp/qerror.h"
 
 //#define DEBUG_PCIE
 #ifdef DEBUG_PCIE

diff --git a/hw/pci/shpc.c b/hw/pci/shpc.c
index a706486394d162840f077fd1ad2a4252461a081f..bfb4d31b622f095f34961e6129e4c1bcef90397f 100644 (file)
--- a/hw/pci/shpc.c
+++ b/hw/pci/shpc.c
@@ -7,7 +7,6 @@
 #include "hw/pci/pci.h"
 #include "hw/pci/pci_bus.h"
 #include "hw/pci/msi.h"
-#include "qapi/qmp/qerror.h"
 
 /* TODO: model power only and disabled slot states. */
 /* TODO: handle SERR and wakeups */

diff --git a/hw/ppc/virtex_ml507.c b/hw/ppc/virtex_ml507.c
index 6feb3c7c394314a3b4f4a3897aa46e4ae1d76c36..439732f7ab88e59213a0af1ff0d92e6a97a0f259 100644 (file)
--- a/hw/ppc/virtex_ml507.c
+++ b/hw/ppc/virtex_ml507.c
@@ -41,7 +41,6 @@
 #include "ppc405.h"
 
 #include "sysemu/block-backend.h"
-#include "qapi/qmp/qerror.h"
 
 #define EPAPR_MAGIC    (0x45504150)
 #define FLASH_SIZE     (16 * 1024 * 1024)

diff --git a/hw/s390x/s390-virtio.c b/hw/s390x/s390-virtio.c
index be2ba86685fb02d55dc30ac5dadc5d9ab618bc23..4a67c3fc1eda8b737c4e13a9638ce46e36a24fb0 100644 (file)
--- a/hw/s390x/s390-virtio.c
+++ b/hw/s390x/s390-virtio.c
@@ -22,6 +22,7 @@
  */
 
 #include "hw/hw.h"
+#include "qapi/qmp/qerror.h"
 #include "sysemu/block-backend.h"
 #include "sysemu/blockdev.h"
 #include "sysemu/sysemu.h"

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

diff --git a/hw/virtio/virtio-rng.c b/hw/virtio/virtio-rng.c
index 22b1d87d0e519ee70fc09f9699960ea327b2637b..740ed3102bce1f83b6a0df823037a3a9a21e2209 100644 (file)
--- a/hw/virtio/virtio-rng.c
+++ b/hw/virtio/virtio-rng.c
@@ -11,7 +11,6 @@
 
 #include "qemu/iov.h"
 #include "hw/qdev.h"
-#include "qapi/qmp/qerror.h"
 #include "hw/virtio/virtio.h"
 #include "hw/virtio/virtio-rng.h"
 #include "sysemu/rng.h"

diff --git a/include/block/block_int.h b/include/block/block_int.h
index 888ec09e964f5e3fb592504a26cfb49b7e3bfa61..a81542c9c26e4155d88ce30023ad20817c075329 100644 (file)
--- a/include/block/block_int.h
+++ b/include/block/block_int.h
@@ -31,7 +31,6 @@
 #include "block/coroutine.h"
 #include "qemu/timer.h"
 #include "qapi-types.h"
-#include "qapi/qmp/qerror.h"
 #include "monitor/monitor.h"
 #include "qemu/hbitmap.h"
 #include "block/snapshot.h"

diff --git a/include/monitor/monitor.h b/include/monitor/monitor.h
index aa831043eba5fbfafa9091a876c4877db35444cb..9aff47e699b88ff7fdeef32a1b5933c7df09a952 100644 (file)
--- a/include/monitor/monitor.h
+++ b/include/monitor/monitor.h
@@ -2,7 +2,6 @@
 #define MONITOR_H
 
 #include "qemu-common.h"
-#include "qapi/qmp/qerror.h"
 #include "qapi/qmp/qdict.h"
 #include "block/block.h"
 #include "qemu/readline.h"

diff --git a/include/qemu/sockets.h b/include/qemu/sockets.h
index 7992ece72aef07b26a2afe52c47fbee63c5e9c7d..c174b5cbdd22a9533437b2f504c378063035a8cf 100644 (file)
--- a/include/qemu/sockets.h
+++ b/include/qemu/sockets.h
@@ -28,7 +28,6 @@ int inet_aton(const char *cp, struct in_addr *ia);
 
 #include "qemu/option.h"
 #include "qapi/error.h"
-#include "qapi/qmp/qerror.h"
 #include "qapi-types.h"
 
 extern QemuOptsList socket_optslist;

diff --git a/migration/migration.c b/migration/migration.c
index 25f6830a778940160a8d3befc9cb98a5d689046e..d7056d7453fb1f0c4f6c67377b1013fe68a9f398 100644 (file)
--- a/migration/migration.c
+++ b/migration/migration.c
@@ -21,6 +21,7 @@
 #include "migration/qemu-file.h"
 #include "sysemu/sysemu.h"
 #include "block/block.h"
+#include "qapi/qmp/qerror.h"
 #include "qemu/sockets.h"
 #include "migration/block.h"
 #include "qemu/thread.h"

diff --git a/migration/savevm.c b/migration/savevm.c
index 2b4e02f1a3494b57eda7b9bd945dabf6449f0a5c..9e0e2867973162a1d74f64f6d65ccd1b6cac7a68 100644 (file)
--- a/migration/savevm.c
+++ b/migration/savevm.c
@@ -37,6 +37,7 @@
 #include "qemu/timer.h"
 #include "audio/audio.h"
 #include "migration/migration.h"
+#include "qapi/qmp/qerror.h"
 #include "qemu/error-report.h"
 #include "qemu/sockets.h"
 #include "qemu/queue.h"

diff --git a/monitor.c b/monitor.c
index 497fed289e1d68c6aad66c0e8d83beff42fabd22..aeea2b5f9e82684ceb10cf9ead81d561a771472c 100644 (file)
--- a/monitor.c
+++ b/monitor.c
@@ -49,6 +49,7 @@
 #include "sysemu/kvm.h"
 #include "qemu/acl.h"
 #include "sysemu/tpm.h"
+#include "qapi/qmp/qerror.h"
 #include "qapi/qmp/qint.h"
 #include "qapi/qmp/qfloat.h"
 #include "qapi/qmp/qlist.h"

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

diff --git a/numa.c b/numa.c
index 28c857c66a8a7b2ce52d3f8292436137d7bf267b..91fc6c1d93d4a68521e150bfce65be05cbd68306 100644 (file)
--- a/numa.c
+++ b/numa.c
@@ -31,7 +31,6 @@
 #include "qapi-visit.h"
 #include "qapi/opts-visitor.h"
 #include "qapi/dealloc-visitor.h"
-#include "qapi/qmp/qerror.h"
 #include "hw/boards.h"
 #include "sysemu/hostmem.h"
 #include "qmp-commands.h"

diff --git a/qapi/qmp-output-visitor.c b/qapi/qmp-output-visitor.c
index 7e0f7ce16aa557acdc7e16decc87979b244b0a32..efc19d5841903dd134f1e33b2827e7f10628d9f6 100644 (file)
--- a/qapi/qmp-output-visitor.c
+++ b/qapi/qmp-output-visitor.c
@@ -16,7 +16,6 @@
 #include "qemu/queue.h"
 #include "qemu-common.h"
 #include "qapi/qmp/types.h"
-#include "qapi/qmp/qerror.h"
 
 typedef struct QStackEntry
 {

diff --git a/qapi/string-output-visitor.c b/qapi/string-output-visitor.c
index 1ab8574585c3d3038dd08908ad6fed853a486cd4..b86ce2cd0723e121c032dc6ee6736a1f820c9b17 100644 (file)
--- a/qapi/string-output-visitor.c
+++ b/qapi/string-output-visitor.c
@@ -13,7 +13,6 @@
 #include "qemu-common.h"
 #include "qapi/string-output-visitor.h"
 #include "qapi/visitor-impl.h"
-#include "qapi/qmp/qerror.h"
 #include "qemu/host-utils.h"
 #include <math.h>
 #include "qemu/range.h"

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

diff --git a/qemu-img.c b/qemu-img.c
index 6d1b1364e1237887564672fe2d418de9e7654ebc..75f4ee44212ef1ba332a5001d79d76301431f7b0 100644 (file)
--- a/qemu-img.c
+++ b/qemu-img.c
@@ -23,6 +23,7 @@
  */
 #include "qapi-visit.h"
 #include "qapi/qmp-output-visitor.h"
+#include "qapi/qmp/qerror.h"
 #include "qapi/qmp/qjson.h"
 #include "qemu-common.h"
 #include "qemu/option.h"

diff --git a/qmp.c b/qmp.c
index a046b68c99b355986c1fe87cc8f6db466da710b1..03eba96193b2c283d06ad58697a1361b169e1e61 100644 (file)
--- a/qmp.c
+++ b/qmp.c
@@ -24,6 +24,7 @@
 #include "hw/qdev.h"
 #include "sysemu/blockdev.h"
 #include "qom/qom-qobject.h"
+#include "qapi/qmp/qerror.h"
 #include "qapi/qmp/qobject.h"
 #include "qapi/qmp-input-visitor.h"
 #include "hw/boards.h"

diff --git a/qobject/json-parser.c b/qobject/json-parser.c
index 015d7855f5e60b54d4ac9190a8b75ec75996c54e..ac991ba3cfe7d8c4e79a3c93941055b7053bebfe 100644 (file)
--- a/qobject/json-parser.c
+++ b/qobject/json-parser.c
@@ -22,7 +22,6 @@
 #include "qapi/qmp/qbool.h"
 #include "qapi/qmp/json-parser.h"
 #include "qapi/qmp/json-lexer.h"
-#include "qapi/qmp/qerror.h"
 
 typedef struct JSONParserContext
 {

diff --git a/scripts/qapi-commands.py b/scripts/qapi-commands.py
index a451a51bce904645e521d409b1e43779d3f857c4..ca22acc1d5ef4fd981f524a2395c726ca50cdde5 100644 (file)
--- a/scripts/qapi-commands.py
+++ b/scripts/qapi-commands.py
@@ -329,7 +329,6 @@ h_comment = '''
 fdef.write(mcgen('''
 #include "qemu-common.h"
 #include "qemu/module.h"
-#include "qapi/qmp/qerror.h"
 #include "qapi/qmp/types.h"
 #include "qapi/qmp/dispatch.h"
 #include "qapi/visitor.h"

diff --git a/stubs/dump.c b/stubs/dump.c
index fac70191eb4a5545ca9996b6e2456b261a393083..8c24eda847b9e5b194438ffb73967107abaa111b 100644 (file)
--- a/stubs/dump.c
+++ b/stubs/dump.c
@@ -13,7 +13,6 @@
 
 #include "qemu-common.h"
 #include "sysemu/dump-arch.h"
-#include "qapi/qmp/qerror.h"
 #include "qmp-commands.h"
 
 int cpu_get_dump_info(ArchDumpInfo *info,

diff --git a/target-arm/cpu.c b/target-arm/cpu.c
index b3d07ac7d80eee34ca0fc98a8496d3a02b9351dc..80669a6d1b76dcb9ebc00813dadd9b707dd4bdcd 100644 (file)
--- a/target-arm/cpu.c
+++ b/target-arm/cpu.c
@@ -22,7 +22,6 @@
 #include "internals.h"
 #include "qemu-common.h"
 #include "hw/qdev-properties.h"
-#include "qapi/qmp/qerror.h"
 #if !defined(CONFIG_USER_ONLY)
 #include "hw/loader.h"
 #endif

diff --git a/target-i386/kvm.c b/target-i386/kvm.c
index 5a236e3103acd2e45e4bb452a4c552c1c1daa23f..daced5cb9441812f79b894616afe760ad1c570b5 100644 (file)
--- a/target-i386/kvm.c
+++ b/target-i386/kvm.c
@@ -36,7 +36,6 @@
 #include <asm/hyperv.h>
 #include "hw/pci/pci.h"
 #include "migration/migration.h"
-#include "qapi/qmp/qerror.h"
 #include "exec/memattrs.h"
 
 //#define DEBUG_KVM

diff --git a/ui/vnc.c b/ui/vnc.c
index af165845a3390939123be2f21efa39d4005e3fd6..2ffd9e500fcd3d9556d39aba276888f197129967 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/qmp/qerror.h"
 #include "qapi/qmp/types.h"
 #include "qmp-commands.h"
 #include "qemu/osdep.h"

diff --git a/util/qemu-config.c b/util/qemu-config.c
index 6cfdd7204ad2f648a15eb46d3dc553618322994b..5fcfd0e6ac4624d640b22e3792c199ca7cb3218d 100644 (file)
--- a/util/qemu-config.c
+++ b/util/qemu-config.c
@@ -2,7 +2,6 @@
 #include "qemu/error-report.h"
 #include "qemu/option.h"
 #include "qemu/config-file.h"
-#include "qapi/qmp/qerror.h"
 #include "qapi/error.h"
 #include "qmp-commands.h"