diff mbox series

[3/3] vl: remove unnecessary #ifdef CONFIG_TPM

Message ID 20171023213359.23025-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. 23, 2017, 9:33 p.m. UTC
a stub is now provided.

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 vl.c | 2 --
 1 file changed, 2 deletions(-)

Comments

Richard W.M. Jones Oct. 23, 2017, 9:37 p.m. UTC | #1
The series fixes the build for me, thanks :-)

Rich.
Stefan Berger Oct. 23, 2017, 9:47 p.m. UTC | #2
On 10/23/2017 05:33 PM, Philippe Mathieu-Daudé wrote:
> a stub is now provided.
>
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
>   vl.c | 2 --
>   1 file changed, 2 deletions(-)
>
> diff --git a/vl.c b/vl.c
> index 0723835bbf..ec299099ff 100644
> --- a/vl.c
> +++ b/vl.c
> @@ -4624,11 +4624,9 @@ int main(int argc, char **argv, char **envp)
>           exit(1);
>       }
>
> -#ifdef CONFIG_TPM
>       if (tpm_init() < 0) {
>           exit(1);
>       }
> -#endif
>
>       /* init the bluetooth world */
>       if (foreach_device_config(DEV_BT, bt_parse))


Now you should be able to also remove the #ifdef CONFIG_TPM from ./tpm.c.

    Stefan
Philippe Mathieu-Daudé Oct. 24, 2017, 2:33 a.m. UTC | #3
Hi Richard,

On 10/23/2017 06:37 PM, Richard W.M. Jones wrote:
> The series fixes the build for me, thanks :-)

Good, does this mean I can add your Tested-by: tag?

Regards,

Phil.
Richard W.M. Jones Oct. 24, 2017, 7:29 a.m. UTC | #4
On Mon, Oct 23, 2017 at 11:33:31PM -0300, Philippe Mathieu-Daudé wrote:
> Hi Richard,
> 
> On 10/23/2017 06:37 PM, Richard W.M. Jones wrote:
> > The series fixes the build for me, thanks :-)
> 
> Good, does this mean I can add your Tested-by: tag?

Sure,

Tested-by: Richard W.M. Jones <rjones@redhat.com>

Rich.
diff mbox series

Patch

diff --git a/vl.c b/vl.c
index 0723835bbf..ec299099ff 100644
--- a/vl.c
+++ b/vl.c
@@ -4624,11 +4624,9 @@  int main(int argc, char **argv, char **envp)
         exit(1);
     }
 
-#ifdef CONFIG_TPM
     if (tpm_init() < 0) {
         exit(1);
     }
-#endif
 
     /* init the bluetooth world */
     if (foreach_device_config(DEV_BT, bt_parse))