提交 88011ed2 编写于 作者: J Jim Fehlig

libxl: fix crash when initializing driver

Commit 54a401af split out DriverConfigInit from DriverConfigNew, but
then called it a bit late from libxlStateInitialize. The cfg is used in
libxlDriverConfigLoadFile and when uninitialized results in a crash.
Calling DriverConfigInit immediately after DriverConfigNew fixes the
crash.
Signed-off-by: NJim Fehlig <jfehlig@suse.com>
Reviewed-by: NErik Skultety <eskultet@redhat.com>
Reviewed-by: NJán Tomko <jtomko@redhat.com>
上级 0895a0e7
...@@ -702,14 +702,14 @@ libxlStateInitialize(bool privileged, ...@@ -702,14 +702,14 @@ libxlStateInitialize(bool privileged,
if (!(cfg = libxlDriverConfigNew())) if (!(cfg = libxlDriverConfigNew()))
goto error; goto error;
if (libxlDriverConfigInit(cfg) < 0)
goto error;
driverConf = g_strdup_printf("%s/libxl.conf", cfg->configBaseDir); driverConf = g_strdup_printf("%s/libxl.conf", cfg->configBaseDir);
if (libxlDriverConfigLoadFile(cfg, driverConf) < 0) if (libxlDriverConfigLoadFile(cfg, driverConf) < 0)
goto error; goto error;
if (libxlDriverConfigInit(cfg) < 0)
goto error;
/* Register the callbacks providing access to libvirt's event loop */ /* Register the callbacks providing access to libvirt's event loop */
libxl_osevent_register_hooks(cfg->ctx, &libxl_osevent_callbacks, cfg->ctx); libxl_osevent_register_hooks(cfg->ctx, &libxl_osevent_callbacks, cfg->ctx);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册