Re: [PATCH 3/8] hw/tpm: Move 'hw/acpi/tpm.h' inclusion from header to sources

[Stefan Berger]

On 6/10/20 4:02 PM, Philippe Mathieu-Daudé wrote:

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é <phi...@redhat.com>

Reviewed-by: Stefan Berger <stef...@linux.ibm.com>

---
  hw/tpm/tpm_ppi.h        | 1 -
  hw/tpm/tpm_tis_isa.c    | 1 +
  hw/tpm/tpm_tis_sysbus.c | 1 +
  3 files changed, 2 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_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"