1. Patchew
  2. QEMU
  3. [PATCH 0/8] tpm: Split hw/ vs backends/
  4. View patch

[PATCH 7/8] hw/tpm: Make 'tpm_util.h' publicly accessible as "sysemu/tpm_util.h"

Philippe Mathieu-Daudé posted 8 patches 5 years, 8 months ago
There is a newer version of this series
[PATCH 7/8] hw/tpm: Make 'tpm_util.h' publicly accessible as "sysemu/tpm_util.h"
Posted by Philippe Mathieu-Daudé 5 years, 8 months ago 
We are going to split the TPM backends from the TPM emulated
hardware in the next commit. Make the TPM util helpers accessible
by moving local "tpm_util.h" to global "sysemu/tpm_util.h".

Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
---
 {hw/tpm => include/sysemu}/tpm_util.h | 6 +++---
 hw/tpm/tpm_crb.c                      | 2 +-
 hw/tpm/tpm_emulator.c                 | 2 +-
 hw/tpm/tpm_passthrough.c              | 2 +-
 hw/tpm/tpm_spapr.c                    | 2 +-
 hw/tpm/tpm_tis_common.c               | 2 +-
 hw/tpm/tpm_util.c                     | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)
 rename {hw/tpm => include/sysemu}/tpm_util.h (95%)

diff --git a/hw/tpm/tpm_util.h b/include/sysemu/tpm_util.h
similarity index 95%
rename from hw/tpm/tpm_util.h
rename to include/sysemu/tpm_util.h
index cf61d830d7..63e872c3b2 100644
--- a/hw/tpm/tpm_util.h
+++ b/include/sysemu/tpm_util.h
@@ -19,8 +19,8 @@
  * License along with this library; if not, see <http://www.gnu.org/licenses/>
  */
 
-#ifndef TPM_TPM_UTIL_H
-#define TPM_TPM_UTIL_H
+#ifndef SYSEMU_TPM_UTIL_H
+#define SYSEMU_TPM_UTIL_H
 
 #include "sysemu/tpm.h"
 #include "qemu/bswap.h"
@@ -69,4 +69,4 @@ static inline void tpm_cmd_set_error(void *b, uint32_t error)
 void tpm_util_show_buffer(const unsigned char *buffer,
                           size_t buffer_size, const char *string);
 
-#endif /* TPM_TPM_UTIL_H */
+#endif /* SYSEMU_TPM_UTIL_H */
diff --git a/hw/tpm/tpm_crb.c b/hw/tpm/tpm_crb.c
index 1cac4d671d..60247295d4 100644
--- a/hw/tpm/tpm_crb.c
+++ b/hw/tpm/tpm_crb.c
@@ -24,9 +24,9 @@
 #include "hw/acpi/tpm.h"
 #include "migration/vmstate.h"
 #include "sysemu/tpm_backend.h"
+#include "sysemu/tpm_util.h"
 #include "sysemu/reset.h"
 #include "tpm_prop.h"
-#include "tpm_util.h"
 #include "tpm_ppi.h"
 #include "trace.h"
 
diff --git a/hw/tpm/tpm_emulator.c b/hw/tpm/tpm_emulator.c
index 3a0fc442f3..9605339f93 100644
--- a/hw/tpm/tpm_emulator.c
+++ b/hw/tpm/tpm_emulator.c
@@ -32,8 +32,8 @@
 #include "qemu/sockets.h"
 #include "io/channel-socket.h"
 #include "sysemu/tpm_backend.h"
+#include "sysemu/tpm_util.h"
 #include "tpm_int.h"
-#include "tpm_util.h"
 #include "tpm_ioctl.h"
 #include "migration/blocker.h"
 #include "migration/vmstate.h"
diff --git a/hw/tpm/tpm_passthrough.c b/hw/tpm/tpm_passthrough.c
index f67244b5d4..7403807ec4 100644
--- a/hw/tpm/tpm_passthrough.c
+++ b/hw/tpm/tpm_passthrough.c
@@ -28,10 +28,10 @@
 #include "qemu/module.h"
 #include "qemu/sockets.h"
 #include "sysemu/tpm_backend.h"
+#include "sysemu/tpm_util.h"
 #include "tpm_int.h"
 #include "qapi/clone-visitor.h"
 #include "qapi/qapi-visit-tpm.h"
-#include "tpm_util.h"
 #include "trace.h"
 
 #define TYPE_TPM_PASSTHROUGH "tpm-passthrough"
diff --git a/hw/tpm/tpm_spapr.c b/hw/tpm/tpm_spapr.c
index 65672048c7..cb4dfd1e6a 100644
--- a/hw/tpm/tpm_spapr.c
+++ b/hw/tpm/tpm_spapr.c
@@ -20,7 +20,7 @@
 #include "migration/vmstate.h"
 
 #include "sysemu/tpm_backend.h"
-#include "tpm_util.h"
+#include "sysemu/tpm_util.h"
 #include "tpm_prop.h"
 
 #include "hw/ppc/spapr.h"
diff --git a/hw/tpm/tpm_tis_common.c b/hw/tpm/tpm_tis_common.c
index 94704870f6..64206a6a3b 100644
--- a/hw/tpm/tpm_tis_common.c
+++ b/hw/tpm/tpm_tis_common.c
@@ -33,7 +33,7 @@
 #include "hw/qdev-properties.h"
 #include "migration/vmstate.h"
 #include "sysemu/tpm_backend.h"
-#include "tpm_util.h"
+#include "sysemu/tpm_util.h"
 #include "tpm_ppi.h"
 #include "trace.h"
 
diff --git a/hw/tpm/tpm_util.c b/hw/tpm/tpm_util.c
index c0a0f3d71f..d0ec2a8235 100644
--- a/hw/tpm/tpm_util.c
+++ b/hw/tpm/tpm_util.c
@@ -23,11 +23,11 @@
 #include "qemu/error-report.h"
 #include "qapi/error.h"
 #include "qapi/visitor.h"
-#include "tpm_util.h"
 #include "tpm_int.h"
 #include "exec/memory.h"
 #include "hw/qdev-properties.h"
 #include "sysemu/tpm_backend.h"
+#include "sysemu/tpm_util.h"
 #include "trace.h"
 
 /* tpm backend property */
-- 
2.21.3
Re: [PATCH 7/8] hw/tpm: Make 'tpm_util.h' publicly accessible as "sysemu/tpm_util.h"
Posted by Stefan Berger 5 years, 8 months ago 
On 6/10/20 4:02 PM, Philippe Mathieu-Daudé wrote:
> We are going to split the TPM backends from the TPM emulated
> hardware in the next commit. Make the TPM util helpers accessible
> by moving local "tpm_util.h" to global "sysemu/tpm_util.h".
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>

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


> ---
>   {hw/tpm => include/sysemu}/tpm_util.h | 6 +++---
>   hw/tpm/tpm_crb.c                      | 2 +-
>   hw/tpm/tpm_emulator.c                 | 2 +-
>   hw/tpm/tpm_passthrough.c              | 2 +-
>   hw/tpm/tpm_spapr.c                    | 2 +-
>   hw/tpm/tpm_tis_common.c               | 2 +-
>   hw/tpm/tpm_util.c                     | 2 +-
>   7 files changed, 9 insertions(+), 9 deletions(-)
>   rename {hw/tpm => include/sysemu}/tpm_util.h (95%)
>
> diff --git a/hw/tpm/tpm_util.h b/include/sysemu/tpm_util.h
> similarity index 95%
> rename from hw/tpm/tpm_util.h
> rename to include/sysemu/tpm_util.h
> index cf61d830d7..63e872c3b2 100644
> --- a/hw/tpm/tpm_util.h
> +++ b/include/sysemu/tpm_util.h
> @@ -19,8 +19,8 @@
>    * License along with this library; if not, see <http://www.gnu.org/licenses/>
>    */
>   
> -#ifndef TPM_TPM_UTIL_H
> -#define TPM_TPM_UTIL_H
> +#ifndef SYSEMU_TPM_UTIL_H
> +#define SYSEMU_TPM_UTIL_H
>   
>   #include "sysemu/tpm.h"
>   #include "qemu/bswap.h"
> @@ -69,4 +69,4 @@ static inline void tpm_cmd_set_error(void *b, uint32_t error)
>   void tpm_util_show_buffer(const unsigned char *buffer,
>                             size_t buffer_size, const char *string);
>   
> -#endif /* TPM_TPM_UTIL_H */
> +#endif /* SYSEMU_TPM_UTIL_H */
> diff --git a/hw/tpm/tpm_crb.c b/hw/tpm/tpm_crb.c
> index 1cac4d671d..60247295d4 100644
> --- a/hw/tpm/tpm_crb.c
> +++ b/hw/tpm/tpm_crb.c
> @@ -24,9 +24,9 @@
>   #include "hw/acpi/tpm.h"
>   #include "migration/vmstate.h"
>   #include "sysemu/tpm_backend.h"
> +#include "sysemu/tpm_util.h"
>   #include "sysemu/reset.h"
>   #include "tpm_prop.h"
> -#include "tpm_util.h"
>   #include "tpm_ppi.h"
>   #include "trace.h"
>   
> diff --git a/hw/tpm/tpm_emulator.c b/hw/tpm/tpm_emulator.c
> index 3a0fc442f3..9605339f93 100644
> --- a/hw/tpm/tpm_emulator.c
> +++ b/hw/tpm/tpm_emulator.c
> @@ -32,8 +32,8 @@
>   #include "qemu/sockets.h"
>   #include "io/channel-socket.h"
>   #include "sysemu/tpm_backend.h"
> +#include "sysemu/tpm_util.h"
>   #include "tpm_int.h"
> -#include "tpm_util.h"
>   #include "tpm_ioctl.h"
>   #include "migration/blocker.h"
>   #include "migration/vmstate.h"
> diff --git a/hw/tpm/tpm_passthrough.c b/hw/tpm/tpm_passthrough.c
> index f67244b5d4..7403807ec4 100644
> --- a/hw/tpm/tpm_passthrough.c
> +++ b/hw/tpm/tpm_passthrough.c
> @@ -28,10 +28,10 @@
>   #include "qemu/module.h"
>   #include "qemu/sockets.h"
>   #include "sysemu/tpm_backend.h"
> +#include "sysemu/tpm_util.h"
>   #include "tpm_int.h"
>   #include "qapi/clone-visitor.h"
>   #include "qapi/qapi-visit-tpm.h"
> -#include "tpm_util.h"
>   #include "trace.h"
>   
>   #define TYPE_TPM_PASSTHROUGH "tpm-passthrough"
> diff --git a/hw/tpm/tpm_spapr.c b/hw/tpm/tpm_spapr.c
> index 65672048c7..cb4dfd1e6a 100644
> --- a/hw/tpm/tpm_spapr.c
> +++ b/hw/tpm/tpm_spapr.c
> @@ -20,7 +20,7 @@
>   #include "migration/vmstate.h"
>   
>   #include "sysemu/tpm_backend.h"
> -#include "tpm_util.h"
> +#include "sysemu/tpm_util.h"
>   #include "tpm_prop.h"
>   
>   #include "hw/ppc/spapr.h"
> diff --git a/hw/tpm/tpm_tis_common.c b/hw/tpm/tpm_tis_common.c
> index 94704870f6..64206a6a3b 100644
> --- a/hw/tpm/tpm_tis_common.c
> +++ b/hw/tpm/tpm_tis_common.c
> @@ -33,7 +33,7 @@
>   #include "hw/qdev-properties.h"
>   #include "migration/vmstate.h"
>   #include "sysemu/tpm_backend.h"
> -#include "tpm_util.h"
> +#include "sysemu/tpm_util.h"
>   #include "tpm_ppi.h"
>   #include "trace.h"
>   
> diff --git a/hw/tpm/tpm_util.c b/hw/tpm/tpm_util.c
> index c0a0f3d71f..d0ec2a8235 100644
> --- a/hw/tpm/tpm_util.c
> +++ b/hw/tpm/tpm_util.c
> @@ -23,11 +23,11 @@
>   #include "qemu/error-report.h"
>   #include "qapi/error.h"
>   #include "qapi/visitor.h"
> -#include "tpm_util.h"
>   #include "tpm_int.h"
>   #include "exec/memory.h"
>   #include "hw/qdev-properties.h"
>   #include "sysemu/tpm_backend.h"
> +#include "sysemu/tpm_util.h"
>   #include "trace.h"
>   
>   /* tpm backend property */

Patchew 2.1-devel-b67e4c2

© 2016 - 2026 Red Hat, Inc.