[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Xen-devel] [Qemu-devel] [PATCH v4 5/5] Qemu-Xen-vTPM: QEMU machine class is initialized before tpm_init()
- To: Quan Xu <quan.xu@xxxxxxxxx>, stefano.stabellini@xxxxxxxxxxxxx, qemu-devel@xxxxxxxxxx, armbru@xxxxxxxxxx, lcapitulino@xxxxxxxxxx, aliguori@xxxxxxxxxx, pbonzini@xxxxxxxxxx, eblake@xxxxxxxxxx, kraxel@xxxxxxxxxx, meyering@xxxxxxxxxx, mjt@xxxxxxxxxx, sw@xxxxxxxxxxx, wei.liu2@xxxxxxxxxx
- From: Stefan Berger <stefanb@xxxxxxxxxxxxxxxxxx>
- Date: Fri, 20 Mar 2015 07:26:16 -0400
- Cc: xen-devel@xxxxxxxxxxxxx
- Delivery-date: Fri, 20 Mar 2015 11:26:42 +0000
- List-id: Xen developer discussion <xen-devel.lists.xen.org>
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@xxxxxxxxx>
---
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@xxxxxxxxxxxxxxxxxx>
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel
|
