diff options
| author | Markus Armbruster <armbru@redhat.com> | 2019-05-23 16:35:07 +0200 |
|---|---|---|
| committer | Markus Armbruster <armbru@redhat.com> | 2019-06-12 13:18:33 +0200 |
| commit | 0b8fa32f551e863bb548a11394239239270dd3dc (patch) | |
| tree | 5407f5eb794045d03eb5f817a4d2fc611524d057 /include | |
| parent | 856dfd8a035e42cd96ca823f1cbbd18d332e2f84 (diff) | |
| download | qemu-0b8fa32f551e863bb548a11394239239270dd3dc.zip qemu-0b8fa32f551e863bb548a11394239239270dd3dc.tar.gz qemu-0b8fa32f551e863bb548a11394239239270dd3dc.tar.bz2 | |
Include qemu/module.h where needed, drop it from qemu-common.h
Signed-off-by: Markus Armbruster <armbru@redhat.com>
Message-Id: <20190523143508.25387-4-armbru@redhat.com>
[Rebased with conflicts resolved automatically, except for
hw/usb/dev-hub.c hw/misc/exynos4210_rng.c hw/misc/bcm2835_rng.c
hw/misc/aspeed_scu.c hw/display/virtio-vga.c hw/arm/stm32f205_soc.c;
ui/cocoa.m fixed up]
Diffstat (limited to 'include')
| -rw-r--r-- | include/hw/boards.h | 1 | ||||
| -rw-r--r-- | include/hw/hw.h | 1 | ||||
| -rw-r--r-- | include/hw/i386/pc.h | 2 | ||||
| -rw-r--r-- | include/qemu-common.h | 2 | ||||
| -rw-r--r-- | include/qom/object.h | 1 |
5 files changed, 3 insertions, 4 deletions
diff --git a/include/hw/boards.h b/include/hw/boards.h index 6ff02bf..b7362af 100644 --- a/include/hw/boards.h +++ b/include/hw/boards.h @@ -6,6 +6,7 @@ #include "sysemu/blockdev.h" #include "sysemu/accel.h" #include "hw/qdev.h" +#include "qemu/module.h" #include "qom/object.h" #include "qom/cpu.h" diff --git a/include/hw/hw.h b/include/hw/hw.h index ab4950c..b1b7996 100644 --- a/include/hw/hw.h +++ b/include/hw/hw.h @@ -12,7 +12,6 @@ #include "hw/irq.h" #include "migration/vmstate.h" #include "migration/qemu-file-types.h" -#include "qemu/module.h" #include "sysemu/reset.h" void QEMU_NORETURN hw_error(const char *fmt, ...) GCC_FMT_ATTR(1, 2); diff --git a/include/hw/i386/pc.h b/include/hw/i386/pc.h index 5d56362..a7d0b87 100644 --- a/include/hw/i386/pc.h +++ b/include/hw/i386/pc.h @@ -1,7 +1,6 @@ #ifndef HW_PC_H #define HW_PC_H -#include "qemu-common.h" #include "exec/memory.h" #include "hw/boards.h" #include "hw/isa/isa.h" @@ -12,6 +11,7 @@ #include "qemu/range.h" #include "qemu/bitmap.h" +#include "qemu/module.h" #include "sysemu/sysemu.h" #include "hw/pci/pci.h" #include "hw/mem/pc-dimm.h" diff --git a/include/qemu-common.h b/include/qemu-common.h index 9b01f6e..e15adc2 100644 --- a/include/qemu-common.h +++ b/include/qemu-common.h @@ -113,8 +113,6 @@ void os_setup_early_signal_handling(void); char *os_find_datadir(void); int os_parse_cmd_args(int index, const char *optarg); -#include "qemu/module.h" - /* * Hexdump a buffer to a file. An optional string prefix is added to every line */ diff --git a/include/qom/object.h b/include/qom/object.h index 288cddd..7bb82a7 100644 --- a/include/qom/object.h +++ b/include/qom/object.h @@ -16,6 +16,7 @@ #include "qapi/qapi-builtin-types.h" #include "qemu/queue.h" +#include "qemu/module.h" struct TypeImpl; typedef struct TypeImpl *Type; |