From 0b8fa32f551e863bb548a11394239239270dd3dc Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Thu, 23 May 2019 16:35:07 +0200 Subject: Include qemu/module.h where needed, drop it from qemu-common.h Signed-off-by: Markus Armbruster 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] --- hw/tpm/tpm_crb.c | 2 +- hw/tpm/tpm_emulator.c | 1 + hw/tpm/tpm_passthrough.c | 2 +- hw/tpm/tpm_tis.c | 1 + 4 files changed, 4 insertions(+), 2 deletions(-) (limited to 'hw/tpm') diff --git a/hw/tpm/tpm_crb.c b/hw/tpm/tpm_crb.c index 3087acc4ab..5e2db9e0c4 100644 --- a/hw/tpm/tpm_crb.c +++ b/hw/tpm/tpm_crb.c @@ -16,7 +16,7 @@ #include "qemu/osdep.h" -#include "qemu-common.h" +#include "qemu/module.h" #include "qapi/error.h" #include "exec/address-spaces.h" diff --git a/hw/tpm/tpm_emulator.c b/hw/tpm/tpm_emulator.c index 70f4b10284..1288cbcb8d 100644 --- a/hw/tpm/tpm_emulator.c +++ b/hw/tpm/tpm_emulator.c @@ -28,6 +28,7 @@ #include "qemu/osdep.h" #include "qemu/error-report.h" +#include "qemu/module.h" #include "qemu/sockets.h" #include "io/channel-socket.h" #include "sysemu/tpm_backend.h" diff --git a/hw/tpm/tpm_passthrough.c b/hw/tpm/tpm_passthrough.c index 479317ee50..e87bd126c6 100644 --- a/hw/tpm/tpm_passthrough.c +++ b/hw/tpm/tpm_passthrough.c @@ -23,8 +23,8 @@ */ #include "qemu/osdep.h" -#include "qemu-common.h" #include "qemu/error-report.h" +#include "qemu/module.h" #include "qemu/sockets.h" #include "sysemu/tpm_backend.h" #include "tpm_int.h" diff --git a/hw/tpm/tpm_tis.c b/hw/tpm/tpm_tis.c index fd183e8deb..174618ac30 100644 --- a/hw/tpm/tpm_tis.c +++ b/hw/tpm/tpm_tis.c @@ -25,6 +25,7 @@ #include "qemu/osdep.h" #include "hw/isa/isa.h" #include "qapi/error.h" +#include "qemu/module.h" #include "hw/acpi/tpm.h" #include "hw/pci/pci_ids.h" -- cgit v1.2.3-55-g7522