[Qemu-devel] [PATCH 3/3] vl: remove unnecessary #ifdef CONFIG_TPM

Philippe Mathieu-Daudé posted 3 patches 8 years, 3 months ago
There is a newer version of this series
[Qemu-devel] [PATCH 3/3] vl: remove unnecessary #ifdef CONFIG_TPM
Posted by Philippe Mathieu-Daudé 8 years, 3 months ago
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))
-- 
2.15.0.rc1


Re: [Qemu-devel] [PATCH 3/3] vl: remove unnecessary #ifdef CONFIG_TPM
Posted by Richard W.M. Jones 8 years, 3 months ago
The series fixes the build for me, thanks :-)

Rich.

-- 
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
Read my programming and virtualization blog: http://rwmj.wordpress.com
virt-df lists disk usage of guests without needing to install any
software inside the virtual machine.  Supports Linux and Windows.
http://people.redhat.com/~rjones/virt-df/

Re: [Qemu-devel] [PATCH 3/3] vl: remove unnecessary #ifdef CONFIG_TPM
Posted by Philippe Mathieu-Daudé 8 years, 3 months ago
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.

Re: [Qemu-devel] [PATCH 3/3] vl: remove unnecessary #ifdef CONFIG_TPM
Posted by Richard W.M. Jones 8 years, 3 months ago
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.

-- 
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
Read my programming and virtualization blog: http://rwmj.wordpress.com
virt-df lists disk usage of guests without needing to install any
software inside the virtual machine.  Supports Linux and Windows.
http://people.redhat.com/~rjones/virt-df/

Re: [Qemu-devel] [PATCH 3/3] vl: remove unnecessary #ifdef CONFIG_TPM
Posted by Stefan Berger 8 years, 3 months ago
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