diff mbox series

[v2,3/4] tpm: remove unnecessary #ifdef CONFIG_TPM

Message ID 20171024122045.30072-4-f4bug@amsat.org
State New
Headers show
Series tpm: add stubs to fix compiling with --disable-tpm | expand

Commit Message

Philippe Mathieu-Daudé Oct. 24, 2017, 12:20 p.m. UTC
Makefile.objs now checks for $(CONFIG_TPM).

Suggested-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 tpm.c | 4 ----
 1 file changed, 4 deletions(-)

Comments

Stefan Berger Oct. 24, 2017, 5:35 p.m. UTC | #1
On 10/24/2017 08:20 AM, Philippe Mathieu-Daudé wrote:
> Makefile.objs now checks for $(CONFIG_TPM).
>
> Suggested-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

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

> ---
>   tpm.c | 4 ----
>   1 file changed, 4 deletions(-)
>
> diff --git a/tpm.c b/tpm.c
> index 45520f555d..ab5d29e91e 100644
> --- a/tpm.c
> +++ b/tpm.c
> @@ -30,8 +30,6 @@ void tpm_register_model(enum TpmModel model)
>       tpm_models[model] = true;
>   }
>
> -#ifdef CONFIG_TPM
> -
>   static const TPMBackendClass *
>   tpm_be_find_by_type(enum TpmType type)
>   {
> @@ -192,8 +190,6 @@ int tpm_config_parse(QemuOptsList *opts_list, const char *optarg)
>       return 0;
>   }
>
> -#endif /* CONFIG_TPM */
> -
>   /*
>    * Walk the list of active TPM backends and collect information about them
>    * following the schema description in qapi-schema.json.
Juan Quintela Oct. 24, 2017, 11:20 p.m. UTC | #2
Philippe Mathieu-Daudé <f4bug@amsat.org> wrote:
> Makefile.objs now checks for $(CONFIG_TPM).
>
> Suggested-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

Reviewed-by: Juan Quintela <quintela@redhat.com>
Valluri, Amarnath Oct. 26, 2017, 7:04 a.m. UTC | #3
On Tue, 2017-10-24 at 09:20 -0300, Philippe Mathieu-Daudé wrote:
> Makefile.objs now checks for $(CONFIG_TPM).

> 

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

> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

> ---


Reviewed-by: Amarnath Valluri <amarnath.valluri@intel.com>


>  tpm.c | 4 ----

>  1 file changed, 4 deletions(-)

> 

> diff --git a/tpm.c b/tpm.c

> index 45520f555d..ab5d29e91e 100644

> --- a/tpm.c

> +++ b/tpm.c

> @@ -30,8 +30,6 @@ void tpm_register_model(enum TpmModel model)

>      tpm_models[model] = true;

>  }

>  

> -#ifdef CONFIG_TPM

> -

>  static const TPMBackendClass *

>  tpm_be_find_by_type(enum TpmType type)

>  {

> @@ -192,8 +190,6 @@ int tpm_config_parse(QemuOptsList *opts_list,

> const char *optarg)

>      return 0;

>  }

>  

> -#endif /* CONFIG_TPM */

> -

>  /*

>   * Walk the list of active TPM backends and collect information

> about them

>   * following the schema description in qapi-schema.json.
diff mbox series

Patch

diff --git a/tpm.c b/tpm.c
index 45520f555d..ab5d29e91e 100644
--- a/tpm.c
+++ b/tpm.c
@@ -30,8 +30,6 @@  void tpm_register_model(enum TpmModel model)
     tpm_models[model] = true;
 }
 
-#ifdef CONFIG_TPM
-
 static const TPMBackendClass *
 tpm_be_find_by_type(enum TpmType type)
 {
@@ -192,8 +190,6 @@  int tpm_config_parse(QemuOptsList *opts_list, const char *optarg)
     return 0;
 }
 
-#endif /* CONFIG_TPM */
-
 /*
  * Walk the list of active TPM backends and collect information about them
  * following the schema description in qapi-schema.json.