[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL v1 06/12] hw/tpm: Move 'hw/acpi/tpm.h' inclusion from header to so
From: |
Stefan Berger |
Subject: |
[PULL v1 06/12] hw/tpm: Move 'hw/acpi/tpm.h' inclusion from header to sources |
Date: |
Tue, 23 Jun 2020 07:41:08 -0400 |
From: Philippe Mathieu-Daudé <philmd@redhat.com>
Nothing in "tpm_ppi.h" require declarations from "hw/acpi/tpm.h".
Reduce dependencies and include it only in the files requiring it.
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Stefan Berger <stefanb@linux.ibm.com>
Message-id: 20200612085444.8362-7-philmd@redhat.com
Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
---
hw/tpm/tpm_ppi.c | 1 +
hw/tpm/tpm_ppi.h | 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.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_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_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.24.1
- [PULL v1 00/12] Merge tpm 2020/06/23 v1, Stefan Berger, 2020/06/23
- [PULL v1 02/12] backends: Add TPM files into their own directory, Stefan Berger, 2020/06/23
- [PULL v1 01/12] docs/specs/tpm: Correct header path name, Stefan Berger, 2020/06/23
- [PULL v1 05/12] hw/tpm: Include missing 'qemu/option.h' header, Stefan Berger, 2020/06/23
- [PULL v1 04/12] hw/tpm: Do not include 'qemu/osdep.h' in header, Stefan Berger, 2020/06/23
- [PULL v1 03/12] hw/tpm: Rename TPMDEV as TPM_BACKEND in Kconfig, Stefan Berger, 2020/06/23
- [PULL v1 06/12] hw/tpm: Move 'hw/acpi/tpm.h' inclusion from header to sources,
Stefan Berger <=
- [PULL v1 09/12] hw/tpm: Move few declarations from 'tpm_util.h' to 'tpm_int.h', Stefan Berger, 2020/06/23
- [PULL v1 07/12] hw/tpm: Remove unnecessary 'tpm_int.h' header inclusion, Stefan Berger, 2020/06/23
- [PULL v1 08/12] hw/tpm: Make TRACE_TPM_UTIL_SHOW_BUFFER check local to tpm_util.c, Stefan Berger, 2020/06/23
- [PULL v1 10/12] hw/tpm: Move DEFINE_PROP_TPMBE() macro to 'tmp_prop.h' local header, Stefan Berger, 2020/06/23
- [PULL v1 11/12] hw/tpm: Make 'tpm_util.h' publicly accessible as "sysemu/tpm_util.h", Stefan Berger, 2020/06/23
- [PULL v1 12/12] tpm: Move backend code under the 'backends/' directory, Stefan Berger, 2020/06/23
- Re: [PULL v1 00/12] Merge tpm 2020/06/23 v1, Peter Maydell, 2020/06/25