OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

hw/tpm: Clean includes

Browse Source 
"tpm_ppi.h" only requires to include "exec/memory.h" to get
the MemoryRegion declaration.

tpm_ppi.c requires "hw/qdev-core.h" to use the DEVICE() macro,
tpm_crb.c is the only source file requiring "exec/address-spaces.h".

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20220207082756.82600-2-f4bug@amsat.org>
Signed-off-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
Philippe Mathieu-Daudé 2022-02-07 09:27:48 +01:00 committed by Thomas Huth
parent 46fc411760
commit b05b6e3606
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hw/tpm/tpm_crb.c
View File

@ -18,6 +18,7 @@
#include "qemu/module.h" #include "qemu/module.h"
#include "qapi/error.h" #include "qapi/error.h"
#include "exec/address-spaces.h"
#include "hw/qdev-properties.h" #include "hw/qdev-properties.h"
#include "hw/pci/pci_ids.h" #include "hw/pci/pci_ids.h"
#include "hw/acpi/tpm.h" #include "hw/acpi/tpm.h"

4
hw/tpm/tpm_ppi.c
View File

@ -14,9 +14,9 @@
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "qapi/error.h" #include "qapi/error.h"
#include "cpu.h"
#include "sysemu/memory_mapping.h" #include "sysemu/memory_mapping.h"
#include "migration/vmstate.h" #include "migration/vmstate.h"
#include "hw/qdev-core.h"
#include "hw/acpi/tpm.h" #include "hw/acpi/tpm.h"
#include "tpm_ppi.h" #include "tpm_ppi.h"
#include "trace.h" #include "trace.h"
@ -44,7 +44,7 @@ void tpm_ppi_reset(TPMPPI *tpmppi)
} }
} }
void tpm_ppi_init(TPMPPI *tpmppi, struct MemoryRegion *m, void tpm_ppi_init(TPMPPI *tpmppi, MemoryRegion *m,
hwaddr addr, Object *obj) hwaddr addr, Object *obj)
{ {
tpmppi->buf = qemu_memalign(qemu_real_host_page_size, tpmppi->buf = qemu_memalign(qemu_real_host_page_size,

4
hw/tpm/tpm_ppi.h
View File

@ -12,7 +12,7 @@
#ifndef TPM_TPM_PPI_H #ifndef TPM_TPM_PPI_H
#define TPM_TPM_PPI_H #define TPM_TPM_PPI_H
#include "exec/address-spaces.h" #include "exec/memory.h"
typedef struct TPMPPI { typedef struct TPMPPI {
MemoryRegion ram; MemoryRegion ram;
@ -29,7 +29,7 @@ typedef struct TPMPPI {
* Register the TPM PPI memory region at @addr on the given address * Register the TPM PPI memory region at @addr on the given address
* space for the object @obj. * space for the object @obj.
**/ **/
void tpm_ppi_init(TPMPPI *tpmppi, struct MemoryRegion *m, void tpm_ppi_init(TPMPPI *tpmppi, MemoryRegion *m,
hwaddr addr, Object *obj); hwaddr addr, Object *obj);
/** /**