From 522ece32d214bd4b086821c4350c2aebe5587878 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Thu, 1 Feb 2018 12:18:30 +0100 Subject: Drop superfluous includes of qapi-types.h and test-qapi-types.h MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Eric Blake Signed-off-by: Markus Armbruster Message-Id: <20180201111846.21846-4-armbru@redhat.com> --- include/block/block.h | 1 - include/block/block_int.h | 1 - include/block/qapi.h | 1 - include/hw/acpi/acpi_dev_interface.h | 1 - include/migration/failover.h | 1 - include/net/net.h | 1 - include/net/slirp.h | 1 - include/net/tap.h | 1 - include/qapi/qmp/qlit.h | 1 - include/sysemu/dump.h | 1 - include/sysemu/replay.h | 1 - include/sysemu/sysemu.h | 1 - include/sysemu/tpm.h | 1 - include/sysemu/tpm_backend.h | 1 - include/ui/console.h | 1 - 15 files changed, 15 deletions(-) (limited to 'include') 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" -- cgit v1.1