Re: [Qemu-devel] [PATCH v4 5/5] Qemu-Xen-vTPM: QEMU machine class is initialized before tpm_init()

[Stefan Berger <stefanb@linux.vnet.ibm.com>]

On 03/10/2015 08:14 AM, Quan Xu wrote:
> make sure QEMU machine class is initialized and QEMU has registered
> Xen stubdom vTPM driver when call tpm_init()
>
> Signed-off-by: Quan Xu <quan.xu@intel.com>
> ---
>   vl.c | 17 +++++++++++------
>   1 file changed, 11 insertions(+), 6 deletions(-)
>
> diff --git a/vl.c b/vl.c
> index f6b3546..0bbdaa1 100644
> --- a/vl.c
> +++ b/vl.c
> @@ -4114,12 +4114,6 @@ 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))
>           exit(1);
> @@ -4225,6 +4219,17 @@ int main(int argc, char **argv, char **envp)
>               exit(1);
>       }
>
> +    /*
> +     * For compatible with Xen stubdom vTPM driver, make
> +     * sure QEMU machine class is initialized and QEMU has
> +     * registered Xen stubdom vTPM driver.
> +     */
> +#ifdef CONFIG_TPM
> +    if (tpm_init() < 0) {
> +        exit(1);
> +    }
> +#endif
> +
>       /* init generic devices */
>       if (qemu_opts_foreach(qemu_find_opts("device"), device_init_func, NULL, 1) != 0)
>           exit(1);
Reviewed-by: Stefan Berger <stefanb@linux.vnet.ibm.com>