Drop superfluous includes of qapi-types.h and test-qapi-types.h

Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Eric Blake <eblake@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20180201111846.21846-4-armbru@redhat.com>

diff --git a/backends/cryptodev.c b/backends/cryptodev.c
index 67edfa53289bc8966c3aadf11169174563973051..d0dff1a463b1edc7b9b5539564016eb40e7a10ef 100644 (file)
--- a/backends/cryptodev.c
+++ b/backends/cryptodev.c
@@ -26,7 +26,6 @@
 #include "hw/boards.h"
 #include "qapi/error.h"
 #include "qapi/visitor.h"
-#include "qapi-types.h"
 #include "qapi-visit.h"
 #include "qemu/config-file.h"
 #include "qom/object_interfaces.h"

diff --git a/backends/hostmem.c b/backends/hostmem.c
index ee2c2d5bfd57921de9eacf728a6f94a70a4183ae..81d14554a7ab9e59f6527bdd4d0ab1b3c0503156 100644 (file)
--- a/backends/hostmem.c
+++ b/backends/hostmem.c
@@ -14,7 +14,6 @@
 #include "hw/boards.h"
 #include "qapi/error.h"
 #include "qapi/visitor.h"
-#include "qapi-types.h"
 #include "qapi-visit.h"
 #include "qemu/config-file.h"
 #include "qom/object_interfaces.h"

diff --git a/hmp.h b/hmp.h
index 536cb91caa4b5ddd1a8dfa779aee158270949e36..62c969caa3f8508d98d803a48be0fcf5d51f5cdc 100644 (file)
--- a/hmp.h
+++ b/hmp.h
@@ -16,7 +16,6 @@
 
 #include "qemu-common.h"
 #include "qemu/readline.h"
-#include "qapi-types.h"
 #include "qapi/qmp/qdict.h"
 
 void hmp_info_name(Monitor *mon, const QDict *qdict);

diff --git a/include/block/block.h b/include/block/block.h
index 2025d7ed19c436fb4e685a7ecc80e24eaad92717..c67ea818215d42a1032d1c8009f2f613ca20c917 100644 (file)
--- a/include/block/block.h
+++ b/include/block/block.h
@@ -9,7 +9,6 @@
 #include "block/dirty-bitmap.h"
 #include "block/blockjob.h"
 #include "qapi/qmp/qobject.h"
-#include "qapi-types.h"
 #include "qemu/hbitmap.h"
 
 /* block.c */

diff --git a/include/block/block_int.h b/include/block/block_int.h
index 99b91906277b927e1269665e336db6df326c221e..3e1c90879924a615721f9c61ce0ac16b34b93866 100644 (file)
--- a/include/block/block_int.h
+++ b/include/block/block_int.h
@@ -31,7 +31,6 @@
 #include "qemu/coroutine.h"
 #include "qemu/stats64.h"
 #include "qemu/timer.h"
-#include "qapi-types.h"
 #include "qemu/hbitmap.h"
 #include "block/snapshot.h"
 #include "qemu/main-loop.h"

diff --git a/include/block/qapi.h b/include/block/qapi.h
index 82ba4b63a04a828243001b9710282d8e630de756..83bdb098bd0d4463c17c476369a1f70b8952dae6 100644 (file)
--- a/include/block/qapi.h
+++ b/include/block/qapi.h
@@ -25,7 +25,6 @@
 #ifndef BLOCK_QAPI_H
 #define BLOCK_QAPI_H
 
-#include "qapi-types.h"
 #include "block/block.h"
 #include "block/snapshot.h"
 

diff --git a/include/hw/acpi/acpi_dev_interface.h b/include/hw/acpi/acpi_dev_interface.h
index 3c2e4e95a5a2ee988fc0cdd119b7e82b8eef67ca..dabf4c4fc95adab77d9f221f7a2aed7443c1451a 100644 (file)
--- a/include/hw/acpi/acpi_dev_interface.h
+++ b/include/hw/acpi/acpi_dev_interface.h
@@ -2,7 +2,6 @@
 #define ACPI_DEV_INTERFACE_H
 
 #include "qom/object.h"
-#include "qapi-types.h"
 #include "hw/boards.h"
 
 /* These values are part of guest ABI, and can not be changed */

diff --git a/include/migration/failover.h b/include/migration/failover.h
index ad91ef238198d4f96bc6e62bb29a25be5237f754..9283d602e6aa9497a9034f5c0d8baf348d4952a6 100644 (file)
--- a/include/migration/failover.h
+++ b/include/migration/failover.h
@@ -14,7 +14,6 @@
 #define QEMU_FAILOVER_H
 
 #include "qemu-common.h"
-#include "qapi-types.h"
 
 void failover_init_state(void);
 FailoverStatus failover_set_state(FailoverStatus old_state,

diff --git a/include/net/net.h b/include/net/net.h
index 4afac1a9dd90fe7d517f4d567e2370c72e48ecf2..eefb259e0ad346b4b5f34a45c3256093d243333f 100644 (file)
--- a/include/net/net.h
+++ b/include/net/net.h
@@ -7,7 +7,6 @@
 #include "qemu/option.h"
 #include "net/queue.h"
 #include "migration/vmstate.h"
-#include "qapi-types.h"
 
 #define MAC_FMT "%02X:%02X:%02X:%02X:%02X:%02X"
 #define MAC_ARG(x) ((uint8_t *)(x))[0], ((uint8_t *)(x))[1], \

diff --git a/include/net/slirp.h b/include/net/slirp.h
index 0c98e463db32607a31bc354cf3fdbfd41cbad065..865d2fca36d2d91b446792db51581e7eabba3596 100644 (file)
--- a/include/net/slirp.h
+++ b/include/net/slirp.h
@@ -27,7 +27,6 @@
 #include "qemu-common.h"
 #include "qapi/qmp/qdict.h"
 #include "qemu/option.h"
-#include "qapi-types.h"
 
 #ifdef CONFIG_SLIRP
 

diff --git a/include/net/tap.h b/include/net/tap.h
index 5da4edc6923eaae0c7b7c4b87797a4c6b53e78eb..ce6f8418acb40fa64f47b81632dd75638e652dc3 100644 (file)
--- a/include/net/tap.h
+++ b/include/net/tap.h
@@ -27,7 +27,6 @@
 #define QEMU_NET_TAP_H
 
 #include "qemu-common.h"
-#include "qapi-types.h"
 #include "standard-headers/linux/virtio_net.h"
 
 int tap_enable(NetClientState *nc);

diff --git a/include/qapi/qmp/qlit.h b/include/qapi/qmp/qlit.h
index b18406bce9693d63ddb8fa21a2e435c945e9b002..56f9d97bd9800d698884437e84fbfbcb60f96831 100644 (file)
--- a/include/qapi/qmp/qlit.h
+++ b/include/qapi/qmp/qlit.h
@@ -14,7 +14,6 @@
 #ifndef QLIT_H
 #define QLIT_H
 
-#include "qapi-types.h"
 #include "qobject.h"
 
 typedef struct QLitDictEntry QLitDictEntry;

diff --git a/include/sysemu/dump.h b/include/sysemu/dump.h
index df43bd0e0749a7cd4b4173ef000d4ffc874db70a..c14bcfe8c60b008a961fdee15495d8b9b1f636d7 100644 (file)
--- a/include/sysemu/dump.h
+++ b/include/sysemu/dump.h
@@ -38,7 +38,6 @@
 
 #include "sysemu/dump-arch.h"
 #include "sysemu/memory_mapping.h"
-#include "qapi-types.h"
 
 typedef struct QEMU_PACKED MakedumpfileHeader {
     char signature[16];     /* = "makedumpfile" */

diff --git a/include/sysemu/replay.h b/include/sysemu/replay.h
index fa14d0ec0b295953fb3234d6a330fe2dd1b7e12e..dc8ae7b6b11c06412cbf5303e67474ded053fa28 100644 (file)
--- a/include/sysemu/replay.h
+++ b/include/sysemu/replay.h
@@ -12,7 +12,6 @@
  *
  */
 
-#include "qapi-types.h"
 #include "sysemu.h"
 
 /* replay clock kinds */

diff --git a/include/sysemu/sysemu.h b/include/sysemu/sysemu.h
index 1c925309e3332c7937a78356c38b076aef186ceb..36fd371c9329fcc83015556c6f9d36a708e7ec5a 100644 (file)
--- a/include/sysemu/sysemu.h
+++ b/include/sysemu/sysemu.h
@@ -5,7 +5,6 @@
 #include "qemu/option.h"
 #include "qemu/queue.h"
 #include "qemu/timer.h"
-#include "qapi-types.h"
 #include "qemu/notify.h"
 #include "qemu/main-loop.h"
 #include "qemu/bitmap.h"

diff --git a/include/sysemu/tpm.h b/include/sysemu/tpm.h
index 233b1a3fc30a04c0ed67b3f023c773e6fb0a5a89..32b753d4f3e64fd345d4cc516142006c181ff437 100644 (file)
--- a/include/sysemu/tpm.h
+++ b/include/sysemu/tpm.h
@@ -13,7 +13,6 @@
 #define QEMU_TPM_H
 
 #include "qom/object.h"
-#include "qapi-types.h"
 
 int tpm_config_parse(QemuOptsList *opts_list, const char *optarg);
 int tpm_init(void);

diff --git a/include/sysemu/tpm_backend.h b/include/sysemu/tpm_backend.h
index 7e166ef954a74a9295dcc5600e690e8b5d1d1c14..14488820f6b8f3e46fab9a856c11fe85a2a7b2c1 100644 (file)
--- a/include/sysemu/tpm_backend.h
+++ b/include/sysemu/tpm_backend.h
@@ -15,7 +15,6 @@
 
 #include "qom/object.h"
 #include "qemu-common.h"
-#include "qapi-types.h"
 #include "qemu/option.h"
 #include "sysemu/tpm.h"
 #include "qapi/error.h"

diff --git a/include/ui/console.h b/include/ui/console.h
index 4c5d2102b602004b3917a98c5e0ae388b57c4f28..2a5efa79edce7dbf2e2984ac7845d6764598334e 100644 (file)
--- a/include/ui/console.h
+++ b/include/ui/console.h
@@ -5,7 +5,6 @@
 #include "qom/object.h"
 #include "qapi/qmp/qdict.h"
 #include "qemu/notify.h"
-#include "qapi-types.h"
 #include "qemu/error-report.h"
 #include "qapi/error.h"
 

diff --git a/migration/migration.h b/migration/migration.h
index d3b214e5ba8267867000345c3084b350f3692e49..848f638a204a81ea3ee81959f45513f1458fbeb4 100644 (file)
--- a/migration/migration.h
+++ b/migration/migration.h
@@ -16,7 +16,6 @@
 
 #include "qemu-common.h"
 #include "qemu/thread.h"
-#include "qapi-types.h"
 #include "exec/cpu-common.h"
 #include "qemu/coroutine_int.h"
 #include "hw/qdev.h"

diff --git a/net/clients.h b/net/clients.h
index 5cae479730b9790843ea13ef1df93055b7b7dc67..a6ef267e198a4cf1ebbec744dcb60107be3e418e 100644 (file)
--- a/net/clients.h
+++ b/net/clients.h
@@ -25,7 +25,6 @@
 #define QEMU_NET_CLIENTS_H
 
 #include "net/net.h"
-#include "qapi-types.h"
 
 int net_init_dump(const Netdev *netdev, const char *name,
                   NetClientState *peer, Error **errp);

diff --git a/net/tap_int.h b/net/tap_int.h
index ae6888f74ae04df497bb16ab720aa0ca17f47c5b..e3a14d5dda9ebfe78b58a45314d90ae9bd7ef74a 100644 (file)
--- a/net/tap_int.h
+++ b/net/tap_int.h
@@ -27,7 +27,6 @@
 #define NET_TAP_INT_H
 
 #include "qemu-common.h"
-#include "qapi-types.h"
 
 int tap_open(char *ifname, int ifname_size, int *vnet_hdr,
              int vnet_hdr_required, int mq_required, Error **errp);

diff --git a/qapi/qmp-dispatch.c b/qapi/qmp-dispatch.c
index b41fa174fee85faf6c9a88972e2a1b3ab561d196..7d18524f3c11419fa27a76b05dda4613962895f7 100644 (file)
--- a/qapi/qmp-dispatch.c
+++ b/qapi/qmp-dispatch.c
@@ -17,7 +17,6 @@
 #include "qapi/qmp/dispatch.h"
 #include "qapi/qmp/json-parser.h"
 #include "qapi/qmp/qjson.h"
-#include "qapi-types.h"
 #include "qapi/qmp/qerror.h"
 
 static QDict *qmp_dispatch_check_obj(const QObject *request, Error **errp)

diff --git a/qemu-keymap.c b/qemu-keymap.c
index 49e9167b866a4f1cabea1b95d45eaba1fa357cff..6216371aa1e026a6562831c2adbe927ce372b6db 100644 (file)
--- a/qemu-keymap.c
+++ b/qemu-keymap.c
@@ -11,7 +11,6 @@
  */
 #include "qemu/osdep.h"
 #include "qemu-common.h"
-#include "qapi-types.h"
 #include "qemu/notify.h"
 #include "ui/input.h"
 

diff --git a/target/i386/cpu.c b/target/i386/cpu.c
index d70954b8b70b4994a11bf74992669cfde2fe027f..6b4103cd27d1bf576f92d4422f25036cca9d7597 100644 (file)
--- a/target/i386/cpu.c
+++ b/target/i386/cpu.c
@@ -32,7 +32,6 @@
 #include "qapi/qmp/qerror.h"
 #include "qapi/qmp/types.h"
 
-#include "qapi-types.h"
 #include "qapi-visit.h"
 #include "qapi/visitor.h"
 #include "qom/qom-qobject.h"

diff --git a/tests/test-clone-visitor.c b/tests/test-clone-visitor.c
index ac6afc562e89daa5cd8088ff8b0dc9ae11a15c86..6b6d4aaebabd78c48d9f89976ef907396959dca7 100644 (file)
--- a/tests/test-clone-visitor.c
+++ b/tests/test-clone-visitor.c
@@ -11,7 +11,6 @@
 
 #include "qemu-common.h"
 #include "qapi/clone-visitor.h"
-#include "test-qapi-types.h"
 #include "test-qapi-visit.h"
 #include "qapi/qmp/types.h"
 

diff --git a/tests/test-qapi-util.c b/tests/test-qapi-util.c
index 4b5e4f8bd36be06003036cfac82ea49f8278a623..847f305cff940b4c6d395541769c6785e2ecae3d 100644 (file)
--- a/tests/test-qapi-util.c
+++ b/tests/test-qapi-util.c
@@ -12,7 +12,6 @@
 
 #include "qemu/osdep.h"
 #include "qapi/error.h"
-#include "test-qapi-types.h"
 
 static void test_qapi_enum_parse(void)
 {

diff --git a/tests/test-qmp-event.c b/tests/test-qmp-event.c
index 9fb3c5e81e8182655cc2f967d9ccced288f4db20..46825b4f3f02e5dd266b0ec6375ac8d97d38df70 100644 (file)
--- a/tests/test-qmp-event.c
+++ b/tests/test-qmp-event.c
@@ -14,7 +14,6 @@
 #include "qemu/osdep.h"
 
 #include "qemu-common.h"
-#include "test-qapi-types.h"
 #include "test-qapi-visit.h"
 #include "test-qapi-event.h"
 #include "qapi/qmp/types.h"

diff --git a/tests/test-qobject-input-visitor.c b/tests/test-qobject-input-visitor.c
index fe591814e4489e66896137f78793e789ee3dda38..ade6062e2c2aee5162afa54febf571f201e44a0c 100644 (file)
--- a/tests/test-qobject-input-visitor.c
+++ b/tests/test-qobject-input-visitor.c
@@ -16,7 +16,6 @@
 #include "qemu-common.h"
 #include "qapi/error.h"
 #include "qapi/qobject-input-visitor.h"
-#include "test-qapi-types.h"
 #include "test-qapi-visit.h"
 #include "qapi/qmp/types.h"
 #include "qapi/qmp/qjson.h"

diff --git a/tests/test-qobject-output-visitor.c b/tests/test-qobject-output-visitor.c
index d375100a52b5c170c3d8fffe60dc121f6a913cb8..1cff769b1514fecbdcecd1ca701213bed3e8c24b 100644 (file)
--- a/tests/test-qobject-output-visitor.c
+++ b/tests/test-qobject-output-visitor.c
@@ -15,7 +15,6 @@
 #include "qemu-common.h"
 #include "qapi/error.h"
 #include "qapi/qobject-output-visitor.h"
-#include "test-qapi-types.h"
 #include "test-qapi-visit.h"
 #include "qapi/qmp/types.h"
 #include "qapi/qmp/qjson.h"

diff --git a/tests/test-string-input-visitor.c b/tests/test-string-input-visitor.c
index 4f9c36bef173f903771c220dc6e32a958a0cc07e..4473944f3f9df3dd6326e9746648c7a5a9b3aaf6 100644 (file)
--- a/tests/test-string-input-visitor.c
+++ b/tests/test-string-input-visitor.c
@@ -15,7 +15,6 @@
 #include "qemu-common.h"
 #include "qapi/error.h"
 #include "qapi/string-input-visitor.h"
-#include "test-qapi-types.h"
 #include "test-qapi-visit.h"
 #include "qapi/qmp/types.h"
 

diff --git a/tests/test-string-output-visitor.c b/tests/test-string-output-visitor.c
index 385cddb5d9ff7a3e7e0f8b175d141592167fcc7a..facb76ffc3b979e298c37292a2d82229ee38fee3 100644 (file)
--- a/tests/test-string-output-visitor.c
+++ b/tests/test-string-output-visitor.c
@@ -15,7 +15,6 @@
 #include "qemu-common.h"
 #include "qapi/error.h"
 #include "qapi/string-output-visitor.h"
-#include "test-qapi-types.h"
 #include "test-qapi-visit.h"
 #include "qapi/qmp/types.h"
 

diff --git a/tests/test-visitor-serialization.c b/tests/test-visitor-serialization.c
index 4d47ceec7ad109d1b588757f4f88263f9c766b1a..a3407d205d95553aa88ef83ed782605ba8cfea8e 100644 (file)
--- a/tests/test-visitor-serialization.c
+++ b/tests/test-visitor-serialization.c
@@ -15,7 +15,6 @@
 #include <float.h>
 
 #include "qemu-common.h"
-#include "test-qapi-types.h"
 #include "test-qapi-visit.h"
 #include "qapi/error.h"
 #include "qapi/qmp/types.h"
@@ -24,7 +23,6 @@
 #include "qapi/qobject-output-visitor.h"
 #include "qapi/string-input-visitor.h"
 #include "qapi/string-output-visitor.h"
-#include "qapi-types.h"
 #include "qapi-visit.h"
 #include "qapi/dealloc-visitor.h"
 

diff --git a/ui/input-legacy.c b/ui/input-legacy.c
index c75aba1549f035becf5b424123afb3fdfdeb375b..92b37ccb902ca28a27750bfbcd02671de0226b4e 100644 (file)
--- a/ui/input-legacy.c
+++ b/ui/input-legacy.c
@@ -26,7 +26,6 @@
 #include "sysemu/sysemu.h"
 #include "ui/console.h"
 #include "qmp-commands.h"
-#include "qapi-types.h"
 #include "ui/keymaps.h"
 #include "ui/input.h"
 

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

diff --git a/ui/vnc.h b/ui/vnc.h
index 23b4dbbe72d531ecdb4e6182a65654911cc1dc4f..1ca062f3321c18ffbbaebbb0112ef4a98217b051 100644 (file)
--- a/ui/vnc.h
+++ b/ui/vnc.h
@@ -43,7 +43,6 @@
 #include "keymaps.h"
 #include "vnc-palette.h"
 #include "vnc-enc-zrle.h"
-#include "qapi-types.h"
 
 // #define _VNC_DEBUG 1