[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 14/25] hw/tpm: Clean includes
From: |
Thomas Huth |
Subject: |
[PULL 14/25] hw/tpm: Clean includes |
Date: |
Mon, 21 Feb 2022 12:59:57 +0100 |
From: Philippe Mathieu-Daudé <f4bug@amsat.org>
"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>
---
hw/tpm/tpm_crb.c | 1 +
hw/tpm/tpm_ppi.c | 4 ++--
hw/tpm/tpm_ppi.h | 4 ++--
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/hw/tpm/tpm_crb.c b/hw/tpm/tpm_crb.c
index 58ebd1469c..aa9c00aad3 100644
--- a/hw/tpm/tpm_crb.c
+++ b/hw/tpm/tpm_crb.c
@@ -18,6 +18,7 @@
#include "qemu/module.h"
#include "qapi/error.h"
+#include "exec/address-spaces.h"
#include "hw/qdev-properties.h"
#include "hw/pci/pci_ids.h"
#include "hw/acpi/tpm.h"
diff --git a/hw/tpm/tpm_ppi.c b/hw/tpm/tpm_ppi.c
index 274e9aa4b0..6dbb9f41e4 100644
--- a/hw/tpm/tpm_ppi.c
+++ b/hw/tpm/tpm_ppi.c
@@ -14,9 +14,9 @@
#include "qemu/osdep.h"
#include "qapi/error.h"
-#include "cpu.h"
#include "sysemu/memory_mapping.h"
#include "migration/vmstate.h"
+#include "hw/qdev-core.h"
#include "hw/acpi/tpm.h"
#include "tpm_ppi.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)
{
tpmppi->buf = qemu_memalign(qemu_real_host_page_size,
diff --git a/hw/tpm/tpm_ppi.h b/hw/tpm/tpm_ppi.h
index 6f773c25a0..bf5d4a300f 100644
--- a/hw/tpm/tpm_ppi.h
+++ b/hw/tpm/tpm_ppi.h
@@ -12,7 +12,7 @@
#ifndef TPM_TPM_PPI_H
#define TPM_TPM_PPI_H
-#include "exec/address-spaces.h"
+#include "exec/memory.h"
typedef struct TPMPPI {
MemoryRegion ram;
@@ -29,7 +29,7 @@ typedef struct TPMPPI {
* Register the TPM PPI memory region at @addr on the given address
* 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);
/**
--
2.27.0
- [PULL 00/25] qtest patches and misc header clean-ups, Thomas Huth, 2022/02/21
- [PULL 01/25] tests/x86: Use 'pc' machine type for old hardware tests, Thomas Huth, 2022/02/21
- [PULL 03/25] erst: drop cast to long long, Thomas Huth, 2022/02/21
- [PULL 02/25] tests/x86: Use 'pc' machine type for hotplug tests, Thomas Huth, 2022/02/21
- [PULL 06/25] tests/qtest: failover: clean up pathname of tests, Thomas Huth, 2022/02/21
- [PULL 08/25] tests/qtest: failover: check the feature is correctly provided, Thomas Huth, 2022/02/21
- [PULL 07/25] tests/qtest: failover: use a macro for check_one_card(), Thomas Huth, 2022/02/21
- [PULL 04/25] tests/qtest/vhost-user-test.c: Use vhostforce=on, Thomas Huth, 2022/02/21
- [PULL 11/25] tests/qtest: failover: test migration if the guest doesn't support failover, Thomas Huth, 2022/02/21
- [PULL 12/25] tests/qtest: failover: migration abort test with failover off, Thomas Huth, 2022/02/21
- [PULL 14/25] hw/tpm: Clean includes,
Thomas Huth <=
- [PULL 05/25] tests/qtest/ide-test: Remove bad retry_isa test, Thomas Huth, 2022/02/21
- [PULL 10/25] tests/qtest: failover: check migration with failover off, Thomas Huth, 2022/02/21
- [PULL 09/25] tests/qtest: failover: check missing guest feature, Thomas Huth, 2022/02/21
- [PULL 13/25] scripts: Remove the old switch-timer-api script, Thomas Huth, 2022/02/21
- [PULL 19/25] core/ptimers: Remove unnecessary 'sysemu/cpus.h' include, Thomas Huth, 2022/02/21
- [PULL 16/25] hw/acpi/memory_hotplug: Remove unused 'hw/acpi/pc-hotplug.h' header, Thomas Huth, 2022/02/21
- [PULL 17/25] qtest: Add missing 'hw/qdev-core.h' include, Thomas Huth, 2022/02/21
- [PULL 15/25] hw/remote: Add missing include, Thomas Huth, 2022/02/21
- [PULL 21/25] linux-user: Add missing "qemu/timer.h" include, Thomas Huth, 2022/02/21
- [PULL 22/25] softmmu/runstate: Clean headers, Thomas Huth, 2022/02/21