diff options
author | Markus Armbruster <armbru@redhat.com> | 2018-02-01 12:18:30 +0100 |
---|---|---|
committer | Markus Armbruster <armbru@redhat.com> | 2018-02-09 05:05:11 +0100 |
commit | 522ece32d214bd4b086821c4350c2aebe5587878 (patch) | |
tree | d140a0dcadeaabaddb9faccaaa1fc84d59cdfc6f | |
parent | 8f0a3716e40cf479ebdc1cf5a34b8d500c05adff (diff) | |
download | qemu-522ece32d214bd4b086821c4350c2aebe5587878.zip qemu-522ece32d214bd4b086821c4350c2aebe5587878.tar.gz qemu-522ece32d214bd4b086821c4350c2aebe5587878.tar.bz2 |
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>
35 files changed, 0 insertions, 36 deletions
diff --git a/backends/cryptodev.c b/backends/cryptodev.c index 67edfa5..d0dff1a 100644 --- 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 ee2c2d5..81d1455 100644 --- 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" @@ -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 2025d7e..c67ea81 100644 --- 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 99b9190..3e1c908 100644 --- 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 82ba4b6..83bdb09 100644 --- 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 3c2e4e9..dabf4c4 100644 --- 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 ad91ef2..9283d60 100644 --- 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 4afac1a..eefb259 100644 --- 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 0c98e46..865d2fc 100644 --- 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 5da4edc..ce6f841 100644 --- 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 b18406b..56f9d97 100644 --- 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 df43bd0..c14bcfe 100644 --- 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 fa14d0e..dc8ae7b 100644 --- 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 1c92530..36fd371 100644 --- 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 233b1a3..32b753d 100644 --- 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 7e166ef..1448882 100644 --- 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 4c5d210..2a5efa7 100644 --- 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 d3b214e..848f638 100644 --- 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 5cae479..a6ef267 100644 --- 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 ae6888f..e3a14d5 100644 --- 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 b41fa17..7d18524 100644 --- 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 49e9167..6216371 100644 --- 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 d70954b..6b4103c 100644 --- 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 ac6afc5..6b6d4aa 100644 --- 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 4b5e4f8..847f305 100644 --- 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 9fb3c5e..46825b4 100644 --- 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 fe59181..ade6062 100644 --- 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 d375100..1cff769 100644 --- 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 4f9c36b..4473944 100644 --- 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 385cddb..facb76f 100644 --- 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 4d47cee..a3407d2 100644 --- 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 c75aba1..92b37cc 100644 --- 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" @@ -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" @@ -43,7 +43,6 @@ #include "keymaps.h" #include "vnc-palette.h" #include "vnc-enc-zrle.h" -#include "qapi-types.h" // #define _VNC_DEBUG 1 |