瀏覽代碼

hw/tpm: Move 'hw/acpi/tpm.h' inclusion from header to sources

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>
Philippe Mathieu-Daudé 5 年之前
父節點
當前提交
4021476605
共有 4 個文件被更改,包括 3 次插入1 次删除
  1. 1 0
      hw/tpm/tpm_ppi.c
  2. 0 1
      hw/tpm/tpm_ppi.h
  3. 1 0
      hw/tpm/tpm_tis_isa.c
  4. 1 0
      hw/tpm/tpm_tis_sysbus.c

+ 1 - 0
hw/tpm/tpm_ppi.c

@@ -17,6 +17,7 @@
 #include "cpu.h"
 #include "cpu.h"
 #include "sysemu/memory_mapping.h"
 #include "sysemu/memory_mapping.h"
 #include "migration/vmstate.h"
 #include "migration/vmstate.h"
+#include "hw/acpi/tpm.h"
 #include "tpm_ppi.h"
 #include "tpm_ppi.h"
 #include "trace.h"
 #include "trace.h"
 
 

+ 0 - 1
hw/tpm/tpm_ppi.h

@@ -12,7 +12,6 @@
 #ifndef TPM_TPM_PPI_H
 #ifndef TPM_TPM_PPI_H
 #define TPM_TPM_PPI_H
 #define TPM_TPM_PPI_H
 
 
-#include "hw/acpi/tpm.h"
 #include "exec/address-spaces.h"
 #include "exec/address-spaces.h"
 
 
 typedef struct TPMPPI {
 typedef struct TPMPPI {

+ 1 - 0
hw/tpm/tpm_tis_isa.c

@@ -26,6 +26,7 @@
 #include "hw/isa/isa.h"
 #include "hw/isa/isa.h"
 #include "hw/qdev-properties.h"
 #include "hw/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "migration/vmstate.h"
+#include "hw/acpi/tpm.h"
 #include "tpm_util.h"
 #include "tpm_util.h"
 #include "tpm_tis.h"
 #include "tpm_tis.h"
 
 

+ 1 - 0
hw/tpm/tpm_tis_sysbus.c

@@ -25,6 +25,7 @@
 #include "qemu/osdep.h"
 #include "qemu/osdep.h"
 #include "hw/qdev-properties.h"
 #include "hw/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "migration/vmstate.h"
+#include "hw/acpi/tpm.h"
 #include "tpm_util.h"
 #include "tpm_util.h"
 #include "hw/sysbus.h"
 #include "hw/sysbus.h"
 #include "tpm_tis.h"
 #include "tpm_tis.h"