[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v2 06/11] hw/tpm: Move 'hw/acpi/tpm.h' inclusion from header to s
From: |
Philippe Mathieu-Daudé |
Subject: |
[PATCH v2 06/11] hw/tpm: Move 'hw/acpi/tpm.h' inclusion from header to sources |
Date: |
Thu, 11 Jun 2020 18:03:01 +0200 |
Nothing in "tpm_ppi.h" require declarations from "hw/acpi/tpm.h".
Reduce dependencies and include it only in the files requiring it.
Reviewed-by: Stefan Berger <stefanb@linux.ibm.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
hw/tpm/tpm_ppi.h | 1 -
hw/tpm/tpm_ppi.c | 1 +
hw/tpm/tpm_tis_isa.c | 1 +
hw/tpm/tpm_tis_sysbus.c | 1 +
4 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/hw/tpm/tpm_ppi.h b/hw/tpm/tpm_ppi.h
index d33ef27de6..6f773c25a0 100644
--- a/hw/tpm/tpm_ppi.h
+++ b/hw/tpm/tpm_ppi.h
@@ -12,7 +12,6 @@
#ifndef TPM_TPM_PPI_H
#define TPM_TPM_PPI_H
-#include "hw/acpi/tpm.h"
#include "exec/address-spaces.h"
typedef struct TPMPPI {
diff --git a/hw/tpm/tpm_ppi.c b/hw/tpm/tpm_ppi.c
index 6d9c1a3e40..72d7a3d926 100644
--- a/hw/tpm/tpm_ppi.c
+++ b/hw/tpm/tpm_ppi.c
@@ -17,6 +17,7 @@
#include "cpu.h"
#include "sysemu/memory_mapping.h"
#include "migration/vmstate.h"
+#include "hw/acpi/tpm.h"
#include "tpm_ppi.h"
#include "trace.h"
diff --git a/hw/tpm/tpm_tis_isa.c b/hw/tpm/tpm_tis_isa.c
index 30ba37079d..42f909ff1e 100644
--- a/hw/tpm/tpm_tis_isa.c
+++ b/hw/tpm/tpm_tis_isa.c
@@ -26,6 +26,7 @@
#include "hw/isa/isa.h"
#include "hw/qdev-properties.h"
#include "migration/vmstate.h"
+#include "hw/acpi/tpm.h"
#include "tpm_util.h"
#include "tpm_tis.h"
diff --git a/hw/tpm/tpm_tis_sysbus.c b/hw/tpm/tpm_tis_sysbus.c
index eced1fc843..edca1dae0d 100644
--- a/hw/tpm/tpm_tis_sysbus.c
+++ b/hw/tpm/tpm_tis_sysbus.c
@@ -25,6 +25,7 @@
#include "qemu/osdep.h"
#include "hw/qdev-properties.h"
#include "migration/vmstate.h"
+#include "hw/acpi/tpm.h"
#include "tpm_util.h"
#include "hw/sysbus.h"
#include "tpm_tis.h"
--
2.21.3
- [PATCH v2 00/11] tpm: Split hw/ vs backends/, Philippe Mathieu-Daudé, 2020/06/11
- [PATCH v2 01/11] docs/specs/tpm: Correct header path name, Philippe Mathieu-Daudé, 2020/06/11
- [PATCH v2 02/11] backends: Add TPM files into their own directory, Philippe Mathieu-Daudé, 2020/06/11
- [PATCH v2 05/11] hw/tpm: Include missing 'qemu/option.h' header, Philippe Mathieu-Daudé, 2020/06/11
- [PATCH v2 06/11] hw/tpm: Move 'hw/acpi/tpm.h' inclusion from header to sources,
Philippe Mathieu-Daudé <=
- [PATCH v2 08/11] hw/tpm: Move few declarations from 'tpm_util.h' to 'tpm_int.h', Philippe Mathieu-Daudé, 2020/06/11
- [PATCH v2 10/11] hw/tpm: Make 'tpm_util.h' publicly accessible as "sysemu/tpm_util.h", Philippe Mathieu-Daudé, 2020/06/11
- [RFC PATCH v2 11/11] tpm: Move backend code under the 'backends/' directory, Philippe Mathieu-Daudé, 2020/06/11
- [PATCH v2 07/11] hw/tpm: Remove unnecessary 'tpm_int.h' header inclusion, Philippe Mathieu-Daudé, 2020/06/11
- [PATCH v2 09/11] hw/tpm: Move DEFINE_PROP_TPMBE() macro to 'tmp_prop.h' local header, Philippe Mathieu-Daudé, 2020/06/11
- [PATCH v2 03/11] hw/tpm: Rename TPMDEV as TPM_BACKEND in Kconfig, Philippe Mathieu-Daudé, 2020/06/11
- [PATCH v2 04/11] hw/tpm: Do not include 'qemu/osdep.h' in header, Philippe Mathieu-Daudé, 2020/06/11
- Re: [PATCH v2 00/11] tpm: Split hw/ vs backends/, Stefan Berger, 2020/06/11
- Re: [PATCH v2 00/11] tpm: Split hw/ vs backends/, Paolo Bonzini, 2020/06/23